puppet-itemize 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b3c318001bfbfe15c2c0568b90c5828cc043374
-  data.tar.gz: 7b6b404e88698f56acccc6df7e756d145a41344f
+  metadata.gz: 87413824f9668fcaae315821a7d3348da4b4e702
+  data.tar.gz: 4d2951949779cb082d2c992d9909c384996eaa2e
 SHA512:
-  metadata.gz: 47a02d64eb0371acbf7ddc46aa9b69af05dcb2429f1cd02c3bd96e08c3fe2a994b5d757b7bcf522d555792caf201f8e0c1c2fca61a1ad7326c8b3ab3aebbd50a
-  data.tar.gz: 1f4d3499b0a7d29907f9f78d2bc5e7fb4bbda7143b5ee80f7a2e7b7aefeff672c546cd98af63c768bc459ab41b440170f8f34a6c90e4cc917cb1f0af3a8f59fe
+  metadata.gz: b180f793fb59579779f53670c416a53964ca1014c76ee72ff7722b1598bae643ab86115c191129094b12af7ab47fa2b93561270972a10d2582101460ddce5dad
+  data.tar.gz: 1c639ec0db9e239caa331ad6a560dbd092928d49ae616451f742c0d0c918dc12ff44c3949f4bc7018ac58dc01e590479912a8c0adf7bfb1ba5d1023707d65c93

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.0.5
+
+* Add the monkeypatch back in. Calculating it via a class method just had too
+  many edge cases.
+
+
 # v0.0.4
 
 * Stop monkeypatching core classes

data/lib/puppet_x/binford2k/itemize.rb

@@ -1,8 +1,7 @@
 module Puppet_X
   module Binford2k
     class Itemize
-      VERSION = '0.0.1'
-
+      require 'puppet_x/binford2k/itemize/version'
       require 'puppet_x/binford2k/itemize/parser'
       require 'puppet_x/binford2k/itemize/runner'
     end

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

@@ -0,0 +1,51 @@
+# 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

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 = value_of(o.type_name)
+    resource_name = o.type_name.value
     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, value_of(item))
+            record(:classes, item.value)
           end
         else
-          record(:classes, value_of(klass.title))
+          record(:classes, klass.title.value)
         end
       end
     else
@@ -92,19 +92,20 @@ class Puppet_X::Binford2k::Itemize::Parser
     case function_name
     when 'include', 'contain', 'require'
       o.arguments.each do |klass|
-        record(:classes, value_of(klass))
+        record(:classes, klass.value)
       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, value_of(o.arguments.first))
+      record(:types, o.arguments.first.value)
 
     else
       record(:functions, function_name)
     end
   end
 
+  # lots of edge cases of edge cases here. Monkeypatching seems more reliable
   def value_of(obj)
     case obj
     when Puppet::Pops::Model::ConcatenatedString
@@ -114,11 +115,11 @@ class Puppet_X::Binford2k::Itemize::Parser
          Puppet::Pops::Model::LiteralDefault
       '<??>'
     when Puppet::Pops::Model::CallMethodExpression
-      obj.functor_expr.right_expr.value
+      value_of(obj.functor_expr.right_expr)
     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
+      value_of(obj.left_expr) + obj.operator + value_of(obj.right_expr)
     when Puppet::Pops::Model::CallNamedFunctionExpression
       "#{obj.functor_expr.value}(#{obj.arguments.map {|a| a.value rescue nil }.join(',')})"
     else

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-itemize
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -48,6 +48,7 @@ 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