bundler 1.13.0.rc.1 → 1.13.0.rc.2

data/lib/bundler/ui/silent.rb

@@ -3,6 +3,7 @@ module Bundler
   module UI
     class Silent
       def add_color(string, color)
+        string
       end
 
       def info(message, newline = nil)
@@ -40,9 +41,6 @@ module Bundler
       def trace(message, newline = nil)
       end
 
-      def major_deprecation(message)
-      end
-
       def silence
         yield
       end

data/lib/bundler/vendor/compact_index_client/lib/compact_index_client.rb

@@ -60,9 +60,8 @@ class Bundler::CompactIndexClient
 private
 
   def update(local_path, remote_path)
-    return if @endpoints.include?(remote_path)
+    return unless @endpoints.add?(remote_path)
     @updater.update(local_path, url(remote_path))
-    @endpoints << remote_path
   end
 
   def update_info(name)

data/lib/bundler/vendor/compact_index_client/lib/compact_index_client/cache.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+require "digest/md5"
 class Bundler::CompactIndexClient
   class Cache
     attr_reader :directory
 
     def initialize(directory)
       @directory = Pathname.new(directory).expand_path
-      FileUtils.mkdir_p info_path(nil)
+      info_roots.each {|dir| FileUtils.mkdir_p(dir) }
     end
 
     def names
@@ -59,7 +60,13 @@ class Bundler::CompactIndexClient
     end
 
     def info_path(name)
-      directory.join("info", name.to_s)
+      name = name.to_s
+      if name =~ /[^a-z0-9_-]/
+        name += "-#{Digest::MD5.hexdigest(name).downcase}"
+        info_roots.last.join(name)
+      else
+        info_roots.first.join(name)
+      end
     end
 
     def specific_dependency(name, version, platform)
@@ -94,5 +101,12 @@ class Bundler::CompactIndexClient
       dependency[-1] = dependency[-1].split("&") if dependency.size > 1
       dependency
     end
+
+    def info_roots
+      [
+        directory.join("info"),
+        directory.join("info-special-characters"),
+      ]
+    end
   end
 end

data/lib/bundler/version.rb

@@ -7,5 +7,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.13.0.rc.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.13.0.rc.2" unless defined?(::Bundler::VERSION)
 end

data/lib/bundler/yaml_serializer.rb

@@ -16,6 +16,8 @@ module Bundler
         yaml << k << ":"
         if v.is_a?(Hash)
           yaml << dump_hash(v).gsub(/^(?!$)/, "  ") # indent all non-empty lines
+        elsif v.is_a?(Array) # Expected to be array of strings
+          yaml << "\n- " << v.map {|s| s.to_s.gsub(/\s+/, " ").inspect }.join("\n- ") << "\n"
         else
           yaml << " " << v.to_s.gsub(/\s+/, " ").inspect << "\n"
         end
@@ -23,11 +25,20 @@ module Bundler
       yaml
     end
 
-    SCAN_REGEX = /
+    ARRAY_REGEX = /
+      ^
+      (?:[ ]*-[ ]) # '- ' before array items
+      (['"]?) # optional opening quote
+      (.*) # value
+      \1 # matching closing quote
+      $
+    /xo
+
+    HASH_REGEX = /
       ^
       ([ ]*) # indentations
       (.*) # key
-      (?::(?=\s)) # :  (without the lookahead the #key includes this when : is present in value)
+      (?::(?=(?:\s|$))) # :  (without the lookahead the #key includes this when : is present in value)
       [ ]?
       (?: !\s)? # optional exclamation mark found with ruby 1.9.3
       (['"]?) # optional opening quote
@@ -39,15 +50,27 @@ module Bundler
     def load(str)
       res = {}
       stack = [res]
-      str.scan(SCAN_REGEX).each do |(indent, key, _, val)|
-        key = convert_to_backward_compatible_key(key)
-        depth = indent.scan(/  /).length
-        if val.empty?
-          new_hash = {}
-          stack[depth][key] = new_hash
-          stack[depth + 1] = new_hash
-        else
-          stack[depth][key] = val
+      last_hash = nil
+      last_empty_key = nil
+      str.split("\n").each do |line|
+        if match = HASH_REGEX.match(line)
+          indent, key, _, val = match.captures
+          key = convert_to_backward_compatible_key(key)
+          depth = indent.scan(/  /).length
+          if val.empty?
+            new_hash = {}
+            stack[depth][key] = new_hash
+            stack[depth + 1] = new_hash
+            last_empty_key = key
+            last_hash = stack[depth]
+          else
+            stack[depth][key] = val
+          end
+        elsif match = ARRAY_REGEX.match(line)
+          _, val = match.captures
+          last_hash[last_empty_key] = [] unless last_hash[last_empty_key].is_a?(Array)
+
+          last_hash[last_empty_key].push(val)
         end
       end
       res

data/man/bundle-binstubs.ronn

@@ -0,0 +1,29 @@
+bundle-binstubs(1) -- Install the binstubs of the listed gems
+=============================================================
+
+## SYNOPSIS
+
+`bundle binstubs` <GEM_NAME> [--force] [--path PATH] [--standalone]
+
+## DESCRIPTION
+
+This command generates binstubs for executables in `GEM_NAME`.
+Binstubs are put into `bin`, or the `--path` directory if one has been set.
+Calling binstubs with [GEM [GEM]] will create binstubs for all given gems.
+
+## OPTIONS
+
+* `--force`:
+  Overwrite existing binstubs if they exist.
+
+* `--path`:
+  The location to install the specified binstubs to. This defaults to `bin`.
+
+* `--standalone`:
+  Makes binstubs that can work without depending on Rubygems or Bundler at
+  runtime.
+
+## BUNDLE INSTALL --BINSTUBS
+
+To create binstubs for all the gems in the bundle you can use the `--binstubs`
+flag in [bundle install(1)][bundle-install].

data/man/bundle-config.ronn

@@ -39,6 +39,38 @@ Executing `bundle config disable_multisource true` upgrades the warning about
 the Gemfile containing multiple primary sources to an error. Executing `bundle
 config --delete disable_multisource` downgrades this error to a warning.
 
+## REMEMBERING OPTIONS
+
+Flags passed to `bundle install` or the Bundler runtime,
+such as `--path foo` or `--without production`, are not remembered between commands.
+If these options must be remembered,they must be set using `bundle config`
+(e.g., `bundle config path foo`).
+
+The options that can be configured are:
+
+* `binstubs`:
+  Creates a directory (defaults to `~/bin`) and place any executables from the
+  gem there. These executables run in Bundler's context. If used, you might add
+  this directory to your environment's `PATH` variable. For instance, if the
+  `rails` gem comes with a `rails` executable, this flag will create a
+  `bin/rails` executable that ensures that all referred dependencies will be
+  resolved using the bundled gems.
+
+* `deployment`:
+  In deployment mode, Bundler will 'roll-out' the bundle for
+  `production` use. Please check carefully if you want to have this option
+  enabled in `development` or `test` environments.
+
+* `path`:
+  The location to install the specified gems to. This defaults to Rubygems'
+  setting. Bundler shares this location with Rubygems, `gem install ...` will
+  have gem installed there, too. Therefore, gems installed without a
+  `--path ...` setting will show up by calling `gem list`. Accodingly, gems
+  installed to other locations will not get listed.
+
+* `without`:
+  A space-separated list of groups referencing gems to skip during installation.
+
 ## BUILD OPTIONS
 
 You can use `bundle config` to give bundler the flags to pass to the gem

data/man/bundle-install.ronn

@@ -43,6 +43,9 @@ update process below under [CONSERVATIVE UPDATING][].
 
 ## OPTIONS
 
+To apply any of `--deployment`, `--path`, `--binstubs`, or `--without` every
+time `bundle install` is run, use `bundle config` (see bundle-config(1)).
+
 * `--binstubs[=<directory>]`:
   Creates a directory (defaults to `~/bin`) and place any executables from the
   gem there. These executables run in Bundler's context. If used, you might add
@@ -93,7 +96,7 @@ update process below under [CONSERVATIVE UPDATING][].
 
 * `--system`:
   Installs the gems specified in the bundle to the system's Rubygems location.
-  This overrides any previous [remembered][REMEMBERED OPTIONS] use of `--path`.
+  This overrides any previous configuration of `--path`.
 
 * `--no-cache`:
   Do not update the cache in `vendor/cache` with the newly bundled gems. This
@@ -108,8 +111,7 @@ update process below under [CONSERVATIVE UPDATING][].
   setting. Bundler shares this location with Rubygems, `gem install ...` will
   have gem installed there, too. Therefore, gems installed without a
   `--path ...` setting will show up by calling `gem list`. Accodingly, gems
-  installed to other locations will not get listed. This setting is a
-  [remembered option][REMEMBERED OPTIONS].
+  installed to other locations will not get listed.
 
 * `--quiet`:
   Do not print progress information to the standard output. Instead, Bundler
@@ -142,14 +144,12 @@ update process below under [CONSERVATIVE UPDATING][].
   A space-separated list of groups referencing gems to skip during installation.
   If a group is given that is in the remembered list of groups given
   to --with, it is removed from that list.
-  This is a [remembered option][REMEMBERED OPTIONS].
 
 * `--with=<list>`:
   A space-separated list of groups referencing gems to install. If an
   optional group is given it is installed. If a group is given that is
   in the remembered list of groups given to --without, it is removed
-  from that list. This is a [remembered option][REMEMBERED OPTIONS].
-
+  from that list.
 
 ## DEPLOYMENT MODE
 
@@ -274,41 +274,6 @@ the vagaries of the dependency resolution process, this usually
 affects more than the gems you list in your Gemfile(5), and can
 (surprisingly) radically change the gems you are using.
 
-## REMEMBERED OPTIONS
-
-Some options (marked above in the [OPTIONS][] section) are remembered
-between calls to `bundle install`, and by the Bundler runtime.
-
-For instance, if you run `bundle install --without test`, a subsequent
-call to `bundle install` that does not include a `--without` flag will
-remember your previous choice.
-
-In addition, a call to `Bundler.setup` will not attempt to make the
-gems in those groups available on the Ruby load path, as they were
-not installed.
-
-The settings that are remembered are:
-
-* `--deployment`:
-  At runtime, this remembered setting will also result in Bundler
-  raising an exception if the `Gemfile.lock` is out of date.
-
-* `--path`:
-  Subsequent calls to `bundle install` will install gems to the
-  directory originally passed to `--path`. The Bundler runtime
-  will look for gems in that location. You can revert this
-  option by running `bundle install --system`.
-
-* `--binstubs`:
-  Bundler will update the executables every subsequent call to
-  `bundle install`.
-
-* `--without`:
-  As described above, Bundler will skip the gems specified by
-  `--without` in subsequent calls to `bundle install`. The
-  Bundler runtime will also not try to make the gems in the
-  skipped groups available.
-
 ## THE GEMFILE.LOCK
 
 When you run `bundle install`, Bundler will persist the full names

data/man/bundle-package.ronn

@@ -27,7 +27,7 @@ in your local bundler configuration.
 
 ## REMOTE FETCHING
 
-By default, if you simply run [bundle install(1)][bundle-install] after running
+By default, if you run [bundle install(1)][bundle-install] after running
 [bundle package(1)][bundle-package], bundler will still connect to `rubygems.org`
 to check whether a platform-specific gem exists for any of the gems
 in `vendor/cache`.

data/man/bundle.ronn

@@ -52,9 +52,6 @@ We divide `bundle` subcommands into primary commands and utilities.
   Determine whether the requirements for your application are installed
   and available to bundler
 
-* `bundle list(1)`:
-  Show all of the gems in the current bundle
-
 * `bundle show(1)`:
   Show the source location of a particular gem in the bundle
 
@@ -85,6 +82,9 @@ We divide `bundle` subcommands into primary commands and utilities.
 * `bundle clean(1)`:
   Clean up unused gems in your bundler directory
 
+* `bundle doctor(1)`:
+  Display warnings about common potential problems
+
 ## PLUGINS
 
 When running a command that isn't listed in PRIMARY COMMANDS or UTILITIES,
@@ -96,3 +96,4 @@ and execute it, passing down any extra arguments to it.
 These commands are obsolete and should no longer be used
 
 * `bundle cache(1)`
+* `bundle list(1)`

data/man/gemfile.5.ronn

@@ -42,7 +42,7 @@ credentials from being stored in plain text in version control.
 
     bundle config gems.example.com user:password
 
-For some sources, like a company Gemfury account, it may be easier to simply
+For some sources, like a company Gemfury account, it may be easier to
 include the credentials in the Gemfile as part of the source URL.
 
     source "https://user:password@gems.example.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.13.0.rc.1
+  version: 1.13.0.rc.2
 platform: ruby
 authors:
 - André Arko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.8
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.8
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
 email:
@@ -137,6 +137,7 @@ files:
 - lib/bundler/cli/common.rb
 - lib/bundler/cli/config.rb
 - lib/bundler/cli/console.rb
+- lib/bundler/cli/doctor.rb
 - lib/bundler/cli/exec.rb
 - lib/bundler/cli/gem.rb
 - lib/bundler/cli/init.rb
@@ -161,7 +162,6 @@ files:
 - lib/bundler/dsl.rb
 - lib/bundler/endpoint_specification.rb
 - lib/bundler/env.rb
-- lib/bundler/environment.rb
 - lib/bundler/environment_preserver.rb
 - lib/bundler/errors.rb
 - lib/bundler/fetcher.rb
@@ -175,6 +175,7 @@ files:
 - lib/bundler/gem_helpers.rb
 - lib/bundler/gem_remote_fetcher.rb
 - lib/bundler/gem_tasks.rb
+- lib/bundler/gem_version_promoter.rb
 - lib/bundler/graph.rb
 - lib/bundler/index.rb
 - lib/bundler/injector.rb
@@ -186,6 +187,8 @@ files:
 - lib/bundler/lazy_specification.rb
 - lib/bundler/lockfile_parser.rb
 - lib/bundler/man/bundle
+- lib/bundler/man/bundle-binstubs
+- lib/bundler/man/bundle-binstubs.txt
 - lib/bundler/man/bundle-config
 - lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle-exec
@@ -209,6 +212,7 @@ files:
 - lib/bundler/mirror.rb
 - lib/bundler/plugin.rb
 - lib/bundler/plugin/api.rb
+- lib/bundler/plugin/api/source.rb
 - lib/bundler/plugin/dsl.rb
 - lib/bundler/plugin/index.rb
 - lib/bundler/plugin/installer.rb
@@ -346,6 +350,7 @@ files:
 - lib/bundler/vlad.rb
 - lib/bundler/worker.rb
 - lib/bundler/yaml_serializer.rb
+- man/bundle-binstubs.ronn
 - man/bundle-config.ronn
 - man/bundle-exec.ronn
 - man/bundle-gem.ronn
@@ -377,9 +382,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
-has_rdoc: