minitest-chef-handler 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b5d77eb9a1bf756e56fb2a9ef5b49811874ac061
+  data.tar.gz: f5093d6ad1bc07dd50676b3ff48e09377de90cb7
+SHA512:
+  metadata.gz: d54cbf57e4306dec76b7932b547551c5dd7ec84c5b07429b73ba54251125d4e26295df14ef64cd0593344f89468b251e4db6a2b02f6641e76588e3b094a0f4d2
+  data.tar.gz: bfd208f8e79d59cc7ec1d9f729e77ecf0c8ec0d5551907f1eccdf20b473cef67a6df2dba18557851d85860eb088c67821040db082f76c1ccb7ac40c70b111d81

data/.travis.yml

@@ -1,4 +1,2 @@
 rvm:
-  - 1.8.7
   - 1.9.3
-  - 2.0

data/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 gemspec
-gem "vagrant", ">= 1.1", :git => "git://github.com/mitchellh/vagrant.git", :ref => "11ad0392758b6b3f4b8a44332c66a79e94cef1eb" # current master has some network issues ...
+gem "vagrant", :github => "mitchellh/vagrant", :tag => "v1.3.3" 

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.0.2 / 01-02-2014
+* 1 bug fix:
+
+  * Fix assert_directory returns nil instead of owner/group of the directory
+
 === 1.0.1 / 04-24-2013
 
 * 1 bug fix:

data/README.md

@@ -135,7 +135,7 @@ report_handlers << handler
 ## Automatic tests detection
 
 MiniTest-chef-hander collects test paths based in the recipes ran.
-It loads the tests based in the name of the cookbook and the name of the recipe.
+It loads the tests based on the name of the cookbook and the name of the recipe.
 The tests must be under the cookbooks directory.
 
 Examples:

data/Vagrantfile

@@ -7,15 +7,31 @@ unless ARGV[0] == "destroy"
   package = result[%r{pkg/.*}].sub(/\.$/,"")
 end
 
-Vagrant::Config.run do |config|
-  config.vm.box = "precise64"
-  config.vm.provision :shell, :inline => "gem install /vagrant/#{package} --no-rdoc --no-ri"
-  config.vm.provision :chef_solo do |chef|
+Vagrant.configure("2") do |config|
+  config.vm.box      = "opscode-precise64"
+  config.vm.box_url  = "https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box"
+
+  # Install required dependencies on the empty VM:
+  #  - rubygems from apt repostitory 
+  #  - Chef 11 with Omnibus installer
+  #  - freshly built minitest-chef-handler gem
+  config.vm.provision :shell, :inline => <<EOS
+set -e
+if ! command -V chef-solo >/dev/null 2>/dev/null; then
+  sudo apt-get update -qq
+  sudo apt-get install -qq curl rubygems
+  curl -L https://www.opscode.com/chef/install.sh | bash -s -- -v 11.6.0
+fi
+gem install /vagrant/#{package} --no-rdoc --no-ri
+EOS
+
+ config.vm.provision :chef_solo do |chef|
     #chef.log_level = :debug
-    #chef.json = {"minitest" => {"verbose" => true}}
+    chef.json = {"minitest" => {"verbose" => false}}
     chef.run_list = [
       "recipe[spec_examples]",
       "minitest-handler",
     ]
   end
+
 end

data/examples/spec_examples/files/default/tests/minitest/default_test.rb

@@ -101,7 +101,7 @@ describe_recipe 'spec_examples::default' do
     it "symlinks the foo in" do
       link("/tmp/foo-symbolic").must_exist.with(
         :link_type, :symbolic).and(:to, "/tmp/foo")
-      assert_symlinked_file "/tmp/foo-symbolic", "root", "root", 0600
+      assert_symlinked_file "/tmp/foo-symbolic", "root", "root", 0644
     end
   end
 
@@ -138,13 +138,14 @@ describe_recipe 'spec_examples::default' do
   describe "services" do
     # You can assert that a service must be running following the converge:
     it "runs as a daemon" do
-      service("ntp").must_be_running
+      service("ssh").must_be_running
     end
 
     # And that it will start when the server boots:
-    it "boots on startup" do
-      service("ntp").must_be_enabled
-    end
+    # Pending FIXME: Chef::Provider::Service::Upstart is not supported by default
+    it "boots on startup" #do
+    #  service("ssh").must_be_enabled
+    #end
   end
 
   describe "users and groups" do

data/gemfiles/chef_10.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "vagrant", ">= 1.1", :git=>"git://github.com/mitchellh/vagrant.git", :ref=>"11ad0392758b6b3f4b8a44332c66a79e94cef1eb"
+gem "vagrant", :github=>"mitchellh/vagrant", :tag=>"v1.3.3"
 gem "chef", "~> 10.0"
 
 gemspec :path=>"../"

data/gemfiles/chef_11.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "vagrant", ">= 1.1", :git=>"git://github.com/mitchellh/vagrant.git", :ref=>"11ad0392758b6b3f4b8a44332c66a79e94cef1eb"
+gem "vagrant", :github=>"mitchellh/vagrant", :tag=>"v1.3.3"
 gem "chef", "~> 11.0"
 
 gemspec :path=>"../"

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

@@ -1,3 +1,5 @@
+require 'set'
+
 module MiniTest
   module Chef
     module Assertions
@@ -33,14 +35,16 @@ module MiniTest
       end
 
       def assert_group_includes(members, group)
-        members = [members] unless members.respond_to?(:&)
-        assert group.members & members == members, "Expected group '#{group.name}' to include members: #{members.join(', ')}"
+        members = Set.new(Array(members))
+        assert Set.new(group.members) & members == members,
+          "Expected group '#{group.name}' to include members: #{members.to_a.join(', ')}"
         group
       end
 
       def refute_group_includes(members, group)
-        members = [members] unless members.respond_to?(:&)
-        refute group.members & members == members, "Expected group '#{group.name}' not to include members: #{members.join(', ')}"
+        members = Set.new(Array(members))
+        refute Set.new(group.members) & members == members,
+          "Expected group '#{group.name}' not to include members: #{members.to_a.join(', ')}"
         group
       end
 
@@ -125,20 +129,27 @@ module MiniTest
       end
 
       def assert_directory(dir, *args)
-        assert File.directory?(dir), "Expected #{dir} is be a directory"
+        assert File.directory?(dir), "Expected #{dir} to be a directory"
         assert_acl(dir, *args)
       end
 
       def assert_file(file, *args)
-        assert File.file?(file), "Expected #{file} is be a file"
+        assert File.file?(file), "Expected #{file} to be a file"
         assert_acl(file, *args)
       end
 
       def assert_acl(file, owner, group, mode)
-        file(file).
-          must_have(:owner, owner).
-          must_have(:group, group).
-          must_have(:mode, mode)
+        unless File.directory?(file)
+          file(file).
+            must_have(:owner, owner).
+            must_have(:group, group).
+            must_have(:mode, mode)
+        else
+          directory(file).
+            must_have(:owner, owner).
+            must_have(:group, group).
+            must_have(:mode, mode)
+        end
       end
 
       def assert_symlinked_file(file, *args)
@@ -165,6 +176,12 @@ module MiniTest
         out
       end
 
+      def refute_sh(command, text=nil)
+        text ||= "Expected #{command} not to succeed"
+        out = `#{command} 2>&1`
+        assert !$?.success?, "#{text}, but succeeded with: #{out}"
+        out
+      end
     end
   end
 end

data/minitest-chef-handler.gemspec

@@ -11,16 +11,16 @@ 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       = '1.0.1'
+  gem.version       = '1.0.2'
 
   gem.add_dependency('minitest', '~> 4.7.3')
-  gem.add_dependency('chef')
+  gem.add_dependency('chef', '>= 10.12.0')
   gem.add_dependency('ci_reporter')
   gem.add_development_dependency "rake"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "appraisal"
   gem.add_development_dependency "ffi", ">= 1"
-  gem.add_development_dependency "vagrant", ">= 1.1"
-  gem.add_development_dependency "berkshelf", ">= 1.3.1"
-  gem.add_development_dependency "berkshelf-vagrant"
+  gem.add_development_dependency "vagrant", "~> 1.3"
+  gem.add_development_dependency "berkshelf", "~> 2.0"
+  gem.add_development_dependency "vagrant-berkshelf", "~> 1.3"
 end

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

@@ -187,6 +187,22 @@ describe MiniTest::Chef::Assertions do
     end
   end
 
+  it "ignores order when asserting group membership" do
+    group = resource_for({:name => 'foo', :members => ['bar', 'baz']})
+    assert_group_includes(['bar', 'baz'], group).must_equal group
+    assert_group_includes(['baz', 'bar'], group).must_equal group
+  end
+
+  it "ignores order when refuting group membership" do
+    group = resource_for({:name => 'foo', :members => ['bar', 'baz']})
+    assert_triggered "Expected group 'foo' not to include members: bar, baz" do
+      refute_group_includes(['bar', 'baz'], group).must_equal group
+    end
+    assert_triggered "Expected group 'foo' not to include members: baz, bar" do
+      refute_group_includes(['baz', 'bar'], group).must_equal group
+    end
+  end
+
   it "verifies that a file includes the specified content" do
     file = resource_for({:path => '/etc/bar'})
     assert_includes_content(file, 'Chef').must_equal file
@@ -347,7 +363,7 @@ describe MiniTest::Chef::Assertions do
     end
 
     it "verifies that it is a directory" do
-      assert_triggered "Expected /etc/foo is be a directory" do
+      assert_triggered "Expected /etc/foo to be a directory" do
         assert_directory("/etc/foo", "foo", "bar", 0755)
       end
     end
@@ -365,7 +381,7 @@ describe MiniTest::Chef::Assertions do
     end
 
     it "verifies that it is a file" do
-      assert_triggered "Expected /etc is be a file" do
+      assert_triggered "Expected /etc to be a file" do
         assert_file("/etc", "foo", "bar", 0755)
       end
     end
@@ -444,4 +460,16 @@ describe MiniTest::Chef::Assertions do
       end
     end
   end
+
+  describe "#refute_sh" do
+    it "succeeds when the command fails" do
+      refute_sh("false")
+    end
+
+    it "fails when the command succeeds" do
+      assert_triggered "Expected true not to succeed, but succeeded with: ABC" do
+        refute_sh("echo ABC && true")
+      end
+    end
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: minitest-chef-handler
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,147 +27,129 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.12.0
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: mocha
   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: 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'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: berkshelf-vagrant
+  name: vagrant-berkshelf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: Run minitest suites after your Chef recipes to check the status of your
   system.
 email:
@@ -216,27 +195,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Run Minitest suites as Chef report handlers
 test_files:
 - spec/minitest-chef-handler/assertions_spec.rb