private_gem 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c97de10eaaa9b52be80ae588d37be3aa9245aba
-  data.tar.gz: 075d707403a84bd38b1e1b9adcba1d2cd43a6fd5
+  metadata.gz: 785007d3ce162844936f9486507e85853e923854
+  data.tar.gz: d8a7444b01b4c2edbd89b52a676751c53c892541
 SHA512:
-  metadata.gz: 86803bd5bb27ac71b374699f81ada59354aabe1b9c7aa24b9c30a462b91e1c163de1000f4d2e8a083051ed7f9f49fefa683b2a6967d44021c275be35eecc7db1
-  data.tar.gz: 5a0766dde0a43710d04af37ee8da7f796558d4a8af290db62fe5c858be5c6fdc703021dea9bbce3ea155ab7bd630c41258a55cea5999fad4752d996ee21b4b61
+  metadata.gz: 9f20074165d804ae9dfff4d5b338e78cc313b0b956fdb57e8be54c47637deae1391558141d87ce46a50bbab005aba2d7b1266f8ed23e3c97b22ef791431ac34a
+  data.tar.gz: 0bb2d8c113a1da89516e48285667363e3252b3636e1e57dea34538b9c6851a08731777f81a4cf8982a12bae739a67ff92e73bea6dd4d1993d944107a609102cf

data/lib/private_gem.rb

@@ -1,37 +1,47 @@
 require 'private_gem/version'
 require 'bundler'
+require 'uri'
 
 module PrivateGem
   def self.server
-    servers_with_credentials = Bundler.settings.all.select do |n|
+    urls_with_credentials = Bundler.settings.all.select do |n|
       url = URI.parse(n)
       url && ['http', 'https'].include?(url.scheme)
     end
 
-    if servers_with_credentials.empty?
+    hosts_with_credentials = Bundler.settings.all.select do |n|
+      n =~ /^([-_a-z\d]+\.)+[a-z]+$/
+    end
+
+    if private_gem_server = Bundler.settings['private_gem_server']
+      if urls_with_credentials.include?(private_gem_server)
+        return private_gem_server
+      end
+
+      private_gem_server_uri = URI.parse(private_gem_server)
+      if private_gem_server_uri && hosts_with_credentials.include?(private_gem_server_uri.host)
+        return private_gem_server
+      end
+
+      abort("You don't have any configured credentials for the private gem server at #{private_gem_server}")
+    end
+
+    if urls_with_credentials.empty?
       abort("You don't have any configured private gem credentials.")
-    elsif servers_with_credentials.size > 1
-      private_gem_server = Bundler.settings['private_gem_server']
-
-      if private_gem_server
-        if servers_with_credentials.include?(private_gem_server)
-          return private_gem_server
-        else
-          abort("You don't have any configured credentials for the private gem server at #{private_gem_server}")
-        end
-      else
-        puts "You have multiple private gem servers defined:"
-        servers_with_credentials.each do |s|
-          puts "  #{s}"
-        end
-        abort("You need to select which private gem server to use using `bundle config private_gem_server URL_OF_GEM_SERVER`")
+    end
+
+    if urls_with_credentials.size > 1
+      msg = "You have multiple private gem servers defined:\n"
+      urls_with_credentials.each do |s|
+        msg << "  #{s}\n"
       end
-    else
-      servers_with_credentials.first
+      abort("#{msg}You need to select which private gem server to use using `bundle config private_gem_server URL_OF_GEM_SERVER`")
     end
+
+    urls_with_credentials.first
   end
 
   def self.credentials
-    Bundler.settings[server]
+    Bundler.settings[server] || Bundler.settings[URI.parse(server).host]
   end
 end

data/lib/private_gem/version.rb

@@ -1,3 +1,3 @@
 module PrivateGem
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: private_gem
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mick Staugaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-around
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - mick@staugaard.com