bundler 1.0.0 → 1.0.2

data/spec/support/platforms.rb

@@ -0,0 +1,49 @@
+module Spec
+  module Platforms
+    include Bundler::GemHelpers
+
+    def rb
+      Gem::Platform::RUBY
+    end
+
+    def mac
+      Gem::Platform.new('x86-darwin-10')
+    end
+
+    def java
+      Gem::Platform.new([nil, "java", nil])
+    end
+
+    def linux
+      Gem::Platform.new(['x86', 'linux', nil])
+    end
+
+    def mswin
+      Gem::Platform.new(['x86', 'mswin32', nil])
+    end
+
+    def all_platforms
+      [rb, java, linux, mswin]
+    end
+
+    def local
+      generic(Gem::Platform.local)
+    end
+
+    def not_local
+      all_platforms.find { |p| p != generic(Gem::Platform.local) }
+    end
+
+    def local_tag
+      if RUBY_PLATFORM == "java"
+        :jruby
+      else
+        :ruby
+      end
+    end
+
+    def not_local_tag
+      [:ruby, :jruby].find { |tag| tag != local_tag }
+    end
+  end
+end

data/spec/support/ruby_ext.rb

@@ -0,0 +1,19 @@
+class IO
+  def read_available_bytes(chunk_size = 1024, select_timeout = 5)
+    buffer = []
+
+    return "" if closed? || eof?
+    # IO.select cannot be used here due to the fact that it
+    # just does not work on windows
+    while true
+      begin
+        buffer << self.readpartial(chunk_size)
+        sleep 0.1
+      rescue(EOFError)
+        break
+      end
+    end
+
+    return buffer.join
+  end
+end

data/spec/support/rubygems_ext.rb

@@ -0,0 +1,30 @@
+module Spec
+  module Rubygems
+    def self.setup
+      Gem.clear_paths
+
+      ENV['BUNDLE_PATH'] = nil
+      ENV['GEM_HOME'] = ENV['GEM_PATH'] = Path.base_system_gems.to_s
+      ENV['PATH'] = ["#{Path.root}/bin", "#{Path.system_gem_path}/bin", ENV['PATH']].join(File::PATH_SEPARATOR)
+
+      unless File.exist?("#{Path.base_system_gems}")
+        FileUtils.mkdir_p(Path.base_system_gems)
+        puts "running `gem install builder rake fakeweb --no-rdoc --no-ri`"
+        `gem install builder rake fakeweb --no-rdoc --no-ri`
+      end
+
+      ENV['HOME'] = Path.home.to_s
+
+      Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
+    end
+
+    def gem_command(command, args = "", options = {})
+      if command == :exec && !options[:no_quote]
+        args = args.gsub(/(?=")/, "\\")
+        args = %["#{args}"]
+      end
+      lib  = File.join(File.dirname(__FILE__), '..', '..', 'lib')
+      %x{#{Gem.ruby} -I#{lib} -rubygems -S gem --backtrace #{command} #{args}}.strip
+    end
+  end
+end

data/spec/support/rubygems_hax/rubygems_plugin.rb

@@ -0,0 +1,9 @@
+class Gem::Platform
+  @local = new(ENV['BUNDLER_SPEC_PLATFORM']) if ENV['BUNDLER_SPEC_PLATFORM']
+end
+
+if ENV['BUNDLER_SPEC_VERSION']
+  module Bundler
+    VERSION = ENV['BUNDLER_SPEC_VERSION'].dup
+  end
+end

data/spec/support/sudo.rb

@@ -0,0 +1,21 @@
+module Spec
+  module Sudo
+    def self.present?
+      @which_sudo ||= `which sudo`.strip
+      !@which_sudo.empty? && ENV['BUNDLER_SUDO_TESTS']
+    end
+
+    def test_sudo?
+      Sudo.present?
+    end
+
+    def sudo(cmd)
+      raise "sudo not present" unless Sudo.present?
+      sys_exec("sudo #{cmd}")
+    end
+
+    def chown_system_gems_to_root
+      sudo "chown -R root #{system_gem_path}"
+    end
+  end
+end

data/spec/update/gems_spec.rb

@@ -0,0 +1,86 @@
+require "spec_helper"
+
+describe "bundle update" do
+  before :each do
+    build_repo2
+
+    install_gemfile <<-G
+      source "file://#{gem_repo2}"
+      gem "activesupport"
+      gem "rack-obama"
+    G
+  end
+
+  describe "with no arguments" do
+    it "updates the entire bundle" do
+      update_repo2 do
+        build_gem "activesupport", "3.0"
+      end
+
+      bundle "update"
+      should_be_installed "rack 1.2", "rack-obama 1.0", "activesupport 3.0"
+    end
+
+    it "doesn't delete the Gemfile.lock file if something goes wrong" do
+      gemfile <<-G
+        source "file://#{gem_repo2}"
+        gem "activesupport"
+        gem "rack-obama"
+        exit!
+      G
+      bundle "update"
+      bundled_app("Gemfile.lock").should exist
+    end
+  end
+
+  describe "with a top level dependency" do
+    it "unlocks all child dependencies that are unrelated to other locked dependencies" do
+      update_repo2 do
+        build_gem "activesupport", "3.0"
+      end
+
+      bundle "update rack-obama"
+      should_be_installed "rack 1.2", "rack-obama 1.0", "activesupport 2.3.5"
+    end
+  end
+end
+
+describe "bundle update in more complicated situations" do
+  before :each do
+    build_repo2
+  end
+
+  it "will eagerly unlock dependencies of a specified gem" do
+    install_gemfile <<-G
+      source "file://#{gem_repo2}"
+
+      gem "thin"
+      gem "rack-obama"
+    G
+
+    update_repo2 do
+      build_gem "thin" , '2.0' do |s|
+        s.add_dependency "rack"
+      end
+    end
+
+    bundle "update thin"
+    should_be_installed "thin 2.0", "rack 1.2", "rack-obama 1.0"
+  end
+end
+
+describe "bundle update without a Gemfile.lock" do
+  it "should not explode" do
+    build_repo2
+
+    gemfile <<-G
+      source "file://#{gem_repo2}"
+
+      gem "rack", "1.0"
+    G
+
+    bundle "update"
+
+    should_be_installed "rack 1.0.0"
+  end
+end

data/spec/update/git_spec.rb

@@ -0,0 +1,159 @@
+require "spec_helper"
+
+describe "bundle update" do
+  describe "git sources" do
+    it "floats on a branch when :branch is used" do
+      build_git  "foo", "1.0"
+      update_git "foo", :branch => "omg"
+
+      install_gemfile <<-G
+        git "#{lib_path('foo-1.0')}", :branch => "omg" do
+          gem 'foo'
+        end
+      G
+
+      update_git "foo", :branch => "omg" do |s|
+        s.write "lib/foo.rb", "FOO = '1.1'"
+      end
+
+      bundle "update"
+
+      should_be_installed "foo 1.1"
+    end
+
+    it "updates correctly when you have like craziness" do
+      build_lib "activesupport", "3.0", :path => lib_path("rails/activesupport")
+      build_git "rails", "3.0", :path => lib_path("rails") do |s|
+        s.add_dependency "activesupport", "= 3.0"
+      end
+
+      install_gemfile <<-G
+        gem "rails", :git => "#{lib_path('rails')}"
+      G
+
+      bundle "update rails"
+      out.should include("Using activesupport (3.0) from #{lib_path('rails')} (at master)")
+      should_be_installed "rails 3.0", "activesupport 3.0"
+    end
+
+    it "floats on a branch when :branch is used and the source is specified in the update" do
+      build_git  "foo", "1.0", :path => lib_path("foo")
+      update_git "foo", :branch => "omg", :path => lib_path("foo")
+
+      install_gemfile <<-G
+        git "#{lib_path('foo')}", :branch => "omg" do
+          gem 'foo'
+        end
+      G
+
+      update_git "foo", :branch => "omg", :path => lib_path("foo") do |s|
+        s.write "lib/foo.rb", "FOO = '1.1'"
+      end
+
+      bundle "update --source foo"
+
+      should_be_installed "foo 1.1"
+    end
+
+    it "floats on master when updating all gems that are pinned to the source even if you have child dependencies" do
+      build_git "foo", :path => lib_path('foo')
+      build_gem "bar", :to_system => true do |s|
+        s.add_dependency "foo"
+      end
+
+      install_gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo')}"
+        gem "bar"
+      G
+
+      update_git "foo", :path => lib_path('foo') do |s|
+        s.write "lib/foo.rb", "FOO = '1.1'"
+      end
+
+      bundle "update foo"
+
+      should_be_installed "foo 1.1"
+    end
+
+    it "notices when you change the repo url in the Gemfile" do
+      build_git "foo", :path => lib_path("foo_one")
+      build_git "foo", :path => lib_path("foo_two")
+
+      install_gemfile <<-G
+        gem "foo", "1.0", :git => "#{lib_path('foo_one')}"
+      G
+
+      FileUtils.rm_rf lib_path("foo_one")
+
+      install_gemfile <<-G
+        gem "foo", "1.0", :git => "#{lib_path('foo_two')}"
+      G
+
+      err.should be_empty
+      out.should include("Fetching #{lib_path}/foo_two")
+      out.should include("Your bundle is complete!")
+    end
+
+    describe "with submodules" do
+      before :each do
+        build_gem "submodule", :to_system => true do |s|
+          s.write "lib/submodule.rb", "puts 'GEM'"
+        end
+
+        build_git "submodule", "1.0" do |s|
+          s.write "lib/submodule.rb", "puts 'GIT'"
+        end
+
+        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
+      end
+
+      it "it unlocks the source when submodules is added to a git source" do
+        install_gemfile <<-G
+          git "#{lib_path('has_submodule-1.0')}" do
+            gem "has_submodule"
+          end
+        G
+
+        run "require 'submodule'"
+        out.should == 'GEM'
+
+        install_gemfile <<-G
+          git "#{lib_path('has_submodule-1.0')}", :submodules => true do
+            gem "has_submodule"
+          end
+        G
+
+        run "require 'submodule'"
+        out.should == 'GIT'
+      end
+
+      it "it unlocks the source when submodules is removed from git source" do
+        pending "This would require actually removing the submodule from the clone"
+        install_gemfile <<-G
+          git "#{lib_path('has_submodule-1.0')}", :submodules => true do
+            gem "has_submodule"
+          end
+        G
+
+        run "require 'submodule'"
+        out.should == 'GIT'
+
+        install_gemfile <<-G
+          git "#{lib_path('has_submodule-1.0')}" do
+            gem "has_submodule"
+          end
+        G
+
+        run "require 'submodule'"
+        out.should == 'GEM'
+      end
+    end
+  end
+end

data/spec/update/source_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe "bundle update" do
+  describe "git sources" do
+    before :each do
+      build_repo2
+      @git = build_git "foo", :path => lib_path("foo") do |s|
+        s.executables = "foobar"
+      end
+
+      install_gemfile <<-G
+        source "file://#{gem_repo2}"
+        git "#{lib_path('foo')}" do
+          gem 'foo'
+        end
+        gem 'rack'
+      G
+    end
+
+    it "updates the source" do
+      update_git "foo", :path => @git.path
+
+      bundle "update --source foo"
+
+      in_app_root do
+        run <<-RUBY
+          require 'foo'
+          puts "WIN" if defined?(FOO_PREV_REF)
+        RUBY
+
+        out.should == "WIN"
+      end
+    end
+
+    it "unlocks gems that were originally pulled in by the source" do
+      update_git "foo", "2.0", :path => @git.path
+
+      bundle "update --source foo"
+      should_be_installed "foo 2.0"
+    end
+
+    it "leaves all other gems frozen" do
+      update_repo2
+      update_git "foo", :path => @git.path
+
+      bundle "update --source foo"
+      should_be_installed "rack 1.0"
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,8 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +09:00
-default_executable: 
+date: 2010-10-02 00:00:00 -07:00
+default_executable: bundle
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -27,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -55,11 +58,21 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- CHANGELOG.md
+- ISSUES.md
+- LICENSE
+- README.md
+- Rakefile
+- UPGRADING.md
 - bin/bundle
+- bundler.gemspec
+- lib/bundler.rb
 - lib/bundler/capistrano.rb
 - lib/bundler/cli.rb
 - lib/bundler/definition.rb
 - lib/bundler/dependency.rb
+- lib/bundler/deployment.rb
 - lib/bundler/dsl.rb
 - lib/bundler/environment.rb
 - lib/bundler/gem_helper.rb
@@ -68,20 +81,6 @@ files:
 - lib/bundler/installer.rb
 - lib/bundler/lazy_specification.rb
 - lib/bundler/lockfile_parser.rb
-- lib/bundler/man/bundle
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
-- lib/bundler/man/bundle-exec
-- lib/bundler/man/bundle-exec.txt
-- lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
-- lib/bundler/man/bundle-package
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-update
-- lib/bundler/man/bundle-update.txt
-- lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
 - lib/bundler/rubygems_ext.rb
@@ -94,44 +93,122 @@ files:
 - lib/bundler/templates/Executable
 - lib/bundler/templates/Gemfile
 - lib/bundler/templates/newgem/Gemfile.tt
+- lib/bundler/templates/newgem/Rakefile.tt
+- lib/bundler/templates/newgem/bin/newgem.tt
 - lib/bundler/templates/newgem/gitignore.tt
-- lib/bundler/templates/newgem/lib/newgem/version.rb.tt
 - lib/bundler/templates/newgem/lib/newgem.rb.tt
+- lib/bundler/templates/newgem/lib/newgem/version.rb.tt
 - lib/bundler/templates/newgem/newgem.gemspec.tt
-- lib/bundler/templates/newgem/Rakefile.tt
 - lib/bundler/ui.rb
+- lib/bundler/vendor/thor.rb
+- lib/bundler/vendor/thor/actions.rb
 - lib/bundler/vendor/thor/actions/create_file.rb
 - lib/bundler/vendor/thor/actions/directory.rb
 - lib/bundler/vendor/thor/actions/empty_directory.rb
 - lib/bundler/vendor/thor/actions/file_manipulation.rb
 - lib/bundler/vendor/thor/actions/inject_into_file.rb
-- lib/bundler/vendor/thor/actions.rb
 - lib/bundler/vendor/thor/base.rb
 - lib/bundler/vendor/thor/core_ext/file_binary_read.rb
 - lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb
 - lib/bundler/vendor/thor/core_ext/ordered_hash.rb
 - lib/bundler/vendor/thor/error.rb
 - lib/bundler/vendor/thor/invocation.rb
+- lib/bundler/vendor/thor/parser.rb
 - lib/bundler/vendor/thor/parser/argument.rb
 - lib/bundler/vendor/thor/parser/arguments.rb
 - lib/bundler/vendor/thor/parser/option.rb
 - lib/bundler/vendor/thor/parser/options.rb
-- lib/bundler/vendor/thor/parser.rb
+- lib/bundler/vendor/thor/shell.rb
 - lib/bundler/vendor/thor/shell/basic.rb
 - lib/bundler/vendor/thor/shell/color.rb
 - lib/bundler/vendor/thor/shell/html.rb
-- lib/bundler/vendor/thor/shell.rb
 - lib/bundler/vendor/thor/task.rb
 - lib/bundler/vendor/thor/util.rb
 - lib/bundler/vendor/thor/version.rb
-- lib/bundler/vendor/thor.rb
 - lib/bundler/version.rb
-- lib/bundler.rb
-- LICENSE
-- README.md
-- ROADMAP.md
-- CHANGELOG.md
-- ISSUES.md
+- lib/bundler/vlad.rb
+- man/bundle-config.ronn
+- man/bundle-exec.ronn
+- man/bundle-install.ronn
+- man/bundle-package.ronn
+- man/bundle-update.ronn
+- man/bundle.ronn
+- man/gemfile.5.ronn
+- man/index.txt
+- spec/cache/gems_spec.rb
+- spec/cache/git_spec.rb
+- spec/cache/path_spec.rb
+- spec/cache/platform_spec.rb
+- spec/install/deploy_spec.rb
+- spec/install/deprecated_spec.rb
+- spec/install/gems/c_ext_spec.rb
+- 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
+- spec/install/gems/simple_case_spec.rb
+- spec/install/gems/sudo_spec.rb
+- spec/install/gems/win32_spec.rb
+- spec/install/gemspec_spec.rb
+- spec/install/git_spec.rb
+- spec/install/invalid_spec.rb
+- spec/install/path_spec.rb
+- spec/install/upgrade_spec.rb
+- spec/lock/flex_spec.rb
+- spec/lock/git_spec.rb
+- spec/other/check_spec.rb
+- spec/other/config_spec.rb
+- spec/other/console_spec.rb
+- spec/other/exec_spec.rb
+- spec/other/ext_spec.rb
+- spec/other/gem_helper_spec.rb
+- spec/other/help_spec.rb
+- spec/other/init_spec.rb
+- spec/other/newgem_spec.rb
+- spec/other/open_spec.rb
+- spec/other/show_spec.rb
+- spec/pack/gems_spec.rb
+- spec/quality_spec.rb
+- spec/resolver/basic_spec.rb
+- spec/resolver/platform_spec.rb
+- spec/runtime/environment_rb_spec.rb
+- spec/runtime/executable_spec.rb
+- spec/runtime/load_spec.rb
+- spec/runtime/platform_spec.rb
+- spec/runtime/require_spec.rb
+- spec/runtime/setup_spec.rb
+- spec/runtime/with_clean_env_spec.rb
+- spec/spec_helper.rb
+- spec/support/builders.rb
+- spec/support/helpers.rb
+- spec/support/indexes.rb
+- spec/support/matchers.rb
+- spec/support/path.rb
+- spec/support/platforms.rb
+- spec/support/ruby_ext.rb
+- spec/support/rubygems_ext.rb
+- spec/support/rubygems_hax/rubygems_plugin.rb
+- spec/support/sudo.rb
+- spec/update/gems_spec.rb
+- spec/update/git_spec.rb
+- spec/update/source_spec.rb
+- lib/bundler/man/bundle
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
+- lib/bundler/man/bundle-exec
+- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/bundle-install
+- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/bundle-package
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-update
+- lib/bundler/man/bundle-update.txt
+- lib/bundler/man/bundle.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/gemfile.5.txt
 has_rdoc: true
 homepage: http://gembundler.com
 licenses: []
@@ -146,6 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -154,6 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -166,5 +245,64 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: []
-
+test_files: 
+- spec/cache/gems_spec.rb
+- spec/cache/git_spec.rb
+- spec/cache/path_spec.rb
+- spec/cache/platform_spec.rb
+- spec/install/deploy_spec.rb
+- spec/install/deprecated_spec.rb
+- spec/install/gems/c_ext_spec.rb
+- 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
+- spec/install/gems/simple_case_spec.rb
+- spec/install/gems/sudo_spec.rb
+- spec/install/gems/win32_spec.rb
+- spec/install/gemspec_spec.rb
+- spec/install/git_spec.rb
+- spec/install/invalid_spec.rb
+- spec/install/path_spec.rb
+- spec/install/upgrade_spec.rb
+- spec/lock/flex_spec.rb
+- spec/lock/git_spec.rb
+- spec/other/check_spec.rb
+- spec/other/config_spec.rb
+- spec/other/console_spec.rb
+- spec/other/exec_spec.rb
+- spec/other/ext_spec.rb
+- spec/other/gem_helper_spec.rb
+- spec/other/help_spec.rb
+- spec/other/init_spec.rb
+- spec/other/newgem_spec.rb
+- spec/other/open_spec.rb
+- spec/other/show_spec.rb
+- spec/pack/gems_spec.rb
+- spec/quality_spec.rb
+- spec/resolver/basic_spec.rb
+- spec/resolver/platform_spec.rb
+- spec/runtime/environment_rb_spec.rb
+- spec/runtime/executable_spec.rb
+- spec/runtime/load_spec.rb
+- spec/runtime/platform_spec.rb
+- spec/runtime/require_spec.rb
+- spec/runtime/setup_spec.rb
+- spec/runtime/with_clean_env_spec.rb
+- spec/spec_helper.rb
+- spec/support/builders.rb
+- spec/support/helpers.rb
+- spec/support/indexes.rb
+- spec/support/matchers.rb
+- spec/support/path.rb
+- spec/support/platforms.rb
+- spec/support/ruby_ext.rb
+- spec/support/rubygems_ext.rb
+- spec/support/rubygems_hax/rubygems_plugin.rb
+- spec/support/sudo.rb
+- spec/update/gems_spec.rb
+- spec/update/git_spec.rb
+- spec/update/source_spec.rb