pdqtest 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31dcb07b28f856c67946e787ae6c7f738a80cd35094dca5e40945b5d583cb93
-  data.tar.gz: 8414386c5b910112ed305524e81fa333bca8f0b7c7def8a1af773d259460b921
+  metadata.gz: 37530405f473c1f36eda386d84ab94debf584179e52bb55bff2fd1f30e27eaf0
+  data.tar.gz: b216fd428e5dc17a4f9d1d395090ae2d0359591693d4bfa9eaef490f9c38e412
 SHA512:
-  metadata.gz: 925cf675abe919ae5b63a95be161b27e9d087011480cae06c094b1c07a435a7e59af7e9bc5644255449c9657dc78cdb40bab19c25d935027d5355aa7e0914b5d
-  data.tar.gz: 51dfde1ed0ffb94309f95c43cf9152f80f534fd7ac6ac600e3d0869ed65d28d5683642373307963a89a6a365d87a636970e6a4033662d3ca5f3c25a9bee8c1ce
+  metadata.gz: b1f5cfe1259ef9c487c7c0d05b0d62495e57ad37366b9e6e5de226e30534ec24012aeed6806be02a28816822ffca2d9affc624d9f70108b2b68ff8ffeebda863
+  data.tar.gz: ed98f8ca46b59f583b7b8df038ffce1052b21515c3c66fe3224a14f3db938eae908314ca15761367d48b20234e6a5935bf0c63aa2696cdee890656f55526cef6

data/doc/puppet_module_dependencies.md

@@ -18,9 +18,10 @@ repositories:
 
 
 ## .fixtures.yml
-There is no need to maintain a `.fixtures.yml` file and the presence of this file when using `pdqtest` is an error.
+There is no need to maintain a `.fixtures.yml` file and the presence of this file when using `pdqtest` is an error (note the leading period)
 
 ## Notes:
 * The filename is for private modules is `fixtures.yml` NOT `.fixtures.yml`.  The leading dot had to be removed to avoid `puppetlabs_spec_helper` also detecting the file and trying to use it.
 * The file format of `.fixtures.yml` and `fixtures.yml` for specifing git repositories is identical
 * Only the repositories section of the file will be processed as we do not use `puppetlabs_spec_helper` to do this for us.
+* We convert the dependencies from `metadata.json` to a temporary puppetfile store at `.Puppetfile.pdqtes` which is then installed using r10k

data/docker_images/centos/Dockerfile

@@ -51,8 +51,8 @@ RUN yum -y install https://pm.puppet.com/puppet-agent/2017.3.5/5.3.5/repos/el/7/
 # bats
 RUN git clone https://github.com/bats-core/bats-core /usr/local/bats
 
-# librarian
-RUN /opt/puppetlabs/puppet/bin/gem install librarian-puppet
+# r10k
+RUN /opt/puppetlabs/puppet/bin/gem install r10k
 
 # git refresh (for processing .fixtures.yml git modules)
 RUN /opt/puppetlabs/puppet/bin/gem install git_refresh

data/docker_images/ubuntu/Dockerfile

@@ -51,7 +51,7 @@ RUN curl -Lo /tmp/puppet-agent.deb https://pm.puppet.com/puppet-agent/2017.3.5/5
 RUN git clone https://github.com/bats-core/bats-core /usr/local/bats
 
 # librarian
-RUN /opt/puppetlabs/puppet/bin/gem install librarian-puppet
+RUN /opt/puppetlabs/puppet/bin/gem install r10k
 
 # git refresh (for processing .fixtures.yml git modules)
 RUN /opt/puppetlabs/puppet/bin/gem install git_refresh

data/lib/pdqtest/docker.rb

@@ -8,8 +8,8 @@ module PDQTest
     STATUS = 2
     ENV='export TERM=xterm LC_ALL=C PATH=/usr/local/bats/bin:/opt/puppetlabs/puppet/bin:$PATH;'
     IMAGES = {
-     :DEFAULT => 'declarativesystems/pdqtest-centos:2018-04-13-0',
-     :UBUNTU  => 'declarativesystems/pdqtest-ubuntu:2018-04-13-0',
+     :DEFAULT => 'declarativesystems/pdqtest-centos:2018-05-31-0',
+     :UBUNTU  => 'declarativesystems/pdqtest-ubuntu:2018-05-31-0',
     }
     HIERA_YAML_CONTAINER = '/etc/puppetlabs/puppet/hiera.yaml'
     HIERA_YAML_HOST = '/spec/fixtures/hiera.yaml'

data/lib/pdqtest/puppet.rb

@@ -22,6 +22,8 @@ module PDQTest
     @@setup_executed  = []
     @@skip_second_run = false
     FIXTURES          = 'fixtures.yml'
+    TMP_PUPPETFILE    = '.Puppetfile.pdqtest'
+
 
     def self.skip_second_run(skip_second_run)
       @@skip_second_run = skip_second_run
@@ -315,5 +317,35 @@ module PDQTest
       Escort::Logger.output.puts "Parsed module name: #{module_name}"
       Escort::Logger.output.puts "Link module command: #{link_module}"
     end
+
+    # extract a Puppetfile from metadata.json and install modules using r10k
+    def self.install_modules()
+      json = JSON.parse(File.read(METADATA))
+      puppetfile = []
+      if json.has_key?("dependencies")
+        json["dependencies"].each { |dependency|
+          line = "mod '#{dependency['name']}'"
+          if dependency.has_key?("version_requirement")
+            # R10K supports specifc named version or 'latest', not the rich versions defined in metadata. To make this
+            # work we will drop any version that specifies a range and just install the latest
+            if dependency['version_requirement'].start_with?(/\d/)
+              line += ", '#{dependency['version_requirement']}'"
+            end
+          end
+          puppetfile << line
+        }
+      end
+
+      File.open(TMP_PUPPETFILE, "w") do |f|
+        f.puts(puppetfile)
+      end
+
+      PDQTest::Emoji.emoji_message("🐌", "I'm downloading The Internet, please hold...")
+
+      cmd = "bundle exec r10k puppetfile install --verbose --moduledir ./spec/fixtures/modules --config .r10k.yaml --puppetfile #{TMP_PUPPETFILE}"
+      status = system(cmd)
+
+      status
+    end
   end
 end

data/lib/pdqtest/rspec.rb

@@ -5,6 +5,7 @@ require 'pdqtest/emoji'
 require 'erb'
 require 'fileutils'
 require 'pdqtest/util'
+require 'json'
 
 
 module PDQTest
@@ -19,9 +20,8 @@ module PDQTest
         FileUtils.mkdir_p(MODULE_CACHE_DIR)
       end
 
-      PDQTest::Emoji.emoji_message("🐌", "I'm downloading The Internet, please hold...")
-      cmd = "LIBRARIAN_PUPPET_TMP=#{MODULE_CACHE_DIR} bundle exec librarian-puppet install --path ./spec/fixtures/modules --destructive"
-      status = system(cmd)
+      status = PDQTest::Puppet.install_modules()
+
       if status
         PDQTest::Puppet.git_fixtures.each { |extra_mod_install_cmd|
           if status
@@ -62,9 +62,7 @@ module PDQTest
           end
 
           # process the rspec template into a new file
-          template = File.read(Util::resource_path(File.join('templates', 'rspec.rb.erb')))
-          testcase = ERB.new(template, nil, '-').result(binding)
-          File.write(spec_file, testcase)
+          PDQTest::Skeleton.install_template(spec_file, 'rspec.rb.erb', {:classname=>classname})
         end
       }
     end

data/lib/pdqtest/skeleton.rb

@@ -41,12 +41,13 @@ module PDQTest
       end
     end
 
-    def self.install_example(filename)
-      example_file = File.join(EXAMPLES_DIR, filename)
-      if ! File.exists?(example_file)
-        template = File.read(Util::resource_path(File.join('templates', 'examples_init.pp.erb')))
-        init_pp  = ERB.new(template, nil, '-').result(binding)
-        File.write(example_file, init_pp)
+    # vars is a hash of variables that can be accessed in template
+    def self.install_template(target, template_file, vars)
+      example_file = File.join(EXAMPLES_DIR, template_file)
+      if ! File.exists?(target)
+        template = File.read(Util::resource_path(File.join('templates', template_file)))
+        content  = ERB.new(template, nil, '-').result(binding)
+        File.write(target, content)
       end
     end
 
@@ -90,11 +91,12 @@ module PDQTest
       install_skeleton('Makefile', 'Makefile')
       install_skeleton('bitbucket-pipelines.yml', 'bitbucket-pipelines.yml')
       install_skeleton('.travis.yml', 'dot_travis.yml')
+      install_template('.r10k.yaml', 'r10k.yaml.erb', {})
     end
 
     def self.install_acceptance(example_file ="init.pp")
-      install_example(File.basename(example_file))
       example_name = File.basename(example_file).gsub(/\.pp$/, '')
+      install_template("#{EXAMPLES_DIR}/#{File.basename(example_file)}",'examples_init.pp.erb', {})
 
       install_skeleton(File.join('spec', 'acceptance', "#{example_name}.bats"), 'init.bats', false)
       install_skeleton(File.join('spec', 'acceptance', "#{example_name}__before.bats"), 'init__before.bats', false)

data/lib/pdqtest/version.rb

@@ -1,4 +1,4 @@
 module PDQTest
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
   PUPPET_VERSION = "5.3.5"
 end

data/pdqtest.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "coveralls", "0.8.21"
-  spec.add_development_dependency "fakefs", "0.13.3"
+  spec.add_development_dependency "fakefs", "0.14.2"
   spec.add_development_dependency "puppet", "5.3.5"
 
   spec.add_runtime_dependency "rake", "12.3.1"
@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "docker-api", "1.34.2"
   spec.add_runtime_dependency "puppet-lint", "2.3.5"
   spec.add_runtime_dependency "puppet-syntax", "2.4.1"
-  spec.add_runtime_dependency "puppetlabs_spec_helper", "2.6.2"
-  spec.add_runtime_dependency "librarian-puppet", "3.0.0"
+  spec.add_runtime_dependency "puppetlabs_spec_helper", "2.7.0"
+  spec.add_runtime_dependency "r10k", "2.6.2"
   spec.add_runtime_dependency "git_refresh", "0.1.1"
   spec.add_runtime_dependency "puppet_factset", "0.5.0"
 end

data/res/skeleton/dot_gitignore

@@ -5,3 +5,4 @@ Puppetfile.lock
 .tmp
 .yardoc
 /pkg
+.Puppetfile.pdqtest

data/res/templates/r10k.yaml.erb

@@ -0,0 +1,3 @@
+---
+:cachedir: <%= PDQTest::Util::app_dir %>/cache/modules
+

data/res/templates/rspec.rb.erb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'puppet_factset'
-describe '<%= classname %>' do
+describe '<%= vars[:classname] %>' do
   # Uncomment only the factset you would like to use for these tests
 <%
 require 'puppet_factset'
@@ -18,6 +18,6 @@ PuppetFactset.factsets.each { |factset|
   end
 
   context 'with default values for all parameters' do
-    it { should contain_class('<%= classname %>') }
+    it { should contain_class('<%= vars[:classname] %>') }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
@@ -198,28 +198,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
-  name: librarian-puppet
+  name: r10k
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: git_refresh
   requirement: !ruby/object:Gem::Requirement
@@ -314,6 +314,7 @@ files:
 - res/skeleton/spec_helper.rb
 - res/skeleton/test.yaml
 - res/templates/examples_init.pp.erb
+- res/templates/r10k.yaml.erb
 - res/templates/rspec.rb.erb
 homepage: https://github.com/GeoffWilliams/pdqtest
 licenses: