linecook-gem 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1b22a12f84db67aa65c0030c0fd60032a86e5c5
-  data.tar.gz: 3abe7056d47b837005fef0d368718160e646849e
+  metadata.gz: ab1e346b376c0135f2fcc9b64ebc12b39ec1e3bf
+  data.tar.gz: a1f386fc0fd5a06268b969f4eaa84856eaacbeb7
 SHA512:
-  metadata.gz: 8a39b3c93b527cb433d576cd4b8debc63875bb367a31a7f1db52b9c26e26dfec3dfc7b5fb8c104356418067031bf64ec0670086b430d89542ec9f86ac5418dcb
-  data.tar.gz: f2e9f0d43ab5d55c63cbc025e0680b799965946859b1862b88054cc97c72174e44f79280eea155722c4b1853fcd39a9e3fa50139d70517fc1dc2985e7c6f35a9
+  metadata.gz: 03882e161852a60da0d218b18f6a2afaf4037a4889a9672ece8e113a908b067582dbb1eb128e4ec48c2c40f874ded9c300a59a103fdd8c4076e9a456e066b5ef
+  data.tar.gz: 16a36d542cc4f1a797c13b34ca9a170f12e9a47c15e480e8a84756a4647eaa5d707687dee96d5015bbfbaaf7a11dbf2129942dd00d89cb7f1366163b662428e3

data/lib/linecook/provisioner/chef-zero.rb

@@ -33,6 +33,10 @@ module Linecook
       FileUtils.rm_rf(Cache.path)
     end
 
+    def chef_port
+      ChefProvisioner::Config.server.split(':')[-1].to_i
+    end
+
     private
 
     def setup
@@ -42,21 +46,17 @@ module Linecook
       chef_config = config[:chef]
       chef_config.merge!(node_name: "linecook-#{SecureRandom.hex(4)}",
                          chef_server_url: ChefProvisioner::Config.server)
-      # FIXME: sort out cache copying here for concurrent builds of different refs
       Chefdepartie.run(background: true, config: chef_config, cache: Cache.path)
       chef_config
     end
 
-    def chef_port
-      ChefProvisioner::Config.server.split(':')[-1].to_i
-    end
-
     # Required in order to have multiple builds run on different refs
     module Cache
       CACHE_PATH = File.join(Linecook::Config::LINECOOK_HOME, 'chefcache').freeze
       PIDFILE = File.join(CACHE_PATH, 'pid')
       STAMPFILE = File.join(CACHE_PATH, 'stamp')
       STALE_THRESHOLD = 86400 # one day in seconds
+      WAIT_TIMEOUT = 60 # time to wait for port to become available again
 
       extend self
 
@@ -66,12 +66,34 @@ module Linecook
           cache_path = Dir.mktmpdir('linecook-chef-cache')
           build
           copy(cache_path)
+          wait_for_close
           cache_path
         end
       end
 
     private
 
+      def wait_for_close
+        attempts = 0
+        while attempts < WAIT_TIMEOUT
+          begin
+            Timeout::timeout(1) do
+              begin
+                s = TCPSocket.new('127.0.0.1', Linecook::Chef.chef_port)
+                s.close
+                return true
+              rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+                return false
+              end
+            end
+          rescue Timeout::Error
+            puts "Port #{Linecook::Chef.chef_port} is still in use"
+            sleep(1)
+          end
+          attempts += 0
+        end
+      end
+
       def copy(cache_path)
         FileUtils.copy_entry(CACHE_PATH, cache_path, preserve: true)
       end

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Dale Hamel