bundler 1.6.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bea44bed0acb6398c570a3ff7e7aa290b3e52a50
-  data.tar.gz: 121da52822f43b573e430a7df36670ee33dd3c9b
+  metadata.gz: 514d77e74e81418428edca7b774b56082fee292c
+  data.tar.gz: 694eb7f3cf2278bb50637d973dec8e02054c1fe3
 SHA512:
-  metadata.gz: c2eac51c09a25749f854980cede45a0054c10b635384938fcf30e546bc28c4f79aaf8bbe79462b09211905289f22dbbbc4aa128af7fbb851b143dea04272ed75
-  data.tar.gz: bba562fb670cecb13c93baed2f98c35be0c1949a5f8fc1503c59c0b9e964354e27c82cf7453aa570ca41332c3f3138b95584152b21738d00ca9a665c2c6db96d
+  metadata.gz: 77c8f5a792c4618a3f4da292c65f6bc4fea3780a2daccda92113e7afe614b944fdf8e07293df2caeb87a5a07bda8f722f21bfb76959a75bf0f9b6164943c5ce0
+  data.tar.gz: b879d8871d105907e90ddd6d1aa301d8fdeb250bb1f4d901f8cc2b2920f8873b84beca5812ee7410821480d3df0b176ae893254b4424a329189a6b8734849f1f

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.6.7 (2014-10-19)
+
+Features:
+
+  - warn to upgrade when using useless source blocks (@danfinnie)
+
+Documentation:
+
+  - explain how to use gem server credentials via ENV (@hwartig)
+
 ## 1.6.6 (2014-08-23)
 
 Bugfixes:

data/lib/bundler/dsl.rb

@@ -125,6 +125,13 @@ module Bundler
         return
       when String
         rubygems_source.add_remote source
+
+        if block_given?
+          Bundler.ui.warn "A block was passed to `source`, but Bundler versions " \
+            "prior to 1.7 ignore the block.  Please upgrade Bundler to 1.7 or " \
+            "specify your dependencies outside of the block passed to `source`."
+        end
+
         return
       else
         @source = source

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.6.6" unless defined?(::Bundler::VERSION)
+  VERSION = "1.6.7" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-config.ronn

@@ -145,11 +145,26 @@ Finally, Bundler also ensures that the current revision in the
 `Gemfile.lock` exists in the local git repository. By doing this, Bundler
 forces you to fetch the latest changes in the remotes.
 
-## MIRRORS OF GEM REPOSITORIES
+## MIRRORS OF GEM SOURCES
 
 Bundler supports overriding gem sources with mirrors. This allows you to
 configure rubygems.org as the gem source in your Gemfile while still using your
 mirror to fetch gems.
 
+    bundle config mirror.SOURCE_URL MIRROR_URL
+
+For example, to use a mirror of rubygems.org hosted at
+
     bundle config mirror.http://rubygems.org http://rubygems-mirror.org
 
+## CREDENTIALS FOR GEM SOURCES
+
+Bundler allows you to configure credentials for any gem source, which allows
+you to avoid putting secrets into your Gemfile.
+
+    bundle config SOURCE_URL USERNAME:PASSWORD
+
+For example, to save the credentials of user `claudette` for the gem source at
+`gems.longerous.com`, you would run:
+
+    bundle config https://gems.longerous.com/ claudette:s00pers3krit

data/man/gemfile.5.ronn

@@ -26,6 +26,23 @@ might contain the gems listed in the `Gemfile`.
 Each of these _source_s `MUST` be a valid Rubygems repository. Sources are
 checked for gems following the heuristics described in [SOURCE PRIORITY][].
 
+### CREDENTIALS (#credentials)
+
+Some gem sources require a username and password. Use `bundle config` to set
+the username and password for any sources that need it. The command must be run
+once on each computer that will install the Gemfile, but this keeps the
+credentials from being stored in plain text in version control.
+
+    bundle config https://gems.example.com/ user:password
+
+For some sources, like a company Gemfury account, it may be easier to simply
+include the credentials in the Gemfile as part of the source URL.
+
+    source "https://user:password@gems.example.com"
+
+Credentials in the source URL will take precedence over credentials set using
+`config`.
+
 ## RUBY (#ruby)
 
 If your application requires a specific Ruby version or engine, specify your

data/spec/install/gemfile_spec.rb

@@ -41,4 +41,29 @@ describe "bundle install" do
     end
   end
 
+  context "with future features" do
+    context "when source is used with a block" do
+      it "reports that sources with a block is not supported" do
+        gemfile <<-G
+          source 'http://rubygems.example.org' do
+            gem 'rack'
+          end
+        G
+
+        bundle :install
+        expect(out).to match(/A block was passed to `source`/)
+      end
+    end
+
+    context "when source is used without a block" do
+      it "prints no warnings" do
+        gemfile <<-G
+          source 'http://rubygems.example.org'
+        G
+
+        bundle :install
+        expect(out).not_to match(/A block was passed to `source`/)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount