pdqtest 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59cfe8a4a7a28734f02acac84965152cb9e28197
-  data.tar.gz: 1b70cf001fc4a3b622990c0f128ff4a6099800e6
+  metadata.gz: 1486e70fe329976fc281d23baeb85cd441865254
+  data.tar.gz: 9208d08425b7b9890fc8d41e519d2ef2777b0dec
 SHA512:
-  metadata.gz: 364b23efc25433b0cf82a4d4c4f3e1d91302f90daffad172cc462905254c5cab2626b0512a5940048b693cee7bdc199b18f37c56dd6e6d94d78151a79b7ed6ed
-  data.tar.gz: d0b0a259cfcbb34dc9f157405a1fbafb45f54e52b6465ac531006c64133a37384487b978a1258d59e46039ce4a9db79bc0c0fe0bbefd20fd3ef9c16ee79b9732
+  metadata.gz: d10dfb2cac8a5db32c04fb7376632be1c735cff13b0d2b8d01a40bdf3815e9b4e26734d573d9a6ff26627354325361c72d8964f3df3db6abdcdd731626f4af60
+  data.tar.gz: 473d65b5bb0ee3f737164908f2ec25703418e80ed44f6aa813dafab5cdf08d76287ef990341fcd557cd49fa6812ffdc903168ab949fe80f236ebc084543fc246

data/lib/pdqtest/skeleton.rb

@@ -8,7 +8,6 @@ require 'pdqtest/upgrade'
 module PDQTest
   module Skeleton
     FIXTURES        = '.fixtures.yml'
-    BACKUP_EXT      = '.pdqtest_old'
     SPEC_DIR        = 'spec'
     ACCEPTANCE_DIR  = File.join(SPEC_DIR, 'acceptance')
     CLASSES_DIR     = File.join(SPEC_DIR, 'classes')
@@ -32,8 +31,6 @@ module PDQTest
       install = false
       if File.exists?(target_file)
         if replace and should_replace_file(target_file, skeleton_file)
-          # move existing file out of the way
-          FileUtils.mv(target_file, target_file + BACKUP_EXT)
           install = true
         end
       else
@@ -64,7 +61,7 @@ module PDQTest
 
       # move .fixtures.yml out of the way
       if File.exists?(FIXTURES)
-        FileUtils.mv(FIXTURES, FIXTURES + BACKUP_EXT)
+        File.delete(FIXTURES)
       end
 
       # make directory structure for testcases
@@ -77,19 +74,24 @@ module PDQTest
       # skeleton files if required
       install_skeleton('Rakefile', 'Rakefile')
       install_skeleton(File.join('spec', 'spec_helper.rb'), 'spec_helper.rb')
-      install_skeleton('.travis.yml', 'dot_travis.yml')
       install_skeleton('.gitignore', 'dot_gitignore')
       install_skeleton('.rspec', 'dot_rspec')
-      install_skeleton('Makefile', 'Makefile')
       install_skeleton(File.join(SPEC_DIR, 'fixtures', HIERA_YAML), HIERA_YAML)
       install_skeleton(File.join(HIERA_DIR, HIERA_TEST), HIERA_TEST)
 
       install_acceptance()
       install_gemfile()
+      install_integrations()
 
       # Make sure there is a Gemfile and we are in it
     end
 
+    def self.install_integrations()
+      install_skeleton('Makefile', 'Makefile')
+      install_skeleton('bitbucket-pipelines.yml', 'bitbucket-pipelines.yml')
+      install_skeleton('.travis.yml', 'dot_travis.yml')
+    end
+
     def self.install_acceptance(example_file ="init.pp")
       install_example(File.basename(example_file))
       example_name = File.basename(example_file).gsub(/\.pp$/, '')

data/lib/pdqtest/upgrade.rb

@@ -1,3 +1,5 @@
+require 'pdqtest/skeleton'
+
 module PDQTest
   module Upgrade
     GEMFILE             = 'Gemfile'
@@ -13,6 +15,10 @@ module PDQTest
         'line'  => "gem 'puppet-strings', :git => 'https://github.com/puppetlabs/puppet-strings'",
         'added' => false,
       },
+      'puppet'          => {
+        'line'  => "gem 'puppet', '#{PDQTest::PUPPET_VERSION}'",
+        'added' => false,
+      }
     }
 
 
@@ -20,43 +26,51 @@ module PDQTest
     def self.upgrade()
       t_file = File.open("#{GEMFILE}.tmp","w")
       updating_gem = false
-      File.open(GEMFILE, 'r') do |f|
-        f.each_line{ |line|
-          if line =~ GEM_REGEXP
-            # a gem stanza
-            processing_gem = $2
-            if GEMS.keys.include?(processing_gem)
-              # fixup one of our monitored gems as needed, mark
-              # this as being a gem that is being updated so
-              # that we can kill any multi-line attributes
-              t_file.puts GEMS[processing_gem]['line']
-              updating_gem = true
-              GEMS[processing_gem]['added'] = true
+
+      if File.exists?(GEMFILE)
+        File.open(GEMFILE, 'r') do |f|
+          f.each_line{ |line|
+            if line =~ GEM_REGEXP
+              # a gem stanza
+              processing_gem = $2
+              if GEMS.keys.include?(processing_gem)
+                # fixup one of our monitored gems as needed, mark
+                # this as being a gem that is being updated so
+                # that we can kill any multi-line attributes
+                t_file.puts GEMS[processing_gem]['line']
+                updating_gem = true
+                GEMS[processing_gem]['added'] = true
+              else
+                # a gem we don't care about - write it out as-is
+                t_file.puts line
+                updating_gem = false
+              end
+            elsif updating_gem and line =~ GEM_ATTRIB_REGEXP
+              # do nothing - remove the multi-line attributes
             else
-              # a gem we don't care about - write it out as-is
+              # anything else... (esp comments)
               t_file.puts line
-              updating_gem = false
             end
-          elsif updating_gem and line =~ GEM_ATTRIB_REGEXP
-            # do nothing - remove the multi-line attributes
-          else
-            # anything else... (esp comments)
-            t_file.puts line
+          }
+        end
+
+        # the code above will only UPGRADE existing gem lines, but if this is our
+        # first run, there will be nothing to upgrade, so loop through the GEMS
+        # for any that are not already added and append them
+        GEMS.each { |name, opts|
+          if ! opts['added']
+            t_file.puts opts['line']
           end
         }
-      end
 
-      # the code above will only UPGRADE existing gem lines, but if this is our
-      # first run, there will be nothing to upgrade, so loop through the GEMS
-      # for any that are not already added and append them
-      GEMS.each { |name, opts|
-        if ! opts['added']
-          t_file.puts opts['line']
-        end
-      }
+        t_file.close
+        FileUtils.mv(t_file.path, GEMFILE)
 
-      t_file.close
-      FileUtils.mv(t_file.path, GEMFILE)
+        # miscellanious file updates
+        PDQTest::Skeleton::install_integrations()
+      else
+        Escort::Logger.error.error "Gemfile not found in #{Dir.pwd}"
+      end
     end
 
   end

data/lib/pdqtest/version.rb

@@ -1,3 +1,4 @@
 module PDQTest
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
+  PUPPET_VERSION = "4.10.8"
 end

data/res/skeleton/Gemfile

@@ -3,7 +3,6 @@ case RUBY_PLATFORM
 when /darwin/
   gem 'CFPropertyList'
 end
-gem 'puppet', '4.10.8'
 gem 'facter', '2.5.1'
 gem 'rubocop', '0.50.0'
 gem 'rspec-puppet-facts', '1.7.0'

data/res/skeleton/Makefile

@@ -4,3 +4,8 @@ all:
 
 shell:
 	bundle exec pdqtest --keep-container acceptance
+
+logical:
+	bundle exec pdqtest syntax
+	bundle exec pdqtest lint
+	bundle exec pdqtest rspec

data/res/skeleton/bitbucket-pipelines.yml

@@ -0,0 +1,16 @@
+image: ruby:2.3.5
+
+pipelines:
+  default:
+    - step:
+        caches:
+          - bundler
+        script:
+          - ruby --version
+          - bundler --version
+          - bundle install
+          - make logical
+
+definitions:
+  caches:
+    bundler: vendor/bundle

data/res/skeleton/dot_travis.yml

@@ -5,10 +5,8 @@ services:
   - docker
 cache: bundler
 before_install:
-  - gem update bundler
-script: "bundle exec pdqtest setup && bundle exec pdqtest all"
+  - bundle install
+  - bundle exec pdqtest setup
+script: "make"
 rvm:
-  - 2.2.2
-env:
-  matrix:
-  - PUPPET_GEM_VERSION="~> 4.7.0"
+  - 2.3.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -303,6 +303,7 @@ files:
 - res/skeleton/Gemfile
 - res/skeleton/Makefile
 - res/skeleton/Rakefile
+- res/skeleton/bitbucket-pipelines.yml
 - res/skeleton/dot_gitignore
 - res/skeleton/dot_rspec
 - res/skeleton/dot_travis.yml