linecook-gem 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad86918c27d3bed05ac3aaad743e427877835f97
-  data.tar.gz: 93df415c037673ac86283e8ae03f81e49c9b0dfa
+  metadata.gz: b82d8effb1494b4d5c4fcfd3c91f4b36fd6af24f
+  data.tar.gz: 1780d0a2b8dffc44dfc7a7fe52b95cff4024f662
 SHA512:
-  metadata.gz: 7bf26a041fdf59d7380f5532e22eeaeb3d0b89aeb8f1e7f08cd57a6d4482e592868526f5e83c41a31b628a6004dc192849eb948703c16b1d32f1e45da5671293
-  data.tar.gz: 8a65d3ffa6bbe955e9280d11a0218326717b40a218d009c278cf4d729b4e144948791ca821b0520f4dbf7b94658a6e35938f9384d27be2e361b41d841eb2831c
+  metadata.gz: dbd66174b697182fdb039743d3abd5804f3884d2dca1d0e12817731cd17565cc939689eb0082d612bb3ddb54d1ffd8b78c2fea2ddd2f563faeb97e5ff0711bc0
+  data.tar.gz: 623f5b9b461ace37d1699fc0e8ff5a11c4a510ec0cac780abab1433d68f7a71483bc3c94f606c4db89d659e78012dfcc935869142284f4bbab051a492adea703

data/lib/linecook/builder/build.rb

@@ -17,6 +17,10 @@ module Linecook
       @container = Linecook::Lxc::Container.new(name: @id, image: @image, remote: Linecook::Builder.ssh)
     end
 
+    def clean
+      Linecook::ImageManager.clean(type: @image[:type]) if @image.is_a?(Hash) && @image[:type]
+    end
+
     def ssh
       @ssh ||= Linecook::SSH.new(@container.ip, username: USERNAME, proxy: Linecook::Builder.ssh, keyfile: Linecook::SSH.private_key, setup: false)
     end

data/lib/linecook/builder/lxc.rb

@@ -92,7 +92,7 @@ module Linecook
       def wait_ssh
         if @remote
           user = Linecook::Build::USERNAME
-          cexec("useradd -m -G sudo #{user}")
+          cexec("id -u #{user} &>/dev/null || useradd -m -G sudo #{user}")
           cexec("mkdir -p /home/#{user}/.ssh")
           Linecook::Builder.ssh.upload(Linecook::SSH.public_key, "/tmp/#{@name}-pubkey")
           Linecook::Builder.ssh.run("sudo mv /tmp/#{@name}-pubkey #{@root}/home/#{user}/.ssh/authorized_keys")

data/lib/linecook/cli.rb

@@ -43,6 +43,13 @@ class Image < Thor
     Linecook::ImageManager.fetch(name)
   end
 
+  desc 'clean', 'Clean up cached images'
+  method_option :type, type: :string, required: true, banner: 'ID', desc: 'Type of image to list', aliases: '-t'
+  def clean
+    opts = options.symbolize_keys
+    puts Linecook::ImageManager.clean(**opts)
+  end
+
   desc 'upload IMAGE', 'Upload an image'
   method_options name: :string
   def upload(image)

data/lib/linecook/image/manager.rb

@@ -27,6 +27,12 @@ module Linecook
       path
     end
 
+    def clean(type: nil)
+      Dir["#{File.join([IMAGE_PATH, type].compact)}/**/*"].each do |image|
+        FileUtils.rm_f(image) unless `mount`.index(image)
+      end
+    end
+
     def upload(image, profile: :private, type: nil)
       path = File.join(IMAGE_PATH, File.basename(image))
       puts "Encrypting and uploading image #{path}"

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

@@ -24,6 +24,7 @@ module Linecook
       build.start
       build.ssh.forward(chef_port)
       build.ssh.upload(script, '/tmp/chef_bootstrap')
+      build.ssh.run('[ -f /var/chef/cache/chef-client-running.pid ] && sudo rm -f /var/chef/cache/chef-client-running.pid')
       build.ssh.run('sudo bash /tmp/chef_bootstrap')
       build.ssh.run('sudo rm -rf /etc/chef')
       build.ssh.stop_forwarding

data/lib/linecook/provisioner/manager.rb

@@ -17,7 +17,8 @@ module Linecook
       Linecook::Packager.package(snapshot, type: build_agent.type) if package
     ensure
       build_agent.stop(clean: clean) unless keep
-      FileUtils.rm_f(snapshot) if clean
+      build_agent.clean if clean
+      FileUtils.rm_f(snapshot) if clean && File.exists?(snapshot.to_s)
     end
 
   private

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 end

metadata

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