ridley 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b8eb6ddf42490fbb4276d36e8f6ef66ee111eed
-  data.tar.gz: 87d75ce26e3c901c88fd0289b072b46d165241d7
+  metadata.gz: 357a447b0c4b262058be9489d458e8188f39dbff
+  data.tar.gz: bc003d0fb3b0070d5a4967c4a12134e38a790c72
 SHA512:
-  metadata.gz: 5d8fac3ec1647f70ac6cb07eeb72fd4e12f984baf12a1244553092146d4ec2842629fbcf4e0d8624b0f14ee0703d7431d3e67b5ae24d93ec299c233820e02cb7
-  data.tar.gz: 87170710eac228bc3901612687d02b0df49fd575770de79cbb1570ecd8351b107bb93ef254ec5aa086ac7decb415a1bbb754d7447463ef702e01b2660966a988
+  metadata.gz: a286321fd9a2146dcadd37f7f1462ae8904603feffb440fe8d32b3e1fe40e35d9f026c7630ade1bcb50e0d8fa9ac2777c1dfd65a370614051fa0f8cd7abec071
+  data.tar.gz: 4c490c386eda16cc1e0e46b9bd2e14142cbfdacd0f3330e7d78930a21f8bb4dca55ef08e12b726db30a0347c92243e32cb075e9da3cf97e5a060619564197591

data/.gitignore

@@ -18,3 +18,5 @@ tmp
 *.sw[op]
 .DS_Store
 .rspec
+.bin/
+vendor/

data/lib/ridley/chef/cookbook.rb

@@ -260,7 +260,7 @@ module Ridley::Chef
       end
 
       def syntax_checker
-        @syntax_checker ||= Cookbook::SyntaxCheck.new(path.to_s)
+        @syntax_checker ||= Cookbook::SyntaxCheck.new(path.to_s, chefignore)
       end
 
       # Determine if the given file should be ignored by the chefignore

data/lib/ridley/chef/cookbook/syntax_check.rb

@@ -82,13 +82,17 @@ module Ridley::Chef
       #
       # @param [String] cookbook_path
       #   the (on disk) path to the cookbook
-      def initialize(cookbook_path)
+      # @param [Ridley::Chef::Chefignore] chefignore
+      #   the instance of R::C::Chefignore to filter out
+      def initialize(cookbook_path, chefignore = nil)
         @cookbook_path   = cookbook_path
         @validated_files = PersistentSet.new
+        @chefignore      = chefignore
       end
 
+
       def ruby_files
-        Dir[File.join(cookbook_path, '**', '*.rb')]
+        Dir[File.join(cookbook_path, '**', '*.rb')].reject { |f| ignored?(f) }
       end
 
       def untested_ruby_files
@@ -96,7 +100,7 @@ module Ridley::Chef
       end
 
       def template_files
-        Dir[File.join(cookbook_path, '**', '*.erb')]
+        Dir[File.join(cookbook_path, '**', '*.erb')].reject { |f| ignored?(f) }
       end
 
       def untested_template_files
@@ -116,6 +120,7 @@ module Ridley::Chef
           return false unless validate_ruby_file(ruby_file)
           validated(ruby_file)
         end
+        true
       end
 
       def validate_templates
@@ -123,6 +128,7 @@ module Ridley::Chef
           return false unless validate_template(template)
           validated(template)
         end
+        true
       end
 
       def validate_template(erb_file)
@@ -150,6 +156,15 @@ module Ridley::Chef
 
         true
       end
+
+      private
+
+        # @return [Ridley::Chef::Chefignore, nil]
+        attr_reader :chefignore
+
+        def ignored?(file)
+          !!chefignore && chefignore.ignored?(file)
+        end
     end
   end
 end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

data/spec/fixtures/chefignore

@@ -1,3 +1,4 @@
 README.md
 Guardfile
 ignores/*.rb
+ignores/*.erb

data/spec/fixtures/example_cookbook/ignores/magic.erb

@@ -0,0 +1,4 @@
+# I should never see this file
+# It has bad ruby in it...
+
+<%= this is not { valid %>

data/spec/fixtures/example_cookbook/ignores/magic.rb

@@ -1 +1,4 @@
 # I should never see this file
+# It has bad ruby in it...
+
+this is not { valid

data/spec/unit/ridley/chef/cookbook/syntax_check_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+describe Ridley::Chef::Cookbook::SyntaxCheck do
+
+  let(:cookbook_dir) { fixtures_path.join('example_cookbook')}
+  let(:chefignore) { Ridley::Chef::Chefignore.new(cookbook_dir) }
+
+  let(:syntax_check) do
+    described_class.new(fixtures_path, chefignore)
+  end
+
+  subject { syntax_check }
+
+  before(:each) do
+    subject.stub(:chefignore) { chefignore }
+  end
+
+  describe "#ruby_files" do
+    it "lists the rb files in a cookbook" do
+      expect(subject.ruby_files).to include(cookbook_dir.join("libraries/my_lib.rb").to_s)
+    end
+
+    it "does not list the rb files in a cookbook that are ignored" do
+      expect(subject.ruby_files).not_to include(cookbook_dir.join("ignores/magic.rb").to_s)
+    end
+  end
+
+  describe "#untested_ruby_files" do
+    it "filters out validated rb files" do
+      valid_ruby_file = cookbook_dir.join("libraries/my_lib.rb").to_s
+      subject.validated(valid_ruby_file)
+      expect(subject.untested_ruby_files).not_to include(valid_ruby_file)
+    end
+  end
+
+  describe "#template_files" do
+    it "lists the erb files in a cookbook" do
+      expect(subject.template_files).to include(cookbook_dir.join("templates/default/temp.txt.erb").to_s)
+    end
+
+    it "does not list the erb files in a cookbook that are ignored" do
+      expect(subject.template_files).not_to include(cookbook_dir.join("ignores/magic.erb").to_s)
+    end
+  end
+
+  describe "#untested_template_files" do
+    it "filters out validated erb files" do
+      valid_template_file = cookbook_dir.join("templates/default/temp.txt.erb").to_s
+      subject.validated(valid_template_file)
+      expect(subject.untested_template_files).not_to include(valid_template_file)
+    end
+  end
+
+  describe "#validated?" do
+    it "checks if a file has already been validated" do
+      valid_template_file = cookbook_dir.join("templates/default/temp.txt.erb").to_s
+      subject.validated(valid_template_file)
+      expect(subject.validated?(valid_template_file)).to be_true
+    end
+  end
+
+  describe "#validated" do
+    let(:validated_files) { double('validated_files') }
+
+    before(:each) do
+      subject.stub(:validated_files) { validated_files }
+    end
+
+    it "records a file as validated" do
+      template_file = cookbook_dir.join("templates/default/temp.txt.erb").to_s
+      file_checksum = Ridley::Chef::Digester.checksum_for_file(template_file)
+
+      expect(validated_files).to receive(:add).with(file_checksum)
+      expect(subject.validated(template_file)).to be_nil
+    end
+  end
+
+  describe "#validate_ruby_files" do
+    it "asks #untested_ruby_files for a list of files and calls #validate_ruby_file on each" do
+      subject.stub(:validate_ruby_file).with(anything()).exactly(9).times { true }
+      expect(subject.validate_ruby_files).to be_true
+    end
+
+    it "marks the successfully validated ruby files" do
+      subject.stub(:validated).with(anything()).exactly(9).times
+      expect(subject.validate_ruby_files).to be_true
+    end
+
+    it "returns false if any ruby file fails to validate" do
+      subject.stub(:validate_ruby_file).with(/\.rb$/) { false }
+      expect(subject.validate_ruby_files).to be_false
+    end
+  end
+
+  describe "#validate_templates" do
+    it "asks #untested_template_files for a list of erb files and calls #validate_template on each" do
+      subject.stub(:validate_template).with(anything()).exactly(9).times { true }
+      expect(subject.validate_templates).to be_true
+    end
+
+    it "marks the successfully validated erb files" do
+      subject.stub(:validated).with(anything()).exactly(9).times
+      expect(subject.validate_templates).to be_true
+    end
+
+    it "returns false if any erb file fails to validate" do
+      subject.stub(:validate_template).with(/\.erb$/) { false }
+      expect(subject.validate_templates).to be_false
+    end
+  end
+
+  describe "#validate_template" do
+    it "asks #shell_out to check the files syntax"
+  end
+
+  describe "#validate_ruby_file" do
+    it "asks #shell_out to check the files syntax"
+  end
+
+  describe "without a chefignore" do
+    let(:chefignore) { nil }
+
+    it "the file listing still works" do
+      expect(subject.ruby_files).to include(cookbook_dir.join("libraries/my_lib.rb").to_s)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -387,6 +387,7 @@ files:
 - spec/fixtures/example_cookbook/definitions/bad_def.rb
 - spec/fixtures/example_cookbook/files/default/file.h
 - spec/fixtures/example_cookbook/files/ubuntu/file.h
+- spec/fixtures/example_cookbook/ignores/magic.erb
 - spec/fixtures/example_cookbook/ignores/magic.rb
 - spec/fixtures/example_cookbook/ignores/ok.txt
 - spec/fixtures/example_cookbook/libraries/my_lib.rb
@@ -409,6 +410,7 @@ files:
 - spec/unit/ridley/bootstrap_context/windows_spec.rb
 - spec/unit/ridley/bootstrap_context_spec.rb
 - spec/unit/ridley/chef/chefignore_spec.rb
+- spec/unit/ridley/chef/cookbook/syntax_check_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
 - spec/unit/ridley/chef_object_spec.rb
@@ -486,6 +488,7 @@ test_files:
 - spec/fixtures/example_cookbook/definitions/bad_def.rb
 - spec/fixtures/example_cookbook/files/default/file.h
 - spec/fixtures/example_cookbook/files/ubuntu/file.h
+- spec/fixtures/example_cookbook/ignores/magic.erb
 - spec/fixtures/example_cookbook/ignores/magic.rb
 - spec/fixtures/example_cookbook/ignores/ok.txt
 - spec/fixtures/example_cookbook/libraries/my_lib.rb
@@ -508,6 +511,7 @@ test_files:
 - spec/unit/ridley/bootstrap_context/windows_spec.rb
 - spec/unit/ridley/bootstrap_context_spec.rb
 - spec/unit/ridley/chef/chefignore_spec.rb
+- spec/unit/ridley/chef/cookbook/syntax_check_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
 - spec/unit/ridley/chef_object_spec.rb