puppet-retrospec 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4224baa0aa258511ae8bc9bae2bc0c2cd4acbe51
-  data.tar.gz: fafff7c4eb4efb843198521e3b6370745844b4ee
+  metadata.gz: 62765af0524e72cd3924e3c4406b7f418896e4f5
+  data.tar.gz: 50210328a846af0f1bbdec63765e9d4ee53caa38
 SHA512:
-  metadata.gz: 4a72c6e609e917b2aac4689a7e4351e1b187d5bf82df550667bc97c174d2fe7823dd8cfea32cdfc0e201155324f0ea33655d0141ea6709916c088a27a0f6f58d
-  data.tar.gz: c8fb49ce6e89aaebfbf850ea33be40e684833759217bfc4b1322c0bb2f6906657c2005c625b7cea225b0f8f72bb5c6c351c1ad49523f00990cd774e4390a099a
+  metadata.gz: 7a7b1e4da9e4a6234d01cd6f0c53b0b28f1305d83678e0e2d510ea61dda03f8e43ea691bd284fb9ed6983d8a9257441b5c6f60663cb0d13c91e620a570a70792
+  data.tar.gz: 4551ab67fa1fea42ce1dd427984dc04f1a8765c542f2ff69aec5341305471b09699c67757a2fc060b0db645774fc37910bd7d7addeb08d626419851b8b5dd653

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 1.6.1
+
+### Bug Fixes
+ * Require the base generator for module data
+ * Fixes #85 - native functions do not contain module name
+ * Fixes #92 - that requires throws errors
+ * Fixes #93 - native functions spec tests contain full namespaced name
+ * Fixes #87 - evaluation fails when parameters have logic
 ## 1.6.0
  * Fixes #77 - class requirements is not coded correctly
  * Fixes #75 - pdk cannot include retrospec due to character limit

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet-retrospec (1.6.0)
+    puppet-retrospec (1.6.1)
       awesome_print
       facets
       retrospec (>= 0.6.2)

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

@@ -33,6 +33,11 @@ module Retrospec
           end
         end
 
+        # @return [String] - returns the main class name by reading the init.pp file
+        def main_class_name
+          File.read(File.join(module_path, 'manifests', 'init.pp')).scan(/\s*class\s(\w+)/).flatten.first || ''
+        end
+
         # returns v3,v4, native to specify the function type
         def function_type
           context.function_type
@@ -176,6 +181,11 @@ Generates a new function with the given name.
             File.extname(function_file) == '.pp'
         end
 
+        # @return [String] - returns the namespaced function name ie. stdlib::round
+        def namespaced_name
+          [main_class_name, function_name].join('::')
+        end
+
         # @return [Boolean] true if the function file is a v4 function
         def v4_function?(function_file)
           # mod_name/lib/puppet/functions
@@ -220,7 +230,10 @@ Generates a new function with the given name.
               puts "Function syntax is bad for #{file}, skipping".warning
               next  # lets skip functions that have bad syntax
             end
-            spec_path = File.join(spec_file_dir, "#{file_data.name}_spec.rb")
+            # separate out namespace for v4 and native functions
+            # TODO should we create sub directories for triple namespace functions one::two::three?
+            file_name = file_data.name.to_s.split('::').last
+            spec_path = File.join(spec_file_dir, "#{file_name}_spec.rb")
             spec_files << spec_path
             safe_create_template_file(spec_path, File.join(template_dir, template_file), file_data)
           end

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

@@ -1,5 +1,6 @@
 require 'retrospec/plugins/v1/module_helpers'
 require 'retrospec/plugins/v1'
+require 'retrospec/plugins/v1/plugin/generators/base_generator'
 
 module Retrospec
   module Puppet

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

@@ -222,6 +222,7 @@ module Retrospec
         name_prefix = o.captures_rest ? '*' : ''
         name_part = "#{name_prefix}#{o.name}"
         data_type = dump_transform(dump_transform(o.value)).first || dump_transform(o.type_expr)
+
         # records what is most likely a variable of some time and its value
         variable_value = dump_transform(o.value)
         # need a case for Puppet::Pops::Model::LambdaExpression
@@ -273,6 +274,10 @@ module Retrospec
         result
       end
 
+
+      # @note this is the starting point where a test is created.  A resource can include a class or define
+      # each resource contains parameters which can have variables or functions as values.
+      # @param o [Puppet::Pops::Model::ResourceBody]
       def dump_ResourceBody o
         type_name = dump_transform(o.eContainer.type_name).gsub('::', '__')
         title = dump_transform(o.title).inspect
@@ -282,19 +287,22 @@ module Retrospec
         if o.operations.count > 0
           result[-1] += '.with('
           result << [:break]
+          # each operation should be a resource parameter and value
           o.operations.each do |p|
+            next unless p
             # this is a bit of a hack but the correct fix is to patch puppet
             result << dump_transform(p) << :break
           end
           result.pop  # remove last line break which is easier than using conditional in loop
+          result << [:dedent, :break, ')']
           unless [::Puppet::Pops::Model::CallNamedFunctionExpression, ::Puppet::Pops::Model::BlockExpression].include?(o.eContainer.eContainer.class)
             result << dump_Resource_Relationship(o)
           end
-          result << [:dedent, :break, ')']
           result << [:end]
           result << [:dedent]
+          result << [:break]
         else
-          result << [:dedent,:dedent, :break,'end',:dedent, '  ']
+          result << [:dedent,:dedent, :break,'end',:dedent, '  ', :break]
         end
         result
       end
@@ -304,6 +312,12 @@ module Retrospec
         []
       end
 
+      # @param o [Puppet::Pops::Model::NamedAccessExpression]
+      # ie. $::var1.split(';')
+      def dump_NamedAccessExpression o
+        [do_dump(o.left_expr), ".", do_dump(o.right_expr)]
+      end
+
       # Interpolated strings are shown as (cat seg0 seg1 ... segN)
       def dump_ConcatenatedString o
         o.segments.collect {|x| dump_transform(x)}.join
@@ -330,6 +344,7 @@ module Retrospec
       end
 
       # this doesn't return anything as we use it to store variables
+      # @param o [Puppet::Pops::Model::AssignmentExpression]
       def dump_AssignmentExpression o
         oper = o.operator.to_s
         result = []
@@ -354,6 +369,7 @@ module Retrospec
         end
       end
 
+      # @param o [Puppet::Pops::Model::BlockExpression]
       def dump_BlockExpression o
         result = [:break]
         o.statements.each {|x| result << dump_transform(x) }
@@ -361,6 +377,7 @@ module Retrospec
       end
 
       # this is the beginning of the resource not the body itself
+      # @param o [Puppet::Pops::Model::ResourceExpression]
       def dump_ResourceExpression o
         result = []
         o.bodies.each do |b|
@@ -371,11 +388,13 @@ module Retrospec
 
       # defines the resource expression and outputs -> when used
       # this would be the place to insert relationsip matchers
+      # @param o [Puppet::Pops::Model::RelationshipExpression]
       def dump_RelationshipExpression o
         [dump_transform(o.left_expr), dump_transform(o.right_expr)]
       end
 
       # Produces (name => expr) or (name +> expr)
+      # @param o [Puppet::Pops::Model::AttributeOperation]
       def dump_AttributeOperation o
         key = o.attribute_name
         value = dump_transform(o.value_expr) || nil
@@ -384,7 +403,7 @@ module Retrospec
 
       # x[y] prints as (slice x y)
       # @return [String] the value of the array expression
-      # @param [Puppet::Pops::Model::AccessExpression]
+      # @param o [Puppet::Pops::Model::AccessExpression]
       def dump_AccessExpression o
         # o.keys.pop is the item to get in the array
         # o.left_expr is the array
@@ -401,6 +420,18 @@ module Retrospec
         end
       end
 
+
+      # @return [String] the value of the expression or example value
+      # @param o [Puppet::Pops::Model::CallMethodExpression]
+      def dump_CallMethodExpression o
+        # ie. ["call-method", [".", "$::facttest", "split"], "/"]
+        result = [o.rval_required ? "# some_value" : do_dump(o.functor_expr),'(' ]
+        o.arguments.collect {|a| result << do_dump(a) }
+        results << ')'
+        result << do_dump(o.lambda) if o.lambda
+        result
+      end
+
       def dump_LiteralFloat o
         o.value.to_s
       end

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

@@ -1,5 +1,5 @@
 module Retrospec
   module Puppet
-    VERSION = '1.6.0'
+    VERSION = '1.6.1'
   end
 end

data/spec/fixtures/fixture_modules/one_resource_module/manifests/parameter_logic.pp

@@ -0,0 +1,5 @@
+class one_resource::parameter_logic(
+  String $param1  = $::facttest.split('/')[0]
+){
+
+}

data/spec/fixtures/fixture_modules/sample_module/manifests/init.pp

@@ -0,0 +1,7 @@
+#lbsdafsdfad
+#fsadfadsfsdfsd
+class sample_module(
+  $var1 = 'sdfasd'
+) {
+
+}

data/spec/fixtures/functions/absolute.pp

@@ -0,0 +1,4 @@
+function simple::absolute(Integer $x) {
+  if $x < 0 { $x * -1 }
+  else { $x }
+}

data/spec/unit/generators/definition_generator_spec.rb

@@ -66,7 +66,7 @@ describe Retrospec::Puppet::Generators::DefinitionGenerator do
   end
 
   it 'should have resources' do
-    resources = ["\n  it do\n    is_expected.to contain_notify('hello')\n  end  "]
+    resources = ["\n  it do\n    is_expected.to contain_notify('hello')\n  end  \n"]
     expect(context.resources).to eq(resources)
   end
 

data/spec/unit/generators/function_generator_spec.rb

@@ -321,6 +321,16 @@ describe 'function_generator' do
         expect(generator.v4_function?(path)).to eq false
       end
 
+      it 'returns main class name' do
+        allow(generator).to receive(:function_type).and_return('native')
+        expect(generator.main_class_name).to eq('sample_module')
+      end
+
+      it 'creates namespaced function name' do
+        allow(generator).to receive(:function_type).and_return('native')
+        expect(generator.namespaced_name).to eq('sample_module::awesome_parser')
+      end
+
       it 'return native template path' do
         allow(generator).to receive(:function_type).and_return('native')
         expect(generator.template_dir).to match(/functions\/native/)

data/spec/unit/generators/hostclass_generator_spec.rb

@@ -84,7 +84,9 @@ describe 'HostClassGenerator' do
        File.join(spec_files_path, 'one_resource_spec.rb'),
        File.join(spec_files_path, 'params_spec.rb'),
        File.join(spec_files_path, 'array_param_spec.rb'),
-       File.join(spec_files_path, 'sub', 'settings_spec.rb')]
+       File.join(spec_files_path, 'sub', 'settings_spec.rb'),
+      File.join(spec_files_path, 'parameter_logic_spec.rb')]
+
     end
 
     after(:each) do

data/spec/unit/generators/serializers/rspec_dumper_spec.rb

@@ -222,8 +222,8 @@ describe 'rspec_serializer' do
 
     it 'relationship_exp' do
       output = serializer.dump(relationship_exp)
-      expect(output).to include(".that_comes_before('Sql::backup[MSSQLSERVER]')")
-      expect(output).to include(".that_requires('Class[sql::install]')")
+      expect(output).to include(")\n    .that_comes_before('Sql::backup[MSSQLSERVER]')")
+      expect(output).to include(")\n    .that_requires('Class[sql::install]')")
     end
 
     it 'should contain correct variables' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-retrospec
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -164,6 +164,7 @@ files:
 - spec/fixtures/fixture_modules/one_resource_module/manifests/node_file.pp
 - spec/fixtures/fixture_modules/one_resource_module/manifests/one_define.pp
 - spec/fixtures/fixture_modules/one_resource_module/manifests/one_resource_class.pp
+- spec/fixtures/fixture_modules/one_resource_module/manifests/parameter_logic.pp
 - spec/fixtures/fixture_modules/one_resource_module/manifests/params.pp
 - spec/fixtures/fixture_modules/one_resource_module/manifests/sub/settings.pp
 - spec/fixtures/fixture_modules/one_resource_module/manifests/sub/settings_define.pp
@@ -175,11 +176,13 @@ files:
 - spec/fixtures/fixture_modules/sample_module/lib/puppet/parser/functions/defined.rb
 - spec/fixtures/fixture_modules/sample_module/lib/puppet/parser/functions/sha1.rb
 - spec/fixtures/fixture_modules/sample_module/lib/puppet/reports/test
+- spec/fixtures/fixture_modules/sample_module/manifests/init.pp
 - spec/fixtures/fixture_modules/sample_module/spec/unit/facter/fix_installed_spec.rb
 - spec/fixtures/fixture_modules/zero_resource_module/manifests/empty_class.pp
 - spec/fixtures/fixture_modules/zero_resource_module/manifests/not_a_resource_defination.pp
 - spec/fixtures/fixture_modules/zero_resource_module/metadata.json
 - spec/fixtures/functions/abs.pp
+- spec/fixtures/functions/absolute.pp
 - spec/fixtures/host_class_test.txt
 - spec/fixtures/manifests/apache.pp
 - spec/fixtures/manifests/includes-class.pp