puppet-cleaner 0.3.0 → 0.3.1

data/Changelog

@@ -1,22 +1,30 @@
+0.3.1 2013-05-09
+-----------------
+Bug fixes:
+  * file resources were incorrectly transformed when a selector was used
+    for ensure attributes
+
+  * comments starting with '##' were transformed to '# #'
+
 0.3.0 2013-05-05
 -----------------
 Features:
-	* New worker for quoting resource titles (-r option)
+  * New worker for quoting resource titles (-r option)
 
 0.2.1 2013-05-03
 -----------------
 Bug fix:
-	* puppet-diff and puppet-inspect were not updated with puppet 3 support
+  * puppet-diff and puppet-inspect were not updated with puppet 3 support
 
 0.2.0 2013-04-29
 -----------------
 Features:
-	* puppet 3 support
+  * puppet 3 support
 
 0.1.1 2013-04-26
 -----------------
 Bug fix:
-	* uninitialized constant Puppet::Cleaner::Worker (NameError) runtime error fixed
+  * uninitialized constant Puppet::Cleaner::Worker (NameError) runtime error fixed
 
 0.1.0 2013-04-16
 -----------------

data/README.md

@@ -47,7 +47,7 @@ and are not optional.
         -o, --octalmode         represents file modes as a 4 digits string
         -r, --resourcetitles    quotes resource titles
         -t n, --softtabs n      indents by n spaces
-        -v, --quotedvariables   emoves unneeded quotes around variables
+        -v, --quotedvariables   removes unneeded quotes around variables
         -w, --trailingws        removes trailing white space
 
 ### puppet-diff

data/lib/puppet-cleaner/parts.rb

@@ -91,7 +91,7 @@ module Puppet::Cleaner
 
   class Comment < Part
     def to_s
-      value.empty? ? "#" : "# #{value}"
+      value.empty? || value[0..0] == "#" ? "##{value}" : "# #{value}"
     end
   end
 

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

@@ -11,9 +11,12 @@ module Puppet::Cleaner
       return if pos >= line.parts.size || line.parts[pos].name != :LBRACE
   
       foreach_colon(line) {|colonpos|
-        start, pos = get_param(line, 'ensure', colonpos)
+        start, endpos = get_param(line, 'ensure', colonpos)
         next if start.nil?
-        pos -= 1 if line.parts[pos].name == :COMMA
+        pos = start + 1
+        pos += 1 while pos < line.parts.size && line.parts[pos].name != :FARROW
+        pos += 1
+        pos += 1 while pos < line.parts.size && [:BLANK, :RETURN, :COMMENT, :MLCOMMENT].include?(line.parts[pos].name)
         value = line.parts[pos].value
         next if [:NAME, :STRING].include?(line.parts[pos].name) && %w(present absent file directory link symlink).include?(value)
         next if line.parts[pos].name == :VARIABLE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-cleaner
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet