linecook-gem 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1abf2321c6f050ebebaff2cd97736d181c3438d3
-  data.tar.gz: e8482496017204409f513273352ac69b50d41295
+  metadata.gz: 6c4d3f814360279e6d37e60a436f6597ff6ac4b1
+  data.tar.gz: fefeaef64eff88fcb7c6610dcd26871aa322f5b6
 SHA512:
-  metadata.gz: 310b56ecc9861ab86f2ed209fe8d77b64571e3b9d664747f2f785754388595be636ca1d3fcabaaf620b5c62fc2bdd3c877e11a40dee8d4ea09af4d7fe03d47f0
-  data.tar.gz: b8a143904d6c6924cff355ebac678bae6abca2e0cac2de2ffd32698bfc58243c63b2fc73161b20d6601117ddfe977d9fd154cbb5ca5f9dc2ff2a8ff89f0e59aa
+  metadata.gz: a5705ef81dd3175c91ae2706974568ef0a3b771a175359aa35f7b35e103b6d15d0b5a8f2f4c65491b249bd4b46e01adbbf5989bb3cd365ee80502b695e43cf0a
+  data.tar.gz: 70214b40fd54f10a9046949a83f2726b9abf93c1462d70f77e2b962bababc56040ac62dcc7e0bd3a094ca6823e65cfae18f0b21a59a2859502088072d1c84a33

data/lib/linecook/image/manager.rb

@@ -1,9 +1,8 @@
 require 'fileutils'
 
-require 'linecook/image/crypt'
-require 'linecook/image/github'
 require 'linecook/image/s3'
-require 'linecook/util/downloader'
+require 'linecook/image/github'
+require 'linecook/image/crypt'
 
 module Linecook
   module ImageManager

data/lib/linecook/packager/ebs.rb

@@ -25,13 +25,15 @@ module Linecook
 
       def package(image, type: nil, ami: nil)
         @image = image
-        @name = "#{File.basename(image).gsub('.squashfs', '').gsub('-decrypted', '')}-#{SecureRandom.hex(4)}"
+        @source = File.basename(@image)
+        @name = "#{@source}-#{SecureRandom.hex(4)}"
         @type = type
-        setup_remote unless instance_id
+        setup_image
         prepare
         execute("tar -C #{@mountpoint} -cpf - . | sudo tar -C #{@root} -xpf -")
         finalize
         snapshot
+        cleanup
         create_ami if ami
       end
 
@@ -54,6 +56,11 @@ module Linecook
         execute("grub-install --root-directory=#{@root} $(echo #{@rootdev} | sed \"s/[0-9]*//g\")") if @hvm
       end
 
+      def cleanup
+        execute("umount #{@image}")
+        execute("rm -f #{@image}")
+        execute("rmdir #{@mountpoint}")
+      end
 
       def chroot_exec(command)
         execute("mount -o bind /dev #{@root}/dev")
@@ -135,7 +142,7 @@ module Linecook
         end
         resp = client.create_snapshot(volume_id: @volume_id, description: "Snapshot of #{@name}")
         @snapshot_id = resp.snapshot_id
-        tag(@snapshot_id, Name: 'Linecook snapshot', image: @name, hvm: @hvm.to_s)
+        tag(@snapshot_id, Name: "Linecook snapshot for #{@source}", type: @type, image: @name, hvm: @hvm.to_s)
         client.delete_volume(volume_id: @volume_id)
       end
 
@@ -202,6 +209,11 @@ module Linecook
             })
           end
         end
+
+        amis.each do |region, ami|
+          tag(ami, region: region, source: @source, name: @name, type: @type, hvm: @hvm.to_s)
+        end
+        amis
       end
 
       def free_device
@@ -238,11 +250,21 @@ module Linecook
         return nil
       end
 
-      def setup_remote
-        start_node
+      def setup_image
         path = "/tmp/#{File.basename(@image)}"
-        @remote.run("wget '#{Linecook::ImageManager.url(File.basename(@image), type: @type)}' -nv -O #{path}")
-        @image = Linecook::Crypto.new(remote: @remote).decrypt_file(path)
+        if instance_id
+          return if File.exists?(@image)
+          Linecook::Downloader.download(image_url, path)
+          @image = path
+        else
+          start_node
+          @remote.run("wget '#{image_url}' -nv -O #{path}")
+          @image = Linecook::Crypto.new(remote: @remote).decrypt_file(path)
+        end
+      end
+
+      def image_url
+        @url ||= Linecook::ImageManager.url(File.basename(@image), type: @type)
       end
 
       def start_node
@@ -306,7 +328,8 @@ module Linecook
       end
 
       def tag(id, **kwargs)
-        resp = client.create_tags(resources: [id], tags: kwargs.map{ |k,v| {key: k, value: v } })
+        puts "Will tag #{id} with #{kwargs}"
+        resp = client(region: kwargs[:region]).create_tags(resources: [id], tags: kwargs.map{ |k,v| {key: k.to_s, value: v.to_s } })
       end
 
       def key_pair

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

@@ -79,8 +79,15 @@ module Linecook
       def build
         if stale
           puts 'Regenerating cookbook cache'
-          Chefdepartie.run(background: true, config: Linecook.config[:chef], cache: CACHE_PATH)
-          Chefdepartie.stop
+          begin
+            Chefdepartie.run(background: true, config: Linecook.config[:chef], cache: CACHE_PATH)
+          rescue
+            puts 'Cache tainted, rebuilding completely'
+            FileUtils.rm_rf(CACHE_PATH)
+            Chefdepartie.run(background: true, config: Linecook.config[:chef], cache: CACHE_PATH)
+          ensure
+            Chefdepartie.stop
+          end
           write_stamp
           unlock
         end

data/lib/linecook/util/config.rb

@@ -69,9 +69,10 @@ module Linecook
 
     def secrets
       @secrets ||= begin
-        if File.exists?(SECRETS_PATH)
+        secrets_path = ENV['LINECOOK_SECRETS_PATH'] || SECRETS_PATH
+        if File.exists?(secrets_path)
           ejson_path = File.join(Gem::Specification.find_by_name('ejson').gem_dir, 'build', "#{Linecook::Config.platform}-amd64", 'ejson' )
-          command = "#{ejson_path} decrypt #{SECRETS_PATH}"
+          command = "#{ejson_path} decrypt #{secrets_path}"
           secrets = JSON.load(`sudo #{command}`)
           secrets.deep_symbolize_keys
         else
@@ -100,10 +101,9 @@ module Linecook
 
     def load_config
       @config ||= begin
+        config_path = ENV['LINECOOK_CONFIG_PATH'] || CONFIG_PATH
         config = YAML.load(File.read(DEFAULT_CONFIG_PATH)) if File.exist?(DEFAULT_CONFIG_PATH)
-        config.deep_merge!(YAML.load(File.read(CONFIG_PATH))) if File.exist?(CONFIG_PATH)
-        # fail "Cookbook path not provided or doesn't exist" unless (config[:chef][:cookbook_path] && Dir.exists?(config[:chef][:cookbook_path]))
-        # fail "Databag secret not provided or doesn't exist" unless (config[:chef][:encrypted_data_bag_secret] && File.exists?(config[:chef][:encrypted_data_bag_secret]))
+        config.deep_merge!(YAML.load(File.read(config_path))) if File.exist?(config_path)
         (config || {}).deep_symbolize_keys!
         config.deep_merge!(secrets)
       end

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/linecook.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
 require 'active_support/all'
 require 'linecook/version'
 require 'linecook/util/config'
+require 'linecook/util/downloader'
 require 'linecook/image/manager'
 require 'linecook/builder/manager'
 require 'linecook/provisioner/manager'

metadata

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