linecook-gem 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6a9328562fa6cf23fc9c9d97500f929b07299e3
-  data.tar.gz: 70c988ff74e983fed3ae8e74c20c3cd59ea6baaa
+  metadata.gz: 52ee4d244952be42e41085347b73b873a2110112
+  data.tar.gz: dc8e1b7d9dcfc8fa7af0009d3fda67b25f510af0
 SHA512:
-  metadata.gz: c7d3c9ce2562d88673b7bed970b8411c1a560d394e8c5401f982b5608464ca9a2c38026fbf825bf55b6097c5145c305bc3489cd21ac9e2a934d56770d513a9ea
-  data.tar.gz: 5856d130e60480ca800ed090ef5e59b016e627225ca4f4ba6b00a9d9e6b6498218f0fd3737ea026802cb1b38efb2b73f60810199a521632d8189929043309542
+  metadata.gz: 477d2277b95838c99f4cd78aba0ce399b8417c941493ad83881cbf4c34b75a2554309fd1b778761b1c0691f17277dfbf47575041c89a97418c70d40965ef2cc5
+  data.tar.gz: 95a941457180422920c157db29c7df6c6170bd14cc57506586ee46e7f786f973daac002fad539ea2dd3a10c577bd832baf588719576d0d1bf4c32056c3f29249

data/lib/linecook/builder/build.rb

@@ -10,7 +10,7 @@ module Linecook
     def initialize(name, image: nil)
       Linecook::Builder.start
       @name = name
-      @image = image || Linecook::Config.load_config[:provisioner][:default_image]
+      @image = image || Linecook.config[:provisioner][:default_image]
       @container = Linecook::Lxc::Container.new(name: @name, image: @image, remote: Linecook::Builder.ssh)
     end
 

data/lib/linecook/builder/darwin_backend.rb

@@ -80,7 +80,7 @@ module Linecook
 
     # get and mount the iso
     def get_iso
-      image = Linecook::Config.load_config[:images][:live_iso]
+      image = Linecook.config[:images][:live_iso]
       @image_path = Linecook::ImageFetcher.fetch(image)
     end
 

data/lib/linecook/builder/linux_backend.rb

@@ -5,8 +5,8 @@ module Linecook
 
     def backend
       check_lxc_version
-      config = Linecook::Config.load_config[:builder]
-      images = Linecook::Config.load_config[:image][:images]
+      config = Linecook.config[:builder]
+      images = Linecook.config[:image][:images]
       Linecook::Lxc::Container.new(name: config[:name], home: config[:home], image: config[:image], bridge: true)
     end
 

data/lib/linecook/builder/lxc.rb

@@ -99,7 +99,7 @@ module Linecook
         @upper_dir = File.join(@upper_base, '/upper')
         @work_dir = File.join(@upper_base, '/work')
         @socket_dirs = []
-        (Linecook::Config.load_config[:socket_dirs] ||[]).each{ |sock| @socket_dirs << File.join(@root, sock) }
+        (Linecook.config[:socket_dirs] ||[]).each{ |sock| @socket_dirs << File.join(@root, sock) }
       end
 
       def write_config

data/lib/linecook/builder/manager.rb

@@ -24,7 +24,7 @@ module Linecook
     end
 
     def ssh
-      config = Linecook::Config.load_config[:builder]
+      config = Linecook.config[:builder]
       @ssh ||= SSH.new(ip, username: config[:username], password: config[:password], keyfile: Linecook::SSH.private_key)
     end
 

data/lib/linecook/image/crypt.rb

@@ -43,7 +43,7 @@ module Linecook
   private
 
     def load_key
-      @iv, @secret_key = Linecook::Config.secrets['aeskey'].match(/\[:IV:(.+):KY:(.+)\]/m).captures
+      @iv, @secret_key = Linecook.config[:aeskey].match(/\[:IV:(.+):KY:(.+)\]/m).captures
     end
   end
 end

