linecook-gem 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c2ebac88ea5856749e3c19115a06aee40f9c258
-  data.tar.gz: 21c9e7a2166694a3793813c82d0131963e3f7b78
+  metadata.gz: ad86918c27d3bed05ac3aaad743e427877835f97
+  data.tar.gz: 93df415c037673ac86283e8ae03f81e49c9b0dfa
 SHA512:
-  metadata.gz: 73f4b086e94dcea9fe1bb9106becf8dcb6bee7293c16b07ed467301335dd3409996808e86fe2bd8abf0cbadfc0e0aa9330bd24e1abba274ea0e4da00c3429631
-  data.tar.gz: 88b2c87c88f17445e74da4ad4c57ea6bd92b2ae3f41cd2e9989ffacebaee9f45172fa121f43ca72ca98d87ba49fc987139068675cb5784f176a984070658a621
+  metadata.gz: 7bf26a041fdf59d7380f5532e22eeaeb3d0b89aeb8f1e7f08cd57a6d4482e592868526f5e83c41a31b628a6004dc192849eb948703c16b1d32f1e45da5671293
+  data.tar.gz: 8a65d3ffa6bbe955e9280d11a0218326717b40a218d009c278cf4d729b4e144948791ca821b0520f4dbf7b94658a6e35938f9384d27be2e361b41d841eb2831c

data/lib/linecook/builder/build.rb

@@ -4,8 +4,9 @@ require 'linecook/builder/manager'
 module Linecook
   class Build
     extend Forwardable
+    USERNAME = 'linecook'
 
-    def_instance_delegators :@container, :stop, :start, :ip, :info
+    def_instance_delegators :@container, :start, :stop, :ip, :info
     attr_reader :type
 
     def initialize(name, tag: nil, image: nil, id: nil)
@@ -17,7 +18,7 @@ module Linecook
     end
 
     def ssh
-      @ssh ||= Linecook::SSH.new(@container.ip, username: 'ubuntu', password: 'ubuntu', proxy: Linecook::Builder.ssh, keyfile: Linecook::SSH.private_key)
+      @ssh ||= Linecook::SSH.new(@container.ip, username: USERNAME, proxy: Linecook::Builder.ssh, keyfile: Linecook::SSH.private_key, setup: false)
     end
 
     def snapshot(save: false)

data/lib/linecook/builder/lxc.rb

@@ -44,10 +44,11 @@ module Linecook
         execute("lxc-start #{container_str} -d") unless running?
       end
 
-      def stop
+      def stop(clean: false)
         setup_dirs
+        cexec("sudo userdel -r -f #{Linecook::Build::USERNAME}") if @remote
         execute("lxc-stop #{container_str} -k") if running?
-        unmount
+        unmount(clean: clean)
       end
 
       def ip
@@ -80,10 +81,23 @@ module Linecook
 
       private
 
+      def cexec(command)
+        execute("lxc-attach #{container_str} -- #{command}")
+      end
+
       def wait_running
         wait_for { running? }
       end
+
       def wait_ssh
+        if @remote
+          user = Linecook::Build::USERNAME
+          cexec("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")
+          cexec("chown -R #{user} /home/#{user}/.ssh")
+        end
         wait_for { capture("lxc-attach -n #{@name} -P #{@home} status ssh || true") =~ /running/ }
       end
 
@@ -144,13 +158,15 @@ module Linecook
         execute("grep -q #{dest} /etc/mtab || sudo mount #{type} #{options} #{source} #{dest}")
       end
 
-      def unmount
+      def unmount(clean: false)
         @socket_dirs.each { |sock| execute("umount #{sock}") }
+        source = capture("mount | grep #{@lower_dir} | awk '{print $1}'") if clean
         execute("umount #{@root}")
         execute("umount #{@upper_base}")
         execute("umount #{@lower_dir}")
         execute("rmdir #{@lower_dir}")
         execute("rmdir #{@upper_base}")
+        FileUtils.rm_f(source) if clean
       end
 
       def bridge_network
@@ -179,7 +195,6 @@ eos
         execute("lxc-attach -n #{@name} -P #{@home} ifup lxcbr0")
       end
 
-
       def setup_image
         @source_path = Linecook::ImageManager.fetch(@source_image, profile: :public)
         if @remote

data/lib/linecook/image/crypt.rb

@@ -36,6 +36,8 @@ module Linecook
     def decrypt_file(source, dest: nil, keypath: nil)
       dest ||= "/tmp/#{File.basename(source)}-decrypted"
       Tempfile.open('key') do |key|
+        key.write(@secret_key)
+        key.flush
         @remote.upload(@secret_key, key.path) if @remote
         capture("openssl enc -#{CIPHER} -out #{dest} -in #{source} -kfile #{key.path} -d", sudo: false)
         @remote.run("rm #{key.path}") if @remote

data/lib/linecook/image/manager.rb

@@ -10,11 +10,20 @@ module Linecook
     IMAGE_PATH = File.join(Config::LINECOOK_HOME, 'images').freeze
     extend self
 
-    def fetch(name, upgrade:false, profile: :private)
-      image_name = Linecook.config[:image][:images][name][:name]
-      path = File.join(IMAGE_PATH, image_name)
-      url = provider(profile).url(name) unless File.exist?(path) || upgrade# FIXME
-      Linecook::Downloader.download(url, path) unless File.exist?(path) || upgrade
+    def fetch(image, upgrade:false, profile: :private, type: nil, encrypted: false)
+      url_path = if image.is_a?(Symbol)
+        image_name = Linecook.config[:image][:images][image][:name]
+        path = File.join(IMAGE_PATH, image_name)
+        provider(profile).url(name) unless File.exist?(path) || upgrade
+      elsif image.is_a?(Hash)
+        profile = :private
+        encrypted = true
+        name = image[:name] == :latest ? File.basename(latest(image[:type])) : image[:name]
+        path = File.join([IMAGE_PATH, image[:type], name].compact)
+        provider(profile).url(name, type: image[:type])
+      end
+
+      Linecook::Downloader.download(url_path, path, encrypted: encrypted) unless File.exist?(path) || upgrade
       path
     end
 

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

@@ -16,7 +16,8 @@ module Linecook
         chef_version: chef_config[:version] || nil,
         first_boot: {
           run_list: role_config[:run_list]
-        }
+        },
+        audit: Linecook.config[:provisioner][:chefzero][:audit]
       )
 
       puts "Establishing connection to build..."

data/lib/linecook/provisioner/manager.rb

@@ -10,18 +10,22 @@ module Linecook
     extend self
 
     def bake(name: nil, tag: nil, id: nil, snapshot: nil, upload: nil, package: nil, build: nil, keep: nil, clean: nil)
-      build_agent = Linecook::Build.new(name, tag: tag, id: id)
+      build_agent = Linecook::Build.new(name, tag: tag, id: id, image: image(name))
       provider(name).provision(build_agent, name) if build
       snapshot = build_agent.snapshot(save: true) if snapshot ||  upload || package
       Linecook::ImageManager.upload(snapshot, type: build_agent.type) if upload || package
       Linecook::Packager.package(snapshot, type: build_agent.type) if package
     ensure
-      build_agent.stop unless keep
+      build_agent.stop(clean: clean) unless keep
       FileUtils.rm_f(snapshot) if clean
     end
 
   private
 
+    def image(name)
+      Linecook.config[:roles][name.to_sym][:image]
+    end
+
     def provider(name)
       provisioner = Linecook.config[:roles][name.to_sym][:provisioner] || Linecook.config[:provisioner][:default_provider]
       case provisioner

data/lib/linecook/util/config.rb

@@ -29,6 +29,9 @@ module Linecook
       provisioner: {
         default_provider: :chefzero,
         default_image: :base_image,
+        chefzero: {
+          audit: true
+        }
       },
       image: {
         provider: {
@@ -77,7 +80,9 @@ module Linecook
 
     def setup
       FileUtils.mkdir_p(LINECOOK_HOME)
-      File.write(DEFAULT_CONFIG_PATH, YAML.dump(DEFAULT_CONFIG)) unless File.exist?(DEFAULT_CONFIG_PATH)
+      config = {}
+      config.merge!(YAML.load(File.read(DEFAULT_CONFIG_PATH))) if File.exist?(DEFAULT_CONFIG_PATH)
+      File.write(DEFAULT_CONFIG_PATH, YAML.dump(DEFAULT_CONFIG.deep_merge(config)))
       check_perms if platform == 'darwin'
     end
 

data/lib/linecook/util/downloader.rb

@@ -4,11 +4,18 @@ require 'fileutils'
 require 'zip'
 require 'ruby-progressbar'
 
+require 'linecook/image/crypt'
+
 module Linecook
   module Downloader
-    def self.download(url, path)
+    LOCK_WAIT_TIMEOUT = 120
+
+    def self.download(url, path, encrypted: false)
+      acquire_lock(path)
       FileUtils.mkdir_p(File.dirname(path))
-      File.open(path, 'w') do |f|
+      cryptfile = "#{File.basename(path)}-encrypted"
+      destination = encrypted ? File.join('/tmp', cryptfile) : path
+      File.open(destination, 'w') do |f|
         pbar = ProgressBar.create(title: File.basename(path), total: nil)
         IO.copy_stream(open(url,
                             content_length_proc: lambda do|t|
@@ -18,8 +25,16 @@ module Linecook
                               pbar.progress = s
                             end), f)
       end
+
+      if encrypted
+        Linecook::Crypto.new.decrypt_file(destination, dest: path)
+        FileUtils.rm_f(destination)
+      end
+    ensure
+      unlock(path)
     end
 
+
     def self.unzip(source, dest: nil)
       puts "Extracting #{source}..."
       dest ||= File.dirname(source)
@@ -31,5 +46,32 @@ module Linecook
         end
       end
     end
+
+  private
+
+    def self.acquire_lock(path)
+      attempts = 0
+      while attempts < LOCK_WAIT_TIMEOUT
+        return lock(path) unless locked?(path)
+        attempts += 1
+        sleep(1)
+      end
+    end
+
+    def self.locked?(path)
+      File.exists?(lockfile(path)) && (true if Process.kill(0, File.read(lockfile(path))) rescue false)
+    end
+
+    def self.lock(path)
+      File.write(lockfile(path), Process.pid.to_s)
+    end
+
+    def self.unlock(path)
+      FileUtils.rm_f(lockfile(path))
+    end
+
+    def self.lockfile(path)
+      "/tmp/#{File.basename(path)}-flock"
+    end
   end
 end

data/lib/linecook/util/ssh.rb

@@ -76,14 +76,14 @@ module Linecook
       OpenSSL::Digest.new('md5',k.to_der).hexdigest.scan(/../).join(":")
     end
 
-    def initialize(hostname, username: 'ubuntu', password: nil, keyfile: nil, proxy: nil)
+    def initialize(hostname, username: 'ubuntu', password: nil, keyfile: nil, proxy: nil, setup: true)
       @username = username
       @password = password
       @hostname = hostname
       @keyfile = keyfile
       @proxy = proxy_command(proxy) if proxy
       wait_for_connection
-      setup_ssh_key if @keyfile
+      setup_ssh_key if @keyfile && setup
     end
 
     def forward(local, remote:nil)

data/lib/linecook/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dale Hamel
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement