minitest-chef-handler 0.5.1 → 0.5.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.5.2 / 06-25-2012
+
+* 1 bug fix:
+
+  * Prevent a premature failure when resources have nil owner, group and mode.
+
 === 0.5.1 / 05-31-2012
 
 * 1 new feature:

data/README.md

@@ -132,19 +132,23 @@ Examples:
 
 If the seen recipes includes the recipe "foo" we try to load tests from:
 
-  cookbooks/foo/tests/default_test.rb
-  cookbooks/foo/tests/default/*_test.rb
+```
+cookbooks/foo/tests/default_test.rb
+cookbooks/foo/tests/default/*_test.rb
 
-  cookbooks/foo/specs/default_spec.rb
-  cookbooks/foo/specs/default/*_spec.rb
+cookbooks/foo/specs/default_spec.rb
+cookbooks/foo/specs/default/*_spec.rb
+```
 
 If the seen recipes includes the recipe "foo::install" we try to load tests from:
 
-  cookbooks/foo/tests/install_test.rb
-  cookbooks/foo/tests/install/*_test.rb
+```
+cookbooks/foo/tests/install_test.rb
+cookbooks/foo/tests/install/*_test.rb
 
-  cookbooks/foo/specs/install_spec.rb
-  cookbooks/foo/specs/install/*_spec.rb
+cookbooks/foo/specs/install_spec.rb
+cookbooks/foo/specs/install/*_spec.rb
+```
 
 ## Automatic chef failure
 

data/lib/minitest-chef-handler/resources.rb

@@ -29,26 +29,32 @@ module MiniTest
       ::Chef::Resource.class_eval do
         include MiniTest::Assertions
         def with(attribute, values)
-          actual_values = resource_value(attribute, values)
+          actual_values = resource_value(attribute)
           assert_equal values, actual_values,
             "The #{resource_name} does not have the expected #{attribute}"
           self
         end
+
         alias :and :with
         alias :must_have :with
+
         private
 
-        def resource_value(attribute, values)
+        def resource_value(attribute)
           case attribute
-            when :mode then mode.kind_of?(Integer) ? mode.to_s(8) : mode.to_s
-            when :owner || :user then Etc.getpwuid(owner).name
-            when :group then Etc.getgrgid(group).name
+            when :mode
+              return nil unless mode
+              mode.kind_of?(Integer) ? mode.to_s(8) : mode.to_s
+            when :owner || :user
+              return nil unless owner
+              owner.is_a?(Integer) ? Etc.getpwuid(owner).name : Etc.getpwnam(owner).name
+            when :group
+              return nil unless group
+              group.is_a?(Integer) ? Etc.getgrgid(group).name : Etc.getgrnam(group).name
             else send(attribute)
           end
         end
-
       end
-
     end
   end
 end

data/minitest-chef-handler.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "minitest-chef-handler"
   gem.require_paths = ["lib"]
-  gem.version       = '0.5.1'
+  gem.version       = '0.5.2'
 
+  gem.add_dependency('minitest')
   gem.add_dependency('chef')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rspec')
 end

data/spec/minitest-chef-handler/resources_spec.rb

@@ -48,4 +48,39 @@ describe MiniTest::Chef::Resources do
     end
   end
 
+  describe "asserting with :mode" do
+    let(:file) { ::Chef::Resource::File.new('/etc/foo') }
+
+    it "fail when the mode is nil" do
+      file.set_or_return(:mode, nil, {})
+
+      assert_triggered(/Expected: "755"\n  Actual: nil/) do
+        file.must_have(:mode, '755')
+      end
+    end
+  end
+
+  describe "asserting with :owner" do
+    let(:file) { ::Chef::Resource::File.new('/etc/foo') }
+
+    it "fail when the owner is nil" do
+      file.set_or_return(:owner, nil, {})
+
+      assert_triggered(/Expected: "david"\n  Actual: nil/) do
+        file.must_have(:owner, 'david')
+      end
+    end
+  end
+
+  describe "asserting with :group" do
+    let(:file) { ::Chef::Resource::File.new('/etc/foo') }
+
+    it "fail when the group is nil" do
+      file.set_or_return(:group, nil, {})
+
+      assert_triggered(/Expected: "staff"\n  Actual: nil/) do
+        file.must_have(:owner, 'staff')
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-chef-handler
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chef
-  requirement: &70293859474040 !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: &70277779223160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70293859474040
+  version_requirements: *70277779223160
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70293859473200 !ruby/object:Gem::Requirement
+  name: chef
+  requirement: &70277779222700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *70293859473200
+  version_requirements: *70277779222700
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70293859472480 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70277779222260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293859472480
+  version_requirements: *70277779222260
 description: Run Minitest suites as Chef report handlers
 email:
 - david.calavera@gmail.com
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 833207758309813032
+      hash: -4169045649435813440
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 833207758309813032
+      hash: -4169045649435813440
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11