linecook-gem 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 807017706c5a506cfb424b1ec39cd94b7c404c68
-  data.tar.gz: fa3b10d58e469b0b90c45bcc9ff83609e7a2302c
+  metadata.gz: 3c2ebac88ea5856749e3c19115a06aee40f9c258
+  data.tar.gz: 21c9e7a2166694a3793813c82d0131963e3f7b78
 SHA512:
-  metadata.gz: a8b27d7bf3e905e3560f3febdac266db5304df8e951dd395f2cef086a4637e3ed2e4e5b17de9b7236458b7b0de798689b4ef10eec2fe81a51a4d35fff98ed60d
-  data.tar.gz: edac426ed6c88470c88621a6c4c5a7ee2b1da7a303e586f4d04d9c8d00603d68fa61e25f165d3c431253a11e996cf9ca6e3dad752a59851dfa60d8fe33ff23f6
+  metadata.gz: 73f4b086e94dcea9fe1bb9106becf8dcb6bee7293c16b07ed467301335dd3409996808e86fe2bd8abf0cbadfc0e0aa9330bd24e1abba274ea0e4da00c3429631
+  data.tar.gz: 88b2c87c88f17445e74da4ad4c57ea6bd92b2ae3f41cd2e9989ffacebaee9f45172fa121f43ca72ca98d87ba49fc987139068675cb5784f176a984070658a621

data/lib/linecook/builder/build.rb

@@ -6,10 +6,12 @@ module Linecook
     extend Forwardable
 
     def_instance_delegators :@container, :stop, :start, :ip, :info
+    attr_reader :type
 
-    def initialize(name, tag: nil, image: nil)
+    def initialize(name, tag: nil, image: nil, id: nil)
       Linecook::Builder.start
-      @id = tag ? "#{name}-#{tag}" : name
+      @type = tag ? "#{name}-#{tag}" : name
+      @id = id ? "#{@type}-#{id}" : @type
       @image = image || Linecook.config[:provisioner][:default_image]
       @container = Linecook::Lxc::Container.new(name: @id, image: @image, remote: Linecook::Builder.ssh)
     end

data/lib/linecook/cli.rb

@@ -23,7 +23,18 @@ class Image < Thor
   subcommand 'crypto', Crypto
 
   desc 'list', 'List images' # add remote flag
+  method_option :type, type: :string, required: false, banner: 'ID', desc: 'Type of image to list', aliases: '-t'
+  method_option :profile, type: :string, default: 'private', banner: 'PROFILE', desc: 'Profile (public/private) of image to list', enum: %w(public private), aliases: '-p'
   def list
+    opts = options.symbolize_keys
+    puts Linecook::ImageManager.list(**opts)
+  end
+
+  desc 'latest ID', 'Get the latest image by id' # add remote flag
+  method_option :profile, type: :string, default: 'private', banner: 'PROFILE', desc: 'Profile (public/private) of image to list', enum: %w(public private), aliases: '-p'
+  def latest(id)
+    opts = options.symbolize_keys
+    puts Linecook::ImageManager.latest(id, **opts)
   end
 
   desc 'fetch IMAGE_NAME', 'Fetch an image by name'
@@ -39,9 +50,10 @@ class Image < Thor
   end
 
   desc 'url IMAGE', 'Get URL for image'
-  method_options image: :string
+  method_option :type, type: :string, required: false, banner: 'ID', desc: 'Type of image to list', aliases: '-t'
   def url(image)
-    puts Linecook::ImageManager.url(image)
+    opts = options.symbolize_keys
+    puts Linecook::ImageManager.url(image, **opts)
   end
 
   desc 'package IMAGE', 'Package image'
@@ -109,7 +121,7 @@ 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 :id, type: :string, required: false, banner: 'ID', desc: 'Optional id for a 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'

data/lib/linecook/image/crypt.rb

@@ -1,5 +1,6 @@
 require 'base64'
 require 'encryptor'
+require 'tempfile'
 
 require 'linecook/image/manager'
 require 'linecook/util/executor'
@@ -24,13 +25,21 @@ module Linecook
 
     def encrypt_file(source, dest: nil, keypath: nil)
       dest ||= "/tmp/#{File.basename(source)}"
-      capture("openssl enc -#{CIPHER} -out #{dest} -in #{source} -pass 'pass:#{@secret_key}'", sudo: false)
+      Tempfile.open('key') do |key|
+        key.write(@secret_key)
+        key.flush
+        capture("openssl enc -#{CIPHER} -out #{dest} -in #{source} -kfile #{key.path}", sudo: false)
+      end
       dest
     end
 
     def decrypt_file(source, dest: nil, keypath: nil)
       dest ||= "/tmp/#{File.basename(source)}-decrypted"
-      capture("openssl enc -#{CIPHER} -out #{dest} -in #{source} -pass pass:#{@secret_key}' -d", sudo: false)
+      Tempfile.open('key') do |key|
+        @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
+      end
       dest
     end
 

data/lib/linecook/image/manager.rb

@@ -18,16 +18,26 @@ module Linecook
       path
     end
 
-    def upload(image, profile: :private)
+    def upload(image, profile: :private, type: nil)
       path = File.join(IMAGE_PATH, File.basename(image))
       puts "Encrypting and uploading image #{path}"
       encrypted = Linecook::Crypto.new.encrypt_file(path)
-      provider(profile).upload(encrypted)
+      provider(profile).upload(encrypted, type: type)
       FileUtils.rm_f(encrypted)
     end
 
-    def url(image, profile: :private)
-      provider(profile).url("builds/#{image}")
+    def url(image, profile: :private, type: nil)
+      provider(profile).url(image, type: type)
+    end
+
+    def list(type: nil, profile: :private)
+      profile = profile.to_sym
+      provider(profile).list(type: type)
+    end
+
+    def latest(type, profile: :private)
+      profile = profile.to_sym
+      provider(profile).latest(type)
     end
 
   private

data/lib/linecook/image/s3.rb

@@ -5,19 +5,29 @@ module Linecook
   module S3Manager
     extend self
     EXPIRY = 20
+    PREFIX = 'builds'
 
-    def url(name)
+    def url(name, type: nil)
       client
       s3 = Aws::S3::Resource.new
-      obj = s3.bucket(Linecook.config[:aws][:s3][:bucket]).object(name)
+      obj = s3.bucket(Linecook.config[:aws][:s3][:bucket]).object(File.join([PREFIX, type, name].compact))
       obj.presigned_url(:get, expires_in: EXPIRY * 60)
     end
 
-    def upload(path)
+    def list(type: nil)
+      list_objects(type: type).map{ |x| x.key if x.key =~ /squashfs$/ }.compact
+    end
+
+    def latest(type)
+      objects = list_objects(type: type).sort! { |a,b| a.last_modified <=> b.last_modified }
+      key = objects.last ? objects.last.key : nil
+    end
+
+    def upload(path, type: nil)
       File.open(path, 'rb') do |file|
         fname = File.basename(path)
         pbar = ProgressBar.create(title: fname, total: file.size)
-        common_opts = { bucket: Linecook.config[:aws][:s3][:bucket], key: File.join('builds', fname) }
+        common_opts = { bucket: Linecook.config[:aws][:s3][:bucket], key: File.join([PREFIX, type, fname].compact) }
         resp = client.create_multipart_upload(storage_class: 'REDUCED_REDUNDANCY', server_side_encryption: 'AES256', **common_opts)
         id = resp.upload_id
         part = 0
@@ -36,6 +46,11 @@ module Linecook
     end
 
   private
+
+    def list_objects(type: nil)
+      client.list_objects(bucket: Linecook.config[:aws][:s3][:bucket], prefix: File.join([PREFIX, type].compact)).contents
+    end
+
     def client
       @client ||= begin
         Aws.config[:credentials] = Aws::Credentials.new(Linecook.config[:aws][:access_key], Linecook.config[:aws][:secret_key])

data/lib/linecook/packager/ebs.rb

@@ -20,8 +20,9 @@ module Linecook
         @region = region
       end
 
-      def package(image)
+      def package(image, type: nil)
         @image = image
+        @type = type
         setup_remote unless instance_id
         prepare
         execute("tar -C #{@mountpoint} -cpf - . | sudo tar -C #{@root} -xpf -")
@@ -166,7 +167,7 @@ module Linecook
       def setup_remote
         start_node
         path = "/tmp/#{File.basename(@image)}"
-        @remote.run("wget '#{Linecook::ImageManager.url(File.basename(@image))}' -nv -O #{path}")
+        @remote.run("wget '#{Linecook::ImageManager.url(File.basename(@image), type: @type)}' -nv -O #{path}")
         @image = Linecook::Crypto.new(remote: @remote).decrypt_file(path)
       end
 

data/lib/linecook/packager/manager.rb

@@ -4,8 +4,8 @@ module Linecook
   module Packager
     extend self
 
-    def package(image)
-      provider.package(image)
+    def package(image, type: type)
+      provider.package(image, type: type)
     end
 
   private

data/lib/linecook/provisioner/manager.rb

@@ -9,12 +9,12 @@ module Linecook
   module Baker
     extend self
 
-    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)
+    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)
       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
+      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
       FileUtils.rm_f(snapshot) if clean

data/lib/linecook/version.rb

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

metadata

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