minitest-chef-handler 0.6.9 → 1.0.0

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

@@ -1,7 +1,6 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe MiniTest::Chef::Resources do
-
   let(:resources) { Class.new{ include MiniTest::Chef::Resources }.new }
 
   it "provides convenient access to current resource state" do
@@ -36,13 +35,13 @@ describe MiniTest::Chef::Resources do
         and(:backup, 5).must_equal(file)
     end
     it "fails if the assertion is not met" do
-      assert_triggered(/The file does not have the expected name/) do
+      assert_triggered("The file /etc/foo does not have the expected name") do
         file.must_have(:name, '/etc/bar')
       end
-      assert_triggered(/The file does not have the expected action/) do
+      assert_triggered("The file /etc/foo does not have the expected action") do
         file.must_have(:name, '/etc/foo').with(:action, 'delete')
       end
-      assert_triggered(/The file does not have the expected action/) do
+      assert_triggered("The file /etc/foo does not have the expected action") do
         file.must_have(:name, '/etc/foo').and(:action, 'delete')
       end
     end
@@ -58,6 +57,28 @@ describe MiniTest::Chef::Resources do
         file.must_have(:mode, '755')
       end
     end
+
+    [["integer", 0755], ["string", "0755"]].each do |type, mode|
+      it "fails with incorrect modes on #{type} mode" do
+        file.define_singleton_method(:mode){ mode }
+        def file.mode; 0755; end
+        assert_triggered(/Expected: "644"\n  Actual: "755"/) do
+          file.must_have(:mode, 0644)
+        end
+        assert_triggered(/Expected: "644"\n  Actual: "755"/) do
+          file.must_have(:mode, 0644)
+        end
+      end
+
+      it "passes with correct modes on #{type} mode" do
+        file.define_singleton_method(:mode){ mode }
+        file.must_have(:mode, '00755')
+        file.must_have(:mode, '00755')
+        file.must_have(:mode, '0755')
+        file.must_have(:mode, '755')
+        file.must_have(:mode, 0755)
+      end
+    end
   end
 
   describe "asserting with :owner" do

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 require 'minitest/autorun'
-require 'minitest/pride'
 require 'minitest/spec'
 require 'mocha/setup'
 
-require File.expand_path('../../lib/minitest-chef-handler', __FILE__)
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+require "minitest-chef-handler"
 
 # Borrowed from MiniTest
 def assert_triggered(expected)
@@ -13,5 +13,9 @@ def assert_triggered(expected)
   msg = e.message.sub(/(---Backtrace---).*/m, '\1')
   msg.gsub!(/\(oid=[-0-9]+\)/, '(oid=N)')
 
-  assert_match expected, msg
+  if expected.is_a?(String)
+    assert_includes msg, expected
+  else
+    assert_match expected, msg
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-chef-handler
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -91,6 +91,86 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: vagrant
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: berkshelf-vagrant
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Run minitest suites after your Chef recipes to check the status of your
   system.
 email:
@@ -100,34 +180,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- Appraisals
+- Berksfile
+- Gemfile
 - History.txt
 - LICENSE
 - README.md
 - Rakefile
 - Vagrantfile
-- examples/chef-handler-cookbook/cookbooks/chef_handler/README.md
-- examples/chef-handler-cookbook/cookbooks/chef_handler/attributes/default.rb
-- examples/chef-handler-cookbook/cookbooks/chef_handler/files/default/handlers/README
-- examples/chef-handler-cookbook/cookbooks/chef_handler/metadata.json
-- examples/chef-handler-cookbook/cookbooks/chef_handler/metadata.rb
-- examples/chef-handler-cookbook/cookbooks/chef_handler/providers/default.rb
-- examples/chef-handler-cookbook/cookbooks/chef_handler/recipes/default.rb
-- examples/chef-handler-cookbook/cookbooks/chef_handler/recipes/json_file.rb
-- examples/chef-handler-cookbook/cookbooks/chef_handler/recipes/minitest.rb
-- examples/chef-handler-cookbook/cookbooks/chef_handler/resources/default.rb
-- examples/simple-solo/cookbooks/foo/recipes/default.rb
-- examples/simple-solo/cookbooks/foo/test/test_foo.rb
-- examples/simple-solo/dna.json
-- examples/simple-solo/solo.rb
-- examples/simple-solo/spec/foo_spec.rb
-- examples/simple-solo/test/test_foo.rb
 - examples/spec_examples/attributes/default.rb
-- examples/spec_examples/files/default/tests/minitest/example_test.rb
+- examples/spec_examples/files/default/tests/minitest/default_test.rb
 - examples/spec_examples/metadata.rb
 - examples/spec_examples/recipes/default.rb
 - examples/spec_examples/templates/default/foo.erb
-- gemfile_chef_10
-- gemfile_chef_11
+- gemfiles/chef_10.gemfile
+- gemfiles/chef_11.gemfile
 - lib/minitest-chef-handler.rb
 - lib/minitest-chef-handler/assertions.rb
 - lib/minitest-chef-handler/ci_runner.rb
@@ -140,8 +208,6 @@ files:
 - lib/minitest-chef-handler/spec.rb
 - lib/minitest-chef-handler/unit.rb
 - minitest-chef-handler.gemspec
-- script/bootstrap
-- script/test
 - spec/minitest-chef-handler/assertions_spec.rb
 - spec/minitest-chef-handler/infections_spec.rb
 - spec/minitest-chef-handler/lookup_spec.rb
@@ -160,12 +226,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1044882646950604713
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1044882646950604713
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/examples/chef-handler-cookbook/cookbooks/chef_handler/README.md

@@ -1,115 +0,0 @@
-Description
-===========
-
-Creates a configured handler path for distributing [Chef report and exception handlers](http://wiki.opscode.com/display/chef/Exception+and+Report+Handlers).  Also exposes an LWRP for enabling Chef handlers from within recipe code (as opposed to hard coding in the client.rb file).  This is useful for cookbook authors who may want to ship a product specific handler (see the `cloudkick` cookbook for an example) with their cookbook.
-
-Attributes
-==========
-
-`node["chef_handler"]["handler_path"]` - location to drop off handlers directory, default is `/var/chef/handlers`.
-
-Resource/Provider
-=================
-
-`chef_handler`
---------------
-
-Requires, configures and enables handlers on the node for the current Chef run.  Also has the ability to pass arguments to the handlers initializer.  This allows initialization data to be pulled from a node's attribute data.
-
-It is best to declare `chef_handler` resources early on in the compile phase so they are available to fire for any exceptions during the Chef run.  If you have a base role you would want any recipes that register Chef handlers to come first in the run_list.
-
-### Actions
-
-- :enable: Enables the Chef handler for the current Chef run on the current node
-- :disable: Disables the Chef handler for the current Chef run on the current node
-
-### Attribute Parameters
-
-- class_name: name attribute. The name of the handler class (can be module name-spaced).
-- source: full path to the handler file.  can also be a gem path if the handler ships as part of a Ruby gem.
-- arguments: an array of arguments to pass the handler's class initializer
-- supports: type of Chef Handler to register as, ie :report, :exception or both. default is `:report => true, :exception => true`
-
-### Example
-    
-    # register the Chef::Handler::JsonFile handler 
-    # that ships with the Chef gem
-    chef_handler "Chef::Handler::JsonFile" do
-      source "chef/handler/json_file"
-      arguments :path => '/var/chef/reports'
-      action :enable
-    end
-    
-    # do the same but during the compile phase
-    chef_handler "Chef::Handler::JsonFile" do
-      source "chef/handler/json_file"
-      arguments :path => '/var/chef/reports'
-      action :nothing
-    end.run_action(:enable)
-    
-    # handle exceptions only
-    chef_handler "Chef::Handler::JsonFile" do
-      source "chef/handler/json_file"
-      arguments :path => '/var/chef/reports'
-      supports exception => true
-      action :enable
-    end
-    
-    
-    # enable the CloudkickHandler which was 
-    # dropped off in the default handler path.
-    # passes the oauth key/secret to the handler's 
-    # intializer.
-    chef_handler "CloudkickHandler" do
-      source "#{node['chef_handler']['handler_path']}/cloudkick_handler.rb"
-      arguments [node['cloudkick']['oauth_key'], node['cloudkick']['oauth_secret']]
-      action :enable
-    end
-
-
-Usage
-=====
-
-default
--------
-
-Put the recipe `chef_handler` at the start of the node's run list to make sure that custom handlers are dropped off early on in the Chef run and available for later recipes.
-
-For information on how to write report and exception handlers for Chef, please see the Chef wiki pages:
-http://wiki.opscode.com/display/chef/Exception+and+Report+Handlers
-
-json_file
----------
-
-Leverages the `chef_handler` LWRP to automatically register the `Chef::Handler::JsonFile` handler that ships as part of Chef. This handler serializes the run status data to a JSON file located at `/var/chef/reports`.
-
-Changes/Roadmap
-===============
-
-## 1.0.4
-
-* [COOK-654] dont try and access a class before it has been loaded
-* fix bad boolean check (if vs unless)
-
-## 1.0.2:
-
-* [COOK-620] ensure handler code is reloaded during daemonized chef runs
-
-License and Author
-==================
-
-Author:: Seth Chisamore (<schisamo@opscode.com>)
-
-Copyright:: 2011, Opscode, Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

data/examples/chef-handler-cookbook/cookbooks/chef_handler/attributes/default.rb

@@ -1,21 +0,0 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Cookbook Name:: chef_handlers
-# Attribute:: default
-#
-# Copyright 2011, Opscode, Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-default["chef_handler"]["handler_path"] = "#{File.expand_path(File.join(Chef::Config[:file_cache_path],'..'))}/handlers"

data/examples/chef-handler-cookbook/cookbooks/chef_handler/files/default/handlers/README

@@ -1 +0,0 @@
-This directory contains Chef handlers to distribute to your nodes.

data/examples/chef-handler-cookbook/cookbooks/chef_handler/metadata.json

@@ -1,29 +0,0 @@
-{
-  "name": "chef_handler",
-  "description": "Distribute and enable Chef Exception and Report handlers",
-  "long_description": "Description\n===========\n\nCreates a configured handler path for distributing [Chef report and exception handlers](http://wiki.opscode.com/display/chef/Exception+and+Report+Handlers).  Also exposes an LWRP for enabling Chef handlers from within recipe code (as opposed to hard coding in the client.rb file).  This is useful for cookbook authors who may want to ship a product specific handler (see the `cloudkick` cookbook for an example) with their cookbook.\n\nAttributes\n==========\n\n`node[\"chef_handler\"][\"handler_path\"]` - location to drop off handlers directory, default is `/var/chef/handlers`.\n\nResource/Provider\n=================\n\n`chef_handler`\n--------------\n\nRequires, configures and enables handlers on the node for the current Chef run.  Also has the ability to pass arguments to the handlers initializer.  This allows initialization data to be pulled from a node's attribute data.\n\nIt is best to declare `chef_handler` resources early on in the compile phase so they are available to fire for any exceptions during the Chef run.  If you have a base role you would want any recipes that register Chef handlers to come first in the run_list.\n\n### Actions\n\n- :enable: Enables the Chef handler for the current Chef run on the current node\n- :disable: Disables the Chef handler for the current Chef run on the current node\n\n### Attribute Parameters\n\n- class_name: name attribute. The name of the handler class (can be module name-spaced).\n- source: full path to the handler file.  can also be a gem path if the handler ships as part of a Ruby gem.\n- arguments: an array of arguments to pass the handler's class initializer\n- supports: type of Chef Handler to register as, ie :report, :exception or both. default is `:report => true, :exception => true`\n\n### Example\n    \n    # register the Chef::Handler::JsonFile handler \n    # that ships with the Chef gem\n    chef_handler \"Chef::Handler::JsonFile\" do\n      source \"chef/handler/json_file\"\n      arguments :path => '/var/chef/reports'\n      action :enable\n    end\n    \n    # do the same but during the compile phase\n    chef_handler \"Chef::Handler::JsonFile\" do\n      source \"chef/handler/json_file\"\n      arguments :path => '/var/chef/reports'\n      action :nothing\n    end.run_action(:enable)\n    \n    # handle exceptions only\n    chef_handler \"Chef::Handler::JsonFile\" do\n      source \"chef/handler/json_file\"\n      arguments :path => '/var/chef/reports'\n      supports exception => true\n      action :enable\n    end\n    \n    \n    # enable the CloudkickHandler which was \n    # dropped off in the default handler path.\n    # passes the oauth key/secret to the handler's \n    # intializer.\n    chef_handler \"CloudkickHandler\" do\n      source \"#{node['chef_handler']['handler_path']}/cloudkick_handler.rb\"\n      arguments [node['cloudkick']['oauth_key'], node['cloudkick']['oauth_secret']]\n      action :enable\n    end\n\n\nUsage\n=====\n\ndefault\n-------\n\nPut the recipe `chef_handler` at the start of the node's run list to make sure that custom handlers are dropped off early on in the Chef run and available for later recipes.\n\nFor information on how to write report and exception handlers for Chef, please see the Chef wiki pages:\nhttp://wiki.opscode.com/display/chef/Exception+and+Report+Handlers\n\njson_file\n---------\n\nLeverages the `chef_handler` LWRP to automatically register the `Chef::Handler::JsonFile` handler that ships as part of Chef. This handler serializes the run status data to a JSON file located at `/var/chef/reports`.\n\nChanges/Roadmap\n===============\n\n## 1.0.4\n\n* [COOK-654] dont try and access a class before it has been loaded\n* fix bad boolean check (if vs unless)\n\n## 1.0.2:\n\n* [COOK-620] ensure handler code is reloaded during daemonized chef runs\n\nLicense and Author\n==================\n\nAuthor:: Seth Chisamore (<schisamo@opscode.com>)\n\nCopyright:: 2011, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "maintainer": "Opscode, Inc.",
-  "maintainer_email": "cookbooks@opscode.com",
-  "license": "Apache 2.0",
-  "platforms": {
-  },
-  "dependencies": {
-  },
-  "recommendations": {
-  },
-  "suggestions": {
-  },
-  "conflicting": {
-  },
-  "providing": {
-  },
-  "replacing": {
-  },
-  "attributes": {
-  },
-  "groupings": {
-  },
-  "recipes": {
-  },
-  "version": "1.0.4"
-}

data/examples/chef-handler-cookbook/cookbooks/chef_handler/metadata.rb

@@ -1,6 +0,0 @@
-maintainer       "Opscode, Inc."
-maintainer_email "cookbooks@opscode.com"
-license          "Apache 2.0"
-description      "Distribute and enable Chef Exception and Report handlers"
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "1.0.4"

data/examples/chef-handler-cookbook/cookbooks/chef_handler/providers/default.rb

@@ -1,83 +0,0 @@
-#
-# Author:: Seth Chisamore <schisamo@opscode.com>
-# Cookbook Name:: chef_handler
-# Provider:: default
-#
-# Copyright:: 2011, Opscode, Inc <legal@opscode.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-action :enable do
-  # use load instead of require to ensure the handler file
-  # is reloaded into memory each chef run. fixes COOK-620
-  begin
-    Object.send(:remove_const, klass)
-    GC.start
-  rescue
-    Chef::Log.debug("#{@new_resource.class_name} has not been loaded.")
-  end
-  file_name = @new_resource.source
-  file_name << ".rb" unless file_name =~ /.*\.rb$/
-  load file_name
-  handler = klass.send(:new, *collect_args(@new_resource.arguments))
-  @new_resource.supports.each do |type, enable|
-    if enable
-      # we have to re-enable the handler every chef run
-      # to ensure daemonized Chef always has the latest
-      # handler code.  TODO: add a :reload action
-      Chef::Log.info("Enabling #{@new_resource} as a #{type} handler")
-      Chef::Config.send("#{type.to_s}_handlers").delete_if {|v| v.class.to_s.include? @new_resource.class_name}
-      Chef::Config.send("#{type.to_s}_handlers") << handler
-      new_resource.updated_by_last_action(true)
-    end
-  end
-end
-
-action :disable do
-  @new_resource.supports.each_key do |type|
-    if enabled?(type)
-      Chef::Log.info("Disabling #{@new_resource} as a #{type} handler")
-      Chef::Config.send("#{type.to_s}_handlers").delete_if {|v| v.class.to_s.include? @new_resource.class_name}
-      new_resource.updated_by_last_action(true)
-    end
-  end
-end
-
-def load_current_resource
-  @current_resource = Chef::Resource::ChefHandler.new(@new_resource.name)
-  @current_resource.class_name(@new_resource.class_name)
-  @current_resource.source(@new_resource.source)
-  @current_resource
-end
-
-private
-def enabled?(type)
-  Chef::Config.send("#{type.to_s}_handlers").select do |handler| 
-    handler.class.to_s.include? @new_resource.class_name
-  end.size >= 1
-end
-
-def collect_args(resource_args = [])
-  if resource_args.is_a? Array
-    resource_args
-  else
-    [resource_args]
-  end
-end
-
-def klass
-  @klass ||= begin
-    @new_resource.class_name.split('::').inject(Kernel) {|scope, const_name| scope.const_get(const_name)}
-  end
-end