bundler 1.11.2 → 1.12.0.pre.1

data/lib/bundler/cli/console.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Console
     attr_reader :options, :group

data/lib/bundler/cli/exec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/current_ruby"
 
 module Bundler
@@ -20,18 +21,12 @@ module Bundler
       ui = Bundler.ui
       raise ArgumentError if cmd.nil?
 
-      # First, try to exec directly to something in PATH
       SharedHelpers.set_bundle_environment
       bin_path = Bundler.which(@cmd)
-      if bin_path
-        Bundler.ui = nil
-        Kernel.exec(bin_path, *args)
-      end
-
-      # If that didn't work, set up the whole bundle
-      Bundler.definition.validate_ruby!
-      Bundler.load.setup_environment
       Bundler.ui = nil
+      # First, try to exec directly to something in PATH
+      Kernel.exec([bin_path, @cmd], *args) if bin_path
+      # Just exec using the given command
       Kernel.exec(@cmd, *args)
     rescue Errno::EACCES, Errno::ENOEXEC
       Bundler.ui = ui

data/lib/bundler/cli/gem.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "pathname"
 
 module Bundler
@@ -5,7 +6,7 @@ module Bundler
     TEST_FRAMEWORK_VERSIONS = {
       "rspec" => "3.0",
       "minitest" => "5.0"
-    }
+    }.freeze
 
     attr_reader :options, :gem_name, :thor, :name, :target
 
@@ -27,7 +28,6 @@ module Bundler
       namespaced_path = name.tr("-", "/")
       constant_name = name.gsub(/-[_-]*(?![_-]|$)/) { "::" }.gsub(/([_-]+|(::)|^)(.|$)/) { $2.to_s + $3.upcase }
       constant_array = constant_name.split("::")
-      test_task = options[:test] == "minitest" ? "test" : "spec"
 
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
@@ -42,9 +42,8 @@ module Bundler
         :author           => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
         :email            => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
         :test             => options[:test],
-        :test_task        => test_task,
         :ext              => options[:ext],
-        :bin              => options[:bin],
+        :exe              => options[:exe],
         :bundler_version  => bundler_dependency_version
       }
       ensure_safe_gem_name(name, constant_array)
@@ -87,6 +86,8 @@ module Bundler
         end
       end
 
+      config[:test_task] = config[:test] == "minitest" ? "test" : "spec"
+
       if ask_and_set(:mit, "Do you want to license your code permissively under the MIT license?",
         "This means that any other developer or company will be legally allowed to use your code " \
         "for free as long as they admit you created it. You can read more about the MIT license " \
@@ -109,7 +110,7 @@ module Bundler
         templates.merge!("CODE_OF_CONDUCT.md.tt" => "CODE_OF_CONDUCT.md")
       end
 
-      templates.merge!("exe/newgem.tt" => "exe/#{name}") if options[:bin]
+      templates.merge!("exe/newgem.tt" => "exe/#{name}") if config[:exe]
 
       if options[:ext]
         templates.merge!(
@@ -135,10 +136,8 @@ module Bundler
         `git add .`
       end
 
-      if options[:edit]
-        # Open gemspec in editor
-        thor.run("#{options["edit"]} \"#{target.join("#{name}.gemspec")}\"")
-      end
+      # Open gemspec in editor
+      open_editor(options["edit"], target.join("#{name}.gemspec")) if options[:edit]
     end
 
   private
@@ -207,5 +206,9 @@ module Bundler
         exit 1
       end
     end
+
+    def open_editor(editor, file)
+      thor.run(%(#{editor} "#{file}"))
+    end
   end
 end

data/lib/bundler/cli/init.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Init
     attr_reader :options

data/lib/bundler/cli/inject.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Inject
     attr_reader :options, :name, :version, :gems

data/lib/bundler/cli/install.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Install
     attr_reader :options
@@ -94,7 +95,7 @@ module Bundler
       Bundler.settings.without    = options[:without]
       Bundler.settings.with       = options[:with]
       Bundler::Fetcher.disable_endpoint = options["full-index"]
-      Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? "1" : nil
+      Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? true : nil
 
       # rubygems plugins sometimes hook into the gem install process
       Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
@@ -150,6 +151,9 @@ module Bundler
         WARN
       end
       raise e
+    rescue Gem::InvalidSpecificationException => e
+      Bundler.ui.warn "You have one or more invalid gemspecs that need to be fixed."
+      raise e
     end
 
   private
@@ -162,10 +166,9 @@ module Bundler
     end
 
     def confirm_without_groups
-      if Bundler.settings.without.any?
-        require "bundler/cli/common"
-        Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
-      end
+      return unless Bundler.settings.without.any?
+      require "bundler/cli/common"
+      Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
     end
 
     def dependencies_count_for(definition)

data/lib/bundler/cli/lock.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Lock
     attr_reader :options
@@ -17,6 +18,7 @@ module Bundler
       Bundler.ui = UI::Silent.new if print
 
       gems = options[:update]
+      Bundler::Fetcher.disable_endpoint = options["full-index"]
 
       if gems && !gems.empty?
         definition = Bundler.definition(:gems => gems)

data/lib/bundler/cli/open.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/cli/common"
 require "shellwords"
 

data/lib/bundler/cli/outdated.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/cli/common"
 
 module Bundler
@@ -26,7 +27,13 @@ module Bundler
       else
         definition = Bundler.definition(:gems => gems, :sources => sources)
       end
-      options["local"] ? definition.resolve_with_cache! : definition.resolve_remotely!
+
+      definition_resolution = proc { options["local"] ? definition.resolve_with_cache! : definition.resolve_remotely! }
+      if options[:parseable]
+        Bundler.ui.silence(&definition_resolution)
+      else
+        definition_resolution.call
+      end
 
       Bundler.ui.info ""
 
@@ -46,17 +53,31 @@ module Bundler
             active_spec = active_spec.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }
           end
           active_spec = active_spec.last
+
+          if options[:major]
+            current_major = current_spec.version.segments.first
+            active_major = active_spec.version.segments.first
+            active_spec = nil unless active_major > current_major
+          end
+
+          if options[:minor]
+            current_minor = current_spec.version.segments[0, 2].compact.join(".")
+            active_minor = active_spec.version.segments[0, 2].compact.join(".")
+            active_spec = nil unless active_minor > current_minor
+          end
         end
         next if active_spec.nil?
 
         gem_outdated = Gem::Version.new(active_spec.version) > Gem::Version.new(current_spec.version)
         git_outdated = current_spec.git_version != active_spec.git_version
         if gem_outdated || git_outdated
-          if out_count == 0
-            if options["pre"]
-              Bundler.ui.info "Outdated gems included in the bundle (including pre-releases):"
-            else
-              Bundler.ui.info "Outdated gems included in the bundle:"
+          unless options[:parseable]
+            if out_count == 0
+              if options["pre"]
+                Bundler.ui.info "Outdated gems included in the bundle (including pre-releases):"
+              else
+                Bundler.ui.info "Outdated gems included in the bundle:"
+              end
             end
           end
 
@@ -64,20 +85,26 @@ module Bundler
           current_version = "#{current_spec.version}#{current_spec.git_version}"
           dependency_version = %(, requested #{dependency.requirement}) if dependency && dependency.specific?
 
-          if dependency
+          if dependency && !options[:parseable]
             groups = dependency.groups.join(", ")
             pl = (dependency.groups.length > 1) ? "s" : ""
             groups = " in group#{pl} \"#{groups}\""
           end
 
-          Bundler.ui.info "  * #{active_spec.name} (newest #{spec_version}, installed #{current_version}#{dependency_version})#{groups}".rstrip
+          spec_outdated_info = "#{active_spec.name} (newest #{spec_version}, installed #{current_version}#{dependency_version})"
+          if options[:parseable]
+            Bundler.ui.info spec_outdated_info.to_s.rstrip
+          else
+            Bundler.ui.info "  * #{spec_outdated_info}#{groups}".rstrip
+          end
+
           out_count += 1
         end
         Bundler.ui.debug "from #{active_spec.loaded_from}"
       end
 
       if out_count.zero?
-        Bundler.ui.info "Bundle up to date!\n"
+        Bundler.ui.info "Bundle up to date!\n" unless options[:parseable]
       else
         exit 1
       end

data/lib/bundler/cli/package.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Package
     attr_reader :options

data/lib/bundler/cli/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Platform
     attr_reader :options
@@ -7,8 +8,10 @@ module Bundler
 
     def run
       platforms, ruby_version = Bundler.ui.silence do
+        locked_ruby_version = Bundler.locked_gems && Bundler.locked_gems.ruby_version
+        gemfile_ruby_version = Bundler.definition.ruby_version && Bundler.definition.ruby_version.single_version_string
         [Bundler.definition.platforms.map {|p| "* #{p}" },
-         Bundler.definition.ruby_version]
+         locked_ruby_version || gemfile_ruby_version]
       end
       output = []
 

data/lib/bundler/cli/show.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/cli/common"
 
 module Bundler

data/lib/bundler/cli/update.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Update
     attr_reader :options, :gems
@@ -12,7 +13,7 @@ module Bundler
       sources = Array(options[:source])
       groups  = Array(options[:group]).map(&:to_sym)
 
-      if gems.empty? && sources.empty? && groups.empty?
+      if gems.empty? && sources.empty? && groups.empty? && !options[:ruby]
         # We're doing a full update
         Bundler.definition(true)
       else
@@ -33,7 +34,7 @@ module Bundler
           gems.concat(specs.map(&:name))
         end
 
-        Bundler.definition(:gems => gems, :sources => sources)
+        Bundler.definition(:gems => gems, :sources => sources, :ruby => options[:ruby])
       end
 
       Bundler::Fetcher.disable_endpoint = options["full-index"]
@@ -63,10 +64,9 @@ module Bundler
   private
 
     def without_groups_messages
-      if Bundler.settings.without.any?
-        require "bundler/cli/common"
-        Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
-      end
+      return unless Bundler.settings.without.any?
+      require "bundler/cli/common"
+      Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
     end
   end
 end

data/lib/bundler/cli/viz.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Viz
     attr_reader :options, :gem_name
@@ -15,12 +16,9 @@ module Bundler
       Bundler.ui.warn "Make sure you have the graphviz ruby gem. You can install it with:"
       Bundler.ui.warn "`gem install ruby-graphviz`"
     rescue StandardError => e
-      if e.message =~ /GraphViz not installed or dot not in PATH/
-        Bundler.ui.error e.message
-        Bundler.ui.warn "Please install GraphViz. On a Mac with homebrew, you can run `brew install graphviz`."
-      else
-        raise
-      end
+      raise unless e.message =~ /GraphViz not installed or dot not in PATH/
+      Bundler.ui.error e.message
+      Bundler.ui.warn "Please install GraphViz. On a Mac with homebrew, you can run `brew install graphviz`."
     end
   end
 end

data/lib/bundler/constants.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   WINDOWS = RbConfig::CONFIG["host_os"] =~ /(msdos|mswin|djgpp|mingw)/
   FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/

data/lib/bundler/current_ruby.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   # Returns current version of Ruby
   #
@@ -7,94 +8,38 @@ module Bundler
   end
 
   class CurrentRuby
-    def on_18?
-      RUBY_VERSION =~ /^1\.8/
-    end
-
-    def on_19?
-      RUBY_VERSION =~ /^1\.9/
-    end
-
-    def on_20?
-      RUBY_VERSION =~ /^2\.0/
-    end
-
-    def on_21?
-      RUBY_VERSION =~ /^2\.1/
-    end
-
-    def on_22?
-      RUBY_VERSION =~ /^2\.2/
-    end
-
-    def on_23?
-      RUBY_VERSION =~ /^2\.3/
-    end
-
-    def on_2?
-      on_20? || on_21? || on_22? || on_23?
-    end
+    KNOWN_MINOR_VERSIONS = %w(
+      1.8
+      1.9
+      2.0
+      2.1
+      2.2
+      2.3
+      2.4
+    ).freeze
+
+    KNOWN_MAJOR_VERSIONS = KNOWN_MINOR_VERSIONS.map {|v| v.split(".", 2).first }.uniq.freeze
+
+    KNOWN_PLATFORMS = %w(
+      jruby
+      maglev
+      mingw
+      mri
+      mswin
+      mswin64
+      rbx
+      ruby
+      x64_mingw
+    ).freeze
 
     def ruby?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
     end
 
-    def ruby_18?
-      ruby? && on_18?
-    end
-
-    def ruby_19?
-      ruby? && on_19?
-    end
-
-    def ruby_20?
-      ruby? && on_20?
-    end
-
-    def ruby_21?
-      ruby? && on_21?
-    end
-
-    def ruby_22?
-      ruby? && on_22?
-    end
-
-    def ruby_23?
-      ruby? && on_23?
-    end
-
-    def ruby_2?
-      ruby? && on_2?
-    end
-
     def mri?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
     end
 
-    def mri_18?
-      mri? && on_18?
-    end
-
-    def mri_19?
-      mri? && on_19?
-    end
-
-    def mri_20?
-      mri? && on_20?
-    end
-
-    def mri_21?
-      mri? && on_21?
-    end
-
-    def mri_22?
-      mri? && on_22?
-    end
-
-    def mri_23?
-      mri? && on_23?
-    end
-
     def rbx?
       ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
     end
@@ -103,14 +48,6 @@ module Bundler
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
     end
 
-    def jruby_18?
-      jruby? && on_18?
-    end
-
-    def jruby_19?
-      jruby? && on_19?
-    end
-
     def maglev?
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "maglev"
     end
@@ -119,100 +56,29 @@ module Bundler
       Bundler::WINDOWS
     end
 
-    def mswin_18?
-      mswin? && on_18?
-    end
-
-    def mswin_19?
-      mswin? && on_19?
-    end
-
-    def mswin_20?
-      mswin? && on_20?
-    end
-
-    def mswin_21?
-      mswin? && on_21?
-    end
-
-    def mswin_22?
-      mswin? && on_22?
-    end
-
-    def mswin_23?
-      mswin? && on_23?
-    end
-
     def mswin64?
       Bundler::WINDOWS && Gem::Platform.local.os == "mswin64" && Gem::Platform.local.cpu == "x64"
     end
 
-    def mswin64_19?
-      mswin64? && on_19?
-    end
-
-    def mswin64_20?
-      mswin64? && on_20?
-    end
-
-    def mswin64_21?
-      mswin64? && on_21?
-    end
-
-    def mswin64_22?
-      mswin64? && on_22?
-    end
-
-    def mswin64_23?
-      mswin64? && on_23?
-    end
-
     def mingw?
       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu != "x64"
     end
 
-    def mingw_18?
-      mingw? && on_18?
-    end
-
-    def mingw_19?
-      mingw? && on_19?
-    end
-
-    def mingw_20?
-      mingw? && on_20?
-    end
-
-    def mingw_21?
-      mingw? && on_21?
-    end
-
-    def mingw_22?
-      mingw? && on_22?
-    end
-
-    def mingw_23?
-      mingw? && on_23?
-    end
-
     def x64_mingw?
       Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu == "x64"
     end
 
-    def x64_mingw_20?
-      x64_mingw? && on_20?
-    end
-
-    def x64_mingw_21?
-      x64_mingw? && on_21?
-    end
-
-    def x64_mingw_22?
-      x64_mingw? && on_22?
-    end
+    (KNOWN_MINOR_VERSIONS + KNOWN_MAJOR_VERSIONS).each do |version|
+      trimmed_version = version.tr(".", "")
+      define_method(:"on_#{trimmed_version}?") do
+        RUBY_VERSION.start_with?("#{version}.")
+      end
 
-    def x64_mingw_23?
-      x64_mingw? && on_23?
+      KNOWN_PLATFORMS.each do |platform|
+        define_method(:"#{platform}_#{trimmed_version}?") do
+          send(:"#{platform}?") && send(:"on_#{trimmed_version}?")
+        end
+      end
     end
   end
 end