kitchen-localhost 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603280763cd44c569d0979c3bda268dfb70e6e5a
-  data.tar.gz: 03d6fa925bc3d7aa675a2d0593de9959349670e0
+  metadata.gz: 34a54cce816185c98766b75a8b87fbd38677418f
+  data.tar.gz: b02ef1f249dc4107d3d589940995a56bce2df255
 SHA512:
-  metadata.gz: 9997708c0e3225cb5af120ce333767445f558febdbd8b59a561e6bb10e0026e8e2d76aa0f19459b86b867093a744263fad58e3de5c1a6df25704a6b1d4c00da8
-  data.tar.gz: 96a5324fb1fd97b3ea946d6ef91412186a71a91407e3b9d8772610f4b785710c941792f4bf376c539dc75069515cf0cd75c4ea6eff4f05958842f572fb40f1ac
+  metadata.gz: b2a53692d0a32a238e7a05bc3e4cbe45033a5e74b8d8703054309a93a0b78299b6da601b4f64d60cc93c8e788a2562f8fbad2cb859a775a919b8e103bf5bcb01
+  data.tar.gz: ba7c44f78e10903888be572d4fc1f4a3032974263d299d31a7baaf70ae2f613c0700ca77625baa6c6df8ac082c08d4ab34c0398b6c6be4ff451319b400070a78

data/.kitchen.yml

@@ -9,9 +9,9 @@ platforms:
   - name: localhost
 
 suites:
-  - name: tempfile
+  - name: create_file
     run_list:
-      - recipe[kitchen-localhost-test]
-    attributes:
-      kitchen_localhost_test:
-        test_file: testing_kitchen_localhost
+      - recipe[kitchen-localhost-test::create_file]
+  - name: delete_file
+    run_list:
+      - recipe[kitchen-localhost-test::delete_file]

data/.travis.yml

@@ -4,7 +4,7 @@ cache: bundler
 sudo: true
 
 script:
-  - bundle exec rake && bundle exec rake kitchen:all
+  - bundle exec rake && bundle exec kitchen test -c 2
 
 rvm:
 - ruby-head

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Kitchen-Localhost CHANGELOG
 ===========================
 
+v0.2.0 (2015-05-31)
+-------------------
+* Try to catch instances where Kitchen is running in concurrency mode and force
+  instances of this driver to run serially.
+
 v0.1.1 (2015-04-29)
 -------------------
 * Bump Kitchen dependency to the final 1.4 release

data/README.md

@@ -29,6 +29,10 @@ understanding that this driver will be running against _your local machine_. If
 you write a cookbook that formats a hard drive and run it with this driver, bad
 things will happen.
 
+Also note that this driver's very nature makes it likely there will be problems
+if you try to do a Test Kitchen run with multiple suites and/or with
+concurrency enabled.
+
 Installation and Setup
 ----------------------
 

data/kitchen-localhost.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Jonathan Hartman']
   spec.email         = %w(j@p4nt5.com)
   spec.description   = 'A Test Kitchen Driver for localhost'
-  spec.summary       = 'Use Test Kitchen to run Chef on your local machine!'
+  spec.summary       = 'Use Test Kitchen on your local machine!'
   spec.homepage      = 'https://github.com/test-kitchen/kitchen-localhost'
   spec.license       = 'Apache 2.0'
 

data/lib/kitchen/driver/localhost.rb

@@ -31,14 +31,42 @@ module Kitchen
     # @author Jonathan Hartman <j@p4nt5.com>
     class Localhost < Kitchen::Driver::Base
       kitchen_driver_api_version 2
-
       plugin_version Kitchen::Localhost::VERSION
 
+      #
+      # Define a Mutex at the class level so we can prevent instances using
+      # this driver from colliding.
+      #
+      # @return [Mutex]
+      #
+      def self.lock
+        @lock ||= Mutex.new
+      end
+
+      #
+      # Lock the class-level Mutex, whatever state it's in currently.
+      #
+      def self.lock!
+        lock.lock
+      end
+
+      #
+      # Unlock the class-level Mutex, whatever state it's in currently.
+      #
+      def self.unlock!
+        # Mutex#unlock raises an exception if lock is owned by another thread
+        # and Mutex#owned? isn't available in Ruby 1.9.
+        lock.unlock if lock.locked?
+      rescue ThreadError
+        nil
+      end
+
       #
       # Create the temp dirs on the local filesystem for Kitchen.
       #
       # (see Base#create)
       def create(state)
+        self.class.lock!
         state[:hostname] = Socket.gethostname
         logger.info("[Localhost] Instance #{instance} ready.")
       end
@@ -56,6 +84,7 @@ module Kitchen
           FileUtils.rm_rf(p)
           logger.info("[Localhost] Deleted temp dir '#{p}'.")
         end
+        self.class.unlock!
       end
     end
   end

data/lib/kitchen/localhost/version.rb

@@ -22,6 +22,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Localhost
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-localhost
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -210,6 +210,6 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Use Test Kitchen to run Chef on your local machine!
+summary: Use Test Kitchen on your local machine!
 test_files: []
 has_rdoc: