chef-rewind 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cefbbaa69a7831ac60f9c606e878059e7f2608dc
-  data.tar.gz: 2a4f1030ac29fac1a99648ba1adb0b6cb29ec53e
+  metadata.gz: 998da8b82028835bba55051d2942811b230025c2
+  data.tar.gz: 13133b9eccad6d6d5e66c7439e7f8ff47f82545c
 SHA512:
-  metadata.gz: c5054f2756825cb8eb289b35d93b1759699dfb801797eba165de52ce56e6955ce2394d26b9c5094c00e24090af6f15698d3c15cb56242ac65a40a6f022650cf7
-  data.tar.gz: 4e60f6920312e2e226fbfd52c8860b06504cf82155f207ad762bdbb2cca8ba70db5432f6e1e698fb964707edb287b60e751ca51f2d77cd22adc5fd1153793097
+  metadata.gz: 70aeff096b089815c45ffea3914ca4971ff503e5b0e6847a925e814abc9b406e45eb0b847c44d59f694e390cb38cc052ab2dbcd79c0d263991dd6530cb53521b
+  data.tar.gz: e722f94a7dc57f7a7e21bc740649a9c51ca7c7d01a56beddf32a09be3cd585865139d9b9bc784ead0c40739d72bdce322be8fc8f19e0e2d06141fcd682853d20

data/.gitignore

@@ -2,8 +2,11 @@
 *.rbc
 .bundle
 .config
+.rake_tasks~
 .yardoc
+Berksfile.lock
 Gemfile.lock
+gemfiles/*.lock
 InstalledFiles
 _yardoc
 coverage
@@ -12,6 +15,9 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+tags
 test/tmp
 test/version_tmp
 tmp
+.kitchen/
+.kitchen.local.yml

data/.kitchen.yml

@@ -0,0 +1,26 @@
+---
+driver:
+  name: vagrant
+  synced_folders:
+    - [ 'pkg', '/opt/pkg']
+
+provisioner:
+  name: chef_zero
+
+platforms:
+  <% %w{11.16.4 12.0.1}.each do |chef_ver| %>
+  - name: ubuntu-14.04-<%= chef_ver %>
+    driver_config:
+      box: opscode-ubuntu-14.04
+      box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box
+      require_chef_omnibus: <%= chef_ver %>
+<% end %>
+
+suites:
+  - name: default
+    run_list:
+      - "recipe[rewind]"
+      - "recipe[minitest-handler]"
+    attributes:
+      rewind:
+        ver: 0.0.9

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 2.1.5
+  - 2.0.0
+script: bundle exec rake spec
+bundler_args: --without kitchen
+sudo: false
+gemfile:
+  - Gemfile
+  - gemfiles/chef-11.gemfile
+  - gemfiles/chef-12.gemfile

data/Berksfile

@@ -0,0 +1,4 @@
+source "https://supermarket.getchef.com"
+
+cookbook "rewind", :path => "spec/data/cookbooks/rewind"
+cookbook 'minitest-handler'

data/Gemfile

@@ -2,43 +2,14 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "activesupport", :group => :compat_testing, :platform => "ruby"
 gem "ronn"
 gem "rspec"
 gem "chef"
 gem "pry"
+gem "rake"
 
-group(:development, :test) do
-  gem 'rack'
-  gem 'thin'
-
-  # Eventmachine 1.0.0 is causing functional test failures on Solaris
-  # 9 SPARC. Pinning em to 0.12.10 solves this issue until we can
-  # replace thin with webrat or some other alternative.
-  gem 'eventmachine', '0.12.10', :platforms => :ruby
-
-  gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(darwin|freebsd)/)
-#  gem 'awesome_print'
-#  gem 'pry'
-end
-
-platforms :mswin, :mingw do
-  gem "ffi", "1.0.9"
-  gem "rdp-ruby-wmi", "0.3.1"
-  gem "windows-api", "0.4.0"
-  gem "windows-pr", "1.2.1"
-  gem "win32-api", "1.4.8"
-  gem "win32-dir", "0.3.7"
-  gem "win32-event", "0.5.2"
-  gem "win32-mutex", "0.3.1"
-  gem "win32-process", "0.6.5"
-  gem "win32-service", "0.7.2"
+group :kitchen do
+  gem 'test-kitchen'
+  gem 'kitchen-vagrant'
+  gem 'berkshelf'
 end
-
-platforms :mingw_18 do
-  gem "win32-open3", "0.3.2"
-end
-
-# If you want to load debugging tools into the bundle exec sandbox,
-# add these additional dependencies into chef/Gemfile.local
-eval(IO.read(__FILE__ + '.local'), binding) if File.exists?(__FILE__ + '.local')

data/README.md

@@ -1,5 +1,7 @@
 # Chef::Rewind
 
+[![Build Status](https://travis-ci.org/thommay/chef-rewind.svg?branch=master)](https://travis-ci.org/thommay/chef-rewind)
+
 This adds a simple function to the Chef library scope to
 rewind or unwind an existing resource. If the given resource does not exist, 
 a `Chef::Exceptions::ResourceNotFound` exception will be raised.
@@ -151,5 +153,7 @@ the source file and not in the my-postgresql cookbook.
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+4. Run the unit tests (`bundle exec rake spec`)
+5. Run test kitchen (`bundle exec kitchen test`)
+6. Push to the branch (`git push origin my-new-feature`)
+7. Create new Pull Request

data/Rakefile

@@ -1,2 +1,12 @@
 #!/usr/bin/env rake
+require 'rspec/core/rake_task'
 require "bundler/gem_tasks"
+
+RSpec::Core::RakeTask.new
+
+begin
+  require 'kitchen/rake_tasks'
+  Kitchen::RakeTasks.new
+rescue LoadError
+  puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
+end

data/chef-rewind.gemspec

@@ -12,5 +12,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "chef-rewind"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.8"
+  gem.version       = "0.0.9"
 end

data/gemfiles/chef-11.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem "ronn"
+gem "rspec"
+gem "chef", '~> 11.0'
+gem "pry"
+gem "rake"

data/gemfiles/chef-12.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem "ronn"
+gem "rspec"
+gem "chef", '~> 12.0'
+gem "pry"
+gem "rake"

data/lib/chef/rewind.rb

@@ -50,16 +50,16 @@ class Chef
   class Resource
     def cookbook_name(arg=nil)
       set_or_return(
-                    :cookbook_name,
-                    arg,
-                    :kind_of => String)
+        :cookbook_name,
+        arg,
+        :kind_of => String)
     end
 
     def recipe_name(arg=nil)
       set_or_return(
-                    :recipe_name,
-                    arg,
-                    :kind_of => String)
+        :recipe_name,
+        arg,
+        :kind_of => String)
     end
   end
 end
@@ -67,18 +67,48 @@ end
 
 class Chef
   class ResourceCollection
-    def delete_resource(resource_id)
-      lookup resource_id
-
-      # assumes `resource_id` is the same as `Chef::Resource#to_s`
-      @resources.delete_if {|r| r.to_s == resource_id }
-      resource_index_value = @resources_by_name[resource_id]
-      @resources_by_name.each do |k, v|
-        @resources_by_name[k] = v - 1 if v > resource_index_value
+    if Gem::Version.new(Chef::VERSION) > Gem::Version.new('12')
+      class ResourceSet
+        def delete(key)
+          @resources_by_key.delete(key)
+        end
       end
 
-      @resources_by_name.delete resource_id
+      class ResourceList
+        def delete(key)
+          @resources.delete_if { |r| r.to_s == key }
+        end
+      end
+
+      def delete_resource(resource_id)
+        lookup resource_id
+
+        @resource_set.delete(resource_id)
+        @resource_list.delete(resource_id)
+      end
+    else
+      def delete_resource(resource_id)
+        lookup resource_id
+
+        indexes_to_delete = @resources.each_index.select do |resource_index|
+          # assumes `resource_id` is the same as `Chef::Resource#to_s`
+          @resources[resource_index].to_s == resource_id
+        end
 
+        # Delete indexes backwards to avoid problems with changing the array
+        indexes_to_delete.sort.reverse.each { |index| delete_index index }
+
+        @resources_by_name.delete resource_id
+      end
+
+      private
+
+      def delete_index(resource_index)
+        @resources.delete_at resource_index
+        @resources_by_name.each do |k, v|
+          @resources_by_name[k] = v - 1 if v > resource_index
+        end
+      end
     end
   end
 end

data/spec/data/cookbooks/rewind/Berksfile

@@ -0,0 +1,3 @@
+source "https://supermarket.getchef.com"
+
+metadata

data/spec/data/cookbooks/rewind/README.md

@@ -0,0 +1 @@
+A sample cookbook

data/spec/data/cookbooks/rewind/files/default/test/default_test.rb

@@ -0,0 +1,21 @@
+require 'minitest/spec'
+
+describe_recipe 'rewind::default' do
+  describe 'the first file' do
+    it 'should get created' do
+      file('/tmp/first_file').must_exist
+    end
+
+    it 'should be rewound' do
+      file('/tmp/first_file').must_include 'a rewound file'
+    end
+  end
+
+  it 'should create the second file' do
+    file('/tmp/second_file').must_exist
+  end
+
+  it 'should not create the third file' do
+    file('/tmp/third_file').wont_exist
+  end
+end

data/spec/data/cookbooks/rewind/metadata.rb

@@ -0,0 +1,7 @@
+name             'rewind'
+maintainer       ''
+maintainer_email ''
+license          ''
+description      'Installs/Configures rewind'
+long_description 'Installs/Configures rewind'
+version          '0.1.0'

data/spec/data/cookbooks/rewind/recipes/base.rb

@@ -0,0 +1,11 @@
+file "/tmp/first_file" do
+  content 'a pristine file'
+end
+
+file '/tmp/second_file' do
+  content 'a file that should exist'
+end
+
+file '/tmp/third_file' do
+  content 'i should not exist'
+end

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

@@ -0,0 +1,12 @@
+chef_gem 'chef-rewind' do
+  source "/opt/pkg/chef-rewind-#{node['rewind']['ver']}.gem"
+end
+
+require 'chef/rewind'
+include_recipe 'rewind::base'
+
+rewind "file[/tmp/first_file]" do
+  content "a rewound file"
+end
+
+unwind 'file[/tmp/third_file]'

data/spec/rewind_recipe_spec.rb

@@ -1,9 +1,8 @@
-
 require 'spec_helper'
 require 'chef/rewind'
 
 describe Chef::Recipe do
-  
+
   before(:each) do
     @cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks"))
     cl = Chef::CookbookLoader.new(@cookbook_repo)
@@ -18,7 +17,7 @@ describe Chef::Recipe do
     # Shell/ext.rb is on the run path, and it defines
     # Chef::Recipe#resources to call pp, which we don't want when
     # we're running tests.
-    @recipe.stub!(:pp)
+    allow(@recipe).to receive(:pp)
   end
 
 
@@ -28,34 +27,34 @@ describe Chef::Recipe do
       @recipe.zen_master "foobar" do
         peace false
       end
-      
+
       @recipe.rewind "zen_master[foobar]" do
         peace true
       end
       resources = @run_context.resource_collection.all_resources
-      resources.length.should == 1
+      expect(resources.length).to eq 1
     end
 
     it "change the value of an existing resource" do
       @recipe.zen_master "foobar" do
         peace false
       end
-      
+
       @recipe.rewind "zen_master[foobar]" do
         peace true
       end
-      
+
       zen_master = @run_context.resource_collection.find("zen_master[foobar]")
       peace_status = zen_master.instance_exec { @peace }
-      peace_status.should == true 
+      expect(peace_status).to be true 
     end
-    
+
     it "throw an error when rewinding a nonexistent resource" do
-      lambda do 
+      expect {
         @recipe.rewind "zen_master[foobar]" do
           peace true
         end
-      end.should raise_error(Chef::Exceptions::ResourceNotFound)
+      }.to raise_error(Chef::Exceptions::ResourceNotFound)
     end
   end
 

data/spec/rewind_resource_spec.rb

@@ -18,7 +18,7 @@ describe Chef::Resource do
   describe "cookbook_name" do
     it "cookbook_name sets @cookbook_name properly" do
       @resource.cookbook_name "foobar"
-      @resource.cookbook_name.should == "foobar"
+      expect(@resource.cookbook_name).to eq "foobar"
     end
 
   end
@@ -26,7 +26,7 @@ describe Chef::Resource do
   describe "recipe_name" do
     it "recipe_name sets @recipe_name properly" do
       @resource.recipe_name "foobar"
-      @resource.recipe_name.should == "foobar"
+      expect(@resource.recipe_name).to eq "foobar"
     end
 
   end

data/spec/spec_helper.rb

@@ -15,19 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# If you need to add anything in here, don't.
-# Add it to one of the files in spec/support
-
-# Abuse ruby's constant lookup to avoid undefined constant errors
-module Shef
-  JUST_TESTING_MOVE_ALONG = true unless defined? JUST_TESTING_MOVE_ALONG
-  IRB = nil unless defined? IRB
-end
-
 # Ruby 1.9 Compat
 $:.unshift File.expand_path("../..", __FILE__)
 
-require 'rubygems'
 require 'rspec/mocks'
 
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
@@ -35,25 +25,7 @@ $:.unshift(File.expand_path("../lib", __FILE__))
 $:.unshift(File.dirname(__FILE__))
 
 require 'chef'
-require 'chef/knife'
-Chef::Knife.load_commands
 require 'chef/mixins'
-require 'chef/application'
-require 'chef/applications'
-
-begin
-  require 'chef/shef'
-rescue LoadError
-  require 'chef/shef/ext'
-end
-require 'chef/util/file_edit'
-
-# If you want to load anything into the testing environment
-# without versioning it, add it to spec/support/local_gems.rb
-require 'spec/support/local_gems.rb' if File.exists?(File.join(File.dirname(__FILE__), 'support', 'local_gems.rb'))
-
-# Explicitly require spec helpers that need to load first
-require 'spec/support/platform_helpers'
 
 # Autoloads support files
 # Excludes support/platforms by default
@@ -63,19 +35,3 @@ Dir["spec/support/**/*.rb"].
   map { |f| f.gsub(%r{.rb$}, '') }.
   each { |f| require f }
 
-RSpec.configure do |config|
-  config.include(Matchers)
-  config.filter_run :focus => true
-  config.filter_run_excluding :external => true
-
-  # Add jruby filters here
-  config.filter_run_excluding :windows_only => true unless windows?
-  config.filter_run_excluding :unix_only => true unless unix?
-  config.filter_run_excluding :ruby_18_only => true unless ruby_18?
-  config.filter_run_excluding :ruby_19_only => true unless ruby_19?
-  config.filter_run_excluding :requires_root => true unless ENV['USER'] == 'root'
-  config.filter_run_excluding :requires_unprivileged_user => true if ENV['USER'] == 'root'
-
-  config.run_all_when_everything_filtered = true
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-end