bundler 1.9.10 → 1.10.0.pre

data/lib/bundler/source/path/installer.rb

@@ -7,34 +7,31 @@ module Bundler
 
         def initialize(spec, options = {})
           @spec              = spec
+          @tmp_bin_dir       = "#{Bundler.tmp(spec.full_name)}/bin"
+          @gem_bin_dir       = "#{Bundler.rubygems.gem_dir}/bin"
+          @bin_dir           = Bundler.requires_sudo? ? @tmp_bin_dir : @gem_bin_dir
           @gem_dir           = Bundler.rubygems.path(spec.full_gem_path)
           @wrappers          = options[:wrappers] || true
           @env_shebang       = options[:env_shebang] || true
           @format_executable = options[:format_executable] || false
           @build_args        = options[:build_args] || Bundler.rubygems.build_args
-          @gem_bin_dir       = "#{Bundler.rubygems.gem_dir}/bin"
-
-          if Bundler.requires_sudo?
-            @tmp_dir = Bundler.tmp(spec.full_name).to_s
-            @bin_dir = "#{@tmp_dir}/bin"
-          else
-            @bin_dir = @gem_bin_dir
-          end
         end
 
         def generate_bin
           return if spec.executables.nil? || spec.executables.empty?
 
+          if Bundler.requires_sudo?
+            FileUtils.mkdir_p(@tmp_bin_dir) unless File.exist?(@tmp_bin_dir)
+          end
+
           super
 
           if Bundler.requires_sudo?
             Bundler.mkdir_p @gem_bin_dir
             spec.executables.each do |exe|
-              Bundler.sudo "cp -R #{@bin_dir}/#{exe} #{@gem_bin_dir}"
+              Bundler.sudo "cp -R #{@tmp_bin_dir}/#{exe} #{@gem_bin_dir}"
             end
           end
-        ensure
-          Bundler.rm_rf(@tmp_dir) if Bundler.requires_sudo?
         end
       end
 

data/lib/bundler/source/rubygems.rb

@@ -5,6 +5,8 @@ require 'rubygems/spec_fetcher'
 module Bundler
   class Source
     class Rubygems < Source
+      autoload :Remote, "bundler/source/rubygems/remote"
+
       # Use the API when installing less than X gems
       API_REQUEST_LIMIT = 500
       # Ask for X gems per API request
@@ -83,15 +85,28 @@ module Bundler
         end
       end
 
-      def install(spec)
-        return ["Using #{version_message(spec)}", nil] if installed_specs[spec].any?
+      def install(spec, opts = {})
+        force = opts[:force]
+        ensure_builtin_gems_cached = opts[:ensure_builtin_gems_cached]
+
+        if ensure_builtin_gems_cached && builtin_gem?(spec)
+          if !cached_path(spec)
+            cached_built_in_gem(spec) unless spec.remote
+            force = true
+          else
+            spec.loaded_from = loaded_from(spec)
+          end
+        end
+
+        return ["Using #{version_message(spec)}", nil] if installed_specs[spec].any? && !force
+
 
         # Download the gem to get the spec, because some specs that are returned
         # by rubygems.org are broken and wrong.
-        if spec.source_uri
+        if spec.remote
           # Check for this spec from other sources
-          uris = [spec.source_uri.without_credentials]
-          uris += source_uris_for_spec(spec)
+          uris = [spec.remote.anonymized_uri]
+          uris += remotes_for_spec(spec).map { |remote| remote.anonymized_uri }
           uris.uniq!
           Installer.ambiguous_gems << [spec.name, *uris] if uris.length > 1
 
@@ -145,7 +160,9 @@ module Bundler
         spec.loaded_from = loaded_from(spec)
         ["Installing #{version_message(spec)}", spec.post_install_message]
       ensure
-        Bundler.rm_rf(install_path) if Bundler.requires_sudo?
+        if install_path && Bundler.requires_sudo?
+          FileUtils.remove_entry_secure(install_path)
+        end
       end
 
       def cache(spec, custom_path = nil)
@@ -196,7 +213,8 @@ module Bundler
 
       def fetchers
         @fetchers ||= remotes.map do |uri|
-            Bundler::Fetcher.new(uri)
+          remote = Source::Rubygems::Remote.new(uri)
+          Bundler::Fetcher.new(remote)
         end
       end
 
@@ -206,11 +224,9 @@ module Bundler
         remotes.map(&method(:suppress_configured_credentials))
       end
 
-    private
-
-      def source_uris_for_spec(spec)
+      def remotes_for_spec(spec)
         specs.search_all(spec.name).inject([]) do |uris, s|
-          uris << s.source_uri.without_credentials if s.source_uri
+          uris << s.remote if s.remote
           uris
         end
       end
@@ -296,7 +312,7 @@ module Bundler
       end
 
       def api_fetchers
-        fetchers.select{|f| f.use_api }
+        fetchers.select(&:use_api)
       end
 
       def remote_specs
@@ -337,7 +353,7 @@ module Bundler
               end
             end until idxcount == idx.size
 
-            if api_fetchers.any? && api_fetchers.all?{|f| f.use_api }
+            if api_fetchers.any?
               # it's possible that gems from one source depend on gems from some
               # other source, so now we download gemspecs and iterate over those
               # dependencies, looking for gems we don't have info on yet.
@@ -354,7 +370,7 @@ module Bundler
             end
           end
 
-          if !allow_api
+          unless allow_api
             api_fetchers.each do |f|
               Bundler.ui.info "Fetching source index from #{f.uri}"
               idx.use f.specs(nil, self)
@@ -364,8 +380,22 @@ module Bundler
       end
 
       def fetch_gem(spec)
-        return false unless spec.source_uri
-        Fetcher.download_gem_from_uri(spec, spec.source_uri.original_uri)
+        return false unless spec.remote
+        uri = spec.remote.uri
+        spec.fetch_platform
+
+        download_path = Bundler.requires_sudo? ? Bundler.tmp(spec.full_name) : Bundler.rubygems.gem_dir
+        gem_path = "#{Bundler.rubygems.gem_dir}/cache/#{spec.full_name}.gem"
+
+        FileUtils.mkdir_p("#{download_path}/cache")
+        Bundler.rubygems.download_gem(spec, uri, download_path)
+
+        if Bundler.requires_sudo?
+          Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/cache"
+          Bundler.sudo "mv #{Bundler.tmp(spec.full_name)}/cache/#{spec.full_name}.gem #{gem_path}"
+        end
+
+        gem_path
       end
 
       def builtin_gem?(spec)

data/lib/bundler/source/rubygems/remote.rb

@@ -0,0 +1,39 @@
+module Bundler
+  class Source
+    class Rubygems
+      class Remote
+        attr_reader :uri,
+                    :anonymized_uri
+
+        def initialize(uri)
+          uri = Bundler.settings.mirror_for(uri)
+          fallback_auth = Bundler.settings.credentials_for(uri)
+
+          @uri = apply_auth(uri, fallback_auth).freeze
+          @anonymized_uri = remove_auth(@uri).freeze
+        end
+
+      private
+
+        def apply_auth(uri, auth)
+          if auth && uri.userinfo.nil?
+            uri = uri.dup
+            uri.userinfo = auth
+          end
+
+          uri
+        end
+
+        def remove_auth(uri)
+          if uri.userinfo
+            uri = uri.dup
+            uri.user = uri.password = nil
+          end
+
+          uri
+        end
+
+      end
+    end
+  end
+end

data/lib/bundler/templates/newgem/.travis.yml.tt

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - <%= RUBY_VERSION %>
+before_install: gem install bundler -v <%= Bundler::VERSION %>

data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt

@@ -2,7 +2,7 @@
 
 As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
 
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
 
 Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
 
@@ -10,4 +10,4 @@ Project maintainers have the right and responsibility to remove, edit, or reject
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
 
-This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

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

@@ -4,6 +4,8 @@ require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
 task :default => :test

data/lib/bundler/templates/newgem/test/{test_newgem.rb.tt → newgem_test.rb.tt}

@@ -1,6 +1,6 @@
-require 'minitest_helper'
+require 'test_helper'
 
-class Test<%= config[:constant_name] %> < Minitest::Test
+class <%= config[:constant_name] %>Test < Minitest::Test
   def test_that_it_has_a_version_number
     refute_nil ::<%= config[:constant_name] %>::VERSION
   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.9.10" unless defined?(::Bundler::VERSION)
+  VERSION = "1.10.0.pre" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-config.ronn

@@ -35,6 +35,10 @@ local and global sources. Not compatible with --global or --local flag.
 Executing bundle with the `BUNDLE_IGNORE_CONFIG` environment variable set will
 cause it to ignore all configuration.
 
+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.
+
 ## BUILD OPTIONS
 
 You can use `bundle config` to give bundler the flags to pass to the gem
@@ -108,6 +112,9 @@ learn more about their operation in [bundle install(1)][bundle-install].
 * `disable_multisource` (`BUNDLE_DISABLE_MULTISOURCE`): When set, Gemfiles
   containing multiple sources will produce errors instead of warnings. Use
   `bundle config --delete disable_multisource` to unset.
+* `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`.
 
 In general, you should set these settings per-application by using the applicable
 flag to the [bundle install(1)][bundle-install] or [bundle package(1)][bundle-package] command.

data/man/bundle-install.ronn

@@ -20,6 +20,7 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
                  [--standalone[=GROUP[ GROUP...]]]
                  [--trust-policy=POLICY]
                  [--without=GROUP[ GROUP...]]
+                 [--with=GROUP[ GROUP...]]
 
 ## DESCRIPTION
 
@@ -127,8 +128,16 @@ update process below under [CONSERVATIVE UPDATING][].
 
 * `--without=<list>`:
   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].
+
 
 ## DEPLOYMENT MODE
 

data/man/bundle.ronn

@@ -67,6 +67,9 @@ We divide `bundle` subcommands into primary commands and utilities.
 * `bundle open(1)`:
   Open an installed gem in the editor
 
+* `bundle lock(1)`:
+  Generate a lockfile for your dependencies
+
 * `bundle viz(1)`:
   Generate a visual representation of your dependencies
 
@@ -92,7 +95,4 @@ and execute it, passing down any extra arguments to it.
 
 These commands are obsolete and should no longer be used
 
-* `bundle lock(1)`
-* `bundle unlock(1)`
 * `bundle cache(1)`
-

data/man/gemfile.5.ronn

@@ -430,11 +430,15 @@ applied to a group of gems by using block form.
       gem "sqlite3"
     end
 
-    group :development do
+    group :development, :optional => true do
       gem "wirble"
       gem "faker"
     end
 
+In the case of the group block form the :optional option can be given
+to prevent a group from being installed unless listed in the `--with`
+option given to the `bundle install` command.
+
 In the case of the `git` block form, the `:ref`, `:branch`, `:tag`,
 and `:submodules` options may be passed to the `git` method, and
 all gems in the block will inherit those options.
@@ -453,10 +457,10 @@ files in your test code as you would if the project were installed as a gem; you
 need not manipulate the load path manually or require project files via relative
 paths.
 
-The `gemspec` method supports optional `:path`, `:name`, and `:development_group`
-options, which control where bundler looks for the `.gemspec`, what named
-`.gemspec` it uses (if more than one is present), and which group development
-dependencies are included in.
+The `gemspec` method supports optional `:path`, `:glob`, `:name`, and `:development_group`
+options, which control where bundler looks for the `.gemspec`, the glob it uses to look
+for the gemspec (defaults to: "{,*,*/*}.gemspec"), what named `.gemspec` it uses
+(if more than one is present), and which group development dependencies are included in.
 
 ## SOURCE PRIORITY
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.9.10
+  version: 1.10.0.pre
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -104,13 +104,11 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- UPGRADING.md
 - bin/bundle
 - bin/bundle_ruby
 - bin/bundler
 - bundler.gemspec
 - lib/bundler.rb
-- lib/bundler/anonymizable_uri.rb
 - lib/bundler/capistrano.rb
 - lib/bundler/cli.rb
 - lib/bundler/cli/binstubs.rb
@@ -125,6 +123,7 @@ files:
 - lib/bundler/cli/init.rb
 - lib/bundler/cli/inject.rb
 - lib/bundler/cli/install.rb
+- lib/bundler/cli/lock.rb
 - lib/bundler/cli/open.rb
 - lib/bundler/cli/outdated.rb
 - lib/bundler/cli/package.rb
@@ -144,6 +143,10 @@ files:
 - lib/bundler/env.rb
 - lib/bundler/environment.rb
 - lib/bundler/fetcher.rb
+- lib/bundler/fetcher/base.rb
+- lib/bundler/fetcher/dependency.rb
+- lib/bundler/fetcher/downloader.rb
+- lib/bundler/fetcher/index.rb
 - lib/bundler/friendly_errors.rb
 - lib/bundler/gem_helper.rb
 - lib/bundler/gem_helpers.rb
@@ -153,7 +156,9 @@ files:
 - lib/bundler/graph.rb
 - lib/bundler/index.rb
 - lib/bundler/injector.rb
+- lib/bundler/inline.rb
 - lib/bundler/installer.rb
+- lib/bundler/installer/parallel_installer.rb
 - lib/bundler/lazy_specification.rb
 - lib/bundler/lockfile_parser.rb
 - lib/bundler/man/bundle
@@ -192,6 +197,7 @@ files:
 - lib/bundler/source/path.rb
 - lib/bundler/source/path/installer.rb
 - lib/bundler/source/rubygems.rb
+- lib/bundler/source/rubygems/remote.rb
 - lib/bundler/source_list.rb
 - lib/bundler/spec_set.rb
 - lib/bundler/ssl_certs/.document
@@ -224,8 +230,8 @@ files:
 - lib/bundler/templates/newgem/rspec.tt
 - lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
 - lib/bundler/templates/newgem/spec/spec_helper.rb.tt
-- lib/bundler/templates/newgem/test/minitest_helper.rb.tt
-- lib/bundler/templates/newgem/test/test_newgem.rb.tt
+- lib/bundler/templates/newgem/test/newgem_test.rb.tt
+- lib/bundler/templates/newgem/test/test_helper.rb.tt
 - lib/bundler/ui.rb
 - lib/bundler/ui/rg_proxy.rb
 - lib/bundler/ui/shell.rb
@@ -309,9 +315,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
-has_rdoc: 

data/UPGRADING.md

@@ -1,103 +0,0 @@
-## Bundler 0.9 to 1.0 and above
-
-Upgrading from Bundler 0.9 to 1.0 is relatively painless. The
-Gemfile API is the same, so your old Gemfiles should continue
-to work.
-
-The "env" file that 0.9 created at `.bundle/environment.rb` has been
-removed. As a side effect of this, Passenger will only find your
-bundled gems if you install with `bundle install --deployment`.
-Alternatively, you can tell Passenger where you gems are installed,
-[something like this](http://andre.arko.net/2010/08/16/using-passengerpane-with-gem_home-set/).
-
-The `bundle lock` command is no longer needed, as the
-Gemfile.lock file is now automatically generated by `bundle install`.
-If you have not yet done so, add your Gemfile.lock to source control
-and check it in.
-
-Running `bundle install` no longer updates the versions of your gems.
-If you need to update just one gem, run `bundle update GEMNAME`. To
-update all gems to the newest versions possible, run `bundle update`.
-
-Bundler now supports multiple platforms, using a block syntax to
-declare platform-specific gems:
-
-    platform :jruby do
-      gem "jruby-maven-plugins"
-    end
-
-Deploying using Bundler is even easier than it was before, as Bundler
-now includes a Capistrano recipe. Simply add this line to the top of
-your deploy.rb file to run Bundler automatically as part of deploying:
-
-    require 'bundler/capistrano'
-
-For more details on deploying using bundler, see the documentation
-for the bundler cap task, and the [documentation on deploying](http://bundler.io/deploying.html).
-
-
-## Bundler 0.8 to 0.9 and above
-
-Upgrading to Bundler 0.9 from Bundler 0.8 requires upgrading several
-API calls in your Gemfile, and some workarounds if you are using Rails 2.3.
-
-### Gemfile Removals
-
-Bundler 0.9 removes the following Bundler 0.8 Gemfile APIs:
-
-1. `disable_system_gems`: This is now the default (and only) option
-   for bundler. Bundler uses the system gems you have specified
-   in the Gemfile, and only the system gems you have specified
-   (and their dependencies)
-2. `disable_rubygems`: This is no longer supported. We are looking
-   into ways to get the fastest performance out of each supported
-   scenario, and we will make speed the default where possible.
-3. `clear_sources`: Bundler now defaults to an empty source
-   list. If you want to include Rubygems, you can add the source
-   via source "http://gemcutter.org". If you use bundle init, this
-   source will be automatically added for you in the generated
-   Gemfile
-4. `bundle_path`: You can specify this setting when installing
-   via `bundle install /path/to/bundle`. Bundler will remember
-   where you installed the dependencies to on a particular
-   machine for future installs, loads, setups, etc.
-5. `bin_path`: Bundler no longer generates executables in the root
-   of your app. You should use `bundle exec` to execute executables
-   in the current context.
-
-### Gemfile Changes
-
-Bundler 0.9 changes the following Bundler 0.8 Gemfile APIs:
-
-1. Bundler 0.8 supported :only and :except as APIs for describing
-   groups of gems. Bundler 0.9 supports a single `group` method,
-   which you can use to group gems together. See the above "Group"
-   section for more information.
-
-   This means that `gem "foo", :only => :production` becomes
-   `gem "foo", :group => :production`, and
-   `only :production { gem "foo" }` becomes
-   `group :production { gem "foo" }`
-
-   The short version is: group your gems together logically, and
-   use the available commands to make use of the groups you've
-   created.
-
-2. `:require_as` becomes `:require`
-
-3. `:vendored_at` is fully removed; you should use `:path`
-
-### API Changes
-
-1. `Bundler.require_env(:environment)` becomes
-   `Bundler.require(:multiple, :groups)`. You must
-   now specify the default group (the default group is the
-   group made up of the gems not assigned to any group)
-   explicitly. So `Bundler.require_env(:test)` becomes
-   `Bundler.require(:default, :test)`
-
-2. `require 'vendor/gems/environment'`: In unlocked
-   mode, where using system gems, this becomes
-   `Bundler.setup(:multiple, :groups)`. If you don't
-   specify any groups, this puts all groups on the load
-   path. In locked mode, it becomes `require '.bundle/environment'`