bundler 1.0.19.rc → 1.0.20.rc

data/CHANGELOG.md

@@ -1,16 +1,31 @@
+## 1.0.20.rc (September 18, 2011)
+
+Features:
+
+  - Rescue interrupts to `bundle` while loading bundler.rb (#1395)
+  - Allow clearing without groups by passing `--without ''` (#1259)
+
+Bugfixes:
+
+  - Manually sort requirements in the lockfile (#1375)
+  - Remove several warnings generated by ruby -w (@stephencelis)
+  - Handle trailing slashes on names passed to `gem` (#1372)
+  - Name modules for gems like 'test-foo_bar' correctly (#1303)
+  - Don't require Psych if Syck is already loaded (#1239)
+
 ## 1.0.19.rc (September 13, 2011)
 
 Features:
 
-	- Compatability with Rubygems 1.8.10 installer changes
-	- Report gem installation failures clearly (@rwilcox, #1380)
-	- Useful error for cap and vlad on first deploy (@nexmat, @kirs)
+  - Compatability with Rubygems 1.8.10 installer changes
+  - Report gem installation failures clearly (@rwilcox, #1380)
+  - Useful error for cap and vlad on first deploy (@nexmat, @kirs)
 
 Bugfixes:
 
-	- `exec` now works when the command contains 'exec'
+  - `exec` now works when the command contains 'exec'
   - Only touch lock after changes on Windows (@robertwahler, #1358)
-	- Keep load paths when #setup is called multiple times (@radsaq, #1379)
+  - Keep load paths when #setup is called multiple times (@radsaq, #1379)
 
 ## 1.0.18 (August 16, 2011)
 

data/bin/bundle

@@ -1,15 +1,15 @@
 #!/usr/bin/env ruby
-
-# Check if an older version of bundler is installed
-require 'bundler'
-$:.each do |path|
-  if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
-    abort "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
-  end
-end
-require 'bundler/cli'
-
 begin
+  require 'bundler'
+  # Check if an older version of bundler is installed
+  $:.each do |path|
+    if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
+      err = "Please remove Bundler 0.8 versions."
+      err << "This can be done by running `gem cleanup bundler`."
+      abort(err)
+    end
+  end
+  require 'bundler/cli'
   Bundler::CLI.start
 rescue Bundler::BundlerError => e
   Bundler.ui.error e.message

data/bundler.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
 
   # Man files are required because they are ignored by git
   man_files            = Dir.glob("lib/bundler/man/**/*")
-  s.files              = `git ls-files`.split("\n") + man_files
+  git_files            = `git ls-files`.split("\n") rescue ''
+  s.files              = git_files + man_files
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables        = %w(bundle)
   s.require_paths      = ["lib"]

data/lib/bundler.rb

@@ -3,11 +3,12 @@ require 'fileutils'
 require 'pathname'
 
 begin
-  require 'psych'
+  # Pull in Psych if we can, but not if Syck is already loaded
+  require 'psych' unless defined?(YAML)
 rescue LoadError
+  require 'yaml'
 end
 
-require 'yaml'
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'
 require 'bundler/version'

data/lib/bundler/cli.rb

@@ -150,12 +150,11 @@ module Bundler
       "Install using defaults tuned for deployment environments"
     def install(path = nil)
       opts = options.dup
-      opts[:without] ||= []
-      if opts[:without].size == 1
-        opts[:without] = opts[:without].map{|g| g.split(" ") }
+      if opts[:without]
+        opts[:without].map!{|g| g.split(" ") }
         opts[:without].flatten!
+        opts[:without].map!{|g| g.to_sym }
       end
-      opts[:without] = opts[:without].map{|g| g.to_sym }
 
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
       ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
@@ -214,7 +213,7 @@ module Bundler
       Bundler.settings[:bin] = opts["binstubs"] if opts[:binstubs]
       Bundler.settings[:no_prune] = true if opts["no-prune"]
       Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
-      Bundler.settings.without = opts[:without] unless opts[:without].empty?
+      Bundler.settings.without = opts[:without]
       Bundler.ui.be_quiet! if opts[:quiet]
 
       Installer.install(Bundler.root, Bundler.definition, opts)
@@ -473,9 +472,10 @@ module Bundler
     desc "gem GEM", "Creates a skeleton for creating a rubygem"
     method_option :bin, :type => :boolean, :default => false, :aliases => '-b', :banner => "Generate a binary for your library."
     def gem(name)
+      name = name.chomp("/") # remove trailing slash if present
       target = File.join(Dir.pwd, name)
-      constant_name = name.split('_').map{|p| p.capitalize}.join
-      constant_name = constant_name.split('-').map{|q| q.capitalize}.join('::') if constant_name =~ /-/
+      constant_name = name.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
+      constant_name = constant_name.split('-').map{|q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
       constant_array = constant_name.split('::')
       git_author_name = `git config user.name`.chomp
       git_author_email = `git config user.email`.chomp

data/lib/bundler/dependency.rb

@@ -71,15 +71,8 @@ module Bundler
     end
 
     def to_lock
-      out = "  #{name}"
-
-      unless requirement == Gem::Requirement.default
-        reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }
-        out << " (#{reqs.join(', ')})"
-      end
-
+      out = super
       out << '!' if source
-
       out << "\n"
     end
 

data/lib/bundler/installer.rb

@@ -67,11 +67,12 @@ module Bundler
         Bundler.ui.debug "from #{spec.loaded_from} "
       end
 
-      # newline after installing, some gems say "with native extensions"
+      # newline comes after installing, some gems say "with native extensions"
       Bundler.ui.info ""
       generate_bundler_executable_stubs(spec) if Bundler.settings[:bin]
       FileUtils.rm_rf(Bundler.tmp)
     rescue Exception => e
+      Bundler.ui.info ""
       Bundler.ui.warn "#{e.class}: #{e.message}"
       msg = "An error occured while installing #{spec.name} (#{spec.version}),"
       msg << " and Bundler cannot continue.\nMake sure that `gem install"

data/lib/bundler/rubygems_ext.rb

@@ -40,6 +40,7 @@ module Gem
     end
 
     # RubyGems 1.8+ used only.
+    remove_method :gem_dir if method_defined? :gem_dir
     def gem_dir
       full_gem_path
     end
@@ -123,7 +124,7 @@ module Gem
     def to_lock
       out = "  #{name}"
       unless requirement == Gem::Requirement.default
-        reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }
+        reqs = requirement.requirements.map{|o,v| "#{o} #{v}" }.sort.reverse
         out << " (#{reqs.join(', ')})"
       end
       out
@@ -151,6 +152,7 @@ module Gem
     MSWIN = Gem::Platform.new('mswin32')
     MINGW = Gem::Platform.new('x86-mingw32')
 
+    undef_method :hash if method_defined? :hash
     def hash
       @cpu.hash ^ @os.hash ^ @version.hash
     end

data/lib/bundler/rubygems_integration.rb

@@ -180,6 +180,7 @@ module Bundler
     end
 
     def stub_source_index170(specs)
+      Gem::SourceIndex.send(:alias_method, :old_initialize, :initialize)
       Gem::SourceIndex.send(:define_method, :initialize) do |*args|
         @gems = {}
         # You're looking at this thinking: Oh! This is how I make those

data/lib/bundler/settings.rb

@@ -62,9 +62,7 @@ module Bundler
     end
 
     def without=(array)
-      unless array.empty?
-        self[:without] = array.join(":")
-      end
+      self[:without] = (array.empty? ? nil : array.join(":")) if array
     end
 
     def without

data/lib/bundler/source.rb

@@ -490,6 +490,7 @@ module Bundler
         @revision   = options["revision"]
         @submodules = options["submodules"]
         @update     = false
+        @installed  = nil
       end
 
       def self.from_lock(options)

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.0.19.rc" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.20.rc" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-install.ronn

@@ -54,9 +54,9 @@ update process below under [CONSERVATIVE UPDATING][].
 
 * `--local`:
   Do not attempt to connect to `rubygems.org`, instead using just
-  the gems located in `vendor/cache`. Note that if a more
-  appropriate platform-specific gem exists on `rubygems.org`,
-  this will bypass the normal lookup.
+  the gems already present in Rubygems' cache or in `vendor/cache`.
+  Note that if a more appropriate platform-specific gem exists on
+  `rubygems.org`, it will not be found.
 
 * `--deployment`:
   Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE].

data/man/gemfile.5.ronn

@@ -280,5 +280,5 @@ bundler uses the following priority order:
      repository otherwise declared. This results in bundler prioritizing the
      ActiveSupport gem from the Rails git repository over ones from
      `rubygems.org`
-  3. The sources specified via `source`, in the order in which they were
-     declared in the `Gemfile`.
+  3. The sources specified via `source`, searching each source in your `Gemfile`
+     from last added to first added.

data/spec/{other → bundler}/gem_helper_spec.rb

@@ -31,6 +31,13 @@ describe "Bundler::GemHelper tasks" do
       File.open(File.join(app.to_s, 'test2.gemspec'), 'w') {|f| f << ''}
       proc { Bundler::GemHelper.new(app.to_s) }.should raise_error(/Unable to determine name/)
     end
+
+    it "handles namespaces and converting to CamelCase" do
+      bundle 'gem test-foo_bar'
+      lib = bundled_app('test-foo_bar').join('lib/test-foo_bar.rb').read
+      lib.should include("module Test")
+      lib.should include("module FooBar")
+    end
   end
 
   context "gem management" do

data/spec/install/gems/groups_spec.rb

@@ -136,6 +136,20 @@ describe "bundle install with gem sources" do
 
           ENV["BUNDLE_WITHOUT"] = nil
         end
+
+        it "clears without when passed an empty list" do
+          bundle :install, :without => "emo"
+
+          bundle 'install --without ""'
+          should_be_installed "activesupport 2.3.5"
+        end
+
+        it "doesn't clear without when nothing is passed" do
+          bundle :install, :without => "emo"
+
+          bundle :install
+          should_not_be_installed "activesupport 2.3.5"
+        end
       end
 
       describe "with gems assigned to multiple groups" do

data/spec/lock/lockfile_spec.rb

@@ -70,10 +70,9 @@ describe "the lockfile format" do
     G
   end
 
-  it "parses lockfiles w/ crazy shit" do
+  it "generates lockfiles with multiple requirements" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
-
       gem "net-sftp"
     G
 

data/spec/other/help_spec.rb

@@ -7,7 +7,8 @@ describe "bundle help" do
     system_gems "bundler-0.8.1"
 
     bundle "help", :expect_err => true
-    err.should == "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
+    err.should include("Please remove Bundler 0.8 versions.")
+    err.should include("This can be done by running `gem cleanup bundler`.")
   end
 
   it "uses groff when available" do

data/spec/support/builders.rb

@@ -167,7 +167,12 @@ module Spec
         # The yard gem iterates over Gem.source_index looking for plugins
         build_gem "yard" do |s|
           s.write "lib/yard.rb", <<-Y
-            Gem.source_index.find_name('').each do |gem|
+            if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("1.8.10")
+              specs = Gem::Specification
+            else
+              specs = Gem.source_index.find_name('')
+            end
+            specs.each do |gem|
               puts gem.full_name
             end
           Y

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 7712070
+  hash: 7712090
   prerelease: true
   segments: 
   - 1
   - 0
-  - 19
+  - 20
   - rc
-  version: 1.0.19.rc
+  version: 1.0.20.rc
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 -07:00
+date: 2011-09-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,6 +146,7 @@ files:
 - man/bundle.ronn
 - man/gemfile.5.ronn
 - man/index.txt
+- spec/bundler/gem_helper_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
 - spec/cache/path_spec.rb
@@ -174,7 +175,6 @@ files:
 - spec/other/console_spec.rb
 - spec/other/exec_spec.rb
 - spec/other/ext_spec.rb
-- spec/other/gem_helper_spec.rb
 - spec/other/help_spec.rb
 - spec/other/init_spec.rb
 - spec/other/newgem_spec.rb
@@ -254,6 +254,7 @@ signing_key:
 specification_version: 3
 summary: The best way to manage your application's dependencies
 test_files: 
+- spec/bundler/gem_helper_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
 - spec/cache/path_spec.rb
@@ -282,7 +283,6 @@ test_files:
 - spec/other/console_spec.rb
 - spec/other/exec_spec.rb
 - spec/other/ext_spec.rb
-- spec/other/gem_helper_spec.rb
 - spec/other/help_spec.rb
 - spec/other/init_spec.rb
 - spec/other/newgem_spec.rb