bundler 1.5.1 → 1.5.2

data/lib/bundler/vendor/thor/shell/html.rb

@@ -7,7 +7,7 @@ class Thor
     #
     class HTML < Basic
       # The start of an HTML bold sequence.
-      BOLD       = "font-weight: bold"
+      BOLD       = 'font-weight: bold'
 
       # Set the terminal's foreground HTML color to black.
       BLACK      = 'color: black'
@@ -67,61 +67,60 @@ class Thor
       # ask("What is your name?")
       #
       # TODO: Implement #ask for Thor::Shell::HTML
-      def ask(statement, color=nil)
-        raise NotImplementedError, "Implement #ask for Thor::Shell::HTML"
+      def ask(statement, color = nil)
+        fail NotImplementedError, 'Implement #ask for Thor::Shell::HTML'
       end
 
-      protected
+    protected
 
-        def can_display_colors?
-          true
-        end
+      def can_display_colors?
+        true
+      end
 
-        # Overwrite show_diff to show diff with colors if Diff::LCS is
-        # available.
-        #
-        def show_diff(destination, content) #:nodoc:
-          if diff_lcs_loaded? && ENV['THOR_DIFF'].nil? && ENV['RAILS_DIFF'].nil?
-            actual  = File.binread(destination).to_s.split("\n")
-            content = content.to_s.split("\n")
+      # Overwrite show_diff to show diff with colors if Diff::LCS is
+      # available.
+      #
+      def show_diff(destination, content) #:nodoc:
+        if diff_lcs_loaded? && ENV['THOR_DIFF'].nil? && ENV['RAILS_DIFF'].nil?
+          actual  = File.binread(destination).to_s.split("\n")
+          content = content.to_s.split("\n")
 
-            Diff::LCS.sdiff(actual, content).each do |diff|
-              output_diff_line(diff)
-            end
-          else
-            super
+          Diff::LCS.sdiff(actual, content).each do |diff|
+            output_diff_line(diff)
           end
+        else
+          super
         end
+      end
 
-        def output_diff_line(diff) #:nodoc:
-          case diff.action
-          when '-'
-            say "- #{diff.old_element.chomp}", :red, true
-          when '+'
-            say "+ #{diff.new_element.chomp}", :green, true
-          when '!'
-            say "- #{diff.old_element.chomp}", :red, true
-            say "+ #{diff.new_element.chomp}", :green, true
-          else
-            say "  #{diff.old_element.chomp}", nil, true
-          end
+      def output_diff_line(diff) #:nodoc:
+        case diff.action
+        when '-'
+          say "- #{diff.old_element.chomp}", :red, true
+        when '+'
+          say "+ #{diff.new_element.chomp}", :green, true
+        when '!'
+          say "- #{diff.old_element.chomp}", :red, true
+          say "+ #{diff.new_element.chomp}", :green, true
+        else
+          say "  #{diff.old_element.chomp}", nil, true
         end
+      end
 
-        # Check if Diff::LCS is loaded. If it is, use it to create pretty output
-        # for diff.
-        #
-        def diff_lcs_loaded? #:nodoc:
-          return true  if defined?(Diff::LCS)
-          return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
+      # Check if Diff::LCS is loaded. If it is, use it to create pretty output
+      # for diff.
+      #
+      def diff_lcs_loaded? #:nodoc:
+        return true  if defined?(Diff::LCS)
+        return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
 
-          @diff_lcs_loaded = begin
-            require 'diff/lcs'
-            true
-          rescue LoadError
-            false
-          end
+        @diff_lcs_loaded = begin
+          require 'diff/lcs'
+          true
+        rescue LoadError
+          false
         end
-
+      end
     end
   end
 end

data/lib/bundler/vendor/thor/util.rb

@@ -15,9 +15,7 @@ class Thor
   #   Thor::Util.load_thorfile("~/.thor/foo")
   #
   module Util
-
     class << self
-
       # Receives a namespace and search for it in the Thor::Base subclasses.
       #
       # ==== Parameters
@@ -25,7 +23,7 @@ class Thor
       #
       def find_by_namespace(namespace)
         namespace = "default#{namespace}" if namespace.empty? || namespace =~ /^:/
-        Thor::Base.subclasses.find { |klass| klass.namespace == namespace }
+        Thor::Base.subclasses.detect { |klass| klass.namespace == namespace }
       end
 
       # Receives a constant and converts it to a Thor namespace. Since Thor
@@ -43,8 +41,8 @@ class Thor
       # String:: If we receive Foo::Bar::Baz it returns "foo:bar:baz"
       #
       def namespace_from_thor_class(constant)
-        constant = constant.to_s.gsub(/^Thor::Sandbox::/, "")
-        constant = snake_case(constant).squeeze(":")
+        constant = constant.to_s.gsub(/^Thor::Sandbox::/, '')
+        constant = snake_case(constant).squeeze(':')
         constant
       end
 
@@ -57,7 +55,7 @@ class Thor
       # ==== Returns
       # Array[Object]
       #
-      def namespaces_in_content(contents, file=__FILE__)
+      def namespaces_in_content(contents, file = __FILE__)
         old_constants = Thor::Base.subclasses.dup
         Thor::Base.subclasses.clear
 
@@ -66,7 +64,7 @@ class Thor
         new_constants = Thor::Base.subclasses.dup
         Thor::Base.subclasses.replace(old_constants)
 
-        new_constants.map!{ |c| c.namespace }
+        new_constants.map! { |c| c.namespace }
         new_constants.compact!
         new_constants
       end
@@ -92,7 +90,7 @@ class Thor
       def snake_case(str)
         return str.downcase if str =~ /^[A-Z_]+$/
         str.gsub(/\B[A-Z]/, '_\&').squeeze('_') =~ /_*(.*)/
-        return $+.downcase
+        $+.downcase
       end
 
       # Receives a string and convert it to camel case. camel_case returns CamelCase.
@@ -131,10 +129,10 @@ class Thor
       # namespace<String>
       #
       def find_class_and_command_by_namespace(namespace, fallback = true)
-        if namespace.include?(?:) # look for a namespaced command
-          pieces  = namespace.split(":")
+        if namespace.include?(':') # look for a namespaced command
+          pieces  = namespace.split(':')
           command = pieces.pop
-          klass   = Thor::Util.find_by_namespace(pieces.join(":"))
+          klass   = Thor::Util.find_by_namespace(pieces.join(':'))
         end
         unless klass # look for a Thor::Group with the right name
           klass, command = Thor::Util.find_by_namespace(namespace), nil
@@ -143,19 +141,19 @@ class Thor
           command = namespace
           klass   = Thor::Util.find_by_namespace('')
         end
-        return klass, command
+        [klass, command]
       end
-      alias find_class_and_task_by_namespace find_class_and_command_by_namespace
+      alias_method :find_class_and_task_by_namespace, :find_class_and_command_by_namespace
 
       # Receives a path and load the thor file in the path. The file is evaluated
       # inside the sandbox to avoid namespacing conflicts.
       #
-      def load_thorfile(path, content=nil, debug=false)
+      def load_thorfile(path, content = nil, debug = false)
         content ||= File.binread(path)
 
         begin
           Thor::Sandbox.class_eval(content, path)
-        rescue Exception => e
+        rescue StandardError => e
           $stderr.puts("WARNING: unable to load thorfile #{path.inspect}: #{e.message}")
           if debug
             $stderr.puts(*e.backtrace)
@@ -165,32 +163,32 @@ class Thor
         end
       end
 
-      def user_home
-        @@user_home ||= if ENV["HOME"]
-          ENV["HOME"]
-        elsif ENV["USERPROFILE"]
-          ENV["USERPROFILE"]
-        elsif ENV["HOMEDRIVE"] && ENV["HOMEPATH"]
-          File.join(ENV["HOMEDRIVE"], ENV["HOMEPATH"])
-        elsif ENV["APPDATA"]
-          ENV["APPDATA"]
-        else
-          begin
-            File.expand_path("~")
-          rescue
-            if File::ALT_SEPARATOR
-              "C:/"
-            else
-              "/"
-            end
-          end
-        end
+      def user_home # rubocop:disable MethodLength
+        @@user_home ||= if ENV['HOME']
+                          ENV['HOME']
+                        elsif ENV['USERPROFILE']
+                          ENV['USERPROFILE']
+                        elsif ENV['HOMEDRIVE'] && ENV['HOMEPATH']
+                          File.join(ENV['HOMEDRIVE'], ENV['HOMEPATH'])
+                        elsif ENV['APPDATA']
+                          ENV['APPDATA']
+                        else
+                          begin
+                            File.expand_path('~')
+                          rescue
+                            if File::ALT_SEPARATOR
+                              'C:/'
+                            else
+                              '/'
+                            end
+                          end
+                        end
       end
 
       # Returns the root where thor files are located, depending on the OS.
       #
       def thor_root
-        File.join(user_home, ".thor").gsub(/\\/, '/')
+        File.join(user_home, '.thor').gsub(/\\/, '/')
       end
 
       # Returns the files in the thor root. On Windows thor_root will be something
@@ -204,7 +202,7 @@ class Thor
         files = Dir["#{escape_globs(thor_root)}/*"]
 
         files.map! do |file|
-          File.directory?(file) ? File.join(file, "main.thor") : file
+          File.directory?(file) ? File.join(file, 'main.thor') : file
         end
       end
 
@@ -218,7 +216,7 @@ class Thor
       # Return the path to the ruby interpreter taking into account multiple
       # installations and windows extensions.
       #
-      def ruby_command
+      def ruby_command # rubocop:disable MethodLength
         @ruby_command ||= begin
           ruby_name = RbConfig::CONFIG['ruby_install_name']
           ruby = File.join(RbConfig::CONFIG['bindir'], ruby_name)
@@ -237,7 +235,7 @@ class Thor
                 # symlink points to 'ruby_install_name'
                 ruby = alternate_ruby if linked_ruby == ruby_name || linked_ruby == ruby
               end
-            rescue NotImplementedError
+            rescue NotImplementedError # rubocop:disable HandleExceptions
               # just ignore on windows
             end
           end
@@ -264,7 +262,6 @@ class Thor
       def escape_globs(path)
         path.to_s.gsub(/[*?{}\[\]]/, '\\\\\\&')
       end
-
     end
   end
 end

data/lib/bundler/vendor/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.18.1"
+  VERSION = '0.18.1'
 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.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.5.2" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-install.ronn

@@ -61,7 +61,7 @@ update process below under [CONSERVATIVE UPDATING][].
   Do not attempt to connect to `rubygems.org`, instead using just
   the gems already present in Rubygems' cache or in `vendor/cache`.
   Note that if a more appropriate platform-specific gem exists on
-  `rubygems.org`, it will not be found. This option implies `--no-cache`.
+  `rubygems.org`, it will not be found.
 
 * `--deployment`:
   Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE].

data/man/gemfile.5.ronn

@@ -217,8 +217,7 @@ as they would for a normal gem.
 A git repository `SHOULD` have at least one file, at the root of the
 directory containing the gem, with the extension `.gemspec`. This file
 `MUST` contain a valid gem specification, as expected by the `gem build`
-command. It `MUST NOT` have any dependencies, other than on the files in
-the git repository itself and any built-in functionality of Ruby or Rubygems.
+command.
 
 If a git repository does not have a `.gemspec`, bundler will attempt to
 create one, but it will not contain any dependencies, executables, or

data/spec/commands/binstubs_spec.rb

@@ -90,6 +90,19 @@ describe "bundle binstubs <gem>" do
 
       expect(bundled_app("bin/foo")).to exist
     end
+
+    it "sets correct permissions for binstubs" do
+      with_umask(0002) do
+        install_gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "rack"
+        G
+
+        bundle "binstubs rack"
+        binary = bundled_app("bin/rackup")
+        expect(File.stat(binary).mode.to_s(8)).to eq("100775")
+      end
+    end
   end
 
   context "--path" do

data/spec/install/gemfile/git_spec.rb

@@ -34,7 +34,7 @@ describe "bundle install with git sources" do
       git = update_git "foo" do |s|
         s.executables = ["foobar"] # we added this the first time, so keep it now
         s.files = ["bin/foobar"] # updating git nukes the files list
-        foospec = s.to_ruby.gsub(/s\.files.*/, 's.files = `git ls-files`.split("\n")')
+        foospec = s.to_ruby.gsub(/s\.files.*/, 's.files = `git ls-files -z`.split("\x0")')
         s.write "foo.gemspec", foospec
       end
 
@@ -911,4 +911,4 @@ describe "bundle install with git sources" do
       expect(out).to include("You need to install git to be able to use gems from git repositories. For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git")
     end
   end
-end
+end

data/spec/install/gems/dependency_api_spec.rb

@@ -162,6 +162,40 @@ describe "gemcutter's dependency API" do
     should_be_installed "rack 1.0.0"
   end
 
+  it "handles host redirects" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    bundle :install, :artifice => "endpoint_host_redirect"
+    should_be_installed "rack 1.0.0"
+  end
+
+  it "handles host redirects without Net::HTTP::Persistent" do
+    gemfile <<-G
+      source "#{source_uri}"
+      gem "rack"
+    G
+
+    FileUtils.mkdir_p lib_path
+    File.open(lib_path("disable_net_http_persistent.rb"), "w") do |h|
+      h.write <<-H
+        module Kernel
+          alias require_without_disabled_net_http require
+          def require(*args)
+            raise LoadError, 'simulated' if args.first == 'openssl' && !caller.grep(/vendored_persistent/).empty?
+            require_without_disabled_net_http(*args)
+          end
+        end
+      H
+    end
+
+    bundle :install, :artifice => "endpoint_host_redirect", :requires => [lib_path("disable_net_http_persistent.rb")]
+    expect(out).to_not match(/Too many redirects/)
+    should_be_installed "rack 1.0.0"
+  end
+
   it "timeouts when Bundler::Fetcher redirects too much" do
     gemfile <<-G
       source "#{source_uri}"

data/spec/install/gems/packed_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "bundle install with gem sources" do
   describe "when cached and locked" do
-    it "does not hit the remote at all if --local is passed" do
+    it "does not hit the remote at all" do
       build_repo2
       install_gemfile <<-G
         source "file://#{gem_repo2}"
@@ -14,11 +14,10 @@ describe "bundle install with gem sources" do
       FileUtils.rm_rf gem_repo2
 
       bundle "install --local"
-      expect(out).not_to include("Updating files in vendor/cache")
       should_be_installed "rack 1.0.0"
     end
 
-    it "does not hit the remote at all if --deployment is passed" do
+    it "does not hit the remote at all" do
       build_repo2
       install_gemfile <<-G
         source "file://#{gem_repo2}"
@@ -30,7 +29,6 @@ describe "bundle install with gem sources" do
       FileUtils.rm_rf gem_repo2
 
       bundle "install --deployment"
-      expect(out).not_to include("Updating files in vendor/cache")
       should_be_installed "rack 1.0.0"
     end
 

data/spec/quality_spec.rb

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