bundler 1.0.2 → 1.0.3

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 1.0.3 (October 15, 2010)
+
+Bugfixes:
+
+  - Use bitwise or in #hash to reduce the chance of overflow
+  - `bundle update` now works with :git + :tag updates
+  - Record relative :path options in the Gemfile.lock
+  - :groups option on gem method in Gemfile now works
+  - Add #platform method and :platform option to Gemfile DSL
+  - --without now accepts a quoted, space-separated list
+  - Installing after --deployment with no lock is now possible
+  - Binstubs can now be symlinked
+  - Print warning if cache for --local install is missing gems
+  - Improve output when installing to a path
+  - The tests all pass! Yay!
+
+## 1.0.2 (October 2, 2010)
+
+Bugfix:
+
+  - Actually include the man pages in the gem, so help works
+
 ## 1.0.1 (October 1, 2010)
 
 Features:

data/Rakefile

@@ -1,16 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
-
-require 'rubygems'
-require 'rubygems/specification'
-require 'bundler'
-
-def gemspec
-  @gemspec ||= begin
-    file = File.expand_path('../bundler.gemspec', __FILE__)
-    eval(File.read(file), binding, file)
-  end
-end
+require 'bundler/gem_helper'
+Bundler::GemHelper.install_tasks
 
 def sudo?
   ENV['BUNDLER_SUDO_TESTS']
@@ -32,7 +23,7 @@ begin
   task :spec => :build
 
   namespace :spec do
-    task :sudo do
+    task :set_sudo do
       ENV['BUNDLER_SUDO_TESTS'] = '1'
     end
 
@@ -44,52 +35,58 @@ begin
       end
     end
 
-    desc "Run the full spec suite including SUDO tests"
-    task :full => ["sudo", "clean", "spec"]
-  end
-
-  # Rubygems 1.3.5, 1.3.6, and HEAD specs
-  rubyopt = ENV["RUBYOPT"]
-  %w(master REL_1_3_5 REL_1_3_6).each do |rg|
-    desc "Run specs with Rubygems #{rg}"
-    RSpec::Core::RakeTask.new("spec_gems_#{rg}") do |t|
-      t.rspec_opts = %w(-fs --color)
-      t.ruby_opts  = %w(-w)
-    end
-
-    task "rubygems_#{rg}" do
-      unless File.directory?("tmp/rubygems_#{rg}")
-        system("git clone git://github.com/jbarnette/rubygems.git tmp/rubygems_#{rg} && cd tmp/rubygems_#{rg} && git reset --hard #{rg}")
+    desc "Run the spec suite with the sudo tests"
+    task :sudo => ["set_sudo", "clean", "spec"]
+
+    namespace :rubygems do
+      # Rubygems 1.3.5, 1.3.6, and HEAD specs
+      rubyopt = ENV["RUBYOPT"]
+      %w(master REL_1_3_5 REL_1_3_6).each do |rg|
+        desc "Run specs with Rubygems #{rg}"
+        RSpec::Core::RakeTask.new(rg) do |t|
+          t.rspec_opts = %w(-fs --color)
+          t.ruby_opts  = %w(-w)
+        end
+
+        task "clone_rubygems_#{rg}" do
+          unless File.directory?("tmp/rubygems_#{rg}")
+            system("git clone git://github.com/jbarnette/rubygems.git tmp/rubygems_#{rg} && cd tmp/rubygems_#{rg} && git reset --hard #{rg}")
+          end
+          ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems_#{rg}/lib")} #{rubyopt}"
+        end
+
+        task rg => "clone_rubygems_#{rg}"
+        task "rubygems:all" => rg
       end
-      ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems_#{rg}/lib")} #{rubyopt}"
     end
 
-    task "spec_gems_#{rg}" => "rubygems_#{rg}"
-    task :ci => "spec_gems_#{rg}"
-  end
+    namespace :ruby do
+      # Ruby 1.8.6, 1.8.7, and 1.9.2 specs
+      task "ensure_rvm" do
+        raise "RVM is not available" unless File.exist?(File.expand_path("~/.rvm/scripts/rvm"))
+      end
 
-  # Ruby 1.8.6, 1.8.7, and 1.9.2 specs
-  task "ensure_rvm" do
-    raise "RVM is not available" unless File.exist?(File.expand_path("~/.rvm/scripts/rvm"))
-  end
+      %w(1.8.6-p399 1.8.7-p302 1.9.2-p0).each do |ruby|
+        ruby_cmd = File.expand_path("~/.rvm/bin/ruby-#{ruby}")
 
-  %w(1.8.6-p399 1.8.7-p249 1.9.2-head).each do |ruby|
-    ruby_cmd = File.expand_path("~/.rvm/bin/ruby-#{ruby}")
+        desc "Run specs on Ruby #{ruby}"
+        RSpec::Core::RakeTask.new(ruby) do |t|
+          t.rspec_opts = %w(-fs --color)
+          t.ruby_opts  = %w(-w)
+        end
 
-    desc "Run specs on Ruby #{ruby}"
-    RSpec::Core::RakeTask.new("spec_ruby_#{ruby}") do |t|
-      t.rspec_opts = %w(-fs --color)
-      t.ruby_opts  = %w(-w)
-    end
+        task "ensure_ruby_#{ruby}" do
+          raise "Could not find Ruby #{ruby} at #{ruby_cmd}" unless File.exist?(ruby_cmd)
+        end
 
-    task "ensure_ruby_#{ruby}" do
-      raise "Could not find Ruby #{ruby} at #{ruby_cmd}" unless File.exist?(ruby_cmd)
+        task "ensure_ruby_#{ruby}" => "ensure_rvm"
+        task ruby => "ensure_ruby_#{ruby}"
+        task "ruby:all" => ruby
+      end
     end
 
-    task "ensure_ruby_#{ruby}" => "ensure_rvm"
-    task "spec_ruby_#{ruby}" => "ensure_ruby_#{ruby}"
-    task :ci => "spec_ruby_#{ruby}"
   end
+
 rescue LoadError
   task :spec do
     abort "Run `gem install rspec --pre` to be able to run specs"
@@ -111,16 +108,16 @@ namespace :man do
       sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt"
     end
 
-    task :build => "#{roff}.txt"
+    task :build_pages => "#{roff}.txt"
   end
-end
 
-desc "Build the man pages"
-task :build => "man:build"
+  desc "Build the man pages"
+  task :build => "man:build_pages"
 
-desc "Clean up from the built man pages"
-task :clean do
-  rm_rf "lib/bundler/man"
+  desc "Clean up from the built man pages"
+  task :clean do
+    rm_rf "lib/bundler/man"
+  end
 end
 
 namespace :vendor do
@@ -137,37 +134,6 @@ namespace :vendor do
   end
 end
 
-begin
-  require 'rake/gempackagetask'
-rescue LoadError
-  task(:gem) { $stderr.puts '`gem install rake` to package gems' }
-else
-  Rake::GemPackageTask.new(gemspec) do |pkg|
-    pkg.gem_spec = gemspec
-  end
-  task :gem => [:build, :gemspec]
-end
-
-desc "install the gem locally"
-task :install => :package do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}}
-end
-
-desc "validate the gemspec"
-task :gemspec do
-  gemspec.validate
-end
-
-desc "Build the gem"
-task :gem => [:gemspec, :build] do
-  mkdir_p "pkg"
-  sh "gem build bundler.gemspec"
-  mv "#{gemspec.full_name}.gem", "pkg"
-end
-
-desc "Install bundler"
-task :install => :gem do
-  sh "gem install pkg/#{gemspec.full_name}.gem"
-end
+task :build => "man:build"
 
 task :default => :spec

data/bundler.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "ronn"
   s.add_development_dependency "rspec"
 
-  s.files              = `git ls-files`.split("\n") + Dir.glob("lib/bundler/man/**/*")
+  # 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
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables        = %w(bundle)
   s.default_executable = "bundle"

data/lib/bundler.rb

@@ -212,7 +212,7 @@ module Bundler
     end
 
     def read_file(file)
-      File.open(file, "rb") { |file| file.read }
+      File.open(file, "rb") { |f| f.read }
     end
 
     def load_gemspec(file)

data/lib/bundler/cli.rb

@@ -156,7 +156,11 @@ module Bundler
     def install(path = nil)
       opts = options.dup
       opts[:without] ||= []
-      opts[:without].map! { |g| g.to_sym }
+      if opts[:without].size == 1
+        opts[:without].map!{|g| g.split(" ") }
+        opts[:without].flatten!
+      end
+      opts[:without].map!{|g| g.to_sym }
 
 
       ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
@@ -190,8 +194,6 @@ module Bundler
       end
 
       if opts[:deployment] || opts[:frozen]
-        Bundler.settings[:frozen] = '1'
-
         unless Bundler.default_lockfile.exist?
           flag = opts[:deployment] ? '--deployment' : '--frozen'
           raise ProductionError, "The #{flag} flag requires a Gemfile.lock. Please make " \
@@ -202,6 +204,8 @@ module Bundler
         if Bundler.root.join("vendor/cache").exist?
           opts[:local] = true
         end
+
+        Bundler.settings[:frozen] = '1'
       end
 
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
@@ -216,18 +220,29 @@ module Bundler
 
       Installer.install(Bundler.root, Bundler.definition, opts)
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
-      Bundler.ui.confirm "Your bundle is complete! " +
-        "Use `bundle show [gemname]` to see where a bundled gem is installed."
 
-      Bundler.ui.confirm "\nYour bundle was installed to `#{Bundler.settings[:path]}`" if Bundler.settings[:path]
+      if Bundler.settings[:path]
+        relative_path = Bundler.settings[:path]
+        relative_path = "./" + relative_path unless relative_path[0] == ?/
+        Bundler.ui.confirm "Your bundle is complete! " +
+          "It was installed into #{relative_path}"
+      else
+        Bundler.ui.confirm "Your bundle is complete! " +
+          "Use `bundle show [gemname]` to see where a bundled gem is installed."
+      end
 
       if path
