bundler 1.3.0.pre → 1.3.0.pre.2

data/lib/bundler/fetcher.rb

@@ -201,7 +201,7 @@ module Bundler
     # fetch from modern index: specs.4.8.gz
     def fetch_all_remote_specs
       @has_api = false
-      Gem.sources = ["#{@remote_uri}"]
+      Bundler.rubygems.sources = ["#{@remote_uri}"]
 
       begin
         Bundler.rubygems.fetch_all_remote_specs

data/lib/bundler/rubygems_integration.rb

@@ -35,6 +35,11 @@ module Bundler
     end
 
     def sources=(val)
+      # Gem.configuration creates a new Gem::ConfigFile, which by default will read ~/.gemrc
+      # If that file exists, its settings (including sources) will overwrite the values we
+      # are about to set here. In order to avoid that, we force memoizing the config file now.
+      configuration
+
       Gem.sources = val
     end
 

data/lib/bundler/runtime.rb

@@ -68,6 +68,9 @@ module Bundler
             Kernel.require file
           end
         rescue LoadError => e
+          REGEXPS.find { |r| r =~ e.message }
+          raise if dep.autorequire || $1 != required_file
+
           if dep.autorequire.nil? && dep.name.include?('-')
             begin
               namespaced_file = dep.name.gsub('-', '/')
@@ -78,9 +81,6 @@ module Bundler
               raise if dep.autorequire || (regex_name && regex_name.gsub('-', '/') != namespaced_file)
               raise e if regex_name.nil?
             end
-          else
-            REGEXPS.find { |r| r =~ e.message }
-            raise if dep.autorequire || $1 != required_file
           end
         end
       end
@@ -104,6 +104,12 @@ module Bundler
         next if spec.name == 'bundler'
         spec.source.cache(spec) if spec.source.respond_to?(:cache)
       end
+
+      Dir[cache_path.join("*/.git")].each do |git_dir|
+        FileUtils.rm_rf(git_dir)
+        FileUtils.touch(File.expand_path("../.bundlecache", git_dir))
+      end
+
       prune_cache unless Bundler.settings[:no_prune]
     end
 
@@ -246,7 +252,7 @@ module Bundler
       end
 
       if cached.any?
-        Bundler.ui.info "Removing outdated .git/path repos from vendor/cache"
+        Bundler.ui.info "Removing outdated git and path gems from vendor/cache"
 
         cached.each do |path|
           path = File.dirname(path)

data/lib/bundler/source/git.rb

@@ -166,8 +166,11 @@ module Bundler
         FileUtils.rm_rf(app_cache_path)
         git_proxy.checkout if requires_checkout?
         git_proxy.copy_to(app_cache_path, @submodules)
-        FileUtils.rm_rf(app_cache_path.join(".git"))
-        FileUtils.touch(app_cache_path.join(".bundlecache"))
+        # Evaluate gemspecs and cache the result. Gemspecs
+        # in git might require git or other dependencies.
+        # The gemspecs we cache should already be evaluated.
+        spec_path = app_cache_path.join(File.basename(spec.loaded_from))
+        File.open(spec_path, 'wb') {|file| file.print spec.to_ruby }
       end
 
       def load_spec_files
@@ -264,4 +267,4 @@ module Bundler
     end
 
   end
-end
+end

data/lib/bundler/source/git/git_proxy.rb

@@ -44,7 +44,9 @@ module Bundler
           else
             Bundler.ui.info "Fetching #{uri}"
             FileUtils.mkdir_p(path.dirname)
-            git %|clone #{uri_escaped} "#{path}" --bare --no-hardlinks|
+            clone_command = %|clone #{uri_escaped} "#{path}" --bare --no-hardlinks|
+            clone_command = "#{clone_command} --quiet" if Bundler.ui.quiet?
+            git clone_command
           end
         end
 
@@ -139,4 +141,4 @@ module Bundler
 
     end
   end
-end
+end

data/lib/bundler/source/path.rb

@@ -137,6 +137,8 @@ module Bundler
               end
             end
           end
+        elsif File.exists?(expanded_path)
+          raise PathError, "The path `#{expanded_path}` is not a directory."
         else
           raise PathError, "The path `#{expanded_path}` does not exist."
         end

data/lib/bundler/templates/newgem/bin/newgem.tt

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-require '<%= config[:name] %>'
+require '<%= config[:namespaced_path] %>'

data/lib/bundler/templates/newgem/lib/newgem.rb.tt

@@ -1,4 +1,4 @@
-require "<%=config[:name]%>/version"
+require "<%=config[:namespaced_path]%>/version"
 
 <%- config[:constant_array].each_with_index do |c,i| -%>
 <%= '  '*i %>module <%= c %>

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require '<%=config[:name]%>/version'
+require '<%=config[:namespaced_path]%>/version'
 
 Gem::Specification.new do |gem|
   gem.name          = <%=config[:name].inspect%>

data/lib/bundler/templates/newgem/spec/spec_helper.rb.tt

@@ -1,2 +1,2 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require '<%= config[:name] %>'
+require '<%= config[:namespaced_path] %>'

data/lib/bundler/templates/newgem/test/minitest_helper.rb.tt

@@ -1,4 +1,4 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require '<%= config[:name] %>'
+require '<%= config[:namespaced_path] %>'
 
 require 'minitest/autorun'

data/lib/bundler/ui.rb

@@ -57,6 +57,10 @@ module Bundler
         @quiet = true
       end
 
+      def quiet?
+        @quiet
+      end
+
       def debug?
         # needs to be false instead of nil to be newline param to other methods
         !!@debug && !@quiet

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

data/spec/bundler/bundler_spec.rb

@@ -3,17 +3,47 @@ require 'bundler'
 
 describe Bundler do
   describe "#load_gemspec_uncached" do
-    it "should catch Psych syntax errors" do
-      gemspec = <<-GEMSPEC
-{:!00 ao=gu\g1= 7~f
-GEMSPEC
-      File.open(tmp("test.gemspec"), 'wb') do |file|
-        file.puts gemspec
+
+    before do
+      @gemspec = tmp("test.gemspec")
+      @gemspec.open('wb') do |f|
+        f.write strip_whitespace(<<-GEMSPEC)
+          ---
+            {:!00 ao=gu\g1= 7~f
+        GEMSPEC
       end
+    end
 
-      expect(proc {
-        Bundler.load_gemspec_uncached(tmp("test.gemspec"))
-      }).to raise_error(Bundler::GemspecError)
+    describe "on Ruby 1.8", :ruby => "1.8" do
+      it "should catch YAML syntax errors" do
+        expect { Bundler.load_gemspec_uncached(@gemspec) }.
+          to raise_error(Bundler::GemspecError)
+      end
     end
+
+    context "on Ruby 1.9", :ruby => "1.9" do
+      context "with Syck as YAML::Engine" do
+        it "raises a GemspecError after YAML load throws ArgumentError" do
+          orig_yamler, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'syck'
+
+          expect { Bundler.load_gemspec_uncached(@gemspec) }.
+            to raise_error(Bundler::GemspecError)
+
+          YAML::ENGINE.yamler = orig_yamler
+        end
+      end
+
+      context "with Psych as YAML::Engine" do
+        it "raises a GemspecError after YAML load throws Psych::SyntaxError" do
+          orig_yamler, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
+
+          expect { Bundler.load_gemspec_uncached(@gemspec) }.
+            to raise_error(Bundler::GemspecError)
+
+          YAML::ENGINE.yamler = orig_yamler
+        end
+      end
+    end
+
   end
 end

data/spec/bundler/dsl_spec.rb

@@ -7,19 +7,31 @@ describe Bundler::Dsl do
   end
 
   describe '#_normalize_options' do
-    it "should convert :github to :git" do
+    it "converts :github to :git" do
       subject.gem("sparks", :github => "indirect/sparks")
       github_uri = "git://github.com/indirect/sparks.git"
       expect(subject.dependencies.first.source.uri).to eq(github_uri)
     end
 
-    it "should convert 'rails' to 'rails/rails'" do
+    it "converts numeric :gist to :git" do
+      subject.gem("not-really-a-gem", :gist => 2859988)
+      github_uri = "git://gist.github.com/2859988.git"
+      expect(subject.dependencies.first.source.uri).to eq(github_uri)
+    end
+
+    it "converts :gist to :git" do
+      subject.gem("not-really-a-gem", :gist => "2859988")
+      github_uri = "git://gist.github.com/2859988.git"
+      expect(subject.dependencies.first.source.uri).to eq(github_uri)
+    end
+
+    it "converts 'rails' to 'rails/rails'" do
       subject.gem("rails", :github => "rails")
       github_uri = "git://github.com/rails/rails.git"
       expect(subject.dependencies.first.source.uri).to eq(github_uri)
     end
 
-    it "should interpret slashless 'github:' value as account name" do
+    it "interprets 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)
@@ -28,7 +40,7 @@ describe Bundler::Dsl do
   end
 
   describe '#method_missing' do
-    it 'should raise an error for unknown DSL methods' do
+    it 'raises 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"
@@ -46,7 +58,7 @@ describe Bundler::Dsl do
   end
 
   describe "syntax errors" do
-    it "should raise a Bundler::GemfileError" do
+    it "raise a Bundler::GemfileError" do
       gemfile "gem 'foo', :path => /unquoted/string/syntax/error"
       expect { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
         to raise_error(Bundler::GemfileError)

data/spec/bundler/gem_helper_spec.rb

@@ -35,7 +35,7 @@ describe "Bundler::GemHelper tasks" do
 
     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 = bundled_app('test-foo_bar').join('lib/test/foo_bar.rb').read
       expect(lib).to include("module Test")
       expect(lib).to include("module FooBar")
     end

data/spec/cache/git_spec.rb

@@ -165,5 +165,24 @@ end
 
       expect(out).not_to include("Your Gemfile contains path and git dependencies.")
     end
+
+    it "evaluates gemspecs and writes them out" do
+      git = build_git "foo"
+
+      # Insert a gemspec method that shells out
+      spec_lines = lib_path("foo-1.0/foo.gemspec").read.split("\n")
+      spec_lines.insert(-2, "s.description = `echo bob`")
+      update_git("foo"){ |s| s.write "foo.gemspec", spec_lines.join("\n") }
+
+      install_gemfile <<-G
+        gem "foo", :git => '#{lib_path("foo-1.0")}'
+      G
+      bundle "#{cmd} --all"
+
+      ref = git.ref_for("master", 11)
+      gemspec = bundled_app("vendor/cache/foo-1.0-#{ref}/foo.gemspec").read
+      expect(gemspec).to_not match("`echo bob`")
+    end
+
   end
 end

data/spec/install/gems/dependency_api_spec.rb

@@ -216,10 +216,10 @@ describe "gemcutter's dependency API" do
 
     bundle :install, :artifice => "endpoint_extra"
 
-    output = <<OUTPUT
-Fetching gem metadata from http://localgemserver.test/..
-Fetching gem metadata from http://localgemserver.test/extra/.
-OUTPUT
+    output = <<-OUTPUT.gsub(/^ +/,'')
+      Fetching gem metadata from http://localgemserver.test/..
+      Fetching gem metadata from http://localgemserver.test/extra/.
+    OUTPUT
     expect(out).to include(output)
   end
 
@@ -433,4 +433,26 @@ OUTPUT
     end
   end
 
+  context ".gemrc with sources is present" do
+    before do
+      File.open(home('.gemrc'), 'w') do |file|
+        file.puts({:sources => ["http://rubygems.org"]}.to_yaml)
+      end
+    end
+
+    after do
+      home('.gemrc').rmtree
+    end
+
+    it "uses other sources declared in the Gemfile" do
+      gemfile <<-G
+        source "#{source_uri}"
+        gem 'rack'
+      G
+
+      bundle "install", :exitstatus => true, :artifice => "endpoint_marshal_fail"
+
+      expect(exitstatus).to eq(0)
+    end
+  end
 end

data/spec/other/config_spec.rb

@@ -95,6 +95,12 @@ describe ".bundle/config" do
       run "puts Bundler.settings[:foo]"
       expect(out).to eq("global")
     end
+
+    it "expands the path at time of setting" do
+      bundle "config --global local.foo .."
+      run "puts Bundler.settings['local.foo']"
+      expect(out).to eq(File.expand_path(Dir.pwd + "/.."))
+    end
   end
 
   describe "local" do
@@ -134,5 +140,11 @@ describe ".bundle/config" do
       run "puts Bundler.settings[:foo]"
       expect(out).to eq("local")
     end
+
+    it "expands the path at time of setting" do
+      bundle "config --local local.foo .."
+      run "puts Bundler.settings['local.foo']"
+      expect(out).to eq(File.expand_path(Dir.pwd + "/.."))
+    end
   end
 end

data/spec/other/newgem_spec.rb

@@ -1,168 +1,329 @@
 require "spec_helper"
 
 describe "bundle gem" do
-  before :each do
+  before do
     @git_name = `git config --global user.name`.chomp
     `git config --global user.name "Bundler User"`
     @git_email = `git config --global user.email`.chomp
     `git config --global user.email user@example.com`
-    bundle 'gem test-gem'
-    # reset gemspec cache for each test because of commit 3d4163a
-    Bundler.clear_gemspec_cache
   end
 
-  after :each do
+  after do
     `git config --global user.name "#{@git_name}"`
     `git config --global user.email #{@git_email}`
   end
 
-  let(:generated_gem) { Bundler::GemHelper.new(bundled_app("test-gem").to_s) }
+  shared_examples_for "git config is present" do
+    context "git config user.{name,email} present" do
+      it "sets gemspec author to git user.name if available" do
+        expect(generated_gem.gemspec.authors.first).to eq("Bundler User")
+      end
 
-  it "generates a gem skeleton" do
-    expect(bundled_app("test-gem/test-gem.gemspec")).to exist
-    expect(bundled_app("test-gem/LICENSE.txt")).to exist
-    expect(bundled_app("test-gem/Gemfile")).to exist
-    expect(bundled_app("test-gem/Rakefile")).to exist
-    expect(bundled_app("test-gem/lib/test-gem.rb")).to exist
-    expect(bundled_app("test-gem/lib/test-gem/version.rb")).to exist
+      it "sets gemspec email to git user.email if available" do
+        expect(generated_gem.gemspec.email.first).to eq("user@example.com")
+      end
+    end
   end
 
-  it "starts with version 0.0.1" do
-    expect(bundled_app("test-gem/lib/test-gem/version.rb").read).to match(/VERSION = "0.0.1"/)
-  end
+  shared_examples_for "git config is absent" do |hoge|
+    it "sets gemspec author to default message if git user.name is not set or empty" do
+      expect(generated_gem.gemspec.authors.first).to eq("TODO: Write your name")
+    end
 
-  it "nests constants so they work" do
-    expect(bundled_app("test-gem/lib/test-gem/version.rb").read).to match(/module Test\n  module Gem/)
-    expect(bundled_app("test-gem/lib/test-gem.rb").read).to match(/module Test\n  module Gem/)
+    it "sets gemspec email to default message if git user.email is not set or empty" do
+      expect(generated_gem.gemspec.email.first).to eq("TODO: Write your email address")
+    end
   end
 
-  context "git config user.{name,email} present" do
-    it "sets gemspec author to git user.name if available" do
-      expect(generated_gem.gemspec.authors.first).to eq("Bundler User")
+  context "gem naming with underscore" do
+    let(:gem_name) { 'test_gem' }
+
+    before do
+      bundle "gem #{gem_name}"
+      # reset gemspec cache for each test because of commit 3d4163a
+      Bundler.clear_gemspec_cache
     end
 
-    it "sets gemspec email to git user.email if available" do
-      expect(generated_gem.gemspec.email.first).to eq("user@example.com")
+    let(:generated_gem) { Bundler::GemHelper.new(bundled_app(gem_name).to_s) }
+
+    it "generates a gem skeleton" do
+      expect(bundled_app("test_gem/test_gem.gemspec")).to exist
+      expect(bundled_app("test_gem/LICENSE.txt")).to exist
+      expect(bundled_app("test_gem/Gemfile")).to exist
+      expect(bundled_app("test_gem/Rakefile")).to exist
+      expect(bundled_app("test_gem/lib/test_gem.rb")).to exist
+      expect(bundled_app("test_gem/lib/test_gem/version.rb")).to exist
     end
-  end
 
-  context "git config user.{name,email} is not set" do
-    before :each do
-      `git config --global --unset user.name`
-      `git config --global --unset user.email`
-      reset!
-      in_app_root
-      bundle 'gem test-gem'
+    it "starts with version 0.0.1" do
+      expect(bundled_app("test_gem/lib/test_gem/version.rb").read).to match(/VERSION = "0.0.1"/)
     end
 
-    it "sets gemspec author to default message if git user.name is not set or empty" do
-      expect(generated_gem.gemspec.authors.first).to eq("TODO: Write your name")
+    it "does not nest constants" do
+      expect(bundled_app("test_gem/lib/test_gem/version.rb").read).to match(/module TestGem/)
+      expect(bundled_app("test_gem/lib/test_gem.rb").read).to match(/module TestGem/)
     end
 
-    it "sets gemspec email to default message if git user.email is not set or empty" do
-      expect(generated_gem.gemspec.email.first).to eq("TODO: Write your email address")
+    it_should_behave_like "git config is present"
+
+    context "git config user.{name,email} is not set" do
+      before do
+        `git config --global --unset user.name`
+        `git config --global --unset user.email`
+        reset!
+        in_app_root
+        bundle "gem #{gem_name}"
+      end
+
+      it_should_behave_like "git config is absent"
     end
-  end
 
-  it "sets gemspec license to MIT by default" do
-    expect(generated_gem.gemspec.license).to eq("MIT")
-  end
+    it "sets gemspec license to MIT by default" do
+      expect(generated_gem.gemspec.license).to eq("MIT")
+    end
 
-  it "requires the version file" do
-    expect(bundled_app("test-gem/lib/test-gem.rb").read).to match(/require "test-gem\/version"/)
-  end
+    it "requires the version file" do
+      expect(bundled_app("test_gem/lib/test_gem.rb").read).to match(/require "test_gem\/version"/)
+    end
 
-  it "runs rake without problems" do
-    system_gems ["rake-10.0.2"]
+    it "runs rake without problems" do
+      system_gems ["rake-10.0.2"]
 
-    rakefile = <<-RAKEFILE
-      task :default do
-        puts 'SUCCESS'
-      end
+      rakefile = <<-RAKEFILE
+        task :default do
+          puts 'SUCCESS'
+        end
 RAKEFILE
-    File.open(bundled_app("test-gem/Rakefile"), 'w') do |file|
-      file.puts rakefile
+      File.open(bundled_app("test_gem/Rakefile"), 'w') do |file|
+        file.puts rakefile
+      end
+
+      Dir.chdir(bundled_app(gem_name)) do
+        sys_exec("rake")
+        expect(out).to include("SUCCESS")
+      end
     end
 
-    Dir.chdir(bundled_app("test-gem")) do
-      sys_exec("rake")
-      expect(out).to include("SUCCESS")
+    context "--bin parameter set" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name} --bin"
+      end
+
+      it "builds bin skeleton" do
+        expect(bundled_app("test_gem/bin/test_gem")).to exist
+      end
+
+      it "requires 'test-gem'" do
+        expect(bundled_app("test_gem/bin/test_gem").read).to match(/require 'test_gem'/)
+      end
     end
-  end
 
-  context "--bin parameter set" do
-    before :each do
-      reset!
-      in_app_root
-      bundle 'gem test-gem --bin'
+    context "--test parameter set to rspec" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name} --test=rspec"
+      end
+
+      it "builds spec skeleton" do
+        expect(bundled_app("test_gem/.rspec")).to exist
+        expect(bundled_app("test_gem/spec/test_gem_spec.rb")).to exist
+        expect(bundled_app("test_gem/spec/spec_helper.rb")).to exist
+      end
+
+      it "requires 'test-gem'" do
+        expect(bundled_app("test_gem/spec/spec_helper.rb").read).to match(/require 'test_gem'/)
+      end
+
+      it "creates a default test which fails" do
+        expect(bundled_app("test_gem/spec/test_gem_spec.rb").read).to match(/false.should be_true/)
+      end
     end
 
-    it "builds bin skeleton" do
-      expect(bundled_app("test-gem/bin/test-gem")).to exist
+    context "--test parameter set to minitest" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name} --test=minitest"
+      end
+
+      it "builds spec skeleton" do
+        expect(bundled_app("test_gem/test/test_test_gem.rb")).to exist
+        expect(bundled_app("test_gem/test/minitest_helper.rb")).to exist
+      end
+
+      it "requires 'test-gem'" do
+        expect(bundled_app("test_gem/test/minitest_helper.rb").read).to match(/require 'test_gem'/)
+      end
+
+      it "requires 'minitest_helper'" do
+        expect(bundled_app("test_gem/test/test_test_gem.rb").read).to match(/require '.\/minitest_helper'/)
+      end
+
+      it "creates a default test which fails" do
+        expect(bundled_app("test_gem/test/test_test_gem.rb").read).to match(/assert false/)
+      end
     end
 
-    it "requires 'test-gem'" do
-      expect(bundled_app("test-gem/bin/test-gem").read).to match(/require 'test-gem'/)
+    context "--test with no arguments" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name} --test"
+      end
+
+      it "defaults to rspec" do
+        expect(bundled_app("test_gem/spec/spec_helper.rb")).to exist
+        expect(bundled_app("test_gem/test/minitest_helper.rb")).to_not exist
+      end
     end
   end
 
-  context "--test parameter set to rspec" do
-    before :each do
-      reset!
-      in_app_root
-      bundle "gem test-gem --test=rspec"
+  context "gem naming with dashed" do
+    let(:gem_name) { 'test-gem' }
+
+    before do
+      bundle "gem #{gem_name}"
+      # reset gemspec cache for each test because of commit 3d4163a
+      Bundler.clear_gemspec_cache
     end
 
-    it "builds spec skeleton" do
-      expect(bundled_app("test-gem/.rspec")).to exist
-      expect(bundled_app("test-gem/spec/test-gem_spec.rb")).to exist
-      expect(bundled_app("test-gem/spec/spec_helper.rb")).to exist
+    let(:generated_gem) { Bundler::GemHelper.new(bundled_app(gem_name).to_s) }
+
+    it "generates a gem skeleton" do
+      expect(bundled_app("test-gem/test-gem.gemspec")).to exist
+      expect(bundled_app("test-gem/LICENSE.txt")).to exist
+      expect(bundled_app("test-gem/Gemfile")).to exist
+      expect(bundled_app("test-gem/Rakefile")).to exist
+      expect(bundled_app("test-gem/lib/test/gem.rb")).to exist
+      expect(bundled_app("test-gem/lib/test/gem/version.rb")).to exist
     end
 
-    it "requires 'test-gem'" do
-      expect(bundled_app("test-gem/spec/spec_helper.rb").read).to match(/require 'test-gem'/)
+    it "starts with version 0.0.1" do
+      expect(bundled_app("test-gem/lib/test/gem/version.rb").read).to match(/VERSION = "0.0.1"/)
     end
 
-    it "creates a default test which fails" do
-      expect(bundled_app("test-gem/spec/test-gem_spec.rb").read).to match(/false.should be_true/)
+    it "nests constants so they work" do
+      expect(bundled_app("test-gem/lib/test/gem/version.rb").read).to match(/module Test\n  module Gem/)
+      expect(bundled_app("test-gem/lib/test/gem.rb").read).to match(/module Test\n  module Gem/)
     end
-  end
 
-  context "--test parameter set to minitest" do
-    before :each do
-      reset!
-      in_app_root
-      bundle "gem test-gem --test=minitest"
+    it_should_behave_like "git config is present"
+
+    context "git config user.{name,email} is not set" do
+      before do
+        `git config --global --unset user.name`
+        `git config --global --unset user.email`
+        reset!
+        in_app_root
+        bundle "gem #{gem_name}"
+      end
+
+      it_should_behave_like "git config is absent"
     end
 
-    it "builds spec skeleton" do
-      expect(bundled_app("test-gem/test/test_test-gem.rb")).to exist
-      expect(bundled_app("test-gem/test/minitest_helper.rb")).to exist
+    it "sets gemspec license to MIT by default" do
+      expect(generated_gem.gemspec.license).to eq("MIT")
     end
 
-    it "requires 'test-gem'" do
-      expect(bundled_app("test-gem/test/minitest_helper.rb").read).to match(/require 'test-gem'/)
+    it "requires the version file" do
+      expect(bundled_app("test-gem/lib/test/gem.rb").read).to match(/require "test\/gem\/version"/)
     end
 
-    it "requires 'minitest_helper'" do
-      expect(bundled_app("test-gem/test/test_test-gem.rb").read).to match(/require '.\/minitest_helper'/)
+    it "runs rake without problems" do
+      system_gems ["rake-10.0.2"]
+
+      rakefile = <<-RAKEFILE
+        task :default do
+          puts 'SUCCESS'
+        end
+RAKEFILE
+      File.open(bundled_app("test-gem/Rakefile"), 'w') do |file|
+        file.puts rakefile
+      end
+
+      Dir.chdir(bundled_app(gem_name)) do
+        sys_exec("rake")
+        expect(out).to include("SUCCESS")
+      end
+    end
+
+    context "--bin parameter set" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name} --bin"
+      end
+
+      it "builds bin skeleton" do
+        expect(bundled_app("test-gem/bin/test-gem")).to exist
+      end
+
+      it "requires 'test/gem'" do
+        expect(bundled_app("test-gem/bin/test-gem").read).to match(/require 'test\/gem'/)
+      end
     end
 
-    it "creates a default test which fails" do
-      expect(bundled_app("test-gem/test/test_test-gem.rb").read).to match(/assert false/)
+    context "--test parameter set to rspec" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name} --test=rspec"
+      end
+
+      it "builds spec skeleton" do
+        expect(bundled_app("test-gem/.rspec")).to exist
+        expect(bundled_app("test-gem/spec/test/gem_spec.rb")).to exist
+        expect(bundled_app("test-gem/spec/spec_helper.rb")).to exist
+      end
+
+      it "requires 'test/gem'" do
+        expect(bundled_app("test-gem/spec/spec_helper.rb").read).to match(/require 'test\/gem'/)
+      end
+
+      it "creates a default test which fails" do
+        expect(bundled_app("test-gem/spec/test/gem_spec.rb").read).to match(/false.should be_true/)
+      end
     end
-  end
 
-  context "--test with no arguments" do
-    before :each do
-      reset!
-      in_app_root
-      bundle "gem test-gem --test"
+    context "--test parameter set to minitest" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name} --test=minitest"
+      end
+
+      it "builds spec skeleton" do
+        expect(bundled_app("test-gem/test/test_test/gem.rb")).to exist
+        expect(bundled_app("test-gem/test/minitest_helper.rb")).to exist
+      end
+
+      it "requires 'test/gem'" do
+        expect(bundled_app("test-gem/test/minitest_helper.rb").read).to match(/require 'test\/gem'/)
+      end
+
+      it "requires 'minitest_helper'" do
+        expect(bundled_app("test-gem/test/test_test/gem.rb").read).to match(/require '.\/minitest_helper'/)
+      end
+
+      it "creates a default test which fails" do
+        expect(bundled_app("test-gem/test/test_test/gem.rb").read).to match(/assert false/)
+      end
     end
 
-    it "defaults to rspec" do
-      expect(bundled_app("test-gem/spec/spec_helper.rb")).to exist
-      expect(bundled_app("test-gem/test/minitest_helper.rb")).to_not exist
+    context "--test with no arguments" do
+      before do
+        reset!
+        in_app_root
+        bundle "gem #{gem_name} --test"
+      end
+
+      it "defaults to rspec" do
+        expect(bundled_app("test-gem/spec/spec_helper.rb")).to exist
+        expect(bundled_app("test-gem/test/minitest_helper.rb")).to_not exist
+      end
     end
   end
 end