puppet-retrospec 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ba74daa4e9c7b8f14e53e78a748a19bd6a2452
-  data.tar.gz: e92c12020b905fdde3be60f8e87b48a6ddd497f6
+  metadata.gz: a9bd4527b504e3bed3e18861dae6308ebe725441
+  data.tar.gz: de5419b0edc23e427d8559e9ddcafc3f18f72109
 SHA512:
-  metadata.gz: 66debb7167d01c98db0a1bba91ce18668d1a83fa4a2bf562ab6e5f54b4121cf88daee015df8a850f7a7e8bf8d36e26a3158b55b008bee52bab2db2d1d2049b76
-  data.tar.gz: 46b9b0111a51e811be08dacca780a5c0ff1a34bcfee9b4a204c96d1208cebe8009c38a686b6c0823919d3e0bcb68ae4afe25cedc644a69f89416e57d88e69789
+  metadata.gz: fa079425ba609de77e12cc553b71602736c63d0ed1ad1c00c4d15ed7b5fe258b2038c0abe561a29b9ce3e96fca26c99ca6df4fbf26f8d5be3d15ceb7132f7cd5
+  data.tar.gz: 97a2a24de34fcdde1c48515f8de008a1df85770393b208bd3849f43b924dee6e620d9b903fc56b7f1029fffa3a7a4fee25c78bd75fce45c29c2a0f8b589a960f

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 1.2.0
+ * fixes gh-53 - adds windows support
 ## 1.1.0
  * fixes gh-62 - add support for creating native puppet fuctions
 ## 1.0.0

data/Gemfile

@@ -11,12 +11,12 @@ group :development do
 end
 
 group :test do
-  gem 'rubocop'
+  gem 'rubocop', platforms: :ruby_20
   gem 'rspec', '~> 3.2'
   gem 'puppet', '4.5.2', :path => 'vendor/gems/puppet-4.5.2'
+  gem 'json_pure', '= 2.0.1' # force this gem as 2.0.2 requires ruby > 2.0.0
   gem 'rake'
   gem 'bundler', '~> 1.0'
   gem 'yard', '~> 0.7'
   gem 'fakefs', :require => 'fakefs/safe'
-  gem 'rspec', '~> 3.2'
 end

data/Gemfile.lock

@@ -17,13 +17,12 @@ GEM
     facets (3.1.0)
     facter (2.4.6)
       CFPropertyList (~> 2.2.6)
-    fakefs (0.9.0)
-    hiera (3.2.0)
-      json_pure
+    fakefs (0.9.1)
+    hiera (3.2.1)
     json (1.8.3)
-    json_pure (2.0.2)
+    json_pure (2.0.1)
     method_source (0.8.2)
-    parser (2.3.1.2)
+    parser (2.3.1.4)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -31,7 +30,7 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rainbow (2.1.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rdoc (3.12.2)
       json (~> 1.4)
     retrospec (0.4.0)
@@ -40,7 +39,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
+    rspec-core (3.5.3)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -49,7 +48,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.42.0)
+    rubocop (0.43.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -58,7 +57,7 @@ GEM
     ruby-progressbar (1.8.1)
     slop (3.6.0)
     trollop (2.1.2)
-    unicode-display_width (1.1.0)
+    unicode-display_width (1.1.1)
     yard (0.9.5)
 
 PLATFORMS
@@ -69,6 +68,7 @@ DEPENDENCIES
   bundler (~> 1.0)
   facets
   fakefs
+  json_pure (= 2.0.1)
   pry
   puppet (= 4.5.2)!
   rake
@@ -80,4 +80,4 @@ DEPENDENCIES
   yard (~> 0.7)
 
 BUNDLED WITH
-   1.12.5
+   1.13.1

data/lib/retrospec/plugins/v1/plugin/generators/node_generator.rb

@@ -1,4 +1,5 @@
 require_relative 'serializers/rspec_dumper'
+require_relative 'resource_base_generator'
 require 'puppet'
 require 'puppet/pops'
 

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

@@ -67,8 +67,8 @@ module Retrospec
           # the user passed in /tmp/test1 and the name is irrelevent
           if ! File.exists?(plugin_data[:module_path])
             plugin_data[:module_path] = File.join(plugin_data[:module_path])
-          # if the module path basename is the same as the module name
-          # this is a parent directory or the module already exists
+            # if the module path basename is the same as the module name
+            # this is a parent directory or the module already exists
           elsif File.basename(plugin_data[:module_path]) != plugin_data[:name]
             plugin_data[:module_path] = File.join(plugin_data[:module_path], plugin_data[:name])
           end
@@ -101,16 +101,16 @@ module Retrospec
           plugin_opts = Trollop.options(args) do
             version "Retrospec puppet plugin: #{Retrospec::Puppet::VERSION} (c) Corey Osman"
             banner <<-EOS
-Generates puppet rspec test code based on the classes and defines inside the manifests directory.\n
-#{sub_command_help}
+            Generates puppet rspec test code based on the classes and defines inside the manifests directory.\n
+            #{sub_command_help}
 
             EOS
             opt :template_dir, 'Path to templates directory (only for overriding Retrospec templates)', :type => :string,
-                :required => false, :default => template_dir
+            :required => false, :default => template_dir
             opt :scm_url, 'SCM url for retrospec templates', :type => :string, :required => false,
-                :default => scm_url
+            :default => scm_url
             opt :branch, 'Branch you want to use for the retrospec template repo', :type => :string, :required => false,
-                :default => scm_branch
+            :default => scm_branch
             opt :enable_beaker_tests, 'Enable the creation of beaker tests', :require => false, :type => :boolean, :default => beaker_tests
             stop_on sub_commands
           end
@@ -240,31 +240,25 @@ Generates puppet rspec test code based on the classes and defines inside the man
         # runs a user defined hook called pre-hook
         def run_pre_hook
           hook_file = File.join(template_dir, 'pre-hook')
-          if File.exist?(hook_file)
-            output = `#{hook_file} #{module_path}`
-            if $CHILD_STATUS.success?
-              puts "Successfully ran hook: #{hook_file}".info
-              puts output.info
-            else
-              puts "Error running hook: #{hook_file}".fatal
-              puts output.fatal
-            end
+          run_hook(hook_file)
+        end
+
+        def run_hook(hook_file)
+          return if File.exist?(hook_file)
+          output = `ruby #{hook_file} #{module_path}`
+          if $CHILD_STATUS.success?
+            puts "Successfully ran hook: #{hook_file}".info
+            puts output.info
+          else
+            puts "Error running hook: #{hook_file}".fatal
+            puts output.fatal
           end
         end
 
         # runs a user defined hook called post-hook
         def run_post_hook
           hook_file = File.join(template_dir, 'post-hook')
-          if File.exist?(hook_file)
-            output = `#{hook_file} #{module_path}`
-            if $CHILD_STATUS.success?
-              puts "Successfully ran hook: #{hook_file}".info
-              puts output.info
-            else
-              puts "Error running hook: #{hook_file}".fatal
-              puts output.fatal
-            end
-          end
+          run_hook(hook_file)
         end
 
         # this is the method that performs all the magic and creates all the files

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

@@ -44,26 +44,34 @@ module Retrospec
         File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
+      # @return [String] window's specific file path for windows and unix specific path for unix
+      # @param [String] path to the template directory
+      def clone_hook_file(template_dir)
+        hook_file_name = 'clone-hook'
+        if File.exist?(File.join(template_dir, hook_file_name))
+          hook_file = File.join(template_dir, hook_file_name)
+        else
+          hook_file = File.join(gem_template_dir, hook_file_name)
+        end
+        hook_file
+      end
+
       # runs the clone hook file
       # the intention of this method and hook is to download the templates
       # from an external repo. Because templates are updated frequently
       # and users will sometimes have client specific templates I wanted to
       # externalize them for easier management.
       def run_clone_hook(template_dir, git_url = nil, branch = nil)
-        if File.exist?(File.join(template_dir, 'clone-hook'))
-          hook_file = File.join(template_dir, 'clone-hook')
+        hook_file = clone_hook_file(template_dir)
+        return if File.exist?(hook_file)
+        output = `ruby #{hook_file} #{template_dir} #{git_url} #{branch}`
+        puts output
+        if $CHILD_STATUS.success?
+          puts "Successfully ran hook: #{hook_file}".info
+          puts output.info
         else
-          hook_file = File.join(gem_template_dir, 'clone-hook')
-        end
-        if File.exist?(hook_file)
-          output = `#{hook_file} #{template_dir} #{git_url} #{branch}`
-          if $CHILD_STATUS.success?
-            puts "Successfully ran hook: #{hook_file}".info
-            puts output.info
-          else
-            puts "Error running hook: #{hook_file}".fatal
-            puts output.fatal
-          end
+          puts "Error running hook: #{hook_file}".fatal
+          puts output.fatal
         end
       end
     end

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

@@ -1,5 +1,5 @@
 module Retrospec
   module Puppet
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/puppet-retrospec.gemspec

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
-require_relative 'lib/retrospec/plugins/v1/plugin/version'
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'retrospec/plugins/v1/plugin/version'
 
 Gem::Specification.new do |s|
   s.name = "puppet-retrospec"

data/spec/unit/generators/function_generator_spec.rb

@@ -358,7 +358,7 @@ describe 'function_generator' do
         path = File.join(generator.module_path, 'spec', 'functions', 'abs_spec.rb')
         expect(generator.generate_spec_files).to eq([path])
         test_file_content = File.read(path)
-        result = "require 'spec_helper'\n\nlet(:x) do\n  'some_value_goes_here'\nend\n\ndescribe 'abs' do\n  it { is_expected.to run.with_params(x).and_return('some_value') }\nend\n"
+        result = "require 'spec_helper'\n\ndescribe 'abs' do\n  let(:x) do\n    'some_value_goes_here'\n  end\n  it { is_expected.to run.with_params(x).and_return('some_value') }\nend\n"
         expect(test_file_content).to eq(result)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-retrospec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Corey Osman