bundler-pgs 0.7.4 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c9c0932962d7f6f4104ede28812bc3ea1f5f67e
-  data.tar.gz: dfd10843086f36d4462a706b2f851760a2058c1c
+  metadata.gz: 05f09a50f4d2b609c647a2812a56da73408c6e3f
+  data.tar.gz: c3c4c0c739164bd69365b080d814cd3662727c8a
 SHA512:
-  metadata.gz: 80f9bbf8819a7b86ebb37746baae9cf021dae4f9bf90a9adbe34001eda4f5dfec28eddf791bd29282b247b5a2c1803e5ce59e7aeeef5629dd17df3191bd1857d
-  data.tar.gz: b98b694620ac9b14d25faef3c9a42fa36864e22f236daebadf6c127f35c051735ccd0817f4839f21929169dab72137894e99567201efed5a397acc51c1a30a26
+  metadata.gz: 35740fcab017a8ca3a287f0b4566c5869fe6715168d9e11f95b02bb1e7ce0442535702c866ca689ff200a229e7525a9e890a748c21c43beed2067d243837a4e4
+  data.tar.gz: cd074bbce0092e19a24f6a86c1d6a663976b0d6f1aa2d29982eb0483dae294509f74a5c74111d3fcd8b3c70640d397f7fd78c946a1a544c0a9dbb576e5cf9b10

data/README.md

@@ -1,31 +1,30 @@
 # Bundler Private Gem Server
 
-Patch for bundler to support credentials for sources that are not stored in Gemfile.lock.
-Useful when running an additional private gem server besides rubygems.org.
+Patch for bundler to support credentials for sources that are not stored in `Gemfile.lock`.
+Useful when running an additional private gem server besides `rubygems.org`.
 
 Example:
 
     # Gemfile
     source "https://rubygems.org/"
-    source "http://_:_@gems.mycompany.com"
+    source "http://_:_@gems.mycompany.com" do
+      ...
+    end  
 
     # Gemfile.lock
     GEM
       remote: https://rubygems.org/
-      remote: http://_:_@gems.mycompany.com/
+      remote: http://_:_@gems.mycompany.com/ (not http://user:password@gems.mycompany.com)
 
 ## Warning
 
 This comes with no warranty!
 
-To prevent bundler from storing a source url to your private gem server with credentials I had to **patch** bundler.
-See `lib/bundler-pgs/bundler_patch.rb` for details.
+To prevent bundler from storing a source url to your private gem server with credentials 
+I **patched** bundler. See `lib/bundler-pgs/bundler_patch.rb` for details.
 
-As long as the internal implementation of fetching a gem from an url does not change everything is fine.
-In case a newer version of bundler change this code part the url might be stored in `Gemfile.lock`
-with the credentials again.
-
-bundler-pgs supports bundler 1.7.4 and older.
+`bundle-pgs` will raise an exception in case the patched class and method does not exist
+in `bundler`anymore.
 
 ## Usage
 
@@ -54,7 +53,9 @@ Add your private gem server url with `_` (underscore) as placeholder for the cre
 
     # Gemfile
     source "https://rubygems.org"
-    source "http://_:_@gems.mycompany.com"
+    source "http://_:_@gems.mycompany.com" do 
+      gem 'my_private_gem'
+    end    
 
 Add your credentials to `~/.gem/gemserver_credential` on **every** server using bundler,
 e.g. ci, staging and production:
@@ -87,5 +88,5 @@ You will also need to change the bundle command for Capistrano:
 
 For comments and question feel free to contact me: business@thomasbaustert.de
 
-Copyright © 2013 [Thomas Baustert](http://thomasbaustert.de), released under the MIT license
+Copyright by [Thomas Baustert](http://thomasbaustert.de), released under the MIT license
 

data/bin/bundle-pgs

@@ -19,7 +19,6 @@ require 'bundler/cli'
 require 'bundler/friendly_errors'
 
 require 'bundler-pgs'
-puts "[bundler-pgs] v#{Bundler::Pgs::VERSION} is loaded"
-puts "[bundler-pgs] patching bundler"
+puts "[bundler-pgs] v#{Bundler::Pgs::VERSION} is used and patches bundler."
 
 Bundler.with_friendly_errors { Bundler::CLI.start }

data/lib/bundler-pgs.rb

@@ -1,13 +1,4 @@
 require 'bundler/version'
-
-if Bundler::VERSION > "1.7.4"
-  puts "\nWarning: You are using bundler #{Bundler::VERSION} and bundler-pgs patch might not work for this version."
-  puts "Make sure your Gemfile.lock does not contain your credentials after running bundle-pgs!"
-  puts ""
-end
-
 require "bundler-pgs/version"
-require "bundler-pgs/credential_file"
 require "bundler-pgs/bundler_patch"
-require "bundler-pgs/bundler_dsl_extension"
 

data/lib/bundler-pgs/bundler_patch.rb

@@ -1,13 +1,24 @@
-require "yaml"
+require 'yaml'
 require 'bundler'
 
+module Bundler::Pgs
+  class MonkeyPatchFailed < RuntimeError
+    def message
+      "bundler-pgs #{Bundler::Pgs::VERSION} failed to patch bundler #{Bundler::VERSION}. Cause: #{message}"
+    end
+  end
+end
+
 ##
 # Patches Bundler::RubygemsIntegration bundler to use url with the credentials.
 #
+raise Bundler::Pgs::MonkeyPatchFailed, "Bundler::RubygemsIntegration not defined anymore" unless defined?(Bundler::RubygemsIntegration)
+raise Bundler::Pgs::MonkeyPatchFailed, "Bundler::RubygemsIntegration.download_gem not defined anymore" unless Bundler::RubygemsIntegration.new.respond_to?(:download_gem)
+
 module Bundler
   class RubygemsIntegration
     def download_gem(spec, uri, path)
-      new_uri = ::BundlerPatch::UriResolver.resolve(uri)
+      new_uri = ::Bundler::Pgs::UriResolver.resolve(uri)
       Gem::RemoteFetcher.fetcher.download(spec, new_uri, path)
     end
   end
@@ -16,12 +27,14 @@ end
 ##
 # Patches Bundler::Fetcher bundler to use url with the credentials.
 #
+raise Bundler::Pgs::MonkeyPatchFailed, "Bundler::Fetcher not defined anymore" unless defined?(Bundler::Fetcher)
+
 module Bundler
   class Fetcher
     alias_method :orig_initialize, :initialize
 
     def initialize(remote_uri)
-      new_uri = ::BundlerPatch::UriResolver.resolve(remote_uri)
+      new_uri = ::Bundler::Pgs::UriResolver.resolve(remote_uri)
       orig_initialize(new_uri)
     end
   end
@@ -30,9 +43,8 @@ end
 ##
 # Replaces credential placeholder (e.g. http://_:_@....) with the credentials from the credentials file.
 #
-module BundlerPatch
+module Bundler::Pgs
   class UriResolver
-    extend BundlerPatch::CredentialFile
 
     def self.resolve(uri)
       if uri_with_hidden_credentials?(uri)
@@ -75,6 +87,13 @@ module BundlerPatch
       new_uri || orig_uri
     end
 
+    def self.with_credential_file(&block)
+      credential_filename = File.join(ENV["HOME"], ".gem", "gemserver_credentials")
+      if File.exists?(credential_filename)
+        yield(credential_filename) if block_given?
+      end
+    end
+
     def self.uri_with_hidden_credentials?(uri)
       user_exists?(uri) && password_exists?(uri)
     end

data/lib/bundler-pgs/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Pgs
-    VERSION = "0.7.4"
+    VERSION = "0.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-pgs
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.1
 platform: ruby
 authors:
 - Thomas Baustert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,9 +54,7 @@ files:
 - bin/bundle-pgs
 - bundler-pgs.gemspec
 - lib/bundler-pgs.rb
-- lib/bundler-pgs/bundler_dsl_extension.rb
 - lib/bundler-pgs/bundler_patch.rb
-- lib/bundler-pgs/credential_file.rb
 - lib/bundler-pgs/version.rb
 homepage: https://github.com/thomasbaustert/bundler-pgs
 licenses: []
@@ -77,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: bundler patch to support private gem server (pgs)

data/lib/bundler-pgs/bundler_dsl_extension.rb

@@ -1,22 +0,0 @@
-##
-# Extend bundler DSL to allow using convenient method in Gemfile.
-# This is optional and not really necessary.
-#
-# Examples:
-#   source "https://rubygems.org"
-#   private_gem_server
-#   private_gem_server("fooserver")
-#
-module Bundler
-  class Dsl
-    include BundlerPatch::CredentialFile
-
-    def private_gem_server(name = "default")
-      with_credential_file do |credential_filename|
-        yaml = YAML.load_file(credential_filename)
-        yaml[name]["source"].to_s.strip
-      end
-    end
-  end
-end
-

data/lib/bundler-pgs/credential_file.rb

@@ -1,12 +0,0 @@
-module BundlerPatch
-  module CredentialFile
-
-    def with_credential_file(&block)
-      credential_filename = File.join(ENV["HOME"], ".gem", "gemserver_credentials")
-      if File.exists?(credential_filename)
-        yield(credential_filename) if block_given?
-      end
-    end
-  end
-
-end