No longer require the first lib/ file, instead use the gemspec name.

postmodern · Apr 30, 2012 · fe7abb3 · fe7abb3
1 parent 1d641d1
commit fe7abb3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,6 +7,7 @@
 
 #### console
 
+* Infer the primary file to require from the gemspec name.
 * No longer run `bundle console`, since it is not the same as running
   `bundle exec irb -Ilib -rfoo/bar.rb`.
 

diff --git a/lib/rubygems/tasks/console.rb b/lib/rubygems/tasks/console.rb
@@ -70,7 +70,7 @@ def console(name=nil)
         gemspec = @project.gemspec(name)
 
         require_paths = gemspec.require_paths
-        require_file  = gemspec.files.find { |path| path.start_with?('lib/') }
+        require_file  = gemspec.name.gsub('-',File::SEPARATOR)
 
         arguments = [@command]
 

diff --git a/spec/console_spec.rb b/spec/console_spec.rb
@@ -8,7 +8,7 @@
     include_context "rake"
 
     if RUBY_VERSION < '1.9'
-      let(:default_options) { %w[-Ilib -rrubygems -rrubygems/tasks.rb] }
+      let(:default_options) { %w[-Ilib -rrubygems -rrubygems/tasks] }
     else
       let(:default_options) { %w[-Ilib -rrubygems/tasks.rb]            }
     end