puppetfile-resolver 0.4.0 → 0.6.1

data/spec/integration/kitchensink_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+require 'puppetfile-resolver/resolver'
+require 'puppetfile-resolver/puppetfile'
+
+describe 'KitchenSink Tests' do
+  it 'should resolve a complete Puppetfile' do
+    content = <<-PUPFILE
+    forge 'https://forge.puppet.com'
+
+    mod 'powershell',
+      :git => 'https://github.com/puppetlabs/puppetlabs-powershell',
+      :tag => 'v4.0.0'
+
+    mod 'simpkv',
+      :git => 'https://gitlab.com/simp/pupmod-simp-simpkv.git',
+      :tag => '0.7.1'
+
+    mod 'puppetlabs/stdlib', '6.3.0'
+
+    # Local module path module
+    mod 'testfixture/test_module', :latest
+
+    PUPFILE
+
+    puppetfile = ::PuppetfileResolver::Puppetfile::Parser::R10KEval.parse(content)
+
+    config = PuppetfileResolver::SpecSearchers::Configuration.new
+    config.local.puppet_module_paths = [File.join(FIXTURES_DIR, 'modulepath')]
+
+    resolver = PuppetfileResolver::Resolver.new(puppetfile)
+    result = resolver.resolve({
+      allow_missing_modules: false,
+      spec_searcher_configuration: config,
+    })
+
+    expect(result.specifications).to include('powershell')
+    expect(result.specifications['powershell'].version.to_s).to eq('4.0.0')
+
+    expect(result.specifications).to include('simpkv')
+    expect(result.specifications['simpkv'].version.to_s).to eq('0.7.1')
+
+    expect(result.specifications).to include('stdlib')
+    expect(result.specifications['stdlib'].version.to_s).to eq('6.3.0')
+
+    expect(result.specifications).to include('test_module')
+    expect(result.specifications['test_module'].version.to_s).to eq('0.1.0')
+  end
+end

data/spec/integration/proxy_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+require 'open3'
+require 'puppetfile-resolver/resolver'
+require 'puppetfile-resolver/puppetfile'
+
+describe 'Proxy Tests' do
+  let(:content) do <<-PUPFILE
+    forge 'https://forge.puppet.com'
+
+    mod 'powershell',
+      :git => 'https://github.com/puppetlabs/puppetlabs-powershell',
+      :tag => 'v4.0.0'
+
+    mod 'puppetlabs/stdlib', '6.3.0'
+    PUPFILE
+  end
+  let(:puppetfile) { ::PuppetfileResolver::Puppetfile::Parser::R10KEval.parse(content) }
+  let(:resolver_config) do
+    PuppetfileResolver::SpecSearchers::Configuration.new.tap do |obj|
+      obj.git.proxy = 'http://localhost:32768'
+      obj.forge.proxy = 'http://localhost:32768'
+    end
+  end
+
+  context 'with an invalid proxy server' do
+    it 'should not resolve a complete Puppetfile' do
+      resolver = PuppetfileResolver::Resolver.new(puppetfile)
+      result = resolver.resolve({
+        allow_missing_modules: true,
+        spec_searcher_configuration: resolver_config,
+      })
+
+      expect(result.specifications).to include('powershell')
+      expect(result.specifications['powershell']).to be_a(PuppetfileResolver::Models::MissingModuleSpecification)
+
+      expect(result.specifications).to include('stdlib')
+      expect(result.specifications['stdlib']).to be_a(PuppetfileResolver::Models::MissingModuleSpecification)
+    end
+  end
+
+  context 'with a valid proxy server' do
+    def start_proxy_server(start_options = ['--timeout=5'])
+      cmd = "ruby \"#{File.join(FIXTURES_DIR, 'proxy.rb')}\" 32768"
+
+      stdin, stdout, stderr, wait_thr = Open3.popen3(cmd)
+      # Wait for the Proxy server to indicate it started
+      line = nil
+      begin
+        line = stderr.readline
+      end until line =~ /#start/
+      stdout.close
+      stdin.close
+      [wait_thr, stderr]
+    end
+
+    before(:each) do
+      @server_thr, @server_pipe = start_proxy_server
+    end
+
+    after(:each) do
+      begin
+        Process.kill("KILL", @server_thr[:pid])
+        Process.wait(@server_thr[:pid])
+      rescue
+        # The server process may not exist and checking in a cross platform way in ruby is difficult
+        # Instead just swallow any errors
+      end
+
+      begin
+        @server_pipe.close
+      rescue
+        # The server process may not exist and checking in a cross platform way in ruby is difficult
+        # Instead just swallow any errors
+      end
+    end
+
+    it 'should resolve a complete Puppetfile' do
+      resolver = PuppetfileResolver::Resolver.new(puppetfile)
+      result = resolver.resolve({
+        allow_missing_modules: false,
+        spec_searcher_configuration: resolver_config,
+      })
+
+      expect(result.specifications).to include('powershell')
+      expect(result.specifications['powershell'].version.to_s).to eq('4.0.0')
+
+      expect(result.specifications).to include('stdlib')
+      expect(result.specifications['stdlib'].version.to_s).to eq('6.3.0')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ root = File.join(__dir__,'..',)
 # Add the language server into the load path
 $LOAD_PATH.unshift(File.join(root,'lib'))
 
+FIXTURES_DIR = File.join(__dir__,'fixtures')
+
 # A cache which we can preload for the purposes of testing, mimicing
 # Local modules
 require 'puppetfile-resolver/cache/base'