data/lib/linecook/image/github.rb

@@ -17,7 +17,7 @@ module Linecook
     end
 
     def source
-      @source ||= (Config.load_config['source_repo'] || 'dalehamel/lxb')
+      @source ||= (Linecook.config['source_repo'] || 'dalehamel/lxb')
     end
 
     def latest

data/lib/linecook/image/manager.rb

@@ -9,7 +9,7 @@ module Linecook
     extend self
 
     def fetch(name, upgrade:false, profile: :private)
-      image_name = Linecook::Config.load_config[:image][:images][name][:name]
+      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
@@ -29,7 +29,7 @@ module Linecook
   private
 
     def provider(image_profile)
-      profile = Linecook::Config.load_config[:image][:provider][image_profile]
+      profile = Linecook.config[:image][:provider][image_profile]
       case profile
       when :s3
         S3Manager

data/lib/linecook/image/s3.rb

@@ -9,7 +9,7 @@ module Linecook
     def url(name)
       client
       s3 = Aws::S3::Resource.new
-      obj = s3.bucket(Linecook::Config.secrets['bucket']).object(name)
+      obj = s3.bucket(Linecook.config[:s3][:bucket]).object(name)
       obj.presigned_url(:get, expires_in: EXPIRY * 60)
     end
 
@@ -17,7 +17,7 @@ module Linecook
       File.open(path, 'rb') do |file|
         fname = File.basename(path)
         pbar = ProgressBar.create(title: fname, total: file.size)
-        common_opts = { bucket: Linecook::Config.secrets['bucket'], key: File.join('builds', fname) }
+        common_opts = { bucket: Linecook.config[:s3][:bucket], key: File.join('builds', fname) }
         resp = client.create_multipart_upload(storage_class: 'REDUCED_REDUNDANCY', server_side_encryption: 'AES256', **common_opts)
         id = resp.upload_id
         part = 0
@@ -38,7 +38,7 @@ module Linecook
   private
     def client
       @client ||= begin
-        Aws.config[:credentials] = Aws::Credentials.new(Linecook::Config.secrets['aws_access_key'], Linecook::Config.secrets['aws_secret_key'])
+        Aws.config[:credentials] = Aws::Credentials.new(Linecook.config[:aws][:access_key], Linecook.config[:aws][:secret_key])
         Aws.config[:region] = 'us-east-1'
         Aws::S3::Client.new
       end

data/lib/linecook/packager/ebs.rb

@@ -84,7 +84,7 @@ module Linecook
 
       def client
         @client ||= begin
-          credentials = Aws::Credentials.new(Linecook::Config.secrets['aws_access_key'], Linecook::Config.secrets['aws_secret_key'])
+          credentials = Aws::Credentials.new(Linecook.config[:aws][:access_key], Linecook.config[:aws][:secret_key])
           Aws::EC2::Client.new(region: @region, credentials: credentials)
         end
       end

data/lib/linecook/packager/manager.rb

@@ -10,8 +10,8 @@ module Linecook
 
   private
     def provider
-      name = Linecook::Config.load_config[:packager][:provider]
-      config = Linecook::Config.load_config[:packager][name]
+      name = Linecook.config[:packager][:provider]
+      config = Linecook.config[:packager][name]
       case name
       when :ebs
         Linecook::Packager::EBS.new(**config)

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

@@ -10,7 +10,7 @@ module Linecook
 
     def provision(build, role)
       chef_config = setup
-      role_config = Linecook::Config.load_config[:roles][role.to_sym]
+      role_config = Linecook.config[:roles][role.to_sym]
       script = ChefProvisioner::Bootstrap.generate(
         node_name: chef_config[:node_name],
         chef_version: chef_config[:version] || nil,
@@ -31,7 +31,7 @@ module Linecook
 
     def setup
       ChefProvisioner::Config.setup(client: 'linecook', listen: 'localhost')
-      config = Linecook::Config.load_config
+      config = Linecook.config
 
       chef_config = config[:chef]
       chef_config.merge!(node_name: "linecook-#{SecureRandom.uuid}",
@@ -71,7 +71,7 @@ module Linecook
       def build
         if stale
           puts 'Regenerating cookbook cache'
-          Chefdepartie.run(background: true, config: Linecook::Config.load_config[:chef], cache: CACHE_PATH)
+          Chefdepartie.run(background: true, config: Linecook.config[:chef], cache: CACHE_PATH)
           Chefdepartie.stop
           write_stamp
           unlock

data/lib/linecook/provisioner/manager.rb

@@ -20,7 +20,7 @@ module Linecook
   private
 
     def provider(name)
-      provisioner = Linecook::Config.load_config[:roles][name.to_sym][:provisioner] || Linecook::Config.load_config[:provisioner][:default_provider]
+      provisioner = Linecook.config[:roles][name.to_sym][:provisioner] || Linecook.config[:provisioner][:default_provider]
       case provisioner
       when :chefzero
         Linecook::Chef

data/lib/linecook/provisioner/packer.rb

@@ -20,7 +20,7 @@ module Linecook
       include Executor
 
       def initialize(build, role)
-        role_config = Linecook::Config.load_config[:roles][role.to_sym]
+        role_config = Linecook.config[:roles][role.to_sym]
         @packer = packer_path
         @build = build
         @template = role_config[:template_path]

data/lib/linecook/util/config.rb

@@ -5,11 +5,17 @@ require 'fileutils'
 require 'xhyve'
 
 module Linecook
+  def self.config
+    config = Config.load_config
+    config
+  end
+
   module Config
     extend self
     attr_reader :config
 
     CONFIG_PATH = File.join(Dir.pwd, 'linecook.yml').freeze # File.expand_path('../../../config/config.yml', __FILE__)
+    SECRETS_PATH = File.join(Dir.pwd, 'secrets.ejson').freeze # File.expand_path('../../../config/config.yml', __FILE__)
     LINECOOK_HOME = File.expand_path('~/.linecook').freeze
     DEFAULT_CONFIG_PATH = File.join(LINECOOK_HOME, 'config.yml').freeze
     DEFAULT_CONFIG = {
@@ -58,8 +64,8 @@ module Linecook
 
     def secrets
       @secrets ||= begin
-        if File.exists?('secrets.ejson')
-          JSON.load(`ejson decrypt secrets.ejson`)
+        if File.exists?(SECRETS_PATH)
+          JSON.load(`ejson decrypt secrets.ejson`).deep_symbolize_keys
         else
           {}
         end
@@ -85,10 +91,11 @@ module Linecook
     def load_config
       @config ||= begin
         config = YAML.load(File.read(DEFAULT_CONFIG_PATH)) if File.exist?(DEFAULT_CONFIG_PATH)
-        config.merge!(YAML.load(File.read(CONFIG_PATH))) if File.exist?(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_symbolize_keys
+        (config || {}).deep_symbolize_keys!
+        config.deep_merge!(secrets)
       end
     end
 

data/lib/linecook/util/ssh.rb

@@ -160,7 +160,7 @@ module Linecook
 
     def setup_ssh_key
       pubkey = Linecook::SSH.public_key(keyfile: @keyfile)
-      config = Linecook::Config.load_config[:builder]
+      config = Linecook.config[:builder]
       run("mkdir -p /home/#{config[:username]}/.ssh")
       upload(pubkey, "/home/#{config[:username]}/.ssh/authorized_keys")
     end

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/man/LINECOOK.1

@@ -1,16 +1,90 @@
 .TH LINECOOK 1 "December 2015" Unix "User Manuals"
 .SH NAME
 .PP
-linecook \- system image builder
+linecook \- Linux system image builder
 .SH SYNOPSIS
 .PP
+linecook setup \- interactive setup
+.PP
 linecook help [\fB\fCCOMMAND\fR]\- for specific command help
 .SH DESCRIPTION
 .PP
 Linecook builds system images utilizing overlayfs, squashfs, and linux containers via LXC. Currently, linecook only natively supports chef for provisioning, but using packer with a null resource, any of the mechanisms supported by packer are also supported by linecook.
+.PP
+Linecook is intended to serve 3 main purposes:
+.RS
+.IP \(bu 2
+Providing a simple, portable image building process that is useable both in baremetal and cloud deployments.
+.IP \(bu 2
+Enabling a means of simple local image development with high production efficacy on Linux and OS X.
+.IP \(bu 2
+Simplifying continuous integration and testing of linux systems.
+.RE
+.SH USAGE
+.TP
+linecook bake SPEC [\-n \-\-name \fB\fCNAME\fR] [\-s \-\-snapshot]
+\-\-name \- The name
+\-\-snapshot \- Snapshot the resulting image for later use
+\-\-encrypt \- Encrypt the snapshot using the configured key. Implies snapshot.
+\-\-upload \- Upload the resulting image to the configured destination. Implies snapshot.
+\-\-all \- Snapshot, encrypt, and upload the resulting image.
+Build a linecook image defined by SPEC, with an optional name to help identify it. The default will be the SPEC name
+.TP
+linecook builder
+start \- start a new builder
+stop \- stop a running builder
+info \- show the info about the builder
+ip \- show the builder's ip
+.TP
+linecook config
+setup
+check \- validate config
+show
+.TP
+linecook build
+list
+info NAME
+ip NAME
+stop NAME
+.TP
+linecook image
+list
+keygen \- generate a new secret key for image encryption
+fetch
+find [\fB\fCREGEX\fR] \- list available remote images filtered by an optional regex
+.PP
+linecook ami [\fB\fCimage\fR] [\-r \-\-region \fB\fCREGION1,REGION2\fR] [\-x \-\-xen\-type \fB\fCPV|HVM\fR] [\-r \-\-root\-size GIGABYTES] \- create an AMI (Amazon Machine Image) from a snapshot.
 .SH CONFIGURATION
 .PP
 Describe config file here once it's been determined
+.SH PROVISIONERS
+.PP
+Linecook includes an embedded chef\-zero server, and uses the chef\-provisioner
+\[la]https://rubygems.org/gems/chef-provisioner\[ra] and chefdepartie
+\[la]https://rubygems.org/gems/chefdepartie\[ra] gems to have first\-class support for local chef\-zero builds.
+.PP
+However, if you're not using chef or don't want to use chef\-zero, linecook can be used seamlessly with packer
+\[la]https://www.packer.io\[ra], and supports any of the Linux\-based provisioners. This includes:
+.RS
+.IP \(bu 2
+Chef\-solo
+.IP \(bu 2
+Chef\-client (with a real chef server)
+.IP \(bu 2
+Ansible
+.IP \(bu 2
+Puppet (masterless or server)
+.IP \(bu 2
+Salt
+.IP \(bu 2
+Plain old shell scripts
+.RE
+.PP
+See the packer documentation for how to configure these provisioners.
+.PP
+To use a packerfile with linecook, just leave out the 'builder' section, or have the builder section be an empty array. You need only specify the 'provisioner' section, and other sections may cause errors. Linecook will automatically insert a null builder with the appropriate connection string for you.
+.PP
+Linecook with packer is a powerful combination, as it allows you to leverage packer's 'null builder' to take advantage of all of the provisioners packer already has really good support for. The result is an intermediate image format (squashfs) that can be easily applied to any target.
 .SH FILES
 .TP
 \fI\&./linecook.yml\fP

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dale Hamel
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: chef-provisioner
   requirement: !ruby/object:Gem::Requirement
@@ -304,4 +304,3 @@ signing_key:
 specification_version: 4
 summary: Build system images using chef zero, LXC, and packer
 test_files: []
-has_rdoc: