Merge pull request glennsarti#36 from beechtom/bug/git-searchers

Fix bugs in Git spec searchers

Author: glennsarti

lib/puppetfile-resolver/spec_searchers/git/gclone.rb

@@ -47,13 +47,13 @@ def self.metadata(puppetfile_module, resolver_ui, config)
         def self.clone_and_read_file(url, ref, file, config)
           clone_cmd = ['git', 'clone', '--bare', '--depth=1', '--single-branch']
           err_msg = ''
-          if config.git.proxy
-            err_msg += " with proxy #{config.git.proxy}: "
-            proxy = "--config \"http.proxy=#{config.git.proxy}\" --config \"https.proxy=#{config.proxy}\""
+          if config.proxy
+            err_msg += " with proxy #{config.proxy}: "
+            proxy = "--config \"http.proxy=#{config.proxy}\" --config \"https.proxy=#{config.proxy}\""
             clone_cmd.push(proxy)
           end
 
-          Dir.mktmpdir(nil, config.git.clone_dir) do |dir|
+          Dir.mktmpdir(nil, config.clone_dir) do |dir|
             clone_cmd.push("--branch=#{ref}") if ref != 'HEAD'
             clone_cmd.push(url, dir)
             out, err_out, process = ::PuppetfileResolver::Util.run_command(clone_cmd)

lib/puppetfile-resolver/spec_searchers/git/github.rb

@@ -43,7 +43,7 @@ def self.metadata(puppetfile_module, resolver_ui, config)
 
           if response.code != '200'
             resolver_ui.debug(err_msg + "Expected HTTP Code 200, but received #{response.code}")
-            return ''
+            return nil
           end
           response.body
         end

lib/puppetfile-resolver/spec_searchers/git/gitlab.rb

@@ -45,7 +45,7 @@ def self.metadata(puppetfile_module, resolver_ui, config)
 
           if response.code != '200'
             resolver_ui.debug(err_msg + "Expected HTTP Code 200, but received #{response.code}")
-            return ''
+            return nil
           end
           response.body
         end

spec/unit/puppetfile-resolver/spec_searchers/git/gclone_spec.rb

@@ -6,8 +6,7 @@
 
 describe PuppetfileResolver::SpecSearchers::Git::GClone do
   PuppetfileModule = Struct.new(:remote, :ref, :branch, :commit, :tag, keyword_init: true)
-  config = PuppetfileResolver::SpecSearchers::Configuration.new
-  config.local.puppet_module_paths = [File.join(FIXTURES_DIR, 'modulepath')]
+  config = PuppetfileResolver::SpecSearchers::GitConfiguration.new
 
   let(:url) do
     'https://github.com/puppetlabs/puppetlabs-powershell'
@@ -39,7 +38,7 @@
 
   context 'invalid url' do
     let(:url) do
-      'https://github.com/puppetlabs/puppetlabs-powershellbad'
+      'https://user:password@github.com/puppetlabs/puppetlabs-powershellbad'
     end
 
     it 'throws exception' do