bundler 1.5.3 → 1.6.0.pre.1

data/lib/bundler/ui/rg_proxy.rb

@@ -0,0 +1,21 @@
+require 'bundler/ui'
+require 'rubygems/user_interaction'
+
+module Bundler
+  module UI
+    class RGProxy < ::Gem::SilentUI
+      def initialize(ui)
+        @ui = ui
+        super()
+      end
+
+      def say(message)
+        if message =~ /native extensions/
+          @ui.info "with native extensions "
+        else
+          @ui.debug(message)
+        end
+      end
+    end
+  end
+end

data/lib/bundler/ui/shell.rb

@@ -0,0 +1,98 @@
+module Bundler
+  module UI
+    class Shell
+      LEVELS = %w(silent error warn confirm info debug)
+
+      attr_writer :shell
+
+      def initialize(options = {})
+        if options["no-color"] || !STDOUT.tty?
+          Thor::Base.shell = Thor::Shell::Basic
+        end
+        @shell = Thor::Base.shell.new
+        @level = ENV['DEBUG'] ? "debug" : "info"
+      end
+
+      def info(msg, newline = nil)
+        tell_me(msg, nil, newline) if level("info")
+      end
+
+      def confirm(msg, newline = nil)
+        tell_me(msg, :green, newline) if level("confirm")
+      end
+
+      def warn(msg, newline = nil)
+        tell_me(msg, :yellow, newline) if level("warn")
+      end
+
+      def error(msg, newline = nil)
+        tell_me(msg, :red, newline) if level("error")
+      end
+
+      def debug(msg, newline = nil)
+        tell_me(msg, nil, newline) if level("debug")
+      end
+
+      def debug?
+        # needs to be false instead of nil to be newline param to other methods
+        level("debug")
+      end
+
+      def quiet?
+        LEVELS.index(@level) <= LEVELS.index("warn")
+      end
+
+      def ask(msg)
+        @shell.ask(msg)
+      end
+
+      def level=(level)
+        raise ArgumentError unless LEVELS.include?(level.to_s)
+        @level = level
+      end
+
+      def level(name = nil)
+        name ? LEVELS.index(name) <= LEVELS.index(@level) : @level
+      end
+
+      def trace(e, newline = nil)
+        msg = ["#{e.class}: #{e.message}", *e.backtrace].join("\n")
+        if debug?
+          tell_me(msg, nil, newline)
+        elsif @trace
+          STDERR.puts "#{msg}#{newline}"
+        end
+      end
+
+      def silence
+        old_level, @level = @level, "silent"
+        yield
+      ensure
+        @level = old_level
+      end
+
+    private
+
+      # valimism
+      def tell_me(msg, color = nil, newline = nil)
+        msg = word_wrap(msg) if newline.is_a?(Hash) && newline[:wrap]
+        if newline.nil?
+          @shell.say(msg, color)
+        else
+          @shell.say(msg, color, newline)
+        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)
+        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
+    end
+  end
+end

data/lib/bundler/ui/silent.rb

@@ -0,0 +1,44 @@
+module Bundler
+  module UI
+    class Silent
+      def info(message, newline = nil)
+      end
+
+      def confirm(message, newline = nil)
+      end
+
+      def warn(message, newline = nil)
+      end
+
+      def error(message, newline = nil)
+      end
+
+      def debug(message, newline = nil)
+      end
+
+      def debug?
+        false
+      end
+
+      def quiet?
+        false
+      end
+
+      def ask(message)
+      end
+
+      def level=(name)
+      end
+
+      def level(name = nil)
+      end
+
+      def trace(message, newline = nil)
+      end
+
+      def silence
+        yield
+      end
+    end
+  end
+end

data/lib/bundler/vendor/net/http/faster.rb

@@ -24,4 +24,3 @@ class Net::BufferedIO #:nodoc:
     end
   end
 end if RUBY_VERSION < '1.9'
-

data/lib/bundler/vendor/net/http/persistent.rb

@@ -1215,4 +1215,3 @@ application:
 end
 
 require 'net/http/persistent/ssl_reuse'
-

data/lib/bundler/vendor/net/http/persistent/ssl_reuse.rb

@@ -126,4 +126,3 @@ class Net::HTTP::Persistent::SSLReuse < Net::HTTP
   private :connect
 
 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.5.3" unless defined?(::Bundler::VERSION)
+  VERSION = "1.6.0.pre.1" unless defined?(::Bundler::VERSION)
 end

data/spec/bundler/definition_spec.rb

@@ -3,7 +3,7 @@ require 'bundler/definition'
 
 describe Bundler::Definition do
   before do
-    allow(Bundler).to receive(:settings){ Bundler::Settings.new(".") }
+    Bundler.stub(:settings){ Bundler::Settings.new(".") }
   end
 
   describe "#lock" do
@@ -11,7 +11,7 @@ describe Bundler::Definition do
       subject{ Bundler::Definition.new(nil, [], [], []) }
 
       before do
-        expect(File).to receive(:open).with("Gemfile.lock", "wb").
+        File.should_receive(:open).with("Gemfile.lock", "wb").
           and_raise(Errno::EACCES)
       end
 

data/spec/bundler/dsl_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Bundler::Dsl do
   before do
     @rubygems = double("rubygems")
-    allow(Bundler::Source::Rubygems).to receive(:new){ @rubygems }
+    Bundler::Source::Rubygems.stub(:new){ @rubygems }
   end
 
   describe "#_normalize_options" do
@@ -34,7 +34,7 @@ describe Bundler::Dsl do
 
   describe "#method_missing" do
     it "raises an error for unknown DSL methods" do
-      expect(Bundler).to receive(:read_file).with("Gemfile").and_return("unknown")
+      Bundler.should_receive(:read_file).with("Gemfile").and_return("unknown")
       error_msg = "Undefined local variable or method `unknown'" \
         " for Gemfile\\s+from Gemfile:1"
       expect { subject.eval_gemfile("Gemfile") }.
@@ -44,7 +44,7 @@ describe Bundler::Dsl do
 
   describe "#eval_gemfile" do
     it "handles syntax errors with a useful message" do
-      expect(Bundler).to receive(:read_file).with("Gemfile").and_return("}")
+      Bundler.should_receive(:read_file).with("Gemfile").and_return("}")
       expect { subject.eval_gemfile("Gemfile") }.
         to raise_error(Bundler::GemfileError, /Gemfile syntax error/)
     end

data/spec/bundler/gem_helper_spec.rb

@@ -43,7 +43,7 @@ describe "Bundler::GemHelper tasks" do
 
   context "gem management" do
     def mock_confirm_message(message)
-      expect(Bundler.ui).to receive(:confirm).with(message)
+      Bundler.ui.should_receive(:confirm).with(message)
     end
 
     def mock_build_message
@@ -116,7 +116,7 @@ describe "Bundler::GemHelper tasks" do
       end
 
       it "raises an appropriate error when the install fails" do
-        expect(@helper).to receive(:build_gem) do
+        @helper.should_receive(:build_gem) do
           # write an invalid gem file, so we can simulate install failure...
           FileUtils.mkdir_p(File.join(@app.to_s, 'pkg'))
           path = "#{@app.to_s}/pkg/test-0.0.1.gem"
@@ -146,9 +146,7 @@ describe "Bundler::GemHelper tasks" do
       end
 
       it "raises an appropriate error if there is no git remote" do
-        # silence messages
-        allow(Bundler.ui).to receive(:confirm)
-        allow(Bundler.ui).to receive(:error)
+        Bundler.ui.stub(:confirm => nil, :error => nil) # silence messages
 
         Dir.chdir(gem_repo1) { `git init --bare` }
         Dir.chdir(@app) { `git commit -a -m "initial commit"` }
@@ -161,7 +159,7 @@ describe "Bundler::GemHelper tasks" do
         mock_confirm_message(/Tagged v0.0.1/)
         mock_confirm_message("Pushed git commits and tags.")
 
-        expect(@helper).to receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
+        @helper.should_receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
 
         Dir.chdir(gem_repo1) { `git init --bare` }
         Dir.chdir(@app) do
@@ -177,7 +175,7 @@ describe "Bundler::GemHelper tasks" do
         mock_build_message
         mock_confirm_message("Tag v0.0.1 has already been created.")
 
-        expect(@helper).to receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
+        @helper.should_receive(:rubygem_push).with(bundled_app('test/pkg/test-0.0.1.gem').to_s)
 
         Dir.chdir(gem_repo1) {
           `git init --bare`

data/spec/bundler/settings_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'bundler/settings'
+
+describe Bundler::Settings do
+
+  describe "#set_local" do
+    context "when the local config file is not found" do
+      it "raises a GemfileNotFound error with explanation" do
+        expect{ subject.set_local("foo", "bar") }.
+          to raise_error(Bundler::GemfileNotFound, "Could not locate Gemfile")
+      end
+    end
+  end
+
+end

data/spec/bundler/source_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Bundler::Source::Rubygems do
   before do
-    allow(Bundler).to receive(:root){ Pathname.new("root") }
+    Bundler.stub(:root){ Pathname.new("root") }
   end
 
   describe "caches" do

data/spec/commands/config_spec.rb

@@ -192,4 +192,22 @@ E
       expect(out).to eq("http://gems.example.org/ => http://gem-mirror.example.org/")
     end
   end
+
+  describe "quoting" do
+    before(:each) { bundle :install }
+
+    it "saves quotes" do
+      bundle "config foo something\\'"
+      run "puts Bundler.settings[:foo]"
+      expect(out).to eq("something'")
+    end
+
+    it "doesn't return quotes around values", :ruby => "1.9" do
+      bundle "config foo '1'"
+      run "puts Bundler.settings.send(:global_config_file).read"
+      expect(out).to include("'1'")
+      run "puts Bundler.settings[:foo]"
+      expect(out).to eq("1")
+    end
+  end
 end

data/spec/commands/console_spec.rb

@@ -18,6 +18,28 @@ describe "bundle console" do
     expect(out).to include("0.9.1")
   end
 
+  it "starts another REPL if configured as such" do
+    bundle "config console pry"
+
+    bundle "console" do |input|
+      input.puts("__callee__")
+      input.puts("exit")
+    end
+    expect(out).to include("pry")
+  end
+
+  it "falls back to IRB if the other REPL isn't available" do
+    bundle "config console pry"
+    # make sure pry isn't there
+
+    bundle "console" do |input|
+      input.puts("__callee__")
+      input.puts("exit")
+    end
+    expect(out).to include("irb")
+  end
+
+
   it "doesn't load any other groups" do
     bundle "console" do |input|
       input.puts("puts ACTIVESUPPORT")

data/spec/commands/exec_spec.rb

@@ -129,6 +129,7 @@ describe "bundle exec" do
     bundle "exec rackup"
 
     expect(out).to eq("0.9.1")
+    expect(err).to match("deprecated")
 
     Dir.chdir bundled_app2 do
       bundle "exec rackup"

data/spec/commands/newgem_spec.rb

@@ -154,7 +154,7 @@ describe "bundle gem" do
       end
 
       it "creates a default test which fails" do
-        expect(bundled_app("test_gem/spec/test_gem_spec.rb").read).to match(/false.should eq(true)/)
+        expect(bundled_app("test_gem/spec/test_gem_spec.rb").read).to include('expect(false).to be true')
       end
     end
 
@@ -330,7 +330,7 @@ describe "bundle gem" do
       end
 
       it "creates a default test which fails" do
-        expect(bundled_app("test-gem/spec/test/gem_spec.rb").read).to match(/false.should eq(true)/)
+        expect(bundled_app("test-gem/spec/test/gem_spec.rb").read).to include('expect(false).to be true')
       end
 
       it "creates a default rake task to run the specs" do

data/spec/commands/open_spec.rb

@@ -33,6 +33,19 @@ describe "bundle open" do
     expect(out).to match(/could not find gem 'missing'/i)
   end
 
+  it "does not blow up if the gem to open does not have a Gemfile" do
+    git = build_git "foo"
+    ref = git.ref_for("master", 11)
+
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem 'foo', :git => "#{lib_path("foo-1.0")}"
+    G
+
+    bundle "open foo", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
+    expect(out).to match("editor #{default_bundle_path.join("bundler/gems/foo-1.0-#{ref}")}")
+  end
+
   it "suggests alternatives for similar-sounding gems" do
     bundle "open Rails", :env => {"EDITOR" => "echo editor", "VISUAL" => "", "BUNDLER_EDITOR" => ""}
     expect(out).to match(/did you mean rails\?/i)

data/spec/{install/gems/packed_spec.rb → commands/package_spec.rb}

@@ -1,5 +1,35 @@
 require "spec_helper"
 
+describe "bundle package" do
+  context "with --gemfile" do
+    it "finds the gemfile" do
+      gemfile bundled_app("NotGemfile"), <<-G
+        source "file://#{gem_repo1}"
+        gem 'rack'
+      G
+
+      bundle "package --gemfile=NotGemfile"
+
+      ENV['BUNDLE_GEMFILE'] = "NotGemfile"
+      should_be_installed "rack 1.0.0"
+    end
+  end
+
+  context "with --path" do
+    it "sets root directory for gems" do
+      gemfile <<-D
+        source "file://#{gem_repo1}"
+        gem 'rack'
+      D
+
+      bundle "package --path=#{bundled_app('test')}"
+
+      should_be_installed "rack 1.0.0"
+      expect(bundled_app("test/vendor/cache/")).to exist
+    end
+  end
+end
+
 describe "bundle install with gem sources" do
   describe "when cached and locked" do
     it "does not hit the remote at all" do