bundler 1.1.5 → 1.2.0.pre

data/lib/bundler/templates/newgem/README.md.tt

@@ -24,6 +24,6 @@ TODO: Write usage instructions here
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request

data/lib/bundler/vendor/thor/parser/options.rb

@@ -1,7 +1,4 @@
 class Thor
-  # This is a modified version of Daniel Berger's Getopt::Long class, licensed
-  # under Ruby's license.
-  #
   class Options < Arguments #:nodoc:
     LONG_RE     = /^(--\w+(?:-\w+)*)$/
     SHORT_RE    = /^(-[a-z])$/i

data/lib/bundler/vendored_thor.rb

@@ -2,7 +2,6 @@ if defined?(Thor)
   Bundler.ui.warn "Thor has already been required. " +
     "This may cause Bundler to malfunction in unexpected ways."
 end
-vendor = File.expand_path('../vendor', __FILE__)
-$:.unshift(vendor) unless $:.include?(vendor)
+$:.unshift File.expand_path('../vendor', __FILE__)
 require 'thor'
 require 'thor/actions'

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.1.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.2.0.pre" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-config.ronn

@@ -23,6 +23,14 @@ Executing `bundle config <name> <value>` will set that configuration to the
 value specified for all bundles executed as the current user. The configuration
 will be stored in `~/.bundle/config`.
 
+Executing `bundle config --global <name> <value>` works the same as above.
+
+Executing `bundle config --local <name> <value>` will set that configuration to
+the local application. The configuration will be stored in `app/.bundle/config`.
+
+Executing `bundle config --delete <name>` will delete the configuration in both
+local and global sources.
+
 ## BUILD OPTIONS
 
 You can use `bundle config` to give bundler the flags to pass to the gem

data/man/bundle-install.ronn

@@ -10,6 +10,7 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
                  [--binstubs[=DIRECTORY]]
                  [--standalone[=GROUP1[ GROUP2...]]]
                  [--quiet]
+                 [--no-cache]
 
 ## DESCRIPTION
 
@@ -81,6 +82,11 @@ update process below under [CONSERVATIVE UPDATING][].
   `bundle` directory and installs the bundle there. It also generates
   a `bundle/bundler/setup.rb` file to replace Bundler's own setup.
 
+* `--no-cache`:
+  Do not update the cache in `vendor/cache` with the newly bundled gems. This
+  does not remove any existing cached gems, only stops the newly bundled gems
+  from being cached during the install.
+
 ## DEPLOYMENT MODE
 
 Bundler's defaults are optimized for development. To switch to

data/man/bundle-package.ronn

@@ -13,9 +13,9 @@ use the gems in the cache in preference to the ones on `rubygems.org`.
 
 ## GIT AND PATH GEMS
 
-In Bundler 1.0, the `bundle package` command only packages `.gem` files,
-not gems specified using the `:git` or `:path` options. This will likely
-change in the future.
+Since Bundler 1.2, the `bundle package` command can also package `:git` and
+`:path` dependencies besides .gem files. This needs to be explicitly enabled
+via the `--all` option. Once used, the `--all` option will be remembered.
 
 ## REMOTE FETCHING
 

data/man/gemfile.5.ronn

@@ -49,7 +49,6 @@ Each _gem_ `MAY` specify files that should be used when autorequiring via
 `Bundler.require`. You may pass an array with multiple files, or `false` to
 prevent any file from being autorequired.
 
-    gem "sqlite3-ruby", :require => "sqlite3"
     gem "redis", :require => ["redis/connection/hiredis", "redis"]
     gem "webmock", :require => false
 
@@ -203,7 +202,7 @@ the `.gemspec`.
     | |-actionpack.gemspec    [actionpack gem located here]
     |~activesupport
     | |-activesupport.gemspec [activesupport gem located here]
-    ...
+    |...
 
 To install a gem located in a git repository, bundler changes to
 the directory containing the gemspec, runs `gem build name.gemspec`
@@ -211,6 +210,20 @@ and then installs the resulting gem. The `gem build` command,
 which comes standard with Rubygems, evaluates the `.gemspec` in
 the context of the directory in which it is located.
 
+### GITHUB (:github)
+
+If the git repository you want to use is hosted on GitHub and is public, you can use the
+:github shorthand to specify just the github username and repository name (without the
+trailing ".git"), separated by a slash. If both the username and repository name are the
+same, you can omit one.
+
+    gem "rails", :github => "rails/rails"
+    gem "rails", :github => "rails"
+
+Are both equivalent to
+
+    gem "rails", :git => "git://github.com/rails/rails.git"
+
 ### PATH (:path)
 
 You can specify that a gem is located in a particular location
@@ -239,7 +252,7 @@ applied to a group of gems by using block form.
 
     platforms :ruby do
       gem "ruby-debug"
-      gem "sqlite3-ruby"
+      gem "sqlite3"
     end
 
     group :development do

data/spec/bundler/dsl_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Bundler::Dsl do
-  describe '#_normalize_options' do
-    before do
-      @rubygems = mock("rubygems")
-      Bundler::Source::Rubygems.stub(:new){ @rubygems }
-    end
+  before do
+    @rubygems = mock("rubygems")
+    Bundler::Source::Rubygems.stub(:new){ @rubygems }
+  end
 
+  describe '#_normalize_options' do
     it "should convert :github to :git" do
       subject.gem("sparks", :github => "indirect/sparks")
       github_uri = "git://github.com/indirect/sparks.git"
@@ -20,32 +20,29 @@ describe Bundler::Dsl do
     end
   end
 
+  describe '#method_missing' do
+    it 'should raise an error for unknown DSL methods' do
+      Bundler.should_receive(:read_file).with("Gemfile").and_return("unknown")
+      error_msg = "Undefined local variable or method `unknown'" \
+        " for Gemfile\\s+from Gemfile:1"
+      lambda{ subject.eval_gemfile("Gemfile") }.
+        should raise_error(Bundler::GemfileError, Regexp.new(error_msg))
+    end
+  end
+
+  describe "#eval_gemfile" do
+    it "handles syntax errors with a useful message" do
+      Bundler.should_receive(:read_file).with("Gemfile").and_return("}")
+      lambda{ subject.eval_gemfile("Gemfile") }.
+        should raise_error(Bundler::GemfileError, /Gemfile syntax error/)
+    end
+  end
+
   describe "syntax errors" do
     it "should raise a Bundler::GemfileError" do
       gemfile "gem 'foo', :path => /unquoted/string/syntax/error"
       lambda { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
         should raise_error(Bundler::GemfileError)
     end
-
-    it "should special case the ruby directive" do
-      gemfile <<-G
-        ruby "1.9.3"
-      G
-      lambda { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
-        should_not raise_error(Bundler::GemfileError)
-    end
-
-    it "should special case the ruby directive and throws a warning" do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-
-        ruby "1.9.3"
-
-        gem "foo"
-      G
-
-      out.should include("Ignoring `ruby` directive")
-      bundled_app("Gemfile.lock").should exist
-    end
   end
 end

data/spec/bundler/gem_helper_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require 'rake'
 require 'bundler/gem_helper'
 
 describe "Bundler::GemHelper tasks" do
@@ -61,6 +62,36 @@ describe "Bundler::GemHelper tasks" do
       Bundler.ui.should be_a(Bundler::UI::Shell)
     end
 
+    describe 'install_tasks' do
+      before(:each) do
+        @saved, Rake.application = Rake.application, Rake::Application.new
+      end
+
+      after(:each) do
+        Rake.application = @saved
+      end
+
+      it "defines Rake tasks" do
+        names = %w[build install release]
+
+        names.each { |name|
+          proc { Rake.application[name] }.should raise_error(/Don't know how to build task/)
+        }
+
+        @helper.install
+
+        names.each { |name|
+          proc { Rake.application[name] }.should_not raise_error
+          Rake.application[name].should be_instance_of Rake::Task
+        }
+      end
+
+      it "provides a way to access the gemspec object" do
+        @helper.install
+        Bundler::GemHelper.gemspec.name.should == 'test'
+      end
+    end
+
     describe 'build' do
       it "builds" do
         mock_build_message

data/spec/cache/gems_spec.rb

@@ -123,7 +123,7 @@ describe "bundle cache" do
     it "re-caches during install" do
       cached_gem("rack-1.0.0").rmtree
       bundle :install
-      out.should include("Updating .gem files in vendor/cache")
+      out.should include("Updating files in vendor/cache")
       cached_gem("rack-1.0.0").should exist
     end
 
@@ -215,6 +215,15 @@ describe "bundle cache" do
       out.should_not =~ /removing/i
     end
 
+    it "does not warn about all if it doesn't have any git/path dependency" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack"
+      G
+      bundle "cache"
+      out.should_not =~ /\-\-all/
+    end
+
     it "should install gems with the name bundler in them (that aren't bundler)" do
       build_gem "foo-bundler", "1.0",
         :path => bundled_app('vendor/cache')

data/spec/cache/git_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
-describe "bundle cache with git" do
+
+describe "git base name" do
   it "base_name should strip private repo uris" do
     source  = Bundler::Source::Git.new("uri" => "git@github.com:bundler.git")
     source.send(:base_name).should == "bundler"
@@ -9,4 +10,115 @@ describe "bundle cache with git" do
     source = Bundler::Source::Git.new("uri" => "//MachineName/ShareFolder")
     source.send(:base_name).should == "ShareFolder"
   end
- end
+end
+
+%w(cache package).each do |cmd|
+  describe "bundle #{cmd} with git" do
+    it "copies repository to vendor cache and uses it" do
+      git = build_git "foo"
+      ref = git.ref_for("master", 11)
+
+      install_gemfile <<-G
+        gem "foo", :git => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "#{cmd} --all"
+      bundled_app("vendor/cache/foo-1.0-#{ref}").should exist
+      bundled_app("vendor/cache/foo-1.0-#{ref}/.git").should_not exist
+
+      FileUtils.rm_rf lib_path("foo-1.0")
+      should_be_installed "foo 1.0"
+    end
+
+    it "runs twice without exploding" do
+      build_git "foo"
+
+      install_gemfile <<-G
+        gem "foo", :git => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "#{cmd} --all"
+      bundle "#{cmd} --all"
+
+      err.should == ""
+      FileUtils.rm_rf lib_path("foo-1.0")
+      should_be_installed "foo 1.0"
+    end
+
+    it "tracks updates" do
+      git = build_git "foo"
+      old_ref = git.ref_for("master", 11)
+
+      install_gemfile <<-G
+        gem "foo", :git => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "#{cmd} --all"
+
+      update_git "foo" do |s|
+        s.write "lib/foo.rb", "puts :CACHE"
+      end
+
+      ref = git.ref_for("master", 11)
+      ref.should_not == old_ref
+
+      bundle "update"
+      bundle "#{cmd} --all"
+
+      bundled_app("vendor/cache/foo-1.0-#{ref}").should exist
+
+      FileUtils.rm_rf lib_path("foo-1.0")
+      run "require 'foo'"
+      out.should == "CACHE"
+    end
+
+    it "uses the local repository to generate the cache" do
+      git = build_git "foo"
+      ref = git.ref_for("master", 11)
+
+      gemfile <<-G
+        gem "foo", :git => '#{lib_path("foo-invalid")}', :branch => :master
+      G
+
+      bundle %|config local.foo #{lib_path('foo-1.0')}|
+      bundle "install"
+      bundle "#{cmd} --all"
+
+      bundled_app("vendor/cache/foo-invalid-#{ref}").should exist
+
+      # Updating the local still uses the local.
+      update_git "foo" do |s|
+        s.write "lib/foo.rb", "puts :LOCAL"
+      end
+
+      run "require 'foo'"
+      out.should == "LOCAL"
+    end
+
+    it "copies repository to vendor cache, including submodules" do
+      build_git "submodule", "1.0"
+
+      git = build_git "has_submodule", "1.0" do |s|
+        s.add_dependency "submodule"
+      end
+
+      Dir.chdir(lib_path('has_submodule-1.0')) do
+        `git submodule add #{lib_path('submodule-1.0')} submodule-1.0`
+        `git commit -m "submodulator"`
+      end
+
+      install_gemfile <<-G
+        git "#{lib_path('has_submodule-1.0')}", :submodules => true do
+          gem "has_submodule"
+        end
+      G
+
+      ref = git.ref_for("master", 11)
+      bundle "#{cmd} --all"
+
+      bundled_app("vendor/cache/has_submodule-1.0-#{ref}").should exist
+      bundled_app("vendor/cache/has_submodule-1.0-#{ref}/submodule-1.0").should exist
+      should_be_installed "has_submodule 1.0"
+    end
+  end
+end

data/spec/cache/path_spec.rb

@@ -1,27 +1,103 @@
 require "spec_helper"
 
-describe "bundle cache" do
-  describe "with path sources" do
-    it "is silent when the path is within the bundle" do
+%w(cache package).each do |cmd|
+  describe "bundle #{cmd} with path" do
+    it "is no-op when the path is within the bundle" do
       build_lib "foo", :path => bundled_app("lib/foo")
 
       install_gemfile <<-G
         gem "foo", :path => '#{bundled_app("lib/foo")}'
       G
 
-      bundle "cache"
-      out.should == "Updating .gem files in vendor/cache"
+      bundle "#{cmd} --all"
+      bundled_app("vendor/cache/foo-1.0").should_not exist
+      should_be_installed "foo 1.0"
     end
 
-    it "warns when the path is outside of the bundle" do
+    it "copies when the path is outside the bundle " do
       build_lib "foo"
 
       install_gemfile <<-G
         gem "foo", :path => '#{lib_path("foo-1.0")}'
       G
 
-      bundle "cache"
-      out.should include("foo at `#{lib_path("foo-1.0")}` will not be cached")
+      bundle "#{cmd} --all"
+      bundled_app("vendor/cache/foo-1.0").should exist
+
+      FileUtils.rm_rf lib_path("foo-1.0")
+      should_be_installed "foo 1.0"
+    end
+
+    it "updates the path on each cache" do
+      build_lib "foo"
+
+      install_gemfile <<-G
+        gem "foo", :path => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "#{cmd} --all"
+
+      build_lib "foo" do |s|
+        s.write "lib/foo.rb", "puts :CACHE"
+      end
+
+      bundle "#{cmd} --all"
+
+      bundled_app("vendor/cache/foo-1.0").should exist
+      FileUtils.rm_rf lib_path("foo-1.0")
+
+      run "require 'foo'"
+      out.should == "CACHE"
+    end
+
+    it "raises a warning without --all" do
+      build_lib "foo"
+
+      install_gemfile <<-G
+        gem "foo", :path => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle cmd
+      out.should =~ /please pass the \-\-all flag/
+      bundled_app("vendor/cache/foo-1.0").should_not exist
+    end
+
+    it "stores the given flag" do
+      build_lib "foo"
+
+      install_gemfile <<-G
+        gem "foo", :path => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "#{cmd} --all"
+      build_lib "bar"
+
+      install_gemfile <<-G
+        gem "foo", :path => '#{lib_path("foo-1.0")}'
+        gem "bar", :path => '#{lib_path("bar-1.0")}'
+      G
+
+      bundle cmd
+      bundled_app("vendor/cache/bar-1.0").should exist
+    end
+
+    it "can rewind chosen configuration" do
+      build_lib "foo"
+
+      install_gemfile <<-G
+        gem "foo", :path => '#{lib_path("foo-1.0")}'
+      G
+
+      bundle "#{cmd} --all"
+      build_lib "baz"
+
+      gemfile <<-G
+        gem "foo", :path => '#{lib_path("foo-1.0")}'
+        gem "baz", :path => '#{lib_path("baz-1.0")}'
+      G
+
+      bundle "#{cmd} --no-all"
+      bundled_app("vendor/cache/baz-1.0").should_not exist
     end
   end
-end
+end