bundler 1.16.6 → 1.17.0.pre.1

data/lib/bundler/settings.rb

@@ -14,6 +14,7 @@ module Bundler
       allow_offline_install
       auto_clean_without_path
       auto_install
+      auto_config_jobs
       cache_all
       cache_all_platforms
       cache_command_is_package
@@ -25,6 +26,7 @@ module Bundler
       disable_exec_load
       disable_local_branch_check
       disable_multisource
+      disable_platform_warnings
       disable_shared_gems
       disable_version_check
       error_on_stderr
@@ -33,6 +35,7 @@ module Bundler
       frozen
       gem.coc
       gem.mit
+      global_path_appends_ruby_scope
       global_gem_cache
       ignore_messages
       init_gems_rb
@@ -42,6 +45,7 @@ module Bundler
       no_install
       no_prune
       only_update_to_newer_versions
+      path_relative_to_cwd
       path.system
       plugins
       prefer_gems_rb
@@ -53,9 +57,12 @@ module Bundler
       suppress_install_using_messages
       unlock_source_unlocks_spec
       update_requires_all_flag
+      use_gem_version_promoter_for_major_updates
+      viz_command
     ].freeze
 
     NUMBER_KEYS = %w[
+      jobs
       redirect
       retry
       ssl_verify_mode
@@ -213,13 +220,13 @@ module Bundler
       locations
     end
 
-    # for legacy reasons, the ruby scope isnt appended when the setting comes from ENV or the global config,
+    # for legacy reasons, in Bundler 1, the ruby scope isnt appended when the setting comes from ENV or the global config,
     # nor do we respect :disable_shared_gems
     def path
       key  = key_for(:path)
       path = ENV[key] || @global_config[key]
       if path && !@temporary.key?(key) && !@local_config.key?(key)
-        return Path.new(path, false, false, false)
+        return Path.new(path, Bundler.feature_flag.global_path_appends_ruby_scope?, false, false)
       end
 
       system_path = self["path.system"] || (self[:disable_shared_gems] == false)
@@ -246,6 +253,20 @@ module Bundler
         path
       end
 
+      def base_path_relative_to_pwd
+        base_path = Pathname.new(self.base_path)
+        expanded_base_path = base_path.expand_path(Bundler.root)
+        relative_path = expanded_base_path.relative_path_from(Pathname.pwd)
+        if relative_path.to_s.start_with?("..")
+          relative_path = base_path if base_path.absolute?
+        else
+          relative_path = Pathname.new(File.join(".", relative_path))
+        end
+        relative_path
+      rescue ArgumentError
+        expanded_base_path
+      end
+
       def validate!
         return unless explicit_path && system_path
         path = Bundler.settings.pretty_values_for(:path)

data/lib/bundler/settings/validator.rb

@@ -74,6 +74,29 @@ module Bundler
           fail!(key, value, "`#{other_key}` is current set to #{other_setting.inspect}", "the `#{conflicting.join("`, `")}` groups conflict")
         end
       end
+
+      rule %w[path], "relative paths are expanded relative to the current working directory" do |key, value, settings|
+        next if value.nil?
+
+        path = Pathname.new(value)
+        next if !path.relative? || !Bundler.feature_flag.path_relative_to_cwd?
+
+        path = path.expand_path
+
+        root = begin
+                 Bundler.root
+               rescue GemfileNotFound
+                 Pathname.pwd.expand_path
+               end
+
+        path = begin
+                 path.relative_path_from(root)
+               rescue ArgumentError
+                 path
+               end
+
+        set(settings, key, path.to_s)
+      end
     end
   end
 end

data/lib/bundler/source.rb

@@ -54,6 +54,15 @@ module Bundler
       instance_of?(Bundler::Source::Path)
     end
 
+    def extension_cache_path(spec)
+      return unless Bundler.feature_flag.global_gem_cache?
+      return unless source_slug = extension_cache_slug(spec)
+      Bundler.user_cache.join(
+        "extensions", Gem::Platform.local.to_s, Bundler.ruby_scope,
+        source_slug, spec.full_name
+      )
+    end
+
   private
 
     def version_color(spec_version, locked_spec_version)
@@ -78,15 +87,6 @@ module Bundler
       end
     end
 
-    def extension_cache_path(spec)
-      return unless Bundler.feature_flag.global_gem_cache?
-      return unless source_slug = extension_cache_slug(spec)
-      Bundler.user_cache.join(
-        "extensions", Gem::Platform.local.to_s, Bundler.ruby_scope,
-        source_slug, spec.full_name
-      )
-    end
-
     def extension_cache_slug(_)
       nil
     end

data/lib/bundler/source/metadata.rb

@@ -19,7 +19,7 @@ module Bundler
             # can't point to the actual gemspec or else the require paths will be wrong
             s.loaded_from = File.expand_path("..", __FILE__)
           end
-          if loaded_spec = Bundler.rubygems.loaded_specs("bundler")
+          if loaded_spec = nil && Bundler.rubygems.loaded_specs("bundler")
             idx << loaded_spec # this has to come after the fake gemspec, to override it
           elsif local_spec = Bundler.rubygems.find_name("bundler").find {|s| s.version.to_s == VERSION }
             idx << local_spec

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

@@ -6,6 +6,7 @@ require "<%= config[:namespaced_path] %>/<%= config[:underscored_name] %>"
 <%- config[:constant_array].each_with_index do |c, i| -%>
 <%= "  " * i %>module <%= c %>
 <%- end -%>
+<%= "  " * config[:constant_array].size %>class Error < StandardError; end
 <%= "  " * config[:constant_array].size %># Your code goes here...
 <%- (config[:constant_array].size-1).downto(0) do |i| -%>
 <%= "  " * i %>end

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

@@ -23,10 +23,6 @@ Gem::Specification.new do |spec|
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
-    spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-    spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."

data/lib/bundler/version.rb

@@ -7,7 +7,7 @@ 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.16.6" unless defined?(::Bundler::VERSION)
+  VERSION = "1.17.0.pre.1" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin

data/man/bundle-add.1

@@ -1,16 +1,16 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-ADD" "1" "October 2018" "" ""
+.TH "BUNDLE\-ADD" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
 .
 .SH "SYNOPSIS"
-\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE]
+\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE] [\-\-skip\-install] [\-\-strict] [\-\-optimistic]
 .
 .SH "DESCRIPTION"
-Adds the named gem to the Gemfile and run \fBbundle install\fR\.
+Adds the named gem to the Gemfile and run \fBbundle install\fR\. \fBbundle install\fR can be avoided by using the flag \fB\-\-skip\-install\fR\.
 .
 .P
 Example:
@@ -25,6 +25,9 @@ bundle add rails \-\-version "< 3\.0, > 1\.1"
 bundle add rails \-\-version "~> 5\.0\.0" \-\-source "https://gems\.example\.com" \-\-group "development"
 .
 .P
+bundle add rails \-\-skip\-install
+.
+.P
 bundle add rails \-\-group "development, test"
 .
 .SH "OPTIONS"
@@ -40,4 +43,16 @@ Specify the group(s) for the added gem\. Multiple groups should be separated by
 .TP
 \fB\-\-source\fR, , \fB\-s\fR
 Specify the source for the added gem\.
+.
+.TP
+\fB\-\-skip\-install\fR
+Adds the gem to the Gemfile but does not install it\.
+.
+.TP
+\fB\-\-optimistic\fR
+Adds optimistic declaration of version
+.
+.TP
+\fB\-\-strict\fR
+Adds strict declaration of version
 

data/man/bundle-add.1.txt

@@ -7,10 +7,11 @@ NAME
 
 SYNOPSIS
        bundle	  add	  GEM_NAME     [--group=GROUP]	   [--version=VERSION]
-       [--source=SOURCE]
+       [--source=SOURCE] [--skip-install] [--strict] [--optimistic]
 
 DESCRIPTION
-       Adds the named gem to the Gemfile and run bundle install.
+       Adds the named gem to  the  Gemfile  and  run  bundle  install.	bundle
+       install can be avoided by using the flag --skip-install.
 
        Example:
 
@@ -18,9 +19,11 @@ DESCRIPTION
 
        bundle add rails --version "< 3.0, > 1.1"
 
-       bundle add rails  --version  "~>  5.0.0"  --source  "https://gems.exam-
+       bundle  add  rails  --version  "~>  5.0.0" --source "https://gems.exam-
        ple.com" --group "development"
 
+       bundle add rails --skip-install
+
        bundle add rails --group "development, test"
 
 OPTIONS
@@ -28,13 +31,22 @@ OPTIONS
 	      Specify version requirements(s) for the added gem.
 
        --group, -g
-	      Specify  the  group(s) for the added gem. Multiple groups should
+	      Specify the group(s) for the added gem. Multiple	groups	should
 	      be separated by commas.
 
        --source, , -s
 	      Specify the source for the added gem.
 
+       --skip-install
+	      Adds the gem to the Gemfile but does not install it.
+
+       --optimistic
+	      Adds optimistic declaration of version
+
+       --strict
+	      Adds strict declaration of version
+
 
 
 
-				 October 2018			 BUNDLE-ADD(1)
+				September 2018			 BUNDLE-ADD(1)

data/man/bundle-add.ronn

@@ -3,10 +3,10 @@ bundle-add(1) -- Add gem to the Gemfile and run bundle install
 
 ## SYNOPSIS
 
-`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE]
+`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE] [--skip-install] [--strict] [--optimistic]
 
 ## DESCRIPTION
-Adds the named gem to the Gemfile and run `bundle install`.
+Adds the named gem to the Gemfile and run `bundle install`. `bundle install` can be avoided by using the flag `--skip-install`.
 
 Example:
 
@@ -16,6 +16,8 @@ bundle add rails --version "< 3.0, > 1.1"
 
 bundle add rails --version "~> 5.0.0" --source "https://gems.example.com" --group "development"
 
+bundle add rails --skip-install
+
 bundle add rails --group "development, test"
 
 ## OPTIONS
@@ -27,3 +29,12 @@ bundle add rails --group "development, test"
 
 * `--source`, , `-s`:
   Specify the source for the added gem.
+
+* `--skip-install`:
+  Adds the gem to the Gemfile but does not install it.
+
+* `--optimistic`:
+  Adds optimistic declaration of version
+
+* `--strict`:
+  Adds strict declaration of version

data/man/bundle-binstubs.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-BINSTUBS" "1" "October 2018" "" ""
+.TH "BUNDLE\-BINSTUBS" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems

data/man/bundle-binstubs.1.txt

@@ -45,4 +45,4 @@ BUNDLE INSTALL --BINSTUBS
 
 
 
-				 October 2018		    BUNDLE-BINSTUBS(1)
+				September 2018		    BUNDLE-BINSTUBS(1)

data/man/bundle-check.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CHECK" "1" "October 2018" "" ""
+.TH "BUNDLE\-CHECK" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems

data/man/bundle-check.1.txt

@@ -30,4 +30,4 @@ OPTIONS
 
 
 
-				 October 2018		       BUNDLE-CHECK(1)
+				September 2018		       BUNDLE-CHECK(1)

data/man/bundle-clean.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CLEAN" "1" "October 2018" "" ""
+.TH "BUNDLE\-CLEAN" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory

data/man/bundle-clean.1.txt

@@ -23,4 +23,4 @@ OPTIONS
 
 
 
-				 October 2018		       BUNDLE-CLEAN(1)
+				September 2018		       BUNDLE-CLEAN(1)

data/man/bundle-config.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CONFIG" "1" "October 2018" "" ""
+.TH "BUNDLE\-CONFIG" "1" "September 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-config\fR \- Set bundler configuration options
@@ -178,6 +178,9 @@ The following is a list of all configuration keys and their purpose\. You can le
 \fBdisable_multisource\fR (\fBBUNDLE_DISABLE_MULTISOURCE\fR): When set, Gemfiles containing multiple sources will produce errors instead of warnings\. Use \fBbundle config \-\-delete disable_multisource\fR to unset\.
 .
 .IP "\(bu" 4
+\fBdisable_platform_warnings\fR (\fBBUNDLE_DISABLE_PLATFORM_WARNINGS\fR): Disable warnings during bundle install when a dependency is unused on the current platform\.
+.
+.IP "\(bu" 4
 \fBdisable_shared_gems\fR (\fBBUNDLE_DISABLE_SHARED_GEMS\fR): Stop Bundler from accessing gems installed to RubyGems\' normal location\.
 .
 .IP "\(bu" 4
@@ -202,6 +205,9 @@ The following is a list of all configuration keys and their purpose\. You can le
 \fBglobal_gem_cache\fR (\fBBUNDLE_GLOBAL_GEM_CACHE\fR): Whether Bundler should cache all gems globally, rather than locally to the installing Ruby installation\.
 .
 .IP "\(bu" 4
+\fBglobal_path_appends_ruby_scope\fR (\fBBUNDLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE\fR): Whether Bundler should append the Ruby scope (e\.g\. engine and ABI version) to a globally\-configured path\.
+.
+.IP "\(bu" 4
 \fBignore_messages\fR (\fBBUNDLE_IGNORE_MESSAGES\fR): When set, no post install messages will be printed\. To silence a single gem, use dot notation like \fBignore_messages\.httparty true\fR\.
 .
 .IP "\(bu" 4
@@ -232,6 +238,9 @@ The following is a list of all configuration keys and their purpose\. You can le
 \fBpath\.system\fR (\fBBUNDLE_PATH__SYSTEM\fR): Whether Bundler will install gems into the default system path (\fBGem\.dir\fR)\.
 .
 .IP "\(bu" 4
+\fBpath_relative_to_cwd\fR (\fBPATH_RELATIVE_TO_CWD\fR) Makes \fB\-\-path\fR relative to the CWD instead of the \fBGemfile\fR\.
+.
+.IP "\(bu" 4
 \fBplugins\fR (\fBBUNDLE_PLUGINS\fR): Enable Bundler\'s experimental plugin system\.
 .
 .IP "\(bu" 4

data/man/bundle-config.1.txt

@@ -205,6 +205,10 @@ LIST OF AVAILABLE KEYS
 	   files containing multiple sources will produce  errors  instead  of
 	   warnings.  Use bundle config --delete disable_multisource to unset.
 
+       o   disable_platform_warnings (BUNDLE_DISABLE_PLATFORM_WARNINGS):  Dis-
+	   able  warnings during bundle install when a dependency is unused on
+	   the current platform.
+
        o   disable_shared_gems (BUNDLE_DISABLE_SHARED_GEMS): Stop Bundler from
 	   accessing gems installed to RubyGems' normal location.
 
@@ -238,41 +242,49 @@ LIST OF AVAILABLE KEYS
 	   cache all gems globally, rather than locally to the installing Ruby
 	   installation.
 
+       o   global_path_appends_ruby_scope				 (BUN-
+	   DLE_GLOBAL_PATH_APPENDS_RUBY_SCOPE): Whether Bundler should	append
+	   the	Ruby scope (e.g. engine and ABI version) to a globally-config-
+	   ured path.
+
        o   ignore_messages (BUNDLE_IGNORE_MESSAGES): When set, no post install
 	   messages will be printed. To silence a single gem, use dot notation
 	   like ignore_messages.httparty true.
 
-       o   init_gems_rb  (BUNDLE_INIT_GEMS_RB) Generate a gems.rb instead of a
+       o   init_gems_rb (BUNDLE_INIT_GEMS_RB) Generate a gems.rb instead of  a
 	   Gemfile when running bundle init.
 
-       o   jobs (BUNDLE_JOBS): The number of gems Bundler can install in  par-
+       o   jobs  (BUNDLE_JOBS): The number of gems Bundler can install in par-
 	   allel. Defaults to 1.
 
        o   list_command (BUNDLE_LIST_COMMAND) Enable new list command feature
 
-       o   major_deprecations	(BUNDLE_MAJOR_DEPRECATIONS):  Whether  Bundler
+       o   major_deprecations  (BUNDLE_MAJOR_DEPRECATIONS):  Whether   Bundler
 	   should print deprecation warnings for behavior that will be changed
 	   in the next major version.
 
-       o   no_install  (BUNDLE_NO_INSTALL): Whether bundle package should skip
+       o   no_install (BUNDLE_NO_INSTALL): Whether bundle package should  skip
 	   installing gems.
 
-       o   no_prune (BUNDLE_NO_PRUNE): Whether Bundler should  leave  outdated
+       o   no_prune  (BUNDLE_NO_PRUNE):  Whether Bundler should leave outdated
 	   gems unpruned when caching.
 
        o   only_update_to_newer_versions     (BUNDLE_ONLY_UPDATE_TO_NEWER_VER-
 	   SIONS): During bundle update, only resolve to newer versions of the
 	   gems in the lockfile.
 
-       o   path  (BUNDLE_PATH):  The  location	on disk where all gems in your
+       o   path (BUNDLE_PATH): The location on disk where  all	gems  in  your
 	   bundle will be located regardless of $GEM_HOME or $GEM_PATH values.
-	   Bundle  gems not found in this location will be installed by bundle
-	   install. Defaults to Gem.dir. When --deployment is  used,  defaults
+	   Bundle gems not found in this location will be installed by	bundle
+	   install.  Defaults  to Gem.dir. When --deployment is used, defaults
 	   to vendor/bundle.
 
-       o   path.system	(BUNDLE_PATH__SYSTEM):	Whether  Bundler  will install
+       o   path.system (BUNDLE_PATH__SYSTEM):  Whether	Bundler  will  install
 	   gems into the default system path (Gem.dir).
 
+       o   path_relative_to_cwd  (PATH_RELATIVE_TO_CWD)  Makes --path relative
+	   to the CWD instead of the Gemfile.
+
        o   plugins (BUNDLE_PLUGINS): Enable Bundler's experimental plugin sys-
 	   tem.
 
@@ -498,4 +510,4 @@ CREDENTIALS FOR GEM SOURCES
 
 
 
-				 October 2018		      BUNDLE-CONFIG(1)
+				September 2018		      BUNDLE-CONFIG(1)