bundler 1.3.2 → 1.3.3

data/.travis.yml

@@ -31,7 +31,7 @@ env:
   # we need to know if changes to rubygems will break bundler on release
   - RGV=master
   # test the latest rubygems release with all of our supported rubies
-  - RGV=v2.0.0
+  - RGV=v2.0.2
 matrix:
   allow_failures:
     # we want to know how we're doing with head, but not fail the build

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.3.3
+
+Features:
+
+  - compatible with Rubygems 2.0.2 (higher and lower already work)
+  - mention skipped groups in bundle install and bundle update output (@simi)
+  - `gem` creates rake tasks for minitest (@coop) and rspec
+
+Bugfixes:
+
+  - require rbconfig for standalone mode
+  - revert to working quoting of RUBYOPT on Windows (@ogra)
+
 ## 1.3.2 (7 March 2013)
 
 Features:

data/Rakefile

@@ -88,7 +88,7 @@ begin
     namespace :rubygems do
       # Rubygems specs by version
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.0).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.2).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)

data/lib/bundler/cli.rb

@@ -169,11 +169,10 @@ module Bundler
       "Use the rubygems modern index instead of the API endpoint"
     method_option "clean", :type => :boolean, :banner =>
       "Run bundle clean automatically after install"
-    unless Bundler.rubygems.security_policies.empty?
-      method_option "trust-policy", :alias => "P", :type => :string, :banner =>
-        "Gem trust policy (like gem install -P). Must be one of " + Bundler.rubygems.security_policies.keys.join('|')
-    end
-
+    method_option "trust-policy", :alias => "P", :type => :string, :banner =>
+      "Gem trust policy (like gem install -P). Must be one of " +
+        Bundler.rubygems.security_policies.keys.join('|') unless
+        Bundler.rubygems.security_policies.empty?
     def install
       opts = options.dup
       if opts[:without]
@@ -251,14 +250,17 @@ module Bundler
       if Bundler.settings[:path]
         absolute_path = File.expand_path(Bundler.settings[:path])
         relative_path = absolute_path.sub(File.expand_path('.'), '.')
-        Bundler.ui.confirm "Your bundle is complete! " +
-          "It was installed into #{relative_path}"
+        Bundler.ui.confirm "Your bundle is complete!"
+        Bundler.ui.confirm without_groups_message if Bundler.settings.without.any?
+        Bundler.ui.confirm "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."
+        Bundler.ui.confirm "Your bundle is complete!"
+        Bundler.ui.confirm without_groups_message if Bundler.settings.without.any?
+        Bundler.ui.confirm "Use `bundle show [gemname]` to see where a bundled gem is installed."
       end
       Installer.post_install_messages.to_a.each do |name, msg|
-        Bundler.ui.confirm "Post-install message from #{name}:\n#{msg}"
+        Bundler.ui.confirm "Post-install message from #{name}:"
+        Bundler.ui.info msg
       end
 
       clean if Bundler.settings[:clean] && Bundler.settings[:path]
@@ -316,8 +318,8 @@ module Bundler
       Installer.install Bundler.root, Bundler.definition, opts
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
       clean if Bundler.settings[:clean] && Bundler.settings[:path]
-      Bundler.ui.confirm "Your bundle is updated! " +
-        "Use `bundle show [gemname]` to see where a bundled gem is installed."
+      Bundler.ui.confirm "Your bundle is updated!"
+      Bundler.ui.confirm without_groups_message if Bundler.settings.without.any?
     end
 
     desc "show [GEM]", "Shows all gems that are part of the bundle, or the path to a given gem"
@@ -859,5 +861,13 @@ module Bundler
       pager ||= 'cat'
     end
 
+    def without_groups_message
+      groups = Bundler.settings.without
+      group_list = [groups[0...-1].join(", "), groups[-1]].
+        reject{|s| s.empty? }.join(" and ")
+      group_str = (groups.size == 1) ? "group" : "groups"
+      "Gems in the #{group_str} #{group_list} were not installed."
+    end
+
   end
 end

data/lib/bundler/installer.rb

@@ -226,6 +226,7 @@ module Bundler
 
 
       File.open File.join(bundler_path, "setup.rb"), "w" do |file|
+        file.puts "require 'rbconfig'"
         file.puts "# ruby 1.8.7 doesn't define RUBY_ENGINE"
         file.puts "ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'"
         file.puts "ruby_version = RbConfig::CONFIG[\"ruby_version\"]"

data/lib/bundler/rubygems_integration.rb

@@ -449,18 +449,26 @@ module Bundler
         Gem::Specification.find_all_by_name name
       end
 
-      def fetch_all_remote_specs
-        fetched, errors = Gem::SpecFetcher.new.available_specs(:complete)
-        # only raise if we don't get any specs back.
-        # this means we still work if prerelease_specs.4.8.gz
-        # don't exist but specs.4.8.gz do
-        if fetched.empty? && error = errors.detect {|e| e.is_a?(Gem::SourceFetchProblem) }
-          raise Gem::RemoteFetcher::FetchError.new(error.error, error.source)
-        end
+      def fetch_specs(source, name)
+        path = source + "#{name}.#{Gem.marshal_version}.gz"
+        string = Gem::RemoteFetcher.fetcher.fetch_path(path)
+        Bundler.load_marshal(string)
+      rescue Gem::RemoteFetcher::FetchError => e
+        # it's okay for prerelease to fail
+        raise e unless name == "prerelease_specs"
+      end
 
+      def fetch_all_remote_specs
+        # Since SpecFetcher now returns NameTuples, we just fetch directly
+        # and unmarshal the array ourselves.
         hash = {}
-        fetched.each do |source, tuples|
-          hash[source.uri] = tuples.map { |tuple| tuple.to_a }
+
+        Gem.sources.each do |source|
+          source = URI.parse(source.to_s) unless source.is_a?(URI)
+          hash[source] = fetch_specs(source, "specs")
+
+          pres = fetch_specs(source, "prerelease_specs")
+          hash[source].push(*pres) if pres && !pres.empty?
         end
 
         hash

data/lib/bundler/runtime.rb

@@ -224,11 +224,7 @@ module Bundler
       rubyopt = [ENV["RUBYOPT"]].compact
       if rubyopt.empty? || rubyopt.first !~ /-rbundler\/setup/
         rubyopt.unshift %|-rbundler/setup|
-        if Bundler::WINDOWS
-          rubyopt.unshift %|"-I#{File.expand_path('../..', __FILE__)}"|
-        else
-          rubyopt.unshift %|-I#{File.expand_path('../..', __FILE__)}|
-        end
+        rubyopt.unshift %|-I#{File.expand_path('../..', __FILE__)}|
         ENV["RUBYOPT"] = rubyopt.join(' ')
       end
     end

data/lib/bundler/settings.rb

@@ -126,7 +126,7 @@ module Bundler
         hash.delete(key) if value.nil?
         FileUtils.mkdir_p(file.dirname)
         require 'bundler/psyched_yaml'
-        File.open(file, "w") { |f| f.puts hash.to_yaml }
+        File.open(file, "w") { |f| f.puts YAML.dump(hash) }
       end
       value
     end

data/lib/bundler/templates/newgem/Rakefile.tt

@@ -1 +1,16 @@
 require "bundler/gem_tasks"
+<% if config[:test] == 'minitest' -%>
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib" << "test"
+end
+
+task :default => :test
+<% elsif config[:test] == 'rspec' -%>
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+<% end -%>

data/lib/bundler/templates/newgem/test/test_newgem.rb.tt

@@ -1,4 +1,4 @@
-require './minitest_helper'
+require 'minitest_helper'
 
 class Test<%= config[:constant_name] %> < MiniTest::Unit::TestCase
   def test_that_it_has_a_version_number

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

data/spec/install/post_bundle_message_spec.rb

@@ -0,0 +1,142 @@
+require 'spec_helper'
+
+describe "post bundle message" do
+  before :each do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rack"
+      gem "activesupport", "2.3.5", :group => [:emo, :test]
+      group :test do
+        gem "rspec"
+      end
+      gem "rack-obama", :group => :obama
+    G
+  end
+
+  let(:bundle_show_message)       {"Use `bundle show [gemname]` to see where a bundled gem is installed."}
+  let(:bundle_deployment_message) {"It was installed into ./vendor"}
+  let(:bundle_complete_message)   {"Your bundle is complete!"}
+  let(:bundle_updated_message)    {"Your bundle is updated!"}
+
+  describe "for fresh bundle install" do
+    it "without any options" do
+      bundle :install
+      expect(out).to include(bundle_show_message)
+      expect(out).not_to include("Gems in the group")
+      expect(out).to include(bundle_complete_message)
+    end
+
+    it "with --without one group" do
+      bundle "install --without emo"
+      expect(out).to include(bundle_show_message)
+      expect(out).to include("Gems in the group emo were not installed")
+      expect(out).to include(bundle_complete_message)
+    end
+
+    it "with --without two groups" do
+      bundle "install --without emo test"
+      expect(out).to include(bundle_show_message)
+      expect(out).to include("Gems in the groups emo and test were not installed")
+      expect(out).to include(bundle_complete_message)
+    end
+
+    it "with --without more groups" do
+      bundle "install --without emo obama test"
+      expect(out).to include(bundle_show_message)
+      expect(out).to include("Gems in the groups emo, obama and test were not installed")
+      expect(out).to include(bundle_complete_message)
+    end
+
+    describe "with --path and" do
+      it "without any options" do
+        bundle "install --path vendor"
+        expect(out).to include(bundle_deployment_message)
+        expect(out).to_not include("Gems in the group")
+        expect(out).to include(bundle_complete_message)
+      end
+
+      it "with --without one group" do
+        bundle "install --without emo --path vendor"
+        expect(out).to include(bundle_deployment_message)
+        expect(out).to include("Gems in the group emo were not installed")
+        expect(out).to include(bundle_complete_message)
+      end
+
+      it "with --without two groups" do
+        bundle "install --without emo test --path vendor"
+        expect(out).to include(bundle_deployment_message)
+        expect(out).to include("Gems in the groups emo and test were not installed")
+        expect(out).to include(bundle_complete_message)
+      end
+
+      it "with --without more groups" do
+        bundle "install --without emo obama test --path vendor"
+        expect(out).to include(bundle_deployment_message)
+        expect(out).to include("Gems in the groups emo, obama and test were not installed")
+        expect(out).to include(bundle_complete_message)
+      end
+    end
+  end
+
+  describe "for second bundle install run" do
+    it "without any options" do
+      2.times { bundle :install }
+      expect(out).to include(bundle_show_message)
+      expect(out).to_not include("Gems in the groups")
+      expect(out).to include(bundle_complete_message)
+    end
+
+    it "with --without one group" do
+      bundle "install --without emo"
+      bundle :install
+      expect(out).to include(bundle_show_message)
+      expect(out).to include("Gems in the group emo were not installed")
+      expect(out).to include(bundle_complete_message)
+    end
+
+    it "with --without two groups" do
+      bundle "install --without emo test"
+      bundle :install
+      expect(out).to include(bundle_show_message)
+      expect(out).to include("Gems in the groups emo and test were not installed")
+      expect(out).to include(bundle_complete_message)
+    end
+
+    it "with --without more groups" do
+      bundle "install --without emo obama test"
+      bundle :install
+      expect(out).to include(bundle_show_message)
+      expect(out).to include("Gems in the groups emo, obama and test were not installed")
+      expect(out).to include(bundle_complete_message)
+    end
+  end
+
+  describe "for bundle update" do
+    it "without any options" do
+      bundle :update
+      expect(out).not_to include("Gems in the groups")
+      expect(out).to include(bundle_updated_message)
+    end
+
+    it "with --without one group" do
+      bundle :install, :without => :emo
+      bundle :update
+      expect(out).to include("Gems in the group emo were not installed")
+      expect(out).to include(bundle_updated_message)
+    end
+
+    it "with --without two groups" do
+      bundle "install --without emo test"
+      bundle :update
+      expect(out).to include("Gems in the groups emo and test were not installed")
+      expect(out).to include(bundle_updated_message)
+    end
+
+    it "with --without more groups" do
+      bundle "install --without emo obama test"
+      bundle :update
+      expect(out).to include("Gems in the groups emo, obama and test were not installed")
+      expect(out).to include(bundle_updated_message)
+    end
+  end
+end

data/spec/other/newgem_spec.rb

@@ -175,7 +175,7 @@ RAKEFILE
       end
 
       it "requires 'minitest_helper'" do
-        expect(bundled_app("test_gem/test/test_test_gem.rb").read).to match(/require '.\/minitest_helper'/)
+        expect(bundled_app("test_gem/test/test_test_gem.rb").read).to match(/require 'minitest_helper'/)
       end
 
       it "creates a default test which fails" do
@@ -351,12 +351,27 @@ RAKEFILE
       end
 
       it "requires 'minitest_helper'" do
-        expect(bundled_app("test-gem/test/test_test/gem.rb").read).to match(/require '.\/minitest_helper'/)
+        expect(bundled_app("test-gem/test/test_test/gem.rb").read).to match(/require 'minitest_helper'/)
       end
 
       it "creates a default test which fails" do
         expect(bundled_app("test-gem/test/test_test/gem.rb").read).to match(/assert false/)
       end
+
+      it "creates a default rake task to run test suite" do
+        rakefile = <<-RAKEFILE
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new :test do |t|
+  t.libs << 'test'
+end
+
+task default: :test
+RAKEFILE
+
+        expect(bundled_app("test-gem/Rakefile").read).to eq(rakefile)
+      end
     end
 
     context "--test with no arguments" do

data/spec/quality_spec.rb

@@ -42,7 +42,7 @@ describe "The library itself" do
     error_messages = []
     Dir.chdir(File.expand_path("../..", __FILE__)) do
       `git ls-files`.split("\n").each do |filename|
-        next if filename =~ /\.gitmodules|\.marshal|fixtures|vendor/
+        next if filename =~ /\.gitmodules|\.marshal|fixtures|vendor|ssl_certs/
         error_messages << check_for_tab_characters(filename)
         error_messages << check_for_extra_spaces(filename)
       end

metadata

@@ -1,66 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bundler
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.3.3
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 2
-  version: 1.3.2
 platform: ruby
-authors: 
-- "Andr\xC3\xA9 Arko"
+authors:
+- André Arko
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ronn
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.7.3
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id002
-description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+description: Bundler manages an application's dependencies through its entire life,
+  across many machines, systematically and repeatably
+email:
 - andre@arko.net
-executables: 
+executables:
 - bundle
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -220,6 +214,7 @@ files:
 - spec/install/git_spec.rb
 - spec/install/invalid_spec.rb
 - spec/install/path_spec.rb
+- spec/install/post_bundle_message_spec.rb
 - spec/install/security_policy_spec.rb
 - spec/install/upgrade_spec.rb
 - spec/integration/inject.rb
@@ -280,60 +275,48 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle-exec
 - 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/gemfile.5
-- lib/bundler/man/bundle-platform
+- lib/bundler/man/bundle-install.txt
 - lib/bundler/man/bundle-package
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-platform
+- lib/bundler/man/bundle-platform.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-platform.txt
-- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/gemfile.5.txt
 homepage: http://gembundler.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: 
+test_files:
 - spec/bundler/bundler_spec.rb
 - spec/bundler/cli_rspec.rb
 - spec/bundler/definition_spec.rb
@@ -363,6 +346,7 @@ test_files:
 - spec/install/git_spec.rb
 - spec/install/invalid_spec.rb
 - spec/install/path_spec.rb
+- spec/install/post_bundle_message_spec.rb
 - spec/install/security_policy_spec.rb
 - spec/install/upgrade_spec.rb
 - spec/integration/inject.rb