beaker-module_install_helper 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 823c0eb3935f314373fd6a2a69c48a4f00e3cbca
-  data.tar.gz: 7ce9f9efee93bacc80f76247359271992d84bddf
+  metadata.gz: 335eced6501675a1215d9492779c7efca77c62bc
+  data.tar.gz: 32c5045a4faed8fc92bc44e019164f6d711b9176
 SHA512:
-  metadata.gz: eae59a8d7a8bcd82382ec9d59a93d840b18a6e186199e2b92c7cb135a8b1af7a11460c11886bde8187293000adee2a7c96d355ef6694e307508f5dd80745bb87
-  data.tar.gz: fd2afeff327e32091ac6600c53090edc763f5f73e0b7c81dc7968fbdfea75642e96aab45ab8998c551fb5db70b27140fdd8932f13acc4b163151f41e4c7bedb7
+  metadata.gz: 53e39c82c94044ee48d18d07004b47dd0e55dc90427f976e924a49044c6416c1d2a7080dda980420372a7947f62bd04fd87ef518736152f79fdb27b55ce180d6
+  data.tar.gz: 23e6824f988c904633fde2338bce5fb72c4950a1cefa093df1113cbc43ef1551ea43dbc9b772c3e0855066e07acd797c890dc66a47c03a7aca1ccb31d46f39fb

data/beaker-module_install_helper.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'beaker-module_install_helper'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ['Puppet']
   spec.email         = ['wilson@puppet.com']
 

data/lib/beaker/module_install_helper.rb

@@ -86,7 +86,7 @@ module Beaker::ModuleInstallHelper
   # and upper bounds. The function then uses the forge rest endpoint to find
   # the most recent release of the given module matching the version requirement
   def module_version_from_requirement(mod_name, vr_str)
-    uri = URI("#{forge_api}/v3/modules/#{mod_name}")
+    uri = URI("#{forge_api}v3/modules/#{mod_name}")
     response = Net::HTTP.get(uri)
     forge_data = JSON.parse(response)
 
@@ -170,18 +170,24 @@ module Beaker::ModuleInstallHelper
 
   def forge_host
     fh = ENV['BEAKER_FORGE_HOST']
-    return fh unless fh.nil?
+    unless fh.nil?
+      fh = 'https://' + fh if fh !~ /^(https:\/\/|http:\/\/)/i
+      fh += '/' unless fh != /\/$/
+      return fh
+    end
+
     'https://forge.puppet.com/'
   end
 
   def forge_api
-    fh = forge_host
-    return 'https://forgeapi.puppetlabs.com' if fh == 'https://forge.puppet.com/'
-
     fa = ENV['BEAKER_FORGE_API']
-    return fa.gsub(/\/$/, '') unless fa.nil?
+    unless fa.nil?
+      fa = 'https://' + fa if fa !~ /^(https:\/\/|http:\/\/)/i
+      fa += '/' unless fa != /\/$/
+      return fa
+    end
 
-    raise 'Must specify BEAKER_FORGE_API env variable when specifying custom forge host'
+    'https://forgeapi.puppetlabs.com/'
   end
 end
 

data/spec/unit/beaker/module_install_helper_spec.rb

@@ -242,27 +242,16 @@ describe Beaker::ModuleInstallHelper do
         allow(ENV).to receive(:[]).with('BEAKER_FORGE_HOST').and_return(nil)
         allow(ENV).to receive(:[]).with('BEAKER_FORGE_API').and_return(nil)
 
-        expect(forge_api).to eq('https://forgeapi.puppetlabs.com')
+        expect(forge_api).to eq('https://forgeapi.puppetlabs.com/')
       end
     end
 
     context 'with BEAKER_FORGE_HOST and BEAKER_FORGE_API env variables specified' do
-      context 'without trailing slash' do
-        it 'returns specified forge api' do
-          allow(ENV).to receive(:[]).with('BEAKER_FORGE_HOST').and_return('custom')
-          allow(ENV).to receive(:[]).with('BEAKER_FORGE_API').and_return('an-api-url')
+      it 'returns specified forge api with trailing slash' do
+        allow(ENV).to receive(:[]).with('BEAKER_FORGE_HOST').and_return('custom')
+        allow(ENV).to receive(:[]).with('BEAKER_FORGE_API').and_return('an-api-url/')
 
-          expect(forge_api).to eq('an-api-url')
-        end
-      end
-
-      context 'with trailing slash' do
-        it 'returns specified forge api without trailing slash' do
-          allow(ENV).to receive(:[]).with('BEAKER_FORGE_HOST').and_return('custom')
-          allow(ENV).to receive(:[]).with('BEAKER_FORGE_API').and_return('an-api-url/')
-
-          expect(forge_api).to eq('an-api-url')
-        end
+        expect(forge_api).to eq('https://an-api-url/')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-module_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec