bundler 1.3.3 → 1.3.4

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 1.3.3
+## 1.3.4 (15 March 2103)
+
+Bugfixes:
+
+  - load YAML on Rubygems version that define module YAML
+  - fix regression that broke --without on ruby 1.8.7
+
+## 1.3.3 (13 March 2013)
 
 Features:
 

data/README.md

@@ -1,4 +1,4 @@
-# Bundler: a gem to bundle gems [![Build Status](https://secure.travis-ci.org/carlhuda/bundler.png?branch=master)](http://travis-ci.org/carlhuda/bundler)
+# Bundler: a gem to bundle gems [![Build Status](https://secure.travis-ci.org/carlhuda/bundler.png?branch=1-3-stable)](http://travis-ci.org/carlhuda/bundler)
 
 Bundler keeps ruby applications running the same code on every machine.
 

data/lib/bundler/cli.rb

@@ -264,15 +264,17 @@ module Bundler
       end
 
       clean if Bundler.settings[:clean] && Bundler.settings[:path]
-    rescue GemNotFound => e
+    rescue GemNotFound, VersionConflict => e
       if opts[:local] && Bundler.app_cache.exist?
         Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
       end
 
-      if Bundler.definition.no_sources?
-        Bundler.ui.warn "Your Gemfile has no remote sources. If you need " \
-          "gems that are not already on\nyour machine, add a line like this " \
-          "to your Gemfile:\n    source 'https://rubygems.org'"
+      if Bundler.definition.rubygems_remotes.empty?
+        Bundler.ui.warn <<-WARN, :wrap => true
+          Your Gemfile has no gem server sources. If you need gems that are \
+          not already on your machine, add a line like this to your Gemfile:
+          source 'https://rubygems.org'
+        WARN
       end
       raise e
     end
@@ -647,6 +649,8 @@ module Bundler
     method_option :requirements, :type => :boolean, :default => false, :aliases => '-r', :banner => "Set to show the version of each required dependency."
     method_option :format, :type => :string, :default => "png", :aliases => '-F', :banner => "This is output format option. Supported format is png, jpg, svg, dot ..."
     def viz
+      require 'graphviz'
+
       output_file = File.expand_path(options[:file])
       graph = Graph.new(Bundler.load, output_file, options[:version], options[:requirements], options[:format])
 
@@ -863,8 +867,8 @@ module Bundler
 
     def without_groups_message
       groups = Bundler.settings.without
-      group_list = [groups[0...-1].join(", "), groups[-1]].
-        reject{|s| s.empty? }.join(" and ")
+      group_list = [groups[0...-1].join(", "), groups[-1..-1]].
+        reject{|s| s.to_s.empty? }.join(" and ")
       group_str = (groups.size == 1) ? "group" : "groups"
       "Gems in the #{group_str} #{group_list} were not installed."
     end

data/lib/bundler/definition.rb

@@ -208,8 +208,8 @@ module Bundler
       end
     end
 
-    def no_sources?
-      @sources.length == 1 && @sources.first.remotes.empty?
+    def rubygems_remotes
+      @sources.select{|s| s.is_a?(Source::Rubygems) }.map{|s| s.remotes }.flatten
     end
 
     def groups

data/lib/bundler/fetcher.rb

@@ -18,7 +18,7 @@ module Bundler
           " is a chance you are experiencing a man-in-the-middle attack, but" \
           " most likely your system doesn't have the CA certificates needed" \
           " for verification. For information about OpenSSL certificates, see" \
-          " bit.ly/ssl-certs. To connect without using SSL, edit your Gemfile" \
+          " bit.ly/ruby-ssl. To connect without using SSL, edit your Gemfile" \
           " sources and change 'https' to 'http'."
       end
     end
@@ -68,7 +68,7 @@ module Bundler
       @remote_uri = remote_uri
       @public_uri = remote_uri.dup
       @public_uri.user, @public_uri.password = nil, nil # don't print these
-      if defined?(OpenSSL::SSL)
+      if defined?(Net::HTTP::Persistent)
         @connection = Net::HTTP::Persistent.new 'bundler', :ENV
         @connection.verify_mode = (Bundler.settings[:ssl_verify_mode] ||
           OpenSSL::SSL::VERIFY_PEER)
@@ -198,7 +198,7 @@ module Bundler
 
       begin
         Bundler.ui.debug "Fetching from: #{uri}"
-        if @connection.is_a?(Net::HTTP::Persistent)
+        if defined?(Net::HTTP::Persistent)
           response = @connection.request(uri)
         else
           req = Net::HTTP::Get.new uri.request_uri

data/lib/bundler/friendly_errors.rb

@@ -8,9 +8,11 @@ module Bundler
   rescue LoadError => e
     raise e unless e.message =~ /cannot load such file -- openssl|openssl.so|libcrypto.so/
     Bundler.ui.error "\nCould not load OpenSSL."
-    Bundler.ui.warn "You must recompile Ruby with OpenSSL support or change the sources in your" \
-      "\nGemfile from 'https' to 'http'. Instructions for compiling with OpenSSL" \
-      "\nusing RVM are available at rvm.io/packages/openssl."
+    Bundler.ui.warn <<-WARN, :wrap => true
+      You must recompile Ruby with OpenSSL support or change the sources in your \
+      Gemfile from 'https' to 'http'. Instructions for compiling with OpenSSL \
+      using RVM are available at rvm.io/packages/openssl.
+    WARN
     Bundler.ui.trace e
     exit 1
   rescue Interrupt => e
@@ -21,9 +23,8 @@ module Bundler
     exit e.status
   rescue Exception => e
     Bundler.ui.error <<-ERR, :wrap => true
-      Unfortunately, a fatal error has occurred. Please see the Bundler
+      Unfortunately, a fatal error has occurred. Please see the Bundler \
       troubleshooting documentation at http://bit.ly/bundler-issues. Thanks!
-
     ERR
     raise e
   end

data/lib/bundler/graph.rb

@@ -118,7 +118,6 @@ module Bundler
       end
 
       def g
-        require 'graphviz'
         @g ||= ::GraphViz.digraph(@graph_name, {:concentrate => true, :normalize => true, :nodesep => 0.55}) do |g|
           g.edge[:weight]   = 2
           g.edge[:fontname] = g.node[:fontname] = 'Arial, Helvetica, SansSerif'

data/lib/bundler/psyched_yaml.rb

@@ -13,7 +13,7 @@ rescue LoadError
 end
 
 # At least load the YAML stdlib, whatever that may be
-require 'yaml' unless defined?(YAML)
+require 'yaml' unless defined?(YAML.dump)
 
 module Bundler
   # On encountering invalid YAML,

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

@@ -3,7 +3,7 @@ require "bundler/gem_tasks"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "lib" << "test"
+  t.libs << "test"
 end
 
 task :default => :test

data/lib/bundler/ui.rb

@@ -110,8 +110,13 @@ module Bundler
         end
       end
 
+      def strip_leading_spaces(text)
+        spaces = text[/\A\s+/, 0]
+        spaces ? text.gsub(/#{spaces}/, '') : text
+      end
+
       def word_wrap(text, line_width = @shell.terminal_width)
-        text.split("\n").collect do |line|
+        strip_leading_spaces(text).split("\n").collect do |line|
           line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
         end * "\n"
       end

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

data/spec/install/gems/simple_case_spec.rb

@@ -291,7 +291,7 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install, :expect_err => true
-      expect(out).to match(/Your Gemfile has no remote sources/i)
+      expect(out).to match(/Your Gemfile has no gem server sources/i)
     end
 
     it "creates a Gemfile.lock on a blank Gemfile" do
@@ -509,7 +509,7 @@ describe "bundle install with gem sources" do
       G
 
       bundle :install, :quiet => true
-      expect(out).to match(/Your Gemfile has no remote sources/)
+      expect(out).to match(/Your Gemfile has no gem server sources/)
     end
   end
 

data/spec/other/newgem_spec.rb

@@ -89,11 +89,11 @@ describe "bundle gem" do
     it "runs rake without problems" do
       system_gems ["rake-10.0.2"]
 
-      rakefile = <<-RAKEFILE
+      rakefile = strip_whitespace <<-RAKEFILE
         task :default do
           puts 'SUCCESS'
         end
-RAKEFILE
+      RAKEFILE
       File.open(bundled_app("test_gem/Rakefile"), 'w') do |file|
         file.puts rakefile
       end
@@ -265,11 +265,11 @@ RAKEFILE
     it "runs rake without problems" do
       system_gems ["rake-10.0.2"]
 
-      rakefile = <<-RAKEFILE
+      rakefile = strip_whitespace <<-RAKEFILE
         task :default do
           puts 'SUCCESS'
         end
-RAKEFILE
+      RAKEFILE
       File.open(bundled_app("test-gem/Rakefile"), 'w') do |file|
         file.puts rakefile
       end
@@ -332,6 +332,19 @@ RAKEFILE
       it "creates a default test which fails" do
         expect(bundled_app("test-gem/spec/test/gem_spec.rb").read).to match(/false.should be_true/)
       end
+
+      it "creates a default rake task to run the specs" do
+        rakefile = strip_whitespace <<-RAKEFILE
+          require "bundler/gem_tasks"
+          require "rspec/core/rake_task"
+
+          RSpec::Core::RakeTask.new(:spec)
+
+          task :default => :spec
+        RAKEFILE
+
+        expect(bundled_app("test-gem/Rakefile").read).to eq(rakefile)
+      end
     end
 
     context "--test parameter set to minitest" do
@@ -358,17 +371,17 @@ RAKEFILE
         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"
+      it "creates a default rake task to run the test suite" do
+        rakefile = strip_whitespace <<-RAKEFILE
+          require "bundler/gem_tasks"
+          require "rake/testtask"
 
-Rake::TestTask.new :test do |t|
-  t.libs << 'test'
-end
+          Rake::TestTask.new(:test) do |t|
+            t.libs << "test"
+          end
 
-task default: :test
-RAKEFILE
+          task :default => :test
+        RAKEFILE
 
         expect(bundled_app("test-gem/Rakefile").read).to eq(rakefile)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn