puppet-itemize 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1625c1cacf7bc9c0373f02357fdef0d912ed642896c30c0fd372a38f84116924
-  data.tar.gz: 7dc10c68119882e62bb4587361a4d1f6b71ee2b94bd36a03af43c4f821863eee
+  metadata.gz: 422fdbc454ed30e9fbca344080e6d4382e55f5332a1c6e3aa156d9f2f5651da3
+  data.tar.gz: 51a10a2c4b77efc62111d15e2ad074cdb1e2c584d6b7aea5d4e5ca30991540c8
 SHA512:
-  metadata.gz: c18bb2c71c6ba444d2f11177c273a3ea7b7872ac1999c91d6d044ed90b9a80eb9fb3032ffbbeb6a3f6241bfbe496065f321af1292dee8c03eac8e2c353b642e5
-  data.tar.gz: ad95bc731049ae6d803e4961ab2cd1979e06c9adfb71e2d4a76c81c8ae8e0aa309205a99e6daa14c723bad30cfea83319eb7f811244f4d6299d0730adda7667b
+  metadata.gz: 4b003d8ff8e2bec6e60334259ec9d8db6c1e5224ddaaec46df38cbf99dd62a9f9e7289f391198559df4ac3d95139fb1665b56328987d54bce0e72df57202d7dd
+  data.tar.gz: 800ee84189d7f936e709e183a08870c8267984a8d8f488a8a0f1f0aff061f58cbf294a4168782c08d68c9420db965b750123a4d4592ebceda4fbf9af22b65715

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v0.0.3
+
+* Parse more syntax edge cases without exploding. We can't evaluate everything
+  because it's pre-compilation, but do what we can or just use a marker token.
+* Only print out undeclared module warnings once per module.
+* Added the option for debug logging of files as they're evaluated.
+* Improved the external element detection logic.
+
+
 # v0.0.2
 
 * Add namespace validation. This will now warn you if you're using elements from

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,6 +1,7 @@
 require 'puppet'
 require 'puppet/parser'
 require 'puppet/util/logging'
+require 'puppet_x/binford2k/itemize/monkeypatch'
 
 class Puppet_X::Binford2k::Itemize::Parser
   attr_reader :results
@@ -63,7 +64,14 @@ class Puppet_X::Binford2k::Itemize::Parser
       # for classes declared as resource-style, we have to traverse back up the
       # tree to see if this resource body was declared by a class resource.
       o.bodies.each do |klass|
-        record(:classes, klass.title.value)
+        case klass.title
+        when Puppet::Pops::Model::LiteralList
+          klass.title.values.each do |item|
+            record(:classes, item.value)
+          end
+        else
+          record(:classes, klass.title.value)
+        end
       end
     else
       record(:types, resource_name)
@@ -75,18 +83,11 @@ class Puppet_X::Binford2k::Itemize::Parser
     case function_name
     when 'include'
       o.arguments.each do |klass|
-        case klass
-        when Puppet::Pops::Model::ConcatenatedString
-          # Because this is pre-compilation, we cannot resolve variables. So just tag w/ a marker
-          # TODO: This should go somewhere else, but I'm not entirely sure where just now.
-          record(:classes, klass.segments.map {|t| t.value rescue nil }.join('<??>'))
-        else
-          record(:classes, klass.value)
-        end
+        record(:classes, klass.value)
       end
 
     when 'create_resources'
-      Puppet.warning 'create_resources detected. Please update to use iteration instead.'
+      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)
 

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

@@ -18,8 +18,7 @@ class Puppet_X::Binford2k::Itemize::Runner
 
       if path
         @metadata  = JSON.parse(File.read(File.expand_path("#{path}/../metadata.json")))
-        author     = @metadata['author']
-        @namespace = @metadata['name'].sub(/^#{author}-/, '')
+        @namespace = @metadata['name'].split(/[-\/]/).last
 
         # we can only use the module name part of this, not the user namespace
         @dependencies = @metadata['dependencies'].map do |dep|
@@ -50,6 +49,7 @@ class Puppet_X::Binford2k::Itemize::Runner
 
   def run!
     @paths.each do |path|
+      Puppet.debug "Itemizing #{path}"
       parser = Puppet_X::Binford2k::Itemize::Parser.new(path, @options).parse!
       parser.results.each do |kind, counts|
         @results[kind] ||= {}
@@ -57,7 +57,7 @@ class Puppet_X::Binford2k::Itemize::Runner
         counts.each do |name, count|
           segments = name.split('::')
           if @dependencies and segments.size > 1
-            Puppet.warning "Undeclared module dependancy: #{name}" unless @dependencies.include? segments.first
+            Puppet.warn_once(:dependency, name, "Undeclared module dependancy: #{name}", :default, :default) unless @dependencies.include? segments.first
           end
           next if @options[:external] and segments.first == @namespace
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-itemize
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-25 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