data/spec/unit/puppetfile-resolver/resolver_spec.rb

@@ -7,7 +7,7 @@ describe PuppetfileResolver::Resolver do
   let(:puppet_version) { nil }
   let(:subject) { PuppetfileResolver::Resolver.new(puppetfile_document, puppet_version) }
   let(:cache) { MockLocalModuleCache.new }
-  let(:default_resolve_options) { { cache: cache, module_paths: ['??does/not/exist'] } }
+  let(:default_resolve_options) { { cache: cache } }
   let(:resolve_options) { default_resolve_options }
 
   RSpec.shared_examples 'a resolver flag' do |flag|

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

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'puppetfile-resolver/spec_searchers/git/gclone'
+require 'puppetfile-resolver/spec_searchers/git_configuration'
+require 'logger'
+require 'json'
+
+describe PuppetfileResolver::SpecSearchers::Git::GClone do
+  PuppetfileModule = Struct.new(:remote, :ref, :branch, :commit, :tag, keyword_init: true)
+  config = PuppetfileResolver::SpecSearchers::GitConfiguration.new
+
+  let(:url) do
+    'https://github.com/puppetlabs/puppetlabs-powershell'
+  end
+
+  let(:puppetfile_module) do
+    PuppetfileModule.new(remote: url)
+  end
+
+
+  context 'valid url' do
+    it 'reads metadata' do
+      content = subject.metadata(puppetfile_module, Logger.new(STDERR), config)
+      expect(JSON.parse(content)['name']).to eq('puppetlabs-powershell')
+    end
+
+    context 'with ref' do
+
+      let(:puppetfile_module) do
+        PuppetfileModule.new(remote: url, ref: '2.1.2')
+      end
+
+      it 'reads metadata' do
+        content = subject.metadata(puppetfile_module, Logger.new(STDERR), config)
+        expect(JSON.parse(content)['name']).to eq('puppetlabs-powershell')
+      end
+    end
+  end
+
+  context 'invalid url' do
+    let(:url) do
+      'https://user:password@github.com/puppetlabs/puppetlabs-powershellbad'
+    end
+
+    it 'throws exception' do
+      expect{subject.metadata(puppetfile_module, Logger.new(STDERR), config)}
+      .to raise_exception(RuntimeError)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetfile-resolver
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Glenn Sarti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: molinillo
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Resolves the Puppet Modules in a Puppetfile with a full dependency graph,
-  including Puppet version checkspec.
+  including Puppet version checks.
 email:
 - glennsarti@users.noreply.github.com
 executables: []
@@ -81,18 +81,32 @@ files:
 - lib/puppetfile-resolver/resolution_result.rb
 - lib/puppetfile-resolver/resolver.rb
 - lib/puppetfile-resolver/spec_searchers/common.rb
+- lib/puppetfile-resolver/spec_searchers/configuration.rb
 - lib/puppetfile-resolver/spec_searchers/forge.rb
+- lib/puppetfile-resolver/spec_searchers/forge_configuration.rb
 - lib/puppetfile-resolver/spec_searchers/git.rb
+- lib/puppetfile-resolver/spec_searchers/git/gclone.rb
+- lib/puppetfile-resolver/spec_searchers/git/github.rb
+- lib/puppetfile-resolver/spec_searchers/git/gitlab.rb
+- lib/puppetfile-resolver/spec_searchers/git_configuration.rb
 - lib/puppetfile-resolver/spec_searchers/local.rb
+- lib/puppetfile-resolver/spec_searchers/local_configuration.rb
 - lib/puppetfile-resolver/ui/debug_ui.rb
 - lib/puppetfile-resolver/ui/null_ui.rb
 - lib/puppetfile-resolver/util.rb
 - lib/puppetfile-resolver/version.rb
 - puppetfile-cli.rb
+- spec/fixtures/modulepath/test_module/README.md
+- spec/fixtures/modulepath/test_module/metadata.json
+- spec/fixtures/proxy.rb
+- spec/integration/deprecation_spec.rb
+- spec/integration/kitchensink_spec.rb
+- spec/integration/proxy_spec.rb
 - spec/spec_helper.rb
 - spec/unit/puppetfile-resolver/puppetfile/document_spec.rb
 - spec/unit/puppetfile-resolver/puppetfile/parser/r10k_eval_spec.rb
 - spec/unit/puppetfile-resolver/resolver_spec.rb
+- spec/unit/puppetfile-resolver/spec_searchers/git/gclone_spec.rb
 homepage: https://glennsarti.github.io/puppetfile-resolver/
 licenses:
 - Apache-2.0
@@ -105,19 +119,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.9
+      version: 2.5.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Dependency resolver for Puppetfiles
 test_files:
-- spec/spec_helper.rb
-- spec/unit/puppetfile-resolver/puppetfile/document_spec.rb
+- spec/fixtures/proxy.rb
+- spec/fixtures/modulepath/test_module/README.md
+- spec/fixtures/modulepath/test_module/metadata.json
 - spec/unit/puppetfile-resolver/puppetfile/parser/r10k_eval_spec.rb
+- spec/unit/puppetfile-resolver/puppetfile/document_spec.rb
 - spec/unit/puppetfile-resolver/resolver_spec.rb
+- spec/unit/puppetfile-resolver/spec_searchers/git/gclone_spec.rb
+- spec/spec_helper.rb
+- spec/integration/proxy_spec.rb
+- spec/integration/kitchensink_spec.rb
+- spec/integration/deprecation_spec.rb