puppet-itemize 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 422fdbc454ed30e9fbca344080e6d4382e55f5332a1c6e3aa156d9f2f5651da3
-  data.tar.gz: 51a10a2c4b77efc62111d15e2ad074cdb1e2c584d6b7aea5d4e5ca30991540c8
+SHA1:
+  metadata.gz: 7b3c318001bfbfe15c2c0568b90c5828cc043374
+  data.tar.gz: 7b6b404e88698f56acccc6df7e756d145a41344f
 SHA512:
-  metadata.gz: 4b003d8ff8e2bec6e60334259ec9d8db6c1e5224ddaaec46df38cbf99dd62a9f9e7289f391198559df4ac3d95139fb1665b56328987d54bce0e72df57202d7dd
-  data.tar.gz: 800ee84189d7f936e709e183a08870c8267984a8d8f488a8a0f1f0aff061f58cbf294a4168782c08d68c9420db965b750123a4d4592ebceda4fbf9af22b65715
+  metadata.gz: 47a02d64eb0371acbf7ddc46aa9b69af05dcb2429f1cd02c3bd96e08c3fe2a994b5d757b7bcf522d555792caf201f8e0c1c2fca61a1ad7326c8b3ab3aebbd50a
+  data.tar.gz: 1f4d3499b0a7d29907f9f78d2bc5e7fb4bbda7143b5ee80f7a2e7b7aefeff672c546cd98af63c768bc459ab41b440170f8f34a6c90e4cc917cb1f0af3a8f59fe

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.0.4
+
+* Stop monkeypatching core classes
+* Catch both prefix and postfix function forms
+* Count `require` and `contain` functions properly
+
+
 # v0.0.3
 
 * Parse more syntax edge cases without exploding. We can't evaluate everything

data/README.md

@@ -92,11 +92,6 @@ below in the class list as `apache::mod::<??>`.
 ```
 $ puppet parser itemize ~/Projects/puppetlabs-apache/manifests/
 Warning: Undeclared module dependancy: portage::makeconf
-Warning: Undeclared module dependancy: portage::makeconf
-Warning: Undeclared module dependancy: portage::makeconf
-Warning: Undeclared module dependancy: portage::makeconf
-Warning: Undeclared module dependancy: portage::makeconf
-Warning: Undeclared module dependancy: portage::makeconf
 Warning: create_resources detected. Please update to use iteration instead.
 Resource usage analysis:
 =======================================

data/lib/puppet_x/binford2k/itemize/parser.rb

@@ -1,7 +1,7 @@
 require 'puppet'
 require 'puppet/parser'
 require 'puppet/util/logging'
-require 'puppet_x/binford2k/itemize/monkeypatch'
+# require 'puppet_x/binford2k/itemize/monkeypatch'
 
 class Puppet_X::Binford2k::Itemize::Parser
   attr_reader :results
@@ -58,7 +58,7 @@ class Puppet_X::Binford2k::Itemize::Parser
   end
 
   def count_ResourceExpression(o)
-    resource_name = o.type_name.value
+    resource_name = value_of(o.type_name)
     case resource_name
     when 'class'
       # for classes declared as resource-style, we have to traverse back up the
@@ -67,10 +67,10 @@ class Puppet_X::Binford2k::Itemize::Parser
         case klass.title
         when Puppet::Pops::Model::LiteralList
           klass.title.values.each do |item|
-            record(:classes, item.value)
+            record(:classes, value_of(item))
           end
         else
-          record(:classes, klass.title.value)
+          record(:classes, value_of(klass.title))
         end
       end
     else
@@ -78,24 +78,54 @@ class Puppet_X::Binford2k::Itemize::Parser
     end
   end
 
+  # postfix functions
+  def count_CallMethodExpression(o)
+    record_function(o, o.functor_expr.right_expr.value)
+  end
+
+  # prefix functions
   def count_CallNamedFunctionExpression(o)
-    function_name = o.functor_expr.value
+    record_function(o, o.functor_expr.value)
+  end
+
+  def record_function(o, function_name)
     case function_name
-    when 'include'
+    when 'include', 'contain', 'require'
       o.arguments.each do |klass|
-        record(:classes, klass.value)
+        record(:classes, value_of(klass))
       end
 
     when 'create_resources'
       Puppet.warn_once(:dependency, 'create_resources', 'create_resources detected. Please update to use iteration instead.', :default, :default)
       record(:functions, function_name)
-      record(:types, o.arguments.first.value)
+      record(:types, value_of(o.arguments.first))
 
     else
       record(:functions, function_name)
     end
   end
 
+  def value_of(obj)
+    case obj
+    when Puppet::Pops::Model::ConcatenatedString
+      obj.segments.map {|t| t.value rescue nil }.join('<??>')
+    when Puppet::Pops::Model::VariableExpression,
+         Puppet::Pops::Model::CallMethodExpression,
+         Puppet::Pops::Model::LiteralDefault
+      '<??>'
+    when Puppet::Pops::Model::CallMethodExpression
+      obj.functor_expr.right_expr.value
+    when Puppet::Pops::Model::AccessExpression
+      obj.keys.map {|t| t.value rescue nil }.join
+    when Puppet::Pops::Model::ArithmeticExpression
+      obj.left_expr.value + obj.operator + obj.right_expr.value
+    when Puppet::Pops::Model::CallNamedFunctionExpression
+      "#{obj.functor_expr.value}(#{obj.arguments.map {|a| a.value rescue nil }.join(',')})"
+    else
+      obj.value
+    end
+  end
+
   def dump!
     require 'json'
     puts JSON.pretty_generate(@results)

data/lib/puppet_x/binford2k/itemize/version.rb

@@ -1,7 +1,7 @@
 module Puppet_X
   module Binford2k
     class Itemize
-      VERSION = '0.0.3'
+      VERSION = '0.0.4'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-itemize
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -48,7 +48,6 @@ files:
 - lib/puppet/face/parser/itemize.rb
 - lib/puppet_x/binford2k/itemize.rb
 - lib/puppet_x/binford2k/itemize/cli.rb
-- lib/puppet_x/binford2k/itemize/monkeypatch.rb
 - lib/puppet_x/binford2k/itemize/parser.rb
 - lib/puppet_x/binford2k/itemize/runner.rb
 - lib/puppet_x/binford2k/itemize/version.rb
@@ -72,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Count the number of types, classes, functions used in Puppet manifest(s).

data/lib/puppet_x/binford2k/itemize/monkeypatch.rb

@@ -1,51 +0,0 @@
-# Update the interpolated string token to return a composed value string so we
-# don't have to special case its handling. Because this is pre-compilation,
-# we cannot resolve variables. So just tag w/ a marker
-class Puppet::Pops::Model::ConcatenatedString
-  def value
-    segments.map {|t| t.value rescue nil }.join('<??>')
-  end
-end
-
-# when a resource declaration title is just a variable
-class Puppet::Pops::Model::VariableExpression
-  def value
-    '<??>'
-  end
-end
-
-# when a resource reference is used
-class Puppet::Pops::Model::AccessExpression
-  def value
-    keys.map {|t| t.value rescue nil }.join
-  end
-end
-
-# when math (like a set operation) is used to generate a list of classes to use.
-class Puppet::Pops::Model::ArithmeticExpression
-  def value
-    left_expr.value + operator + right_expr.value
-  end
-end
-
-# when a postfix method generates a list of classes to declare
-class Puppet::Pops::Model::CallMethodExpression
-  def value
-    '<??>'
-  end
-end
-
-# when a function generates the name of a class to declare
-class Puppet::Pops::Model::CallNamedFunctionExpression
-  def value
-    "#{functor_expr.value}(#{arguments.map {|a| a.value rescue nil }.join(',')})"
-  end
-end
-
-# When someone uses a resource reference to ... declare a class with a default expression
-# like ... who even does that?
-class Puppet::Pops::Model::LiteralDefault
-  def value
-    '<??>'
-  end
-end