-        Bundler.ui.warn "\nIf you meant to install it to your system, please remove the\n" \
-                        "`#{path}` directory and run `bundle install --system`"
+        Bundler.ui.warn "The path argument to `bundle install` is deprecated. " +
+          "It will be removed in version 1.1. " +
+          "Please use `bundle install --path #{path}` instead."
       end
     rescue GemNotFound => e
+      if opts[:local]
+        Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
+      end
+
       if Bundler.definition.no_sources?
-        Bundler.ui.warn "Your Gemfile doesn't have any sources. You can add one with a line like 'source :gemcutter'"
+        Bundler.ui.warn "Your Gemfile doesn't have any sources. You can add one with a line like 'source :rubygems'"
       end
       raise e
     end

data/lib/bundler/dsl.rb

@@ -53,9 +53,6 @@ module Bundler
 
       options = Hash === args.last ? args.pop : {}
       version = args || [">= 0"]
-      if group = options[:groups] || options[:group]
-        options[:group] = group
-      end
 
       _deprecated_options(options)
       _normalize_options(name, version, options)
@@ -135,6 +132,7 @@ module Bundler
     ensure
       platforms.each { @platforms.pop }
     end
+    alias_method :platform, :platforms
 
     def env(name)
       @env, old = name, @env
@@ -187,7 +185,7 @@ module Bundler
     def _normalize_options(name, version, opts)
       _normalize_hash(opts)
 
-      invalid_keys = opts.keys - %w(group git path name branch ref tag require submodules platforms)
+      invalid_keys = opts.keys - %w(group groups git path name branch ref tag require submodules platform platforms)
       if invalid_keys.any?
         plural = invalid_keys.size > 1
         message = "You passed #{invalid_keys.map{|k| ':'+k }.join(", ")} "
@@ -200,10 +198,12 @@ module Bundler
       end
 
       groups = @groups.dup
+      opts["group"] = opts.delete("groups") || opts["group"]
       groups.concat Array(opts.delete("group"))
       groups = [:default] if groups.empty?
 
       platforms = @platforms.dup
+      opts["platforms"] = opts["platform"] || opts["platforms"]
       platforms.concat Array(opts.delete("platforms"))
       platforms.map! { |p| p.to_sym }
       platforms.each do |p|

data/lib/bundler/gem_helper.rb

@@ -1,6 +1,7 @@
 $:.unshift File.expand_path('../vendor', __FILE__)
 require 'open3'
 require 'thor'
+require 'bundler'
 
 module Bundler
   class GemHelper

data/lib/bundler/rubygems_ext.rb

@@ -124,7 +124,7 @@ module Gem
     MING  = Gem::Platform.new('x86-mingw32')
 
     def hash
-      @cpu.hash + @os.hash + @version.hash
+      @cpu.hash ^ @os.hash ^ @version.hash
     end
 
     alias eql? ==

data/lib/bundler/shared_helpers.rb

@@ -76,11 +76,6 @@ module Bundler
       executables = specs.map { |s| s.executables }.flatten
       Gem.source_index # ensure RubyGems is fully loaded
 
-     ::Kernel.class_eval do
-        private
-        def gem(*) ; end
-      end
-
       ::Kernel.send(:define_method, :gem) do |dep, *reqs|
         if executables.include? File.basename(caller.first.split(':').first)
           return
@@ -113,6 +108,7 @@ module Bundler
 
       # Yeah, talk about a hack
       source_index_class = (class << Gem::SourceIndex ; self ; end)
+      source_index_class.send(:remove_method, :from_gems_in)
       source_index_class.send(:define_method, :from_gems_in) do |*args|
         source_index = Gem::SourceIndex.new
         source_index.spec_dirs = *args
@@ -122,7 +118,9 @@ module Bundler
 
       # OMG more hacks
       gem_class = (class << Gem ; self ; end)
+      gem_class.send(:remove_method, :refresh)
       gem_class.send(:define_method, :refresh) { }
+      gem_class.send(:remove_method, :bin_path)
       gem_class.send(:define_method, :bin_path) do |name, *args|
         exec_name, *reqs = args
 

data/lib/bundler/source.rb

@@ -276,7 +276,8 @@ module Bundler
         @allow_remote = false
 
         if options["path"]
-          @path = Pathname.new(options["path"]).expand_path(Bundler.root)
+          @path = Pathname.new(options["path"])
+          @path = @path.expand_path(Bundler.root) unless @path.relative?
         end
 
         @name = options["name"]
@@ -326,8 +327,10 @@ module Bundler
       def load_spec_files
         index = Index.new
 
-        if File.directory?(path)
-          Dir["#{path}/#{@glob}"].each do |file|
+        expanded_path = path.expand_path
+
+        if File.directory?(expanded_path)
+          Dir["#{expanded_path}/#{@glob}"].each do |file|
             spec = Bundler.load_gemspec(file)
             if spec
               spec.loaded_from = file.to_s
@@ -344,14 +347,14 @@ module Bundler
               s.platform = Gem::Platform::RUBY
               s.summary  = "Fake gemspec for #{@name}"
               s.relative_loaded_from = "#{@name}.gemspec"
-              if path.join("bin").exist?
-                binaries = path.join("bin").children.map{|c| c.basename.to_s }
+              if expanded_path.join("bin").exist?
+                binaries = expanded_path.join("bin").children.map{|c| c.basename.to_s }
                 s.executables = binaries
               end
             end
           end
         else
-          raise PathError, "The path `#{path}` does not exist."
+          raise PathError, "The path `#{expanded_path}` does not exist."
         end
 
         index
@@ -600,7 +603,7 @@ module Bundler
         if cached?
           return if has_revision_cached?
           Bundler.ui.info "Updating #{uri}"
-          in_cache { git %|fetch --force --quiet "#{uri}" refs/heads/*:refs/heads/*| }
+          in_cache { git %|fetch --force --quiet --tags "#{uri}" refs/heads/*:refs/heads/*| }
         else
           Bundler.ui.info "Fetching #{uri}"
           FileUtils.mkdir_p(cache_path.dirname)
@@ -614,7 +617,7 @@ module Bundler
           git %|clone --no-checkout "#{cache_path}" "#{path}"|
         end
         Dir.chdir(path) do
-          git %|fetch --force --quiet "#{cache_path}"|
+          git %|fetch --force --quiet --tags "#{cache_path}"|
           git "reset --hard #{revision}"
 
           if @submodules

data/lib/bundler/templates/Executable

@@ -6,7 +6,9 @@
 # this file is here to facilitate running it.
 #
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../<%= relative_gemfile_path %>", __FILE__)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../<%= relative_gemfile_path %>",
+  Pathname.new(__FILE__).realpath)
 
 require 'rubygems'
 require 'bundler/setup'

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

data/man/gemfile.5.ronn

@@ -240,6 +240,25 @@ In the case of the `git` block form, the `:ref`, `:branch`, `:tag`,
 and `:submodules` options may be passed to the `git` method, and
 all gems in the block will inherit those options.
 
+## GEMSPEC (#gemspec)
+
+If you wish to use Bundler to help install dependencies for a gem while it is
+being developed, use the `gemspec` method to pull in the dependencies listed in
+the `.gemspec` file.
+
+The `gemspec` method adds any runtime dependencies as gem requirements in the
+default group. It also adds development dependencies as gem requirements in the
+`development` group. Finally, it adds a gem requirement on your project (`:path
+=> '.'`). In conjunction with `Bundler.setup`, this allows you to require project
+files in your test code as you would if the project were installed as a gem; you
+need not manipulate the load path manually or require project files via relative
+paths.
+
+The `gemspec` method supports optional `:path`, `:name`, and `:development_group`
+options, which control where bundler looks for the `.gemspec`, what named
+`.gemspec` it uses (if more than one is present), and which group development
+dependencies are included in.
+
 ## SOURCE PRIORITY
 
 When attempting to locate a gem to satisfy a gem requirement,

data/spec/install/deploy_spec.rb

@@ -18,6 +18,13 @@ describe "install with --deployment or --frozen" do
     out.should include("The --frozen flag requires a Gemfile.lock")
   end
 
+  it "works after you try to deploy without a lock" do
+    bundle "install --deployment"
+    bundle :install, :exit_status => true
+    exitstatus.should == 0
+    should_be_installed "rack 1.0"
+  end
+
   it "still works if you are not in the app directory and specify --gemfile" do
     bundle "install"
     Dir.chdir tmp

data/spec/install/gems/groups_spec.rb

@@ -10,6 +10,7 @@ describe "bundle install with gem sources" do
           group :emo do
             gem "activesupport", "2.3.5"
           end
+          gem "thin", :groups => [:emo]
         G
       end
 
@@ -17,8 +18,19 @@ describe "bundle install with gem sources" do
         should_be_installed "rack 1.0.0"
       end
 
-      it "installs gems in other groups" do
+      it "installs gems in a group block into that group" do
         should_be_installed "activesupport 2.3.5"
+
+        run("require 'activesupport'; puts ACTIVESUPPORT",
+          :default, :expect_err => true)
+        @err.should =~ /no such file to load -- activesupport/
+      end
+
+      it "installs gems with inline :groups into those groups" do
+        should_be_installed "thin 1.0"
+
+        run("require 'thin'; puts THIN", :default, :expect_err => true)
+        @err.should =~ /no such file to load -- thin/
       end
 
       it "sets up everything if Bundler.setup is used with no groups" do
@@ -27,6 +39,9 @@ describe "bundle install with gem sources" do
 
         out = run("require 'activesupport'; puts ACTIVESUPPORT")
         out.should == '2.3.5'
+
+        out = run("require 'thin'; puts THIN")
+        out.should == '1.0'
       end
     end
 
@@ -83,9 +98,8 @@ describe "bundle install with gem sources" do
           should_be_installed "activesupport 2.3.2", :groups => [:default]
         end
 
-        it "still works when locked" do
+        it "still works on a different machine and excludes gems" do
           bundle :install, :without => "emo"
-          bundle :lock
 
           simulate_new_machine
           bundle :install, :without => "emo"
@@ -168,6 +182,11 @@ describe "bundle install with gem sources" do
             bundle "install --without emo lolercoaster"
             should_not_be_installed "activesupport 2.3.5"
           end
+
+          it "does not install the gem w/ option --without 'emo lolercoaster'" do
+            bundle "install --without 'emo lolercoaster'"
+            should_not_be_installed "activesupport 2.3.5"
+          end
         end
       end
 
@@ -206,4 +225,4 @@ describe "bundle install with gem sources" do
       end
     end
   end
-end
+end

data/spec/install/gems/platform_spec.rb

@@ -116,9 +116,8 @@ describe "bundle install across platforms" do
   end
 end
 
-# TODO: Don't make the tests hardcoded to a platform
 describe "bundle install with platform conditionals" do
-  it "installs gems tagged w/ the current platform" do
+  it "installs gems tagged w/ the current platforms" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
 
@@ -130,7 +129,7 @@ describe "bundle install with platform conditionals" do
     should_be_installed "nokogiri 1.4.2"
   end
 
-  it "does not install gems tagged w/ another platform" do
+  it "does not install gems tagged w/ another platforms" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
 
@@ -145,37 +144,52 @@ describe "bundle install with platform conditionals" do
     should_not_be_installed "nokogiri 1.4.2"
   end
 
-  it "installs gems tagged w/ the current platform" do
+  it "does not install gems tagged w/ another platform" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
 
-      gem "nokogiri", :platforms => :#{local_tag}
+      gem "rack"
+
+      platform :#{not_local_tag} do
+        gem "nokogiri"
+      end
     G
 
-    should_be_installed "nokogiri 1.4.2"
+    should_be_installed     "rack 1.0"
+    should_not_be_installed "nokogiri 1.4.2"
   end
 
-  it "doesn't install gems tagged w/ a different platform" do
+  it "installs gems tagged w/ the current platforms inline" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
-
-      platforms :#{not_local_tag} do
-        gem "nokogiri"
-      end
+      gem "nokogiri", :platforms => :#{local_tag}
     G
-
-    should_not_be_installed "nokogiri"
+    should_be_installed "nokogiri 1.4.2"
   end
 
-  it "does not install gems tagged w/ another platform" do
+  it "does not install gems tagged w/ another platforms inline" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
-
       gem "rack"
       gem "nokogiri", :platforms => :#{not_local_tag}
     G
-
     should_be_installed     "rack 1.0"
     should_not_be_installed "nokogiri 1.4.2"
   end
+
+  it "installs gems tagged w/ the current platform inline" do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "nokogiri", :platform => :#{local_tag}
+    G
+    should_be_installed "nokogiri 1.4.2"
+  end
+
+  it "doesn't install gems tagged w/ another platform inline" do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "nokogiri", :platform => :#{not_local_tag}
+    G
+    should_not_be_installed "nokogiri 1.4.2"
+  end
 end

data/spec/install/gems/simple_case_spec.rb

@@ -63,6 +63,7 @@ describe "bundle install with gem sources" do
 
       lambda { run '1' }.should_not change { File.mtime(bundled_app('Gemfile.lock')) }
     end
+
     it "fetches gems" do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
@@ -706,4 +707,36 @@ describe "bundle install with gem sources" do
     end
   end
 
+  describe "when locked and installed with --without" do
+    before(:each) do
+      build_repo2
+      system_gems "rack-0.9.1" do
+        install_gemfile <<-G, :without => :rack
+          source "file://#{gem_repo2}"
+          gem "rack"
+
+          group :rack do
+            gem "rack_middleware"
+          end
+        G
+      end
+    end
+
+    it "uses the correct versions even if --without was used on the original" do
+      should_be_installed "rack 0.9.1"
+      should_not_be_installed "rack_middleware 1.0"
+      simulate_new_machine
+
+      bundle :install
+
+      should_be_installed "rack 0.9.1"
+      should_be_installed "rack_middleware 1.0"
+    end
+
+    it "does not hit the remote a second time" do
+      FileUtils.rm_rf gem_repo2
+      bundle "install --without rack"
+      err.should be_empty
+    end
+  end
 end

data/spec/install/git_spec.rb

@@ -331,7 +331,8 @@ describe "bundle install with git sources" do
     bundle :install, :expect_err => true
 
     out.should include("An error has occurred in git")
-    err.should include("fatal: 'omgomg'")
+    err.should include("fatal")
+    err.should include("omgomg")
     err.should include("fatal: The remote end hung up unexpectedly")
   end
 
@@ -471,12 +472,12 @@ describe "bundle install with git sources" do
       end
 
       install_gemfile <<-G
-        source "http://#{gem_repo1}"
+        source "file://#{gem_repo1}"
         gem "bar", :path => "#{lib_path('bar')}"
       G
 
       install_gemfile <<-G
-        source "http://#{gem_repo1}"
+        source "file://#{gem_repo1}"
         gem "bar", :git => "#{lib_path('bar')}"
       G
 

data/spec/install/path_spec.rb

@@ -37,7 +37,7 @@ describe "bundle install with explicit source paths" do
   it "expands paths" do
     build_lib "foo"
 
-    relative_path = lib_path('foo-1.0').relative_path_from(Pathname.new("~").expand_path)
+    relative_path = lib_path('foo-1.0').relative_path_from(Pathname.new('~').expand_path)
 
     install_gemfile <<-G
       gem 'foo', :path => "~/#{relative_path}"
@@ -184,37 +184,31 @@ describe "bundle install with explicit source paths" do
     end
   end
 
-  describe "when locked" do
-    it "keeps source pinning" do
-      build_lib "foo", "1.0", :path => lib_path('foo')
-      build_lib "omg", "1.0", :path => lib_path('omg')
-      build_lib "foo", "1.0", :path => lib_path('omg/foo') do |s|
-        s.write "lib/foo.rb", "puts 'FAIL'"
-      end
-
-      install_gemfile <<-G
-        gem "foo", :path => "#{lib_path('foo')}"
-        gem "omg", :path => "#{lib_path('omg')}"
-      G
-
-      bundle :lock
-
-      should_be_installed "foo 1.0"
+  it "keeps source pinning" do
+    build_lib "foo", "1.0", :path => lib_path('foo')
+    build_lib "omg", "1.0", :path => lib_path('omg')
+    build_lib "foo", "1.0", :path => lib_path('omg/foo') do |s|
+      s.write "lib/foo.rb", "puts 'FAIL'"
     end
 
-    it "works when the path does not have a gemspec" do
-      build_lib "foo", :gemspec => false
+    install_gemfile <<-G
+      gem "foo", :path => "#{lib_path('foo')}"
+      gem "omg", :path => "#{lib_path('omg')}"
+    G
+
+    should_be_installed "foo 1.0"
+  end
 
-      gemfile <<-G
-        gem "foo", "1.0", :path => "#{lib_path('foo-1.0')}"
-      G
+  it "works when the path does not have a gemspec" do
+    build_lib "foo", :gemspec => false
 
-      should_be_installed "foo 1.0"
+    gemfile <<-G
+      gem "foo", "1.0", :path => "#{lib_path('foo-1.0')}"
+    G
 
-      bundle :lock
+    should_be_installed "foo 1.0"
 
-      should_be_installed "foo 1.0"
-    end
+    should_be_installed "foo 1.0"
   end
 
   it "installs executable stubs" do

data/spec/lock/flex_spec.rb

@@ -375,7 +375,7 @@ describe "the lockfile format" do
     G
   end
 
-  it "stores relative paths when the path is provided in a relative fashion" do
+  it "stores relative paths when the path is provided in a relative fashion and in Gemfile dir" do
     build_lib "foo", :path => bundled_app('foo')
 
     install_gemfile <<-G
@@ -400,6 +400,31 @@ describe "the lockfile format" do
     G
   end
 
+  it "stores relative paths when the path is provided in a relative fashion and is above Gemfile dir" do
+    build_lib "foo", :path => bundled_app(File.join('..', 'foo'))
+
+    install_gemfile <<-G
+      path "../foo"
+      gem "foo"
+    G
+
+    lockfile_should_be <<-G
+      PATH
+        remote: ../foo
+        specs:
+          foo (1.0)
+
+      GEM
+        specs:
+
+      PLATFORMS
+        #{generic(Gem::Platform.local)}
+
+      DEPENDENCIES
+        foo
+    G
+  end
+
   it "stores relative paths when the path is provided in an absolute fashion but is relative" do
     build_lib "foo", :path => bundled_app('foo')
 

data/spec/other/console_spec.rb

@@ -51,52 +51,4 @@ describe "bundle console" do
       out.should include("NameError")
     end
   end
-
-  describe "when locked" do
-    before :each do
-      bundle :lock
-    end
-
-    it "starts IRB with the default group loaded" do
-      bundle :console do |input|
-        input.puts("puts RACK")
-        input.puts("exit")
-      end
-      out.should include("0.9.1")
-    end
-
-    it "doesn't load any other groups" do
-      bundle :console do |input|
-        input.puts("puts ACTIVESUPPORT")
-        input.puts("exit")
-      end
-      out.should include("NameError")
-    end
-
-    describe "and given a group" do
-      it "loads the given group" do
-        bundle "console test" do |input|
-          input.puts("puts ACTIVESUPPORT")
-          input.puts("exit")
-        end
-        out.should include("2.3.5")
-      end
-
-      it "loads the default group" do
-        bundle "console test" do |input|
-          input.puts("puts RACK")
-          input.puts("exit")
-        end
-        out.should include("0.9.1")
-      end
-
-      it "doesn't load other groups" do
-        bundle "console test" do |input|
-          input.puts("puts RACK_MIDDLEWARE")
-          input.puts("exit")
-        end
-        out.should include("NameError")
-      end
-    end
-  end
-end
+end

data/spec/other/open_spec.rb

@@ -32,20 +32,4 @@ describe "bundle open" do
     bundle "open missing", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
     out.should match(/could not find gem 'missing'/i)
   end
-
-  describe "while locked" do
-    before :each do
-      bundle :lock
-    end
-
-    it "opens the gem with EDITOR if set" do
-      bundle "open rails", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
-      out.should == "editor #{default_bundle_path('gems', 'rails-2.3.2')}"
-    end
-
-    it "complains if gem not in bundle" do
-      bundle "open missing", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
-      out.should match(/could not find gem 'missing'/i)
-    end
-  end
 end

data/spec/other/show_spec.rb

@@ -38,23 +38,6 @@ describe "bundle show" do
     bundle "show missing"
     out.should =~ /could not find gem 'missing'/i
   end
-
-  describe "while locked" do
-    before :each do
-      bundle :lock
-    end
-
-    it "prints path if gem exists in bundle" do
-      bundle "show rails"
-      out.should == default_bundle_path('gems', 'rails-2.3.2').to_s
-    end
-
-    it "complains if gem not in bundle" do
-      bundle "show missing"
-      out.should =~ /could not find gem 'missing'/i
-    end
-  end
-
 end
 
 describe "bundle show with a git repo" do

data/spec/runtime/environment_rb_spec.rb

@@ -9,12 +9,10 @@ describe "environment.rb file" do
       install_gemfile <<-G
         gem "no-gemspec", "1.0", :git => "#{lib_path('no-gemspec-1.0')}"
       G
-
-      bundle :lock
     end
 
     it "loads the library via a virtual spec" do
-      run <<-R, :lite_runtime => true
+      run <<-R
         require 'no-gemspec'
         puts NOGEMSPEC
       R
@@ -32,12 +30,10 @@ describe "environment.rb file" do
 
         gem "activesupport", "2.3.5"
       G
-
-      bundle :lock
     end
 
     it "does not pull in system gems" do
-      run <<-R, :lite_runtime => true
+      run <<-R
         require 'rubygems'
 
         begin;
@@ -51,7 +47,7 @@ describe "environment.rb file" do
     end
 
     it "provides a gem method" do
-      run <<-R, :lite_runtime => true
+      run <<-R
         gem 'activesupport'
         require 'activesupport'
         puts ACTIVESUPPORT
@@ -61,7 +57,7 @@ describe "environment.rb file" do
     end
 
     it "raises an exception if gem is used to invoke a system gem not in the bundle" do
-      run <<-R, :lite_runtime => true
+      run <<-R
         begin
           gem 'rack'
         rescue LoadError => e
@@ -73,7 +69,7 @@ describe "environment.rb file" do
     end
 
     it "sets GEM_HOME appropriately" do
-      run "puts ENV['GEM_HOME']", :lite_runtime => true
+      run "puts ENV['GEM_HOME']"
       out.should == default_bundle_path.to_s
     end
   end
@@ -87,12 +83,10 @@ describe "environment.rb file" do
         gem "rack", "1.0.0"
         gem "activesupport", "2.3.5"
       G
-
-      bundle :lock
     end
 
     it "sets GEM_PATH appropriately" do
-      run "puts Gem.path", :lite_runtime => true
+      run "puts Gem.path"
       paths = out.split("\n")
       paths.should include(system_gem_path.to_s)
       paths.should include(default_bundle_path.to_s)
@@ -124,8 +118,7 @@ describe "environment.rb file" do
 
     it "evals each gemspec in the context of its parent directory" do
       bundle :install
-      bundle :lock
-      run "require 'bar'; puts BAR", :lite_runtime => true
+      run "require 'bar'; puts BAR"
       out.should == "1.0"
     end
 
@@ -161,7 +154,6 @@ describe "environment.rb file" do
       install_gemfile <<-G
         gem "bundler", :path => "#{File.expand_path("..", lib)}"
       G
-      bundle :lock
 
       bundle %|exec ruby -e "require 'bundler'; Bundler.setup"|
       err.should be_empty

data/spec/runtime/load_spec.rb

@@ -69,26 +69,21 @@ describe "Bundler.load" do
     end
   end
 
-  describe "when locked" do
-    before :each do
-      install_gemfile <<-G
-        source "file://#{gem_repo1}"
-        gem "activesupport"
-      G
-      bundle :lock
-    end
+  # This is obviously not true on 1.9 thanks to the AWEOME! gem prelude :'(
+  it "does not invoke setup inside env.rb" do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "activesupport"
+    G
 
-    # This is obviously not true on 1.9 thanks to the AWEOME! gem prelude :'(
-    it "does not invoke setup inside env.rb" do
-      ruby <<-RUBY
-        require 'bundler'
-        Bundler.load
-        puts $LOAD_PATH.grep(/activesupport/i)
-      RUBY
+    ruby <<-RUBY
+      require 'bundler'
+      Bundler.load
+      puts $LOAD_PATH.grep(/activesupport/i)
+    RUBY
 
-      out.should == ""
-    end if RUBY_VERSION < "1.9"
-  end
+    out.should == ""
+  end if RUBY_VERSION < "1.9"
 
   describe "not hurting brittle rubygems" do
     it "does not inject #source into the generated YAML of the gem specs" do

data/spec/runtime/require_spec.rb

@@ -94,8 +94,6 @@ describe "Bundler.require" do
 
   describe "using bundle exec" do
     it "requires the locked gems" do
-      bundle :lock
-
       bundle "exec ruby -e 'Bundler.require'"
       check out.should == "two"
 
@@ -183,34 +181,6 @@ describe "Bundler.require" do
       check out.should == "two_not_loaded\none\ntwo"
     end
 
-    describe "when locked" do
-      it "works when the gems are in the Gemfile in the correct order" do
-        gemfile <<-G
-          path "#{lib_path}"
-          gem "two"
-          gem "one"
-        G
-
-        bundle :lock
-
-        run "Bundler.require"
-        check out.should == "two\nmodule_two\none"
-      end
-
-      it "fails when the gems are in the Gemfile in the wrong order" do
-        gemfile <<-G
-          path "#{lib_path}"
-          gem "one"
-          gem "two"
-        G
-
-        bundle :lock
-
-        run "Bundler.require"
-        check out.should == "two_not_loaded\none\ntwo"
-      end
-    end
-
     describe "with busted gems" do
       it "should be busted" do
         build_gem "busted_require", :to_system => true do |s|

data/spec/spec_helper.rb

@@ -38,8 +38,9 @@ RSpec.configure do |config|
   config.include Spec::Platforms
   config.include Spec::Sudo
 
-  config.filter_run :focus => true
+  config.filter_run :focused => true
   config.run_all_when_everything_filtered = true
+  config.alias_example_to :fit, :focused => true
 
   original_wd       = Dir.pwd
   original_path     = ENV['PATH']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Carl Lerche
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-02 00:00:00 -07:00
+date: 2010-10-15 00:00:00 -07:00
 default_executable: bundle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,7 +145,6 @@ files:
 - spec/install/gems/env_spec.rb
 - spec/install/gems/flex_spec.rb
 - spec/install/gems/groups_spec.rb
-- spec/install/gems/locked_spec.rb
 - spec/install/gems/packed_spec.rb
 - spec/install/gems/platform_spec.rb
 - spec/install/gems/resolving_spec.rb
@@ -256,7 +255,6 @@ test_files:
 - spec/install/gems/env_spec.rb
 - spec/install/gems/flex_spec.rb
 - spec/install/gems/groups_spec.rb
-- spec/install/gems/locked_spec.rb
 - spec/install/gems/packed_spec.rb
 - spec/install/gems/platform_spec.rb
 - spec/install/gems/resolving_spec.rb

data/spec/install/gems/locked_spec.rb

@@ -1,48 +0,0 @@
-require "spec_helper"
-
-describe "bundle install with gem sources" do
-  describe "when locked and installed with --without" do
-    before(:each) do
-      build_repo2
-      system_gems "rack-0.9.1" do
-        install_gemfile <<-G, :without => :rack
-          source "file://#{gem_repo2}"
-          gem "rack"
-
-          group :rack do
-            gem "rack_middleware"
-          end
-        G
-
-        bundle :lock
-      end
-    end
-
-    it "uses the correct versions even if --without was used on the original" do
-      should_be_installed "rack 0.9.1"
-      should_not_be_installed "rack_middleware 1.0"
-      simulate_new_machine
-
-      bundle :install
-
-      should_be_installed "rack 0.9.1"
-      should_be_installed "rack_middleware 1.0"
-    end
-
-    it "regenerates the environment.rb if install is called twice on a locked repo" do
-      run "begin; require 'rack_middleware'; rescue LoadError; puts 'WIN'; end", :lite_runtime => true
-      check out.should == "WIN"
-
-      bundle :install
-
-      run "require 'rack_middleware'; puts RACK_MIDDLEWARE", :lite_runtime => true
-      out.should == "1.0"
-    end
-
-    it "does not hit the remote a second time" do
-      FileUtils.rm_rf gem_repo2
-      bundle "install --without rack"
-      err.should be_empty
-    end
-  end
-end