linecook-gem 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3890b7bac9016028f98b6967d21b9f60518ac84f
-  data.tar.gz: c3e4bfe870cf93ea51aa28cfb44f0a12ed330c26
+  metadata.gz: 5ad8c9eb3eb01a5e5578360ba001fac59a8723f3
+  data.tar.gz: 1237ff044167090a98b47bd7961b420215a4a98e
 SHA512:
-  metadata.gz: f18cdad769a08a53c6ce845da61cecdab88f57d75ba762175327809a17bf57905bf7f7bb854a448e7d04d839726e005aba5f5a2d05a8a941e56875cea2262878
-  data.tar.gz: 59bf75141b3503ee285ad9cde5532f74cdc2a2b697f49cde355325f87abce4bec39890cbb465a978ddb0307a84db6f7f521d05b76e9661b2950157f189e1cac5
+  metadata.gz: 5685db5fa8d4eb2bc6f7b154f18c877638328cb08b36bc5ad55b369f8c10b65ea06e75550a4a8ffd72dff99396b7e94b2d4930186919f2a1d7742290998dc63a
+  data.tar.gz: 0a4f8b340dc8226e8107eb484ceffd08d0f0f701be8c80c967c8318e1ffd42aa5dedec1387dbe80a11f5dd446853e684b3f9130b2c7a9f47453bb453a46f7bef

data/lib/linecook/builder/build.rb

@@ -7,11 +7,11 @@ module Linecook
 
     def_instance_delegators :@container, :stop, :start, :ip, :info
 
-    def initialize(name, image: nil)
+    def initialize(name, tag: nil, image: nil)
       Linecook::Builder.start
-      @name = name
+      @id = tag ? "#{name}-#{tag}" : name
       @image = image || Linecook.config[:provisioner][:default_image]
-      @container = Linecook::Lxc::Container.new(name: @name, image: @image, remote: Linecook::Builder.ssh)
+      @container = Linecook::Lxc::Container.new(name: @id, image: @image, remote: Linecook::Builder.ssh)
     end
 
     def ssh
@@ -19,9 +19,12 @@ module Linecook
     end
 
     def snapshot(save: false)
-      path = "/tmp/#{@name}-#{Time.now.to_i}.squashfs"
+      path = "/tmp/#{@id}-#{Time.now.to_i}.squashfs"
+      @container.pause
       Linecook::Builder.ssh.run("sudo mksquashfs #{@container.root} #{path} -wildcards -e 'usr/src' 'var/lib/apt/lists/archive*' 'var/cache/apt/archives'") # FIXME make these excludes dynamic based on OS
+      @container.resume
       Linecook::Builder.ssh.download(path, local: File.join(Linecook::ImageManager::IMAGE_PATH, File.basename(path))) if save
+      Linecook::Builder.ssh.run("sudo rm -f #{path}")
       path
     end
   end

data/lib/linecook/builder/lxc.rb

@@ -36,9 +36,17 @@ module Linecook
         unmount unless running?
       end
 
+      def pause
+        execute("lxc-stop #{container_str} -k") if running?
+      end
+
+      def resume
+        execute("lxc-start #{container_str} -d") unless running?
+      end
+
       def stop
         setup_dirs
-        execute("lxc-stop #{container_str} -k")
+        execute("lxc-stop #{container_str} -k") if running?
         unmount
       end
 

data/lib/linecook/cli.rb

@@ -108,8 +108,10 @@ class Linecook::CLI < Thor
 
   desc 'bake', 'Bake a new image.'
   method_option :name, type: :string, required: true, banner: 'ROLE_NAME', desc: 'Name of the role to build', aliases: '-n'
+  method_option :tag, type: :string, required: false, banner: 'TAG', desc: 'Optional tag for a build', aliases: '-t'
   method_option :image, type: :string,  banner: 'SOURCE_IMAGE', desc: 'Source image to seed the build.', aliases: '-i'
   method_option :keep, type: :boolean, default: true, desc: 'Keep the build running when done', aliases: '-k'
+  method_option :clean, type: :boolean, default: false, desc: 'Clean up all build artifacts', aliases: '-c'
   method_option :build, type: :boolean, default: true, desc: 'Build the image', aliases: '-b'
   method_option :snapshot, type: :boolean, default: false, desc: 'Snapshot the resulting build to create an image', aliases: '-s'
   method_option :upload, type: :boolean, default: false, desc: 'Upload the resulting build. Implies --snapshot and --encrypt.', aliases: '-u'

data/lib/linecook/image/manager.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 require 'linecook/image/crypt'
 require 'linecook/image/github'
 require 'linecook/image/s3'
@@ -19,7 +21,9 @@ module Linecook
     def upload(image, profile: :private)
       path = File.join(IMAGE_PATH, File.basename(image))
       puts "Encrypting and uploading image #{path}"
-      provider(profile).upload(Linecook::Crypto.new.encrypt_file(path))
+      encrypted = Linecook::Crypto.new.encrypt_file(path)
+      provider(profile).upload(encrypted)
+      FileUtils.rm_f(encrypted)
     end
 
     def url(image, profile: :private)

data/lib/linecook/provisioner/manager.rb

@@ -1,4 +1,5 @@
 require 'securerandom'
+require 'fileutils'
 
 require 'linecook/builder/build'
 require 'linecook/provisioner/chef-zero'
@@ -8,13 +9,15 @@ module Linecook
   module Baker
     extend self
 
-    def bake(name: nil, image: nil, snapshot: nil, upload: nil, package: nil, build: nil, keep: nil)
-      build_agent = Linecook::Build.new(name, image: image)
+    def bake(name: nil, tag: nil, image: nil, snapshot: nil, upload: nil, package: nil, build: nil, keep: nil, clean: nil)
+      build_agent = Linecook::Build.new(name, tag: tag, image: image)
       provider(name).provision(build_agent, name) if build
       snapshot = build_agent.snapshot(save: true) if snapshot ||  upload || package
       Linecook::ImageManager.upload(snapshot) if upload || package
       Linecook::Packager.package(snapshot) if package
+    ensure
       build_agent.stop unless keep
+      FileUtils.rm_f(snapshot) if clean
     end
 
   private

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

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