puppet-cleaner 0.1.0 → 0.1.1

data/Changelog

@@ -1,3 +1,8 @@
+0.1.1 2013-04-26
+-----------------
+Bug fix:
+	* uninitialized constant Puppet::Cleaner::Worker (NameError) runtime error fixed
+
 0.1.0 2013-04-16
 -----------------
 Features:

data/README.md

@@ -20,8 +20,27 @@ Utilities
 ### puppet-clean
 
 Receives a puppet manifest file as input and outputs the result of
-applying a set of transformation rules that makes it comply with
-a subset of the current puppet style guide.
+applying the set of transformation rules that you select. If no options
+are selected all of them are applied, which currently is a subset of the
+puppet style guide.
+
+    Usage:
+    
+        puppet-clean [-h] [-t n] [-abedlmovw ] file.pp [file2.pp...]
+    
+    Options:
+        -h, --help              this help message
+        -d, --debug             prints tokens before and after the transformation
+    
+        -a, --alignfarrow       aligns fat arrow (=>)
+        -b, --quotedbooleans    removes unneeded quotes around boolean literals
+        -e, --ensurefirst       moves 'ensure' parameter to the top
+        -l, --link              uses ensure => link and target for symbolic links
+        -m, --mlcomments        converts /* */ style comments into #
+        -o, --octalmode         uses a 4 digit string for file modes
+        -t n, --softtabs n      indents by n spaces
+        -v, --quotedvariables   removes unneeded quotes around variables
+        -w, --trailingws        removes trailing white space
 
 ### puppet-diff
 

data/lib/puppet-cleaner/workers/unquotedtitles.rb

@@ -0,0 +1,32 @@
+module Puppet::Cleaner
+  class UnquotedTitles < Worker
+    def part_names
+      [:COLON]
+    end
+  
+    def operate(line)
+      pos = line.position - 1
+      pos -= 1 while [:BLANK, :RETURN, :COMMENT, :MLCOMMENT].include?(line.parts[pos].name)
+      return if line.parts[pos].name == :STRING
+
+####
+=begin
+      start, pos  = get_param(line, 'ensure', line.position)
+      return if start.nil?
+  
+      ensure_param = line.parts.slice!(start..pos)
+      ensure_param += [Part.create([:COMMA, {:value => ","}])] unless ensure_param[-1].name == :COMMA
+  
+      pos = start
+      if line.parts[pos].name == :SEMIC
+        commapos = start - 1
+        commapos -= 1 while [:RETURN, :BLANK].include?(line.parts[commapos])
+        line.parts.delete_at(commapos)
+      end
+  
+      line.append(line.position, ensure_param)
+=end
+####
+    end
+  end
+end

data/lib/puppet-cleaner/workers.rb

@@ -1,2 +1,62 @@
+module Puppet::Cleaner
+  class Worker
+    def part_names
+      raise "Must be implemented in subclass"
+    end
+  
+    def operate
+      raise "Must be implemented in subclass"
+    end
+  
+    def get_param(line, param_name, pos)
+      depth = 1
+  
+      loop do
+        pos += 1
+        break if depth == 0 || pos >= line.parts.size
+        case line.parts[pos].name
+        when :LBRACE, :COLON
+          depth += 1
+        when :RBRACE
+          depth -= 1
+        when :SEMIC
+          depth -= 1
+        when :FARROW
+          next if depth != 1
+  
+          parampos = pos - 1
+          parampos -= 1 while [:BLANK, :RETURN].include?(line.parts[parampos].name)
+          next unless line.parts[parampos].name == :NAME && line.parts[parampos].value == param_name
+          start = parampos - 1
+          start -= 1 while [:BLANK, :RETURN].include?(line.parts[start].name)
+          start += 1
+  
+          loop do
+            pos += 1
+            break if depth < 0 || pos >= line.parts.size
+            case line.parts[pos].name
+            when :LBRACE
+              depth += 1
+            when :COMMA, :SEMIC, :RBRACE
+              depth -= 1 if line.parts[pos].name == :RBRACE
+              next if depth > 1
+              pos += 1 if line.parts[pos].name == :RBRACE && depth == 1
+              pos += 1 while pos < line.parts.size && ![:COMMA, :SEMIC, :RBRACE].include?(line.parts[pos].name)
+              break
+            end
+          end
+
+          return nil if pos >= line.parts.size
+          pos -= 1 unless line.parts[pos].name == :COMMA
+          pos -= 1 while [:BLANK, :RETURN].include?(line.parts[pos].name)
+  
+          return [start, pos]
+        end
+      end
+      nil
+    end
+  end
+end # module
+
 workersglob = File.join(File.dirname(__FILE__), "workers", "*.rb")
 Dir[workersglob].each {|worker| require worker }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-cleaner
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Gerardo Santana Gomez Garrido
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-18 00:00:00 Z
+date: 2013-04-26 00:00:00 Z
 dependencies: []
 
 description: Cleans puppet source code
@@ -35,12 +35,12 @@ files:
 - lib/puppet-cleaner/inspect.rb
 - lib/puppet-cleaner/workers.rb
 - lib/puppet-cleaner/workers/quotedbooleans.rb
-- lib/puppet-cleaner/workers/worker.rb
 - lib/puppet-cleaner/workers/unneededquotes.rb
 - lib/puppet-cleaner/workers/multilinecomments.rb
 - lib/puppet-cleaner/workers/trailingwhitespaceincomments.rb
 - lib/puppet-cleaner/workers/trailingwhitespace.rb
 - lib/puppet-cleaner/workers/symlink.rb
+- lib/puppet-cleaner/workers/unquotedtitles.rb
 - lib/puppet-cleaner/workers/alignfarrow.rb
 - lib/puppet-cleaner/workers/ensurefirst.rb
 - lib/puppet-cleaner/workers/octalmode.rb

data/lib/puppet-cleaner/workers/worker.rb

@@ -1,59 +0,0 @@
-module Puppet::Cleaner
-  class Worker
-    def part_names
-      raise "Must be implemented in subclass"
-    end
-  
-    def operate
-      raise "Must be implemented in subclass"
-    end
-  
-    def get_param(line, param_name, pos)
-      depth = 1
-  
-      loop do
-        pos += 1
-        break if depth == 0 || pos >= line.parts.size
-        case line.parts[pos].name
-        when :LBRACE, :COLON
-          depth += 1
-        when :RBRACE
-          depth -= 1
-        when :SEMIC
-          depth -= 1
-        when :FARROW
-          next if depth != 1
-  
-          parampos = pos - 1
-          parampos -= 1 while [:BLANK, :RETURN].include?(line.parts[parampos].name)
-          next unless line.parts[parampos].name == :NAME && line.parts[parampos].value == param_name
-          start = parampos - 1
-          start -= 1 while [:BLANK, :RETURN].include?(line.parts[start].name)
-          start += 1
-  
-          loop do
-            pos += 1
-            break if depth < 0 || pos >= line.parts.size
-            case line.parts[pos].name
-            when :LBRACE
-              depth += 1
-            when :COMMA, :SEMIC, :RBRACE
-              depth -= 1 if line.parts[pos].name == :RBRACE
-              next if depth > 1
-              pos += 1 if line.parts[pos].name == :RBRACE && depth == 1
-              pos += 1 while pos < line.parts.size && ![:COMMA, :SEMIC, :RBRACE].include?(line.parts[pos].name)
-              break
-            end
-          end
-
-          return nil if pos >= line.parts.size
-          pos -= 1 unless line.parts[pos].name == :COMMA
-          pos -= 1 while [:BLANK, :RETURN].include?(line.parts[pos].name)
-  
-          return [start, pos]
-        end
-      end
-      nil
-    end
-  end
-end # module