bundler 1.1.5 → 1.2.0.pre

data/spec/support/helpers.rb

@@ -60,7 +60,7 @@ module Spec
     def bundle(cmd, options = {})
       expect_err  = options.delete(:expect_err)
       exitstatus = options.delete(:exitstatus)
-      options["no-color"] = true unless options.key?("no-color") || cmd.to_s[0..3] == "exec"
+      options["no-color"] = true unless options.key?("no-color") || %w(exec conf).include?(cmd.to_s[0..3])
 
       bundle_bin = File.expand_path('../../../bin/bundle', __FILE__)
 
@@ -292,6 +292,17 @@ module Spec
       ENV['BUNDLER_SPEC_PLATFORM'] = old if block_given?
     end
 
+    def simulate_ruby_engine(engine, version = "1.6.0")
+      return if engine == local_ruby_engine
+
+      old, ENV['BUNDLER_SPEC_RUBY_ENGINE'] = ENV['BUNDLER_SPEC_RUBY_ENGINE'], engine
+      old_version, ENV['BUNDLER_SPEC_RUBY_ENGINE_VERSION'] = ENV['BUNDLER_SPEC_RUBY_ENGINE_VERSION'], version
+      yield if block_given?
+    ensure
+      ENV['BUNDLER_SPEC_RUBY_ENGINE'] = old if block_given?
+      ENV['BUNDLER_SPEC_RUBY_ENGINE_VERSION'] = old_version if block_given?
+    end
+
     def simulate_bundler_version(version)
       old, ENV['BUNDLER_SPEC_VERSION'] = ENV['BUNDLER_SPEC_VERSION'], version.to_s
       yield if block_given?

data/spec/support/platforms.rb

@@ -49,5 +49,38 @@ module Spec
     def not_local_tag
       [:ruby, :jruby].find { |tag| tag != local_tag }
     end
+
+    def local_ruby_engine
+      ENV["BUNDLER_SPEC_RUBY_ENGINE"] || (defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby")
+    end
+
+    def local_engine_version
+      return ENV["BUNDLER_SPEC_RUBY_ENGINE_VERSION"] if ENV["BUNDLER_SPEC_RUBY_ENGINE_VERSION"]
+
+      case local_ruby_engine
+      when "ruby"
+        RUBY_VERSION
+      when "rbx"
+        Rubinius::VERSION
+      when "jruby"
+        JRUBY_VERSION
+      else
+        raise BundlerError, "That RUBY_ENGINE is not recognized"
+        nil
+      end
+    end
+
+    def not_local_engine_version
+      case not_local_tag
+      when :ruby
+        not_local_ruby_version
+      when :jruby
+        "1.6.1"
+      end
+    end
+
+    def not_local_ruby_version
+      "1.12"
+    end
   end
 end

data/spec/support/rubygems_hax/platform.rb

@@ -8,4 +8,15 @@ if ENV['BUNDLER_SPEC_VERSION']
   module Bundler
     VERSION = ENV['BUNDLER_SPEC_VERSION'].dup
   end
-end
+end
+
+class Object
+  if ENV['BUNDLER_SPEC_RUBY_ENGINE']
+    remove_const :RUBY_ENGINE if defined?(RUBY_ENGINE)
+    RUBY_ENGINE = ENV['BUNDLER_SPEC_RUBY_ENGINE']
+
+    if RUBY_ENGINE == "jruby"
+      JRUBY_VERSION = ENV["BUNDLER_SPEC_RUBY_ENGINE_VERSION"]
+    end
+  end
+end

data/spec/update/gems_spec.rb

@@ -33,6 +33,18 @@ describe "bundle update" do
     end
   end
 
+  describe "--quiet argument" do
+    it 'shows UI messages without --quiet argument' do
+      bundle "update"
+      out.should include("Fetching source")
+    end
+
+    it 'does not show UI messages with --quiet argument' do
+      bundle "update --quiet"
+      out.should_not include("Fetching source")
+    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

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  hash: 481461827
+  prerelease: 6
   segments: 
   - 1
-  - 1
-  - 5
-  version: 1.1.5
+  - 2
+  - 0
+  - pre
+  version: 1.2.0.pre
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-17 00:00:00 Z
+date: 2012-05-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -93,6 +94,7 @@ files:
 - lib/bundler/psyched_yaml.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
+- lib/bundler/ruby_version.rb
 - lib/bundler/rubygems_ext.rb
 - lib/bundler/rubygems_integration.rb
 - lib/bundler/runtime.rb
@@ -145,7 +147,6 @@ files:
 - lib/bundler/vendor/thor/task.rb
 - lib/bundler/vendor/thor/util.rb
 - lib/bundler/vendor/thor/version.rb
-- lib/bundler/vendored_persistent.rb
 - lib/bundler/vendored_thor.rb
 - lib/bundler/version.rb
 - lib/bundler/vlad.rb
@@ -165,7 +166,6 @@ files:
 - 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/dependency_api_spec.rb
 - spec/install/gems/env_spec.rb
@@ -197,6 +197,7 @@ files:
 - spec/other/newgem_spec.rb
 - spec/other/open_spec.rb
 - spec/other/outdated_spec.rb
+- spec/other/platform_spec.rb
 - spec/other/show_spec.rb
 - spec/quality_spec.rb
 - spec/realworld/edgecases_spec.rb

data/lib/bundler/vendored_persistent.rb

@@ -1,3 +0,0 @@
-vendor = File.expand_path('../vendor', __FILE__)
-$:.unshift(vendor) unless $:.include?(vendor)
-require 'net/http/persistent'

data/spec/install/deprecated_spec.rb

@@ -1,36 +0,0 @@
-require "spec_helper"
-
-describe "bundle install with deprecated features" do
-  before :each do
-    in_app_root
-  end
-
-  %w().each do |deprecated|
-
-    it "reports that #{deprecated} is deprecated" do
-      gemfile <<-G
-        #{deprecated}
-      G
-
-      bundle :install
-      out.should =~ /'#{deprecated}' has been removed/
-      out.should =~ /See the README for more information/
-    end
-
-  end
-
-
-  %w().each do |deprecated|
-
-    it "reports that :#{deprecated} is deprecated" do
-      gemfile <<-G
-        gem "rack", :#{deprecated} => true
-      G
-
-      bundle :install
-      out.should =~ /Please replace :#{deprecated}|The :#{deprecated} option is no longer supported/
-    end
-
-  end
-
-end