puppet-lint 0.3.2 → 0.4.0.pre1

data/spec/puppet-lint/plugins/check_resources/unquoted_file_mode_spec.rb

@@ -4,8 +4,35 @@ describe 'unquoted_file_mode' do
   describe '4 digit unquoted file mode' do
     let(:code) { "file { 'foo': mode => 0777 }" }
 
-    its(:problems) {
-      should only_have_problem :kind => :warning, :message => "unquoted file mode"
-    }
+    its(:problems) do
+      should only_have_problem(
+        :kind       => :warning,
+        :message    => "unquoted file mode",
+        :linenumber => 1,
+        :column     => 23,
+      )
+    end
+  end
+
+  describe '4 digit unquoted file mode w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "file { 'foo': mode => 0777 }" }
+
+    its(:problems) do
+      should only_have_problem(
+        :kind       => :fixed,
+        :message    => "unquoted file mode",
+        :linenumber => 1,
+        :column     => 23,
+      )
+    end
+    its(:manifest) { should == "file { 'foo': mode => '0777' }" }
   end
 end

data/spec/puppet-lint/plugins/check_resources/unquoted_resource_title_spec.rb

@@ -11,10 +11,38 @@ describe 'unquoted_resource_title' do
     let(:code) { "file { foo: }" }
 
     its(:problems) {
-      should only_have_problem :kind => :warning, :message => "unquoted resource title", :linenumber => 1
+      should only_have_problem(
+        :kind       => :warning,
+        :message    => "unquoted resource title",
+        :linenumber => 1,
+        :column     => 8,
+      )
     }
   end
 
+  describe 'unquoted resource title on single line resource w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "file { foo: }" }
+
+    its(:problems) {
+      should only_have_problem(
+        :kind       => :fixed,
+        :message    => "unquoted resource title",
+        :linenumber => 1,
+        :column     => 8,
+      )
+    }
+
+    its(:manifest) { should == "file { 'foo': }" }
+  end
+
   describe 'quoted resource title on multi line resource' do
     let(:code) { "
       file { 'foo':
@@ -31,7 +59,41 @@ describe 'unquoted_resource_title' do
     }
 
     its(:problems) {
-      should only_have_problem :kind => :warning, :message => "unquoted resource title", :linenumber => 2
+      should only_have_problem(
+        :kind       => :warning,
+        :message    => "unquoted resource title",
+        :linenumber => 2,
+        :column     => 14,
+      )
+    }
+  end
+
+  describe 'unquoted resource title on multi line resource w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "
+      file { foo:
+      }"
+    }
+
+    its(:problems) {
+      should only_have_problem(
+        :kind       => :fixed,
+        :message    => "unquoted resource title",
+        :linenumber => 2,
+        :column     => 14,
+      )
+    }
+
+    its(:manifest) { should == "
+      file { 'foo':
+      }"
     }
   end
 
@@ -55,7 +117,45 @@ describe 'unquoted_resource_title' do
     }
 
     its(:problems) {
-      should only_have_problem :kind => :warning, :message => "unquoted resource title", :linenumber => 4
+      should only_have_problem(
+        :kind       => :warning,
+        :message    => "unquoted resource title",
+        :linenumber => 4,
+        :column     => 9,
+      )
+    }
+  end
+
+  describe 'condensed resources with an unquoted title w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "
+      file {
+        'foo': ;
+        bar: ;
+      }"
+    }
+
+    its(:problems) {
+      should only_have_problem(
+        :kind       => :fixed,
+        :message    => "unquoted resource title",
+        :linenumber => 4,
+        :column     => 9,
+      )
+    }
+
+    its(:manifest) { should == "
+      file {
+        'foo': ;
+        'bar': ;
+      }"
     }
   end
 

data/spec/puppet-lint/plugins/check_strings/double_quoted_strings_spec.rb

@@ -7,6 +7,23 @@ describe 'double_quoted_strings' do
     its(:problems) { should be_empty }
   end
 
+  describe 'double quoted string containing a variable inside single quotes w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "exec { \"/usr/bin/wget -O - '${source}' | /usr/bin/apt-key add -\": }" }
+
+    its(:problems) { should be_empty }
+    its(:manifest) {
+      should == "exec { \"/usr/bin/wget -O - '${source}' | /usr/bin/apt-key add -\": }"
+    }
+  end
+
   describe 'multiple strings in a line' do
     let(:code) { "\"aoeu\" '${foo}'" }
 
@@ -20,6 +37,28 @@ describe 'double_quoted_strings' do
     }
   end
 
+  describe 'multiple strings in a line w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "\"aoeu\" '${foo}'" }
+
+    its(:problems) {
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'double quoted string containing no variables',
+        :linenumber => 1,
+        :column     => 1,
+      })
+    }
+    its(:manifest) { should == "'aoeu' '${foo}'" }
+  end
+
   describe 'double quoted string nested in a single quoted string' do
     let(:code) { "'grep \"status=sent\" /var/log/mail.log'" }
 

data/spec/puppet-lint/plugins/check_strings/only_variable_string_spec.rb

@@ -13,4 +13,27 @@ describe 'only_variable_string' do
       })
     }
   end
+
+  describe 'string containing only a variable w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { '"${foo}"' }
+
+    its(:problems) {
+      should only_have_problem({
+        :kind       => :fixed,
+        :message    => 'string containing only a variable',
+        :linenumber => 1,
+        :column     => 3,
+      })
+    }
+
+    its(:manifest) { should == "$foo" }
+  end
 end

data/spec/puppet-lint/plugins/check_strings/quoted_booleans_spec.rb

@@ -52,4 +52,92 @@ describe 'quoted_booleans' do
       })
     }
   end
+
+  describe 'quoted false w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "class { 'foo': boolFlag => 'false' }" }
+
+    its(:problems) {
+      should only_have_problem({
+        :kind       => :fixed,
+        :message    => 'quoted boolean value found',
+        :linenumber => 1,
+        :column     => 28,
+      })
+    }
+    its(:manifest) { should == "class { 'foo': boolFlag => false }" }
+  end
+
+  describe 'quoted true w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "class { 'foo': boolFlag => 'true' }" }
+
+    its(:problems) {
+      should only_have_problem({
+        :kind       => :fixed,
+        :message    => 'quoted boolean value found',
+        :linenumber => 1,
+        :column     => 28,
+      })
+    }
+    its(:manifest) { should == "class { 'foo': boolFlag => true }" }
+  end
+
+  describe 'double quoted true w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "class { 'foo': boolFlag => \"true\" }" }
+
+    its(:problems) {
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'quoted boolean value found',
+        :linenumber => 1,
+        :column     => 28,
+      })
+    }
+    its(:manifest) { should == "class { 'foo': boolFlag => true }" }
+  end
+
+  describe 'double quoted false w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "class { 'foo': boolFlag => \"false\" }" }
+
+    its(:problems) {
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'quoted boolean value found',
+        :linenumber => 1,
+        :column     => 28,
+      })
+    }
+    its(:manifest) { should == "class { 'foo': boolFlag => false }" }
+  end
 end

data/spec/puppet-lint/plugins/check_strings/variables_not_enclosed_spec.rb

@@ -14,6 +14,28 @@ describe 'variables_not_enclosed' do
     }
   end
 
+  describe 'variable not enclosed in {} w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { '" $gronk"' }
+
+    its(:problems) {
+      should only_have_problem({
+        :kind       => :fixed,
+        :message    => 'variable not enclosed in {}',
+        :linenumber => 1,
+        :column     => 3,
+      })
+    }
+    its(:manifest) { should == '" ${gronk}"' }
+  end
+
   describe 'variable not enclosed in {} after many tokens' do
     let(:code) { ("'groovy'\n" * 20) + '" $gronk"' }
 
@@ -26,4 +48,26 @@ describe 'variables_not_enclosed' do
       })
     }
   end
+
+  describe 'variable not enclosed in {} after many tokens w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { ("'groovy'\n" * 20) + '" $gronk"' }
+
+    its(:problems) {
+      should only_have_problem({
+        :kind       => :fixed,
+        :message    => 'variable not enclosed in {}',
+        :linenumber => 21,
+        :column     => 3,
+      })
+    }
+    its(:manifest) { should == ("'groovy'\n" * 20) + '" ${gronk}"' }
+  end
 end

data/spec/puppet-lint/plugins/check_whitespace/arrow_alignment_spec.rb

@@ -105,16 +105,85 @@ describe 'arrow_alignment' do
       should have_problem({
         :kind       => :warning,
         :message    => 'indentation of => is not properly aligned',
-        :linenumber => 5,
-        :column     => 15,
+        :linenumber => 3,
+        :column     => 13,
+      })
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'indentation of => is not properly aligned',
+        :linenumber => 4,
+        :column     => 13,
+      })
+      should have_problem({
+        :kind       => :warning,
+        :message    => 'indentation of => is not properly aligned',
+        :linenumber => 6,
+        :column     => 14,
       })
       should have_problem({
         :kind       => :warning,
         :message    => 'indentation of => is not properly aligned',
+        :linenumber => 7,
+        :column     => 13,
+      })
+    end
+  end
+
+  describe 'single resource with a misaligned => w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "
+      file { '/tmp/foo':
+        foo => 1,
+        bar => 2,
+        gronk => 3,
+        baz  => 4,
+        meh => 5,
+      }"
+    }
+
+    its(:problems) do
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'indentation of => is not properly aligned',
+        :linenumber => 3,
+        :column     => 13,
+      })
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'indentation of => is not properly aligned',
+        :linenumber => 4,
+        :column     => 13,
+      })
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'indentation of => is not properly aligned',
         :linenumber => 6,
         :column     => 14,
       })
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'indentation of => is not properly aligned',
+        :linenumber => 7,
+        :column     => 13,
+      })
     end
+
+    its(:manifest) { should == "
+      file { '/tmp/foo':
+        foo   => 1,
+        bar   => 2,
+        gronk => 3,
+        baz   => 4,
+        meh   => 5,
+      }"
+    }
   end
 
   describe 'complex resource with a misaligned =>' do
@@ -134,8 +203,8 @@ describe 'arrow_alignment' do
       should have_problem({
         :kind       => :warning,
         :message    => 'indentation of => is not properly aligned',
-        :linenumber => 4,
-        :column     => 14,
+        :linenumber => 3,
+        :column     => 13,
       })
       should have_problem({
         :kind       => :warning,
@@ -146,10 +215,65 @@ describe 'arrow_alignment' do
       should have_problem({
         :kind       => :warning,
         :message    => 'indentation of => is not properly aligned',
-        :linenumber => 8,
-        :column     => 14,
+        :linenumber => 9,
+        :column     => 13,
+      })
+    end
+  end
+
+  describe 'complex resource with a misaligned => w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "
+      file { '/tmp/foo':
+        foo => 1,
+        bar  => $baz ? {
+          gronk => 2,
+          meh => 3,
+        },
+        meep => 4,
+        bah => 5,
+      }"
+    }
+
+    its(:problems) do
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'indentation of => is not properly aligned',
+        :linenumber => 3,
+        :column     => 13,
+      })
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'indentation of => is not properly aligned',
+        :linenumber => 6,
+        :column     => 15,
+      })
+      should have_problem({
+        :kind       => :fixed,
+        :message    => 'indentation of => is not properly aligned',
+        :linenumber => 9,
+        :column     => 13,
       })
     end
+
+    its(:manifest) { should == "
+      file { '/tmp/foo':
+        foo  => 1,
+        bar  => $baz ? {
+          gronk => 2,
+          meh   => 3,
+        },
+        meep => 4,
+        bah  => 5,
+      }"
+    }
   end
 
   describe 'multi-resource with a misaligned =>' do
@@ -174,6 +298,47 @@ describe 'arrow_alignment' do
     end
   end
 
+  describe 'multi-resource with a misaligned => w/fix' do
+    before do
+      PuppetLint.configuration.fix = true
+    end
+
+    after do
+      PuppetLint.configuration.fix = false
+    end
+
+    let(:code) { "
+      file {
+        '/tmp/foo': ;
+        '/tmp/bar':
+          foo => 'bar';
+        '/tmp/baz':
+          gronk => 'bah',
+          meh => 'no'
+      }"
+    }
+
+    its(:problems) do
+      should only_have_problem({
+        :kind       => :fixed,
+        :message    => 'indentation of => is not properly aligned',
+        :linenumber => 8,
+        :column     => 15,
+      })
+    end
+
+    its(:manifest) { should == "
+      file {
+        '/tmp/foo': ;
+        '/tmp/bar':
+          foo => 'bar';
+        '/tmp/baz':
+          gronk => 'bah',
+          meh   => 'no'
+      }"
+    }
+  end
+
   describe 'multiple single line resources' do
     let(:code) { "
       file { 'foo': ensure => file }