chef-rewind 0.0.8 → 0.0.9

data/spec/unwind_recipe_spec.rb

@@ -29,10 +29,21 @@ describe Chef::Recipe do
       @recipe.unwind "zen_master[foobar]"
 
       resources = @run_context.resource_collection.all_resources
-      resources.length.should == 0
+      expect(resources.empty?).to be_truthy
     end
 
-    it "should define resource completely when unwind is called" do
+    it 'should only remove the correct resource' do
+      @recipe.zen_master "foobar"
+      @recipe.cat "blanket"
+      @recipe.zen_master "bar"
+
+      @recipe.unwind "cat[blanket]"
+
+      resources = @run_context.resource_collection.all_resources
+      expect(resources.length).to eq 2
+    end
+
+    it "should delete resource completely when unwind is called" do
       @recipe.zen_master "foo" do
         action :nothing
         peace false
@@ -52,13 +63,31 @@ describe Chef::Recipe do
         notifies :blowup, "cat[blanket]"
       end
 
-      lambda { @runner.converge }.should raise_error(Chef::Provider::Cat::CatError)
+      expect { @runner.converge }.to raise_error(Chef::Provider::Cat::CatError)
     end
 
     it "should throw an error when unwinding a nonexistent resource" do
-      lambda do
+      expect {
         @recipe.unwind "zen_master[foobar]"
-      end.should raise_error(Chef::Exceptions::ResourceNotFound)
+      }.to raise_error(Chef::Exceptions::ResourceNotFound)
+    end
+
+    it "should correctly unwind a resource that was defined more than once" do
+      @recipe.zen_master "foo" do
+        peace true
+      end
+      @recipe.cat "blanket"
+      @recipe.zen_master "foo" do
+        peace false
+      end
+      @recipe.zen_master "bar"
+
+      @recipe.unwind "zen_master[foo]"
+
+      %w(zen_master[bar] cat[blanket]).each do |name|
+        resource = @run_context.resource_collection.lookup(name)
+        expect(resource.to_s).to eq(name)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-rewind
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Bryan Berry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies: []
 description: Monkey patches Chef to allow rewinding and unwinding of existing resources
 email:
@@ -17,63 +17,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".kitchen.yml"
+- ".travis.yml"
+- Berksfile
 - CHANGELOG
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - chef-rewind.gemspec
+- gemfiles/chef-11.gemfile
+- gemfiles/chef-12.gemfile
 - lib/chef/rewind.rb
-- spec/data/cookbooks/angrybash/recipes/default.rb
-- spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl
-- spec/data/cookbooks/apache2/recipes/default.rb
-- spec/data/cookbooks/borken/recipes/default.rb
-- spec/data/cookbooks/borken/templates/default/borken.erb
-- spec/data/cookbooks/chefignore
-- spec/data/cookbooks/java/files/default/java.response
-- spec/data/cookbooks/openldap/attributes/default.rb
-- spec/data/cookbooks/openldap/attributes/smokey.rb
-- spec/data/cookbooks/openldap/definitions/client.rb
-- spec/data/cookbooks/openldap/definitions/server.rb
-- spec/data/cookbooks/openldap/files/default/.dotfile
-- spec/data/cookbooks/openldap/files/default/.ssh/id_rsa
-- spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir
-- spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt
-- spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt
-- spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile
-- spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt
-- spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt
-- spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt
-- spec/data/cookbooks/openldap/recipes/default.rb
-- spec/data/cookbooks/openldap/recipes/gigantor.rb
-- spec/data/cookbooks/openldap/recipes/one.rb
-- spec/data/cookbooks/openldap/templates/default/openldap_stuff.conf.erb
-- spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb
-- spec/data/cookbooks/openldap/templates/default/test.erb
+- spec/data/cookbooks/rewind/Berksfile
+- spec/data/cookbooks/rewind/README.md
+- spec/data/cookbooks/rewind/files/default/test/default_test.rb
+- spec/data/cookbooks/rewind/metadata.rb
+- spec/data/cookbooks/rewind/recipes/base.rb
+- spec/data/cookbooks/rewind/recipes/default.rb
 - spec/rewind_recipe_spec.rb
 - spec/rewind_resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/chef_helpers.rb
 - spec/support/lib/chef/provider/cat.rb
-- spec/support/lib/chef/provider/easy.rb
-- spec/support/lib/chef/provider/snakeoil.rb
 - spec/support/lib/chef/provider/zen_master.rb
 - spec/support/lib/chef/resource/cat.rb
-- spec/support/lib/chef/resource/one_two_three_four.rb
 - spec/support/lib/chef/resource/zen_master.rb
-- spec/support/matchers/leak.rb
-- spec/support/mock/constant.rb
-- spec/support/mock/platform.rb
-- spec/support/platform_helpers.rb
-- spec/support/platforms/prof/gc.rb
-- spec/support/platforms/prof/win32.rb
-- spec/support/shared/functional/directory_resource.rb
-- spec/support/shared/functional/file_resource.rb
-- spec/support/shared/functional/knife.rb
-- spec/support/shared/functional/securable_resource.rb
-- spec/support/shared/unit/api_error_inspector.rb
-- spec/support/shared/unit/platform_introspector.rb
 - spec/unwind_recipe_spec.rb
 homepage: ''
 licenses: []
@@ -84,69 +54,33 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Monkey patches Chef to allow rewinding and unwinding of existing resources
 test_files:
-- spec/data/cookbooks/angrybash/recipes/default.rb
-- spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl
-- spec/data/cookbooks/apache2/recipes/default.rb
-- spec/data/cookbooks/borken/recipes/default.rb
-- spec/data/cookbooks/borken/templates/default/borken.erb
-- spec/data/cookbooks/chefignore
-- spec/data/cookbooks/java/files/default/java.response
-- spec/data/cookbooks/openldap/attributes/default.rb
-- spec/data/cookbooks/openldap/attributes/smokey.rb
-- spec/data/cookbooks/openldap/definitions/client.rb
-- spec/data/cookbooks/openldap/definitions/server.rb
-- spec/data/cookbooks/openldap/files/default/.dotfile
-- spec/data/cookbooks/openldap/files/default/.ssh/id_rsa
-- spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir
-- spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt
-- spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt
-- spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile
-- spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt
-- spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt
-- spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt
-- spec/data/cookbooks/openldap/recipes/default.rb
-- spec/data/cookbooks/openldap/recipes/gigantor.rb
-- spec/data/cookbooks/openldap/recipes/one.rb
-- spec/data/cookbooks/openldap/templates/default/openldap_stuff.conf.erb
-- spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb
-- spec/data/cookbooks/openldap/templates/default/test.erb
+- spec/data/cookbooks/rewind/Berksfile
+- spec/data/cookbooks/rewind/README.md
+- spec/data/cookbooks/rewind/files/default/test/default_test.rb
+- spec/data/cookbooks/rewind/metadata.rb
+- spec/data/cookbooks/rewind/recipes/base.rb
+- spec/data/cookbooks/rewind/recipes/default.rb
 - spec/rewind_recipe_spec.rb
 - spec/rewind_resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/chef_helpers.rb
 - spec/support/lib/chef/provider/cat.rb
-- spec/support/lib/chef/provider/easy.rb
-- spec/support/lib/chef/provider/snakeoil.rb
 - spec/support/lib/chef/provider/zen_master.rb
 - spec/support/lib/chef/resource/cat.rb
-- spec/support/lib/chef/resource/one_two_three_four.rb
 - spec/support/lib/chef/resource/zen_master.rb
-- spec/support/matchers/leak.rb
-- spec/support/mock/constant.rb
-- spec/support/mock/platform.rb
-- spec/support/platform_helpers.rb
-- spec/support/platforms/prof/gc.rb
-- spec/support/platforms/prof/win32.rb
-- spec/support/shared/functional/directory_resource.rb
-- spec/support/shared/functional/file_resource.rb
-- spec/support/shared/functional/knife.rb
-- spec/support/shared/functional/securable_resource.rb
-- spec/support/shared/unit/api_error_inspector.rb
-- spec/support/shared/unit/platform_introspector.rb
 - spec/unwind_recipe_spec.rb
-has_rdoc: 

data/spec/data/cookbooks/angrybash/recipes/default.rb

@@ -1,8 +0,0 @@
-bash "go off the rails" do
-  code <<-END
-    for i in localhost 127.0.0.1 #{Socket.gethostname()}
-    do
-      echo "grant all on *.* to root@'$i' identified by 'a_password'; flush privileges;" | mysql -u root -h 127.0.0.1
-    done
-   END
-end

data/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl

@@ -1,2 +0,0 @@
-# apache2_module_conf_generate.pl
-# this is just here for show.

data/spec/data/cookbooks/apache2/recipes/default.rb

@@ -1,3 +0,0 @@
-#
-# Nothing ot see here
-# 

data/spec/data/cookbooks/borken/recipes/default.rb

@@ -1,2 +0,0 @@
-a cat walked on the keyboard one day...
-(*&(*&(*&(*&(*^%$%^%#^^&(*)(*{}}}}}}}}+++++===))))))

data/spec/data/cookbooks/borken/templates/default/borken.erb

@@ -1,2 +0,0 @@
-a cat walked on the keyboard one day...
-<%= (*&)(*^^^^*******++_+_--- }}}}]]]end)%>

data/spec/data/cookbooks/chefignore

@@ -1,6 +0,0 @@
-#
-# The ignore file allows you to skip files in cookbooks with the same name that appear
-# later in the search path.
-#
-
-recipes/ignoreme.rb

data/spec/data/cookbooks/java/files/default/java.response

@@ -1,2 +0,0 @@
-# Hi, I'm pretending to be the preseed file for installing the Sun JDK on debian
-# or Ubuntu

data/spec/data/cookbooks/openldap/attributes/default.rb

@@ -1,16 +0,0 @@
-chef_env ||= nil
-case chef_env
-when "prod"
-  default[:ldap_server] = "ops1prod"
-  default[:ldap_basedn] = "dc=hjksolutions,dc=com"
-  default[:ldap_replication_password] = "yes"
-when "corp"
-  default[:ldap_server] = "ops1prod"
-  default[:ldap_basedn] = "dc=hjksolutions,dc=com"
-  default[:ldap_replication_password] = "yougotit"
-else
-
-  default[:ldap_server] = "ops1prod"
-  default[:ldap_basedn] = "dc=hjksolutions,dc=com"
-  default[:ldap_replication_password] = "forsure" 
-end

data/spec/data/cookbooks/openldap/attributes/smokey.rb

@@ -1 +0,0 @@
-default[:smokey] = "robinson"

data/spec/data/cookbooks/openldap/definitions/client.rb

@@ -1,5 +0,0 @@
-define :openldap_client, :mothra => "a big monster" do
-  cat "#{params[:name]}" do
-     pretty_kitty true
-  end
-end

data/spec/data/cookbooks/openldap/definitions/server.rb

@@ -1,5 +0,0 @@
-define :openldap_server, :mothra => "a big monster" do
-  cat "#{params[:name]}" do
-     pretty_kitty true
-  end
-end

data/spec/data/cookbooks/openldap/files/default/.dotfile

@@ -1 +0,0 @@
-I am here to test .dotfiles work in file directories.

data/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa

@@ -1 +0,0 @@
-FAKE KEY

data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir

@@ -1 +0,0 @@
-this is a dotfile in a dotdir

data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt

@@ -1,3 +0,0 @@
-# remote directory
-# file specificity: default
-# relpath: remotedir/remote_dir_file1.txt

data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt

@@ -1,3 +0,0 @@
-# remote directory
-# file specificity: default
-# relpath: remotedir/remote_dir_file2.txt

data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile

@@ -1 +0,0 @@
-this is a file with a name beginning with a . dot

data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt

@@ -1,3 +0,0 @@
-# remote directory
-# file specificity: default
-# relpath: remotedir/remotesubdir/remote_dir_file1.txt

data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt

@@ -1,3 +0,0 @@
-# remote directory
-# file specificity: default
-# relpath: remotedir/remotesubdir/remote_dir_file2.txt

data/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt

@@ -1,3 +0,0 @@
-# remote directory
-# file specificity: default
-# relpath: remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt

data/spec/data/cookbooks/openldap/recipes/default.rb

@@ -1,3 +0,0 @@
-cat "blanket" do
-  pretty_kitty true
-end

data/spec/data/cookbooks/openldap/recipes/gigantor.rb

@@ -1,3 +0,0 @@
-cat "blanket" do
-  pretty_kitty false
-end

data/spec/data/cookbooks/openldap/recipes/one.rb

@@ -1,15 +0,0 @@
-##
-# Nodes should have a unique name
-##
-name "test.example.com-default"
-
-##
-# Nodes can set arbitrary arguments
-##
-sunshine "in"
-something "else"
-
-##
-# Nodes should have recipes
-##
-recipes "operations-master", "operations-monitoring"

data/spec/data/cookbooks/openldap/templates/default/openldap_stuff.conf.erb

@@ -1 +0,0 @@
-slappiness is <%= node[:slappiness] -%>

data/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb

@@ -1 +0,0 @@
-super secret is <%= @secret -%>

data/spec/data/cookbooks/openldap/templates/default/test.erb

@@ -1 +0,0 @@
-We could be diving for pearls!

data/spec/support/lib/chef/provider/easy.rb

@@ -1,35 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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.
-#
-
-class Chef
-  class Provider
-    class Easy < Chef::Provider
-      def load_current_resource
-        true
-      end
-  
-      def action_sell
-        true
-      end
-      
-      def action_buy
-        true
-      end
-    end
-  end
-end

data/spec/support/lib/chef/provider/snakeoil.rb

@@ -1,40 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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.
-#
-
-class Chef
-  class Provider
-    class SnakeOil < Chef::Provider
-      def load_current_resource
-        true
-      end
-  
-      def action_purr
-        @new_resource.updated_by_last_action(true)
-        true
-      end
-
-      def action_sell
-        true
-      end
-      
-      def action_buy
-        true
-      end
-    end
-  end
-end