bundler 1.3.6 → 1.4.0.pre.1

data/spec/other/help_spec.rb

@@ -11,21 +11,21 @@ describe "bundle help" do
     expect(err).to include("running `gem cleanup bundler`.")
   end
 
-  it "uses groff when available" do
-    fake_groff!
+  it "uses mann when available" do
+    fake_man!
 
     bundle "help gemfile"
-    expect(out).to eq(%|["-Wall", "-mtty-char", "-mandoc", "-Tascii", "#{root}/lib/bundler/man/gemfile.5"]|)
+    expect(out).to eq(%|["#{root}/lib/bundler/man/gemfile.5"]|)
   end
 
   it "prefixes bundle commands with bundle- when finding the groff files" do
-    fake_groff!
+    fake_man!
 
     bundle "help install"
-    expect(out).to eq(%|["-Wall", "-mtty-char", "-mandoc", "-Tascii", "#{root}/lib/bundler/man/bundle-install"]|)
+    expect(out).to eq(%|["#{root}/lib/bundler/man/bundle-install"]|)
   end
 
-  it "simply outputs the txt file when there is no groff on the path" do
+  it "simply outputs the txt file when there is no man on the path" do
     kill_path!
 
     bundle "help install", :expect_err => true

data/spec/other/outdated_spec.rb

@@ -25,7 +25,7 @@ describe "bundle outdated" do
 
       bundle "outdated"
 
-      expect(out).to include("activesupport (3.0 > 2.3.5)")
+      expect(out).to include("activesupport (3.0 > 2.3.5) Gemfile specifies \"= 2.3.5\"")
       expect(out).to include("foo (1.0")
 
       # Gem names are one per-line, between "*" and their parenthesized version.
@@ -92,7 +92,7 @@ describe "bundle outdated" do
         end
 
         bundle "outdated --pre"
-        expect(out).to include("activesupport (3.0.0.beta > 2.3.5)")
+        expect(out).to include("activesupport (3.0.0.beta > 2.3.5) Gemfile specifies \"= 2.3.5\"")
       end
     end
 
@@ -109,7 +109,7 @@ describe "bundle outdated" do
         G
 
         bundle "outdated"
-        expect(out).to include("activesupport (3.0.0.beta.2 > 3.0.0.beta.1)")
+        expect(out).to include("activesupport (3.0.0.beta.2 > 3.0.0.beta.1) Gemfile specifies \"= 3.0.0.beta.1\"")
       end
     end
   end

data/spec/quality_spec.rb

@@ -32,6 +32,7 @@ describe "The library itself" do
     failing_lines = []
     File.readlines(filename).each_with_index do |line,number|
       next if line =~ /^\s+#.*\s+\n$/
+      next if %w(LICENCE.md).include?(line)
       failing_lines << number + 1 if line =~ /\s+\n$/
     end
 
@@ -54,7 +55,7 @@ describe "The library itself" do
     exempt = /\.gitmodules|\.marshal|fixtures|vendor|ssl_certs|LICENSE/
     error_messages = []
     Dir.chdir(File.expand_path("../..", __FILE__)) do
-      `git ls-files -z`.split("\x0").each do |filename|
+      `git ls-files`.split("\n").each do |filename|
         next if filename =~ exempt
         error_messages << check_for_tab_characters(filename)
         error_messages << check_for_extra_spaces(filename)
@@ -67,7 +68,7 @@ describe "The library itself" do
     included = /spec/
     error_messages = []
     Dir.chdir(File.expand_path("../", __FILE__)) do
-      `git ls-files -z`.split("\x0").each do |filename|
+      `git ls-files`.split("\n").each do |filename|
         next unless filename =~ included
         error_messages << check_for_spec_defs_with_single_quotes(filename)
       end

data/spec/realworld/dependency_api_spec.rb

@@ -48,7 +48,7 @@ describe "gemcutter's dependency API", :realworld => true do
         gem "rack"
 
         old_v, $VERBOSE = $VERBOSE, nil
-        Bundler::Fetcher::API_TIMEOUT = 1
+        Bundler::Fetcher.api_timeout = 1
         $VERBOSE = old_v
       G
 

data/spec/realworld/edgecases_spec.rb

@@ -10,7 +10,7 @@ describe "real world edgecases", :realworld => true do
     expect(err).to eq("")
   end
 
-  # https://github.com/carlhuda/bundler/issues/1202
+  # https://github.com/bundler/bundler/issues/1202
   it "bundle cache works with rubygems 1.3.7 and pre gems", :ruby => "1.8" do
     install_gemfile <<-G
       source :rubygems
@@ -21,7 +21,7 @@ describe "real world edgecases", :realworld => true do
     expect(out).not_to include("Removing outdated .gem files from vendor/cache")
   end
 
-  # https://github.com/carlhuda/bundler/issues/1486
+  # https://github.com/bundler/bundler/issues/1486
   # this is a hash collision that only manifests on 1.8.7
   it "finds the correct child versions", :ruby => "1.8" do
     install_gemfile <<-G
@@ -35,7 +35,7 @@ describe "real world edgecases", :realworld => true do
     expect(out).to include("activemodel (3.0.5)")
   end
 
-  # https://github.com/carlhuda/bundler/issues/1500
+  # https://github.com/bundler/bundler/issues/1500
   it "does not fail install because of gem plugins" do
     realworld_system_gems("open_gem --version 1.4.2", "rake --version 0.9.2")
     gemfile <<-G

data/spec/realworld/parallel_install_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "installing dependencies parallely", :realworld => true do
+  it "installs gems parallely" do
+    gemfile <<-G
+      source "https://rubygems.org"
+
+      gem 'activesupport', '~> 3.2.13'
+      gem 'faker', '~> 1.1.2'
+    G
+
+    bundle :install, :jobs => 4
+    bundle "show activesupport"
+    expect(out).to match(/activesupport/)
+
+    bundle "show faker"
+    expect(out).to match(/faker/)
+  end
+end

data/spec/resolver/basic_spec.rb

@@ -23,4 +23,15 @@ describe "Resolving" do
     dep "my_app"
     should_resolve_as %w(activemodel-3.2.11 builder-3.0.4 grape-0.2.6 my_app-1.0.0)
   end
+
+  it "should throw error in case of circular dependencies" do
+    @index = a_circular_index
+    dep "circular_app"
+
+    got = resolve
+    expect {
+      got = got.map { |s| s.full_name }.sort
+    }.to raise_error(Bundler::CyclicDependencyError, /please remove either gem 'foo' or gem 'bar'/i)
+  end
+
 end

data/spec/runtime/require_spec.rb

@@ -33,6 +33,10 @@ describe "Bundler.require" do
       s.write "lib/seven.rb", "puts 'seven'"
     end
 
+    build_lib "eight", "1.0.0" do |s|
+      s.write "lib/eight.rb", "puts 'eight'"
+    end
+
     gemfile <<-G
       path "#{lib_path}"
       gem "one", :group => :bar, :require => %w(baz qux)
@@ -42,6 +46,7 @@ describe "Bundler.require" do
       gem "five"
       gem "six", :group => "string"
       gem "seven", :group => :not
+      gem "eight", :require => true, :group => :require_true
     G
   end
 
@@ -69,6 +74,10 @@ describe "Bundler.require" do
     # required in resolver order instead of gemfile order
     run("Bundler.require(:not)")
     expect(out.split("\n").sort).to eq(['seven', 'three'])
+
+    # test require: true
+    run "Bundler.require(:require_true)"
+    expect(out).to eq("eight")
   end
 
   it "allows requiring gems with non standard names explicitly" do

data/spec/runtime/setup_spec.rb

@@ -631,7 +631,7 @@ describe "Bundler.setup" do
     expect(out).to eq("yay")
   end
 
-  it "stubs out Gem.refresh so it does not reveal system gems" do
+  it "ignores Gem.refresh" do
     system_gems "rack-1.0.0"
 
     install_gemfile <<-G
@@ -640,12 +640,11 @@ describe "Bundler.setup" do
     G
 
     run <<-R
-      puts Bundler.rubygems.find_name("rack").inspect
       Gem.refresh
       puts Bundler.rubygems.find_name("rack").inspect
     R
 
-    expect(out).to eq("[]\n[]")
+    expect(out).to eq("[]")
   end
 
   describe "when a vendored gem specification uses the :path option" do

data/spec/spec_helper.rb

@@ -43,7 +43,6 @@ RSpec.configure do |config|
   config.include Spec::Rubygems
   config.include Spec::Platforms
   config.include Spec::Sudo
-  config.include Spec::Permissions
 
   if Spec::Sudo.test_sudo?
     config.filter_run :sudo => true

data/spec/support/builders.rb

@@ -234,9 +234,7 @@ module Spec
         end
 
         # Capistrano did this (at least until version 2.5.10)
-        # Rubygems 2.2 doesn't allow the specifying of a dependency twice
-        # See https://github.com/rubygems/rubygems/commit/03dbac93a3396a80db258d9bc63500333c25bd2f
-        build_gem "double_deps", "1.0", :skip_validation => true do |s|
+        build_gem "double_deps" do |s|
           s.add_dependency "net-ssh", ">= 1.0.0"
           s.add_dependency "net-ssh"
         end
@@ -607,7 +605,7 @@ module Spec
             @spec.authors = ["that guy"]
           end
 
-          Bundler.rubygems.build(@spec, opts[:skip_validation])
+          Bundler.rubygems.build(@spec)
           if opts[:to_system]
             `gem install --ignore-dependencies #{@spec.full_name}.gem`
           else

data/spec/support/helpers.rb

@@ -94,10 +94,6 @@ module Spec
       requires_str = requires.map{|r| "-r#{r}"}.join(" ")
 
       env = (options.delete(:env) || {}).map{|k,v| "#{k}='#{v}' "}.join
-      args = options.map do |k,v|
-        v == true ? " --#{k}" : " --#{k} #{v}" if v
-      end.join
-
       cmd = "#{env}#{Gem.ruby} -I#{lib} #{requires_str} #{bundle_bin}"
 
       if exitstatus
@@ -226,13 +222,13 @@ module Spec
       ENV["PATH"] = "#{tmp("broken_path")}:#{ENV["PATH"]}"
     end
 
-    def fake_groff!
-      FileUtils.mkdir_p(tmp("fake_groff"))
-      File.open(tmp("fake_groff/groff"), "w", 0755) do |f|
+    def fake_man!
+      FileUtils.mkdir_p(tmp("fake_man"))
+      File.open(tmp("fake_man/man"), "w", 0755) do |f|
         f.puts "#!/usr/bin/env ruby\nputs ARGV.inspect\n"
       end
 
-      ENV["PATH"] = "#{tmp("fake_groff")}:#{ENV["PATH"]}"
+      ENV["PATH"] = "#{tmp("fake_man")}:#{ENV["PATH"]}"
     end
 
     def kill_path!

data/spec/support/indexes.rb

@@ -130,5 +130,23 @@ module Spec
         end
       end
     end
+
+    def a_circular_index
+      build_index do
+        gem "rack", "1.0.1"
+        gem("foo", '0.2.6') do
+          dep "bar", ">= 0"
+        end
+
+        gem("bar", "1.0.0") do
+          dep "foo", ">= 0"
+        end
+
+        gem("circular_app", '1.0.0') do
+          dep "foo", ">= 0"
+          dep "bar", ">= 0"
+        end
+      end
+    end
   end
 end

data/spec/support/streams.rb

@@ -0,0 +1,13 @@
+require 'stringio'
+
+def capture(*streams)
+  streams.map! { |stream| stream.to_s }
+  begin
+    result = StringIO.new
+    streams.each { |stream| eval "$#{stream} = result" }
+    yield
+  ensure
+    streams.each { |stream| eval("$#{stream} = #{stream.upcase}") }
+  end
+  result.string
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0.pre.1
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
@@ -54,8 +54,8 @@ files:
 - .rspec
 - .travis.yml
 - CHANGELOG.md
-- CONTRIBUTE.md
 - CONTRIBUTING.md
+- DEVELOPMENT.md
 - ISSUES.md
 - LICENSE.md
 - README.md
@@ -67,6 +67,8 @@ files:
 - lib/bundler.rb
 - lib/bundler/capistrano.rb
 - lib/bundler/cli.rb
+- lib/bundler/constants.rb
+- lib/bundler/current_ruby.rb
 - lib/bundler/definition.rb
 - lib/bundler/dep_proxy.rb
 - lib/bundler/dependency.rb
@@ -90,6 +92,10 @@ files:
 - lib/bundler/lazy_specification.rb
 - lib/bundler/lockfile_parser.rb
 - lib/bundler/match_platform.rb
+- lib/bundler/parallel_workers.rb
+- lib/bundler/parallel_workers/thread_worker.rb
+- lib/bundler/parallel_workers/unix_worker.rb
+- lib/bundler/parallel_workers/worker.rb
 - lib/bundler/psyched_yaml.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
@@ -98,6 +104,7 @@ files:
 - lib/bundler/rubygems_ext.rb
 - lib/bundler/rubygems_integration.rb
 - lib/bundler/runtime.rb
+- lib/bundler/safe_catch.rb
 - lib/bundler/settings.rb
 - lib/bundler/setup.rb
 - lib/bundler/shared_helpers.rb
@@ -146,9 +153,9 @@ files:
 - lib/bundler/vendor/thor/actions/file_manipulation.rb
 - lib/bundler/vendor/thor/actions/inject_into_file.rb
 - lib/bundler/vendor/thor/base.rb
-- lib/bundler/vendor/thor/core_ext/dir_escape.rb
-- lib/bundler/vendor/thor/core_ext/file_binary_read.rb
+- lib/bundler/vendor/thor/command.rb
 - lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb
+- lib/bundler/vendor/thor/core_ext/io_binary_read.rb
 - lib/bundler/vendor/thor/core_ext/ordered_hash.rb
 - lib/bundler/vendor/thor/error.rb
 - lib/bundler/vendor/thor/group.rb
@@ -164,7 +171,6 @@ files:
 - 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/task.rb
 - lib/bundler/vendor/thor/util.rb
 - lib/bundler/vendor/thor/version.rb
 - lib/bundler/vendored_persistent.rb
@@ -186,6 +192,7 @@ files:
 - spec/bundler/dsl_spec.rb
 - spec/bundler/gem_helper_spec.rb
 - spec/bundler/psyched_yaml_spec.rb
+- spec/bundler/safe_catch_spec.rb
 - spec/bundler/source_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
@@ -234,6 +241,7 @@ files:
 - spec/quality_spec.rb
 - spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb
+- spec/realworld/parallel_install_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
 - spec/runtime/executable_spec.rb
@@ -252,7 +260,6 @@ files:
 - spec/support/artifice/endpoint_extra.rb
 - spec/support/artifice/endpoint_extra_missing.rb
 - spec/support/artifice/endpoint_fallback.rb
-- spec/support/artifice/endpoint_host_redirect.rb
 - spec/support/artifice/endpoint_marshal_fail.rb
 - spec/support/artifice/endpoint_redirect.rb
 - spec/support/artifice/endpoint_timeout.rb
@@ -263,11 +270,11 @@ files:
 - spec/support/indexes.rb
 - spec/support/matchers.rb
 - spec/support/path.rb
-- spec/support/permissions.rb
 - spec/support/platforms.rb
 - spec/support/ruby_ext.rb
 - spec/support/rubygems_ext.rb
 - spec/support/rubygems_hax/platform.rb
+- spec/support/streams.rb
 - spec/support/sudo.rb
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
@@ -308,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
@@ -319,6 +326,7 @@ test_files:
 - spec/bundler/dsl_spec.rb
 - spec/bundler/gem_helper_spec.rb
 - spec/bundler/psyched_yaml_spec.rb
+- spec/bundler/safe_catch_spec.rb
 - spec/bundler/source_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
@@ -367,6 +375,7 @@ test_files:
 - spec/quality_spec.rb
 - spec/realworld/dependency_api_spec.rb
 - spec/realworld/edgecases_spec.rb
+- spec/realworld/parallel_install_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
 - spec/runtime/executable_spec.rb
@@ -385,7 +394,6 @@ test_files:
 - spec/support/artifice/endpoint_extra.rb
 - spec/support/artifice/endpoint_extra_missing.rb
 - spec/support/artifice/endpoint_fallback.rb
-- spec/support/artifice/endpoint_host_redirect.rb
 - spec/support/artifice/endpoint_marshal_fail.rb
 - spec/support/artifice/endpoint_redirect.rb
 - spec/support/artifice/endpoint_timeout.rb
@@ -396,11 +404,11 @@ test_files:
 - spec/support/indexes.rb
 - spec/support/matchers.rb
 - spec/support/path.rb
-- spec/support/permissions.rb
 - spec/support/platforms.rb
 - spec/support/ruby_ext.rb
 - spec/support/rubygems_ext.rb
 - spec/support/rubygems_hax/platform.rb
+- spec/support/streams.rb
 - spec/support/sudo.rb
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb