linecook-gem 0.7.13 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e42de890203c6e9b445d91888cc01f3912bcc35
-  data.tar.gz: 587a632d1cda40b979730c2f6445e45c8473a341
+  metadata.gz: cdfda88b02f59d7207a72bb5cf478f5211471ffa
+  data.tar.gz: b62d50d1caeaed2126437781ac9591cf2a61db72
 SHA512:
-  metadata.gz: 0b17c0e9a5f6234a47e6191eff2bb95dd1126b578cca9ba4d823de36c84bd3f0cffa60792109d143c29a325fdcf2599352978e8f5b179cf7441d37215dbdca45
-  data.tar.gz: c66d00c7f1d1b7a956632575d9f17827d18798444df26f3cf8e73c7ecbb79371b92d806f0fb959a74acc2114fc4c6cf0bc564fd9fe5836e5fcda79241131d995
+  metadata.gz: a09c5d0e13281c5154210a3dffc1f8e7592418afb3b9be478873b0236a0d01a28100005fc3e340cdfef6d5eb184f933680200a521a240e2c2a6d610389492577
+  data.tar.gz: d28b99d10e116e387cc6ff69dec1513eb3ab0cf464d3249801eeb43393df125d27eb5acacbc84e39f1623dfb70c22210cc92b3a554b32ffcf7939c0869f2dc79

data/lib/linecook-gem/baker/docker.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'docker'
 
 require 'linecook-gem/image'
+require 'linecook-gem/util/locking'
 
 # Until https://github.com/swipely/docker-api/pull/413 gets merged
 class Excon::Errors::InternalServerError < Excon::Errors::InternalServerErrorError; end
@@ -12,6 +13,7 @@ module Linecook
   module Baker
     # FIXME - refactor into a base class with an interface
     class Docker
+      include Locking
 
       RETAIN_IMAGES = 3 # number of latest images to retain
 
@@ -99,13 +101,20 @@ module Linecook
       end
 
       def import(image)
-        puts "Importing #{image.id}..."
-        image.fetch
-        open(image.path) do |io|
-          ::Docker::Image.import_stream(repo: image.group, tag: image.tag, changes: ['CMD ["/sbin/init"]']) do
-            io.read(Excon.defaults[:chunk_size] * 10 ) || ""
+        lock("import_#{image.id}")
+        if image_exists?(image)
+          puts "Image #{image.id} has already been imported"
+        else
+          puts "Importing #{image.id}..."
+          image.fetch
+          open(image.path) do |io|
+            ::Docker::Image.import_stream(repo: image.group, tag: image.tag, changes: ['CMD ["/sbin/init"]']) do
+              io.read(Excon.defaults[:chunk_size] * 10 ) || ""
+            end
           end
         end
+      ensure
+        unlock("import_#{image.id}")
       end
 
 

data/lib/linecook-gem/packager/packer.rb

@@ -8,12 +8,14 @@ require 'pty'
 
 require 'linecook-gem/image'
 require 'linecook-gem/util/downloader'
+require 'linecook-gem/util/locking'
 require 'linecook-gem/packager/route53'
 
 module Linecook
   class AmiPacker
 
     include Downloader
+    include Locking
 
     SOURCE_URL = 'https://releases.hashicorp.com/packer/'
     PACKER_VERSION = '0.8.6'
@@ -186,30 +188,6 @@ module Linecook
       !File.exists?("/dev/#{device}") && !File.exists?(lock_path(device))
     end
 
-    def lock(name)
-      lockfile(name).flock(File::LOCK_EX)
-    end
-
-    def unlock(name)
-      lockfile(name).flock(File::LOCK_UN)
-      lockfile(name).close
-    end
-
-    def clear_lock(name)
-      unlock(name)
-      FileUtils.rm_f(lockfile(name))
-    end
-
-    def lockfile(suffix)
-      @locks ||= {}
-      path = lock_path(suffix)
-      @locks[path] = @locks[path] || File.open(path, File::RDWR|File::CREAT, 0644)
-    end
-
-    def lock_path(suffix)
-      "/tmp/free_device_lock_#{suffix.gsub('/','_')}"
-    end
-
     def device_prefix
       prefixes = ['xvd', 'sd']
       `sudo ls -1 /sys/block`.lines.each do |dev| # FIXME

data/lib/linecook-gem/util/locking.rb

@@ -0,0 +1,29 @@
+require 'fileutils'
+
+module Linecook
+  module Locking
+    def lock(name)
+      lockfile(name).flock(File::LOCK_EX)
+    end
+
+    def unlock(name)
+      lockfile(name).flock(File::LOCK_UN)
+      lockfile(name).close
+    end
+
+    def clear_lock(name)
+      unlock(name)
+      FileUtils.rm_f(lockfile(name))
+    end
+
+    def lockfile(suffix)
+      @locks ||= {}
+      path = lock_path(suffix)
+      @locks[path] = @locks[path] || File.open(path, File::RDWR|File::CREAT, 0644)
+    end
+
+    def lock_path(suffix)
+      "/tmp/lock_#{suffix.gsub('/','_')}"
+    end
+  end
+end

data/lib/linecook-gem/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.7.13'
+  VERSION = '0.7.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.7.14
 platform: ruby
 authors:
 - Dale Hamel
@@ -280,6 +280,7 @@ files:
 - lib/linecook-gem/packager/route53.rb
 - lib/linecook-gem/packager/squashfs.rb
 - lib/linecook-gem/util/downloader.rb
+- lib/linecook-gem/util/locking.rb
 - lib/linecook-gem/util/secrets.rb
 - lib/linecook-gem/version.rb
 - man/LINECOOK.1