bundler 1.1.4 → 1.1.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.5 (Jul 17, 2012)
+
+Features:
+
+  - Special case `ruby` directive from 1.2.0, so you can install Gemfiles that use it
+
 ## 1.1.4 (May 27, 2012)
 
 Bugfixes:

data/lib/bundler/dsl.rb

@@ -86,7 +86,7 @@ module Bundler
           else
             raise DslError, "You cannot specify the same gem twice coming from different sources. You " \
                             "specified that #{dep.name} (#{dep.requirement}) should come from " \
-                            "#{current.source || 'an unspecfied source'} and #{dep.source}"
+                            "#{current.source || 'an unspecified source'} and #{dep.source}"
           end
         end
       end
@@ -163,6 +163,12 @@ module Bundler
       @env = old
     end
 
+    def ruby(*args)
+      msg = "Ignoring `ruby` directive. This is a feature added to Bundler 1.2.0 \n" \
+            "and higher. Please upgrade if you would like to use it. \n\n"
+      Bundler.ui.warn msg
+    end
+
     # Deprecated methods
 
     def self.deprecate(name, replacement = nil)

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

data/spec/bundler/dsl_spec.rb

@@ -26,5 +26,26 @@ describe Bundler::Dsl do
       lambda { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
         should raise_error(Bundler::GemfileError)
     end
+
+    it "should special case the ruby directive" do
+      gemfile <<-G
+        ruby "1.9.3"
+      G
+      lambda { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
+        should_not raise_error(Bundler::GemfileError)
+    end
+
+    it "should special case the ruby directive and throws a warning" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+
+        ruby "1.9.3"
+
+        gem "foo"
+      G
+
+      out.should include("Ignoring `ruby` directive")
+      bundled_app("Gemfile.lock").should exist
+    end
   end
 end

data/spec/lock/lockfile_spec.rb

@@ -646,7 +646,7 @@ describe "the lockfile format" do
     G
 
     bundled_app("Gemfile.lock").should_not exist
-    out.should include "rack (>= 0) should come from an unspecfied source and git://hubz.com (at master)"
+    out.should include "rack (>= 0) should come from an unspecified source and git://hubz.com (at master)"
   end
 
   it "works correctly with multiple version dependencies" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 Z
+date: 2012-07-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -234,20 +234,20 @@ files:
 - 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
 - lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
 - lib/bundler/man/bundle-package
-- lib/bundler/man/bundle-package.txt
 - lib/bundler/man/bundle-update
+- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-install.txt
 homepage: http://gembundler.com
 licenses: []
 
@@ -281,85 +281,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: 
-- spec/bundler/dsl_spec.rb
-- spec/bundler/gem_helper_spec.rb
-- spec/bundler/source_spec.rb
-- 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/dependency_api_spec.rb
-- spec/install/gems/env_spec.rb
-- spec/install/gems/flex_spec.rb
-- spec/install/gems/groups_spec.rb
-- spec/install/gems/packed_spec.rb
-- spec/install/gems/platform_spec.rb
-- spec/install/gems/post_install_spec.rb
-- spec/install/gems/resolving_spec.rb
-- spec/install/gems/simple_case_spec.rb
-- spec/install/gems/standalone_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/git_spec.rb
-- spec/lock/lockfile_spec.rb
-- spec/other/check_spec.rb
-- spec/other/clean_spec.rb
-- spec/other/config_spec.rb
-- spec/other/console_spec.rb
-- spec/other/exec_spec.rb
-- spec/other/ext_spec.rb
-- spec/other/help_spec.rb
-- spec/other/init_spec.rb
-- spec/other/newgem_spec.rb
-- spec/other/open_spec.rb
-- spec/other/outdated_spec.rb
-- spec/other/show_spec.rb
-- spec/quality_spec.rb
-- spec/realworld/edgecases_spec.rb
-- spec/resolver/basic_spec.rb
-- spec/resolver/platform_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/artifice/endopint_marshal_fail_basic_authentication.rb
-- spec/support/artifice/endpoint.rb
-- spec/support/artifice/endpoint_500.rb
-- spec/support/artifice/endpoint_api_missing.rb
-- spec/support/artifice/endpoint_basic_authentication.rb
-- spec/support/artifice/endpoint_extra.rb
-- spec/support/artifice/endpoint_extra_missing.rb
-- spec/support/artifice/endpoint_fallback.rb
-- spec/support/artifice/endpoint_marshal_fail.rb
-- spec/support/artifice/endpoint_redirect.rb
-- spec/support/builders.rb
-- spec/support/fakeweb/rack-1.0.0.marshal
-- spec/support/fakeweb/windows.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/platform.rb
-- spec/support/sudo.rb
-- spec/update/gems_spec.rb
-- spec/update/git_spec.rb
-- spec/update/source_spec.rb
+test_files: []
+