bundler 1.2.5 → 1.3.0.pre

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

data/man/bundle-exec.ronn

@@ -59,7 +59,7 @@ It also modifies Rubygems:
 ### Shelling out
 
 When shelling out (using the `system` or backticks methods,
-for example), Bundler's environment changes will propogate to
+for example), Bundler's environment changes will propagate to
 the subshell environment. If you desire to shell out without
 Bundler's environment changes, simply employ the `with_clean_env`
 method. It will restore all environment variables to what they

data/man/bundle-update.ronn

@@ -39,7 +39,7 @@ When you run [bundle install(1)][bundle-install] the first time, bundler will re
 all of the dependencies, all the way down, and install what you need:
 
     Fetching source index for http://rubygems.org/
-    Installing rake (10.0.2)
+    Installing rake (0.8.7)
     Installing abstract (1.0.0)
     Installing activesupport (3.0.0.rc)
     Installing builder (2.1.2)

data/man/bundle.ronn

@@ -43,6 +43,9 @@ We divide `bundle` subcommands into primary commands and utilities.
 * [bundle config(1)][bundle-config]:
   Specify and read configuration options for bundler
 
+* `bundle help(1)`:
+  Displays this help page
+
 ## UTILITIES
 
 * `bundle check(1)`:
@@ -73,7 +76,7 @@ We divide `bundle` subcommands into primary commands and utilities.
 * `bundle gem(1)`:
   Create a simple gem, suitable for development with bundler
 
-* `bundle platform(1)`:
+* [bundle platform(1)][bundle-platform]:
   Displays platform compatibility information
 
 ## OBSOLETE

data/spec/bundler/bundler_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 require 'bundler'
 
@@ -12,34 +11,9 @@ GEMSPEC
         file.puts gemspec
       end
 
-      proc {
+      expect(proc {
         Bundler.load_gemspec_uncached(tmp("test.gemspec"))
-      }.should raise_error(Bundler::GemspecError)
-    end
-
-    it "can load a gemspec with unicode characters with default ruby encoding" do
-      # spec_helper forces the external encoding to UTF-8 but that's not the
-      # ruby default.
-      encoding = nil
-
-      if defined?(Encoding)
-        encoding = Encoding.default_external
-        Encoding.default_external = "ASCII"
-      end
-
-      File.open(tmp("test.gemspec"), "wb") do |file|
-        file.puts <<-G.gsub(/^\s+/, '')
-          # -*- encoding: utf-8 -*-
-          Gem::Specification.new do |gem|
-            gem.author = "André the Giant"
-          end
-        G
-      end
-
-      gemspec = Bundler.load_gemspec_uncached(tmp("test.gemspec"))
-      gemspec.author.should == "André the Giant"
-
-      Encoding.default_external = encoding if defined?(Encoding)
+      }).to raise_error(Bundler::GemspecError)
     end
   end
 end

data/spec/bundler/cli_rspec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+
+describe 'bundle executable' do
+  it 'returns non-zero exit status when passed unrecognized options' do
+    bundle '--invalid_argument', :exitstatus => true
+    expect(exitstatus).to_not be_zero
+  end
+end

data/spec/bundler/definition_spec.rb

@@ -22,4 +22,4 @@ describe Bundler::Definition do
     end
   end
 
-end
+end

data/spec/bundler/dsl_spec.rb

@@ -10,14 +10,21 @@ describe Bundler::Dsl do
     it "should convert :github to :git" do
       subject.gem("sparks", :github => "indirect/sparks")
       github_uri = "git://github.com/indirect/sparks.git"
-      subject.dependencies.first.source.uri.should == github_uri
+      expect(subject.dependencies.first.source.uri).to eq(github_uri)
     end
 
     it "should convert 'rails' to 'rails/rails'" do
       subject.gem("rails", :github => "rails")
       github_uri = "git://github.com/rails/rails.git"
-      subject.dependencies.first.source.uri.should == github_uri
+      expect(subject.dependencies.first.source.uri).to eq(github_uri)
     end
+
+    it "should interpret slashless 'github:' value as account name" do
+      subject.gem("bundler", :github => "carlhuda")
+      github_uri = "git://github.com/carlhuda/bundler.git"
+      expect(subject.dependencies.first.source.uri).to eq(github_uri)
+    end
+
   end
 
   describe '#method_missing' do
@@ -25,24 +32,24 @@ describe Bundler::Dsl 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))
+      expect { subject.eval_gemfile("Gemfile") }.
+        to 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/)
+      expect { subject.eval_gemfile("Gemfile") }.
+        to 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)
+      expect { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
+        to raise_error(Bundler::GemfileError)
     end
   end
 end

data/spec/bundler/gem_helper_spec.rb

@@ -8,7 +8,7 @@ describe "Bundler::GemHelper tasks" do
       bundle 'gem test'
       app = bundled_app("test")
       helper = Bundler::GemHelper.new(app.to_s)
-      helper.gemspec.name.should == 'test'
+      expect(helper.gemspec.name).to eq('test')
     end
 
     it "interpolates the name for a hidden gemspec" do
@@ -16,28 +16,28 @@ describe "Bundler::GemHelper tasks" do
       app = bundled_app("test")
       FileUtils.mv app.join('test.gemspec'), app.join('.gemspec')
       helper = Bundler::GemHelper.new(app.to_s)
-      helper.gemspec.name.should == 'test'
+      expect(helper.gemspec.name).to eq('test')
     end
 
     it "should fail when there is no gemspec" do
       bundle 'gem test'
       app = bundled_app("test")
       FileUtils.rm(File.join(app.to_s, 'test.gemspec'))
-      proc { Bundler::GemHelper.new(app.to_s) }.should raise_error(/Unable to determine name/)
+      expect { Bundler::GemHelper.new(app.to_s) }.to raise_error(/Unable to determine name/)
     end
 
     it "should fail when there are two gemspecs and the name isn't specified" do
       bundle 'gem test'
       app = bundled_app("test")
       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/)
+      expect { Bundler::GemHelper.new(app.to_s) }.to 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")
+      expect(lib).to include("module Test")
+      expect(lib).to include("module FooBar")
     end
   end
 
@@ -47,7 +47,7 @@ describe "Bundler::GemHelper tasks" do
     end
 
     def mock_build_message
-      mock_confirm_message "test 0.0.1 built to pkg/test-0.0.1.gem"
+      mock_confirm_message "test 0.0.1 built to pkg/test-0.0.1.gem."
     end
 
     before(:each) do
@@ -59,7 +59,7 @@ describe "Bundler::GemHelper tasks" do
     end
 
     it "uses a shell UI for output" do
-      Bundler.ui.should be_a(Bundler::UI::Shell)
+      expect(Bundler.ui).to be_a(Bundler::UI::Shell)
     end
 
     describe 'install_tasks' do
@@ -75,20 +75,20 @@ describe "Bundler::GemHelper tasks" do
         names = %w[build install release]
 
         names.each { |name|
-          proc { Rake.application[name] }.should raise_error(/Don't know how to build task/)
+          expect { Rake.application[name] }.to 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
+          expect { Rake.application[name] }.not_to raise_error
+          expect(Rake.application[name]).to be_instance_of Rake::Task
         }
       end
 
       it "provides a way to access the gemspec object" do
         @helper.install
-        Bundler::GemHelper.gemspec.name.should == 'test'
+        expect(Bundler::GemHelper.gemspec.name).to eq('test')
       end
     end
 
@@ -96,23 +96,23 @@ describe "Bundler::GemHelper tasks" do
       it "builds" do
         mock_build_message
         @helper.build_gem
-        bundled_app('test/pkg/test-0.0.1.gem').should exist
+        expect(bundled_app('test/pkg/test-0.0.1.gem')).to exist
       end
 
       it "raises an appropriate error when the build fails" do
         # break the gemspec by adding back the TODOs...
         File.open("#{@app.to_s}/test.gemspec", 'w'){|f| f << @gemspec }
-        proc { @helper.build_gem }.should raise_error(/TODO/)
+        expect { @helper.build_gem }.to raise_error(/TODO/)
       end
     end
 
     describe 'install' do
       it "installs" do
         mock_build_message
-        mock_confirm_message "test (0.0.1) installed"
+        mock_confirm_message "test (0.0.1) installed."
         @helper.install_gem
-        bundled_app('test/pkg/test-0.0.1.gem').should exist
-        %x{gem list}.should include("test (0.0.1)")
+        expect(bundled_app('test/pkg/test-0.0.1.gem')).to exist
+        expect(%x{gem list}).to include("test (0.0.1)")
       end
 
       it "raises an appropriate error when the install fails" do
@@ -123,13 +123,13 @@ describe "Bundler::GemHelper tasks" do
           File.open(path, 'w'){|f| f << "not actually a gem"}
           path
         end
-        proc { @helper.install_gem }.should raise_error
+        expect { @helper.install_gem }.to raise_error
       end
     end
 
     describe 'release' do
       it "shouldn't push if there are uncommitted files" do
-        proc { @helper.release_gem }.should raise_error(/files that need to be committed/)
+        expect { @helper.release_gem }.to raise_error(/files that need to be committed/)
       end
 
       it 'raises an appropriate error if there is no git remote' do
@@ -145,13 +145,13 @@ describe "Bundler::GemHelper tasks" do
           `git commit -a -m "initial commit"`
         }
 
-        proc { @helper.release_gem }.should raise_error
+        expect { @helper.release_gem }.to raise_error
       end
 
       it "releases" do
         mock_build_message
         mock_confirm_message(/Tagged v0.0.1/)
-        mock_confirm_message("Pushed git commits and tags")
+        mock_confirm_message("Pushed git commits and tags.")
 
         @helper.should_receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
 
@@ -169,6 +169,23 @@ describe "Bundler::GemHelper tasks" do
         }
         @helper.release_gem
       end
+
+      it "releases even if tag already exists" do
+        mock_build_message
+        mock_confirm_message("Tag v0.0.1 has already been created.")
+
+        @helper.should_receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
+
+        Dir.chdir(gem_repo1) {
+          `git init --bare`
+        }
+        Dir.chdir(@app) {
+         `git commit -a -m "another commit"`
+         `git tag -a -m \"Version 0.0.1\" v0.0.1`
+        }
+        @helper.release_gem
+      end
+
     end
   end
 end

data/spec/bundler/psyched_yaml_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'bundler/psyched_yaml'
 
 describe Bundler::YamlSyntaxError do
   it "is raised on YAML parse errors" do

data/spec/bundler/source_spec.rb

@@ -7,18 +7,18 @@ describe Bundler::Source::Rubygems do
 
   describe "caches" do
     it "should include Bundler.app_cache" do
-      subject.caches.should include(Bundler.app_cache)
+      expect(subject.caches).to include(Bundler.app_cache)
     end
 
     it "should include GEM_PATH entries" do
       Gem.path.each do |path|
-        subject.caches.should include(File.expand_path("#{path}/cache"))
+        expect(subject.caches).to include(File.expand_path("#{path}/cache"))
       end
     end
 
     it "should be an array of strings or pathnames" do
       subject.caches.each do |cache|
-        [String, Pathname].should include(cache.class)
+        expect([String, Pathname]).to include(cache.class)
       end
     end
   end

data/spec/cache/gems_spec.rb

@@ -13,7 +13,7 @@ describe "bundle cache" do
     end
 
     it "copies the .gem file to vendor/cache" do
-      bundled_app("vendor/cache/rack-1.0.0.gem").should exist
+      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
     end
 
     it "uses the cache as a source when installing gems" do
@@ -70,7 +70,7 @@ describe "bundle cache" do
 
       bundle "cache"
 
-      bundled_app("Gemfile.lock").should exist
+      expect(bundled_app("Gemfile.lock")).to exist
     end
   end
 
@@ -102,7 +102,7 @@ describe "bundle cache" do
 
       bundle :cache
 
-      bundled_app("Gemfile.lock").should exist
+      expect(bundled_app("Gemfile.lock")).to exist
     end
   end
 
@@ -115,23 +115,23 @@ describe "bundle cache" do
         gem "actionpack"
       G
       bundle :cache
-      cached_gem("rack-1.0.0").should exist
-      cached_gem("actionpack-2.3.2").should exist
-      cached_gem("activesupport-2.3.2").should exist
+      expect(cached_gem("rack-1.0.0")).to exist
+      expect(cached_gem("actionpack-2.3.2")).to exist
+      expect(cached_gem("activesupport-2.3.2")).to exist
     end
 
     it "re-caches during install" do
       cached_gem("rack-1.0.0").rmtree
       bundle :install
-      out.should include("Updating files in vendor/cache")
-      cached_gem("rack-1.0.0").should exist
+      expect(out).to include("Updating files in vendor/cache")
+      expect(cached_gem("rack-1.0.0")).to exist
     end
 
     it "adds and removes when gems are updated" do
       update_repo2
       bundle 'update'
-      cached_gem("rack-1.2").should exist
-      cached_gem("rack-1.0.0").should_not exist
+      expect(cached_gem("rack-1.2")).to exist
+      expect(cached_gem("rack-1.0.0")).not_to exist
     end
 
     it "adds new gems and dependencies" do
@@ -139,8 +139,8 @@ describe "bundle cache" do
         source "file://#{gem_repo2}"
         gem "rails"
       G
-      cached_gem("rails-2.3.2").should exist
-      cached_gem("activerecord-2.3.2").should exist
+      expect(cached_gem("rails-2.3.2")).to exist
+      expect(cached_gem("activerecord-2.3.2")).to exist
     end
 
     it "removes .gems for removed gems and dependencies" do
@@ -148,9 +148,9 @@ describe "bundle cache" do
         source "file://#{gem_repo2}"
         gem "rack"
       G
-      cached_gem("rack-1.0.0").should exist
-      cached_gem("actionpack-2.3.2").should_not exist
-      cached_gem("activesupport-2.3.2").should_not exist
+      expect(cached_gem("rack-1.0.0")).to exist
+      expect(cached_gem("actionpack-2.3.2")).not_to exist
+      expect(cached_gem("activesupport-2.3.2")).not_to exist
     end
 
     it "removes .gems when gem changes to git source" do
@@ -161,9 +161,9 @@ describe "bundle cache" do
         gem "rack", :git => "#{lib_path("rack-1.0")}"
         gem "actionpack"
       G
-      cached_gem("rack-1.0.0").should_not exist
-      cached_gem("actionpack-2.3.2").should exist
-      cached_gem("activesupport-2.3.2").should exist
+      expect(cached_gem("rack-1.0.0")).not_to exist
+      expect(cached_gem("actionpack-2.3.2")).to exist
+      expect(cached_gem("activesupport-2.3.2")).to exist
     end
 
 
@@ -175,7 +175,7 @@ describe "bundle cache" do
         G
 
         bundle :cache
-        cached_gem("platform_specific-1.0-java").should exist
+        expect(cached_gem("platform_specific-1.0-java")).to exist
       end
 
       simulate_new_machine
@@ -184,8 +184,8 @@ describe "bundle cache" do
         gem "platform_specific"
       G
 
-      cached_gem("platform_specific-1.0-#{Gem::Platform.local}").should exist
-      cached_gem("platform_specific-1.0-java").should exist
+      expect(cached_gem("platform_specific-1.0-#{Gem::Platform.local}")).to exist
+      expect(cached_gem("platform_specific-1.0-java")).to exist
     end
 
     it "doesn't remove gems with mismatched :rubygems_version or :date" do
@@ -196,7 +196,7 @@ describe "bundle cache" do
       simulate_new_machine
 
       bundle :install
-      cached_gem("rack-1.0.0").should exist
+      expect(cached_gem("rack-1.0.0")).to exist
     end
 
     it "handles directories and non .gem files in the cache" do
@@ -212,7 +212,7 @@ describe "bundle cache" do
       G
       bundle "cache"
       bundle "install"
-      out.should_not =~ /removing/i
+      expect(out).not_to match(/removing/i)
     end
 
     it "does not warn about all if it doesn't have any git/path dependency" do
@@ -221,7 +221,7 @@ describe "bundle cache" do
         gem "rack"
       G
       bundle "cache"
-      out.should_not =~ /\-\-all/
+      expect(out).not_to match(/\-\-all/)
     end
 
     it "should install gems with the name bundler in them (that aren't bundler)" do