puppet-retrospec 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002916714e063012f04646ccf19f1b8a1187fcf0
-  data.tar.gz: 0face14d5260e31e4b6f5ff5ec1e9d67f1847b7e
+  metadata.gz: 19182f00aac6e9f41d3dad24c42331a932ef3082
+  data.tar.gz: af3c40c03e987d7257fc7afcd4bc11b34b89d3d1
 SHA512:
-  metadata.gz: 356c8bec48b1bee94dfbefba8b7da3eaaab8758c420c391dacec95022bd8511db15c95c4ebd114b0a7e8a4d29b671d9ddde959501767d5679ae1b3fa989e3467
-  data.tar.gz: 9cf6823f600855200d52f3ea47f637256cf68b30ad5e01ac5f095224d046eb67f984be2bcbc7d5a2e2f6d01d26e4211e5830189e367d42c347453cb14313b47c
+  metadata.gz: 38e3846b3e6dd206a60c3696e638b8e14228d2b02b8d2edd4609e53dba3c68376bb9e6057d79bdb4eeac2b0de4f2571aad042d2ae05f2486ea76f03857057101
+  data.tar.gz: b1824320e73212d7082da5835a068c2035eb807fc3f7f66c8bf5efae042a1519282401500b4da7d870534b2b9f27a3809021b1e9da21b276a504dba3efbf64c3

data/.gitlab-ci.yml

@@ -39,6 +39,7 @@ ruby2.3:
   image: ruby:2.3
 
 stages:
+  - validate
   - test
   - release
   - deploy
@@ -60,7 +61,7 @@ bump_and_tag:
   tags:
     - ruby2.2
   only:
-    - master@puppet-debugger/puppet-debugger
+    - master@nwops/puppet-retrospec
   script:
     - gem install release_me
     - bump_and_tag

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 1.3.1
+ * adds ability to sync files
 ## 1.3.0
  * fixes gh-68 - add ability to overwrite generated files
  * updates README

data/Gemfile

@@ -2,12 +2,13 @@ source 'http://rubygems.org'
 
 gem 'awesome_print'
 gem 'facets'
-gem 'retrospec', '~> 0.5'
+gem 'retrospec', '~> 0.6'
 gem 'trollop'
 
 group :development do
   gem 'pry'
   gem 'rdoc', '~> 3.12'
+  gem 'overcommit'
 end
 
 group :test do
@@ -17,6 +18,6 @@ group :test do
   gem 'puppet', '4.5.2', :path => 'vendor/gems/puppet-4.5.2'
   gem 'rake'
   gem 'rspec', '~> 3.2'
-  gem 'rubocop', platforms: :ruby_20
+  gem 'rubocop'
   gem 'yard', '~> 0.7'
 end

data/Gemfile.lock

@@ -12,16 +12,23 @@ GEM
     CFPropertyList (2.2.8)
     ast (2.3.0)
     awesome_print (1.7.0)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
     diff-lcs (1.2.5)
     facets (3.1.0)
     facter (2.4.6)
       CFPropertyList (~> 2.2.6)
     fakefs (0.9.1)
+    ffi (1.9.18)
     hiera (3.2.1)
+    iniparse (1.4.2)
     json (1.8.3)
     json_pure (2.0.1)
     method_source (0.8.2)
+    overcommit (0.38.0)
+      childprocess (~> 0.5.8)
+      iniparse (~> 1.4)
     parser (2.3.1.4)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -33,7 +40,7 @@ GEM
     rake (11.3.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    retrospec (0.5.0)
+    retrospec (0.6.0)
       trollop
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -69,11 +76,12 @@ DEPENDENCIES
   facets
   fakefs
   json_pure (= 2.0.1)
+  overcommit
   pry
   puppet (= 4.5.2)!
   rake
   rdoc (~> 3.12)
-  retrospec (~> 0.5)
+  retrospec (~> 0.6)
   rspec (~> 3.2)
   rubocop
   trollop

data/README.md

@@ -30,7 +30,6 @@ Table of Contents
     * [Creating a new function](#creating-a-new-function)
     * [Creating a new type](#creating-a-new-type)
     * [Creating a schema file](#creating-a-new-module-schema-file)
-  * [Dependency](#dependency)
   * [Enable Future Parser](#enabling-the-future-parser)
   * [Configuration](#configuration)
   * [Example](#example)
@@ -51,6 +50,9 @@ TOC Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)
 [![Gem Version](https://badge.fury.io/rb/puppet-retrospec.svg)](http://badge.fury.io/rb/puppet-retrospec)
 
 ## News
+### 3/7/17
+You can now sync files.  Any template file that contains a `.sync` in the file name will automatically
+be syncronized.  This is especially helpful for Gemfiles, Rakefiles and other static files that need to be updated.
 ### 2/1/17
 You can now choose to overwrite files!  This is very useful when updating old module code with newer content.
 See Usage below for how to enable.
@@ -225,10 +227,6 @@ retrospec puppet
 + /private/tmp/testabc124/testabc124_schema.yaml
 ```
 
-## Dependency
-Retrospec relies heavily on the puppet 3.7.x codebase.  Because of this hard dependency the puppet gem is vendored into the library so there should not be conflicts with your existing puppet gem.  
-
-
 ## Configuration
  Below is a list of options that you can set in the config file.  Setting these options will help cut down on passing parameters. (/Users/username/.retrospec/config.yaml)  `retrospec -h`
 

data/lib/retrospec/plugins/v1/plugin/generators/parsers/facter.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 # this is required to use when processing erb templates
 class OpenStruct
   def get_binding
-    binding()
+    binding
   end
 end
 

data/lib/retrospec/plugins/v1/plugin/generators/serializers/rspec_dumper_full.rb

@@ -227,7 +227,7 @@ module Retrospec
 
       def dump_LambdaExpression o
         result = ["lambda"]
-        result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
+        result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size > 0
         if o.body
           result << do_dump(o.body)
         else

data/lib/retrospec/plugins/v1/plugin/generators/serializers/schema_dumper.rb

@@ -198,7 +198,7 @@ module Retrospec
 
       def dump_LambdaExpression o
         result = ["lambda"]
-        result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size() > 0
+        result << ["parameters"] + o.parameters.collect {|p| do_dump(p) } if o.parameters.size > 0
         if o.body
           result << do_dump(o.body)
         else

data/lib/retrospec/plugins/v1/plugin/puppet.rb

@@ -265,7 +265,8 @@ Generates puppet rspec test code and puppet module components.
 
         # this is the method that performs all the magic and creates all the files
         def create_files
-          safe_create_module_files
+          filter = /nodesets|acceptance|spec_helper_acceptance/ unless context.enable_beaker_tests?
+          safe_create_module_files(template_dir, module_path, context, filter)
           fact(module_path, config_data)
           type_spec_files(module_path, config_data)
           provider_spec_files(module_path, config_data)
@@ -279,38 +280,6 @@ Generates puppet rspec test code and puppet module components.
           true
         end
 
-        # creates any file that is contained in the templates/modules_files directory structure
-        # loops through the directory looking for erb files or other files.
-        # strips the erb extension and renders the template to the current module path
-        # filenames must named how they would appear in the normal module path.  The directory
-        # structure where the file is contained
-        def safe_create_module_files
-          templates = Find.find(File.join(template_dir, 'module_files')).sort
-          templates.each do |template|
-            # need to remove the erb extension and rework the destination path
-            if template =~ /nodesets|acceptance|spec_helper_acceptance/ and !context.enable_beaker_tests?
-              next
-            else
-              dest = template.gsub(File.join(template_dir, 'module_files'), module_path)
-              if File.symlink?(template)
-                safe_create_symlink(template, dest)
-              elsif File.directory?(template)
-                safe_mkdir(dest)
-              else
-                # because some plugins contain erb files themselves any erb file will be copied only
-                # so we need to designate which files should be rendered with .retrospec.erb
-                if template =~ /\.retrospec\.erb/
-                  # render any file ending in .retrospec_erb as a template
-                  dest = dest.gsub(/\.retrospec\.erb/, '')
-                  safe_create_template_file(dest, template, context)
-                else
-                  safe_copy_file(template, dest)
-                end
-              end
-            end
-          end
-        end
-
         def description
           'Generates puppet rspec test code based on the classes and defines inside the manifests directory'
         end

data/lib/retrospec/plugins/v1/plugin/version.rb

@@ -1,5 +1,5 @@
 module Retrospec
   module Puppet
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

data/puppet-retrospec.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Corey Osman"]
-  s.date = "2016-07-28"
+  s.date = "2017-03-07"
   s.description = "Retrofits and generates valid puppet rspec test code to existing modules"
   s.email = "corey@nwops.io"
   s.extra_rdoc_files = [
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = "2.4.5.1"
   s.summary = "Generates puppet rspec test code based on the classes and defines inside the manifests directory. Aims to reduce some of the boilerplate coding with default test patterns."
   s.add_runtime_dependency(%q<trollop>, [">= 0"])
-  s.add_runtime_dependency(%q<retrospec>, ["~> 0.5"])
+  s.add_runtime_dependency(%q<retrospec>, ["~> 0.6"])
   s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
   s.add_runtime_dependency(%q<facets>, [">= 0"])
   s.add_development_dependency(%q<rdoc>, ["~> 3.12"])

data/spec/unit/puppet-retrospec_spec.rb

@@ -140,7 +140,7 @@ describe 'puppet-retrospec' do
         tomcat = Retrospec::Plugins::V1::Puppet.new(module_path, global_opts)
         tomcat.post_init
         filepath = File.expand_path(File.join(module_path, 'spec', 'acceptance', 'nodesets', 'default.yml'))
-        tomcat.safe_create_module_files
+        tomcat.create_files
         expect(File.exist?(filepath)).to eq(true)
         expect(Dir.glob(File.expand_path(File.join(module_path, 'spec', 'acceptance', 'nodesets', '*.yml'))).length).to eq 15
       end
@@ -188,7 +188,7 @@ describe 'puppet-retrospec' do
     tomcat = Retrospec::Plugins::V1::Puppet.new(module_path, global_opts)
     tomcat.post_init
     filepath = File.expand_path(File.join(module_path, 'spec', 'spec_helper.rb'))
-    tomcat.safe_create_module_files
+    tomcat.create_files
     path = tomcat.module_path
     expect(File.exist?(filepath)).to eq(true)
   end
@@ -197,7 +197,7 @@ describe 'puppet-retrospec' do
     tomcat = Retrospec::Plugins::V1::Puppet.new(module_path, global_opts)
     tomcat.post_init
     filepath = File.expand_path(File.join(module_path, 'spec', 'shared_contexts.rb'))
-    tomcat.safe_create_module_files
+    tomcat.create_files
     expect(File.exist?(filepath)).to eq(true)
   end
 
@@ -205,7 +205,7 @@ describe 'puppet-retrospec' do
     tomcat = Retrospec::Plugins::V1::Puppet.new(module_path, global_opts)
     tomcat.post_init
     filepath = File.expand_path(File.join(module_path, 'spec', 'shared_contexts.rb'))
-    tomcat.safe_create_module_files
+    tomcat.create_files
     path = tomcat.module_path
     expect(tomcat.context.all_hiera_data).to eq('tomcat::catalina_home' => nil,
                                                 'tomcat::user' => nil,
@@ -225,7 +225,7 @@ describe 'puppet-retrospec' do
     tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], opts)
     tomcat.post_init
     filepath = File.expand_path(File.join(path, 'spec', 'spec_helper_acceptance.rb'))
-    tomcat.safe_create_module_files
+    tomcat.create_files
     expect(File.exist?(filepath)).to eq(true)
   end
 
@@ -235,7 +235,7 @@ describe 'puppet-retrospec' do
     filepath = File.expand_path(File.join(path, 'spec', 'spec_helper_acceptance.rb'))
     tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], opts)
     tomcat.post_init
-    tomcat.safe_create_module_files
+    tomcat.create_files
     expect(File.exist?(filepath)).to eq(false)
   end
 
@@ -245,7 +245,7 @@ describe 'puppet-retrospec' do
     tomcat = Retrospec::Plugins::V1::Puppet.new(@opts[:module_path], opts)
     tomcat.post_init
     filepath = File.expand_path(File.join(path, 'spec', 'acceptance', 'nodesets', 'default.yml'))
-    tomcat.safe_create_module_files
+    tomcat.create_files
     expect(File.exist?(filepath)).to eq(true)
     expect(Dir.glob(File.expand_path(File.join(path, 'spec', 'acceptance', 'nodesets', '*.yml'))).length).to eq 15
   end
@@ -254,7 +254,7 @@ describe 'puppet-retrospec' do
     tomcat = Retrospec::Plugins::V1::Puppet.new(module_path, global_opts)
     tomcat.post_init
     filepath = File.expand_path(File.join(module_path, 'Gemfile'))
-    tomcat.safe_create_module_files
+    tomcat.create_files
     expect(File.exist?(filepath)).to eq(true)
   end
 
@@ -262,7 +262,7 @@ describe 'puppet-retrospec' do
     tomcat = Retrospec::Plugins::V1::Puppet.new(module_path, global_opts)
     tomcat.post_init
     filepath = File.expand_path(File.join(module_path, 'Rakefile'))
-    tomcat.safe_create_module_files
+    tomcat.create_files
     expect(File.exist?(filepath)).to eq(true)
   end
 
@@ -271,7 +271,7 @@ describe 'puppet-retrospec' do
     FileUtils.rm_f(filepath) # ensure we have a clean state
     tomcat = Retrospec::Plugins::V1::Puppet.new(module_path, global_opts)
     tomcat.post_init
-    tomcat.safe_create_module_files
+    tomcat.create_files
     expect(File.exist?(filepath)).to eq(true)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-retrospec
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement