singel 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b044c6a0f921fc3cd684571e5be6c2dd48e7788b
-  data.tar.gz: 7d5117ca9e6e7a4d9d7f7248d3aca4bc053f877c
+  metadata.gz: aaa5865dd1830b229c430c5846b5ef4b28c586b0
+  data.tar.gz: 54c9c871c502e99a8e9f9103868ae7355217e1bd
 SHA512:
-  metadata.gz: 47c2f627068266abe8fa919e4264aab32829b9335ddcbbb3c982a5c6fa70024c3f795e7b30e94328b5578c5d86cbace13345a3773f94bc8a43cad00d875ce134
-  data.tar.gz: 23c68854c622fc10268c5e736ea1ade9117ef586ee6f8b422464b3d9846505b73d838813232da42d29c1097395d5efd706f73158e76e7c3deab76c6f386ea5a7
+  metadata.gz: d27fb80019dd99723ae69fd2e9c18a2be5316cea852457a8072851b9c84cd67b99157c0db4efb486f7cc5b58d5fbe6087c68a4d8dbb73e0c240a90d597a63483
+  data.tar.gz: f61553aed236cdf546ce82fb544213d8ad51d6eb0215e6e02a79c565f87fc14a5b408a79a42f90adbbbbecd9132e578e7ee53beef1ef58bc573c0b0bfa54357f

data/.gitignore

@@ -39,3 +39,6 @@ Gemfile.lock
 # singel related files
 outputs
 packer
+
+# editor files
+*.swp

data/bin/singel

@@ -25,64 +25,14 @@ begin
   require 'aws-sdk-core'
   require 'json'
   require 'pty'
+  require 'config.rb'
   require 'orchestrator.rb'
   require 'executor.rb'
   require 'uploader.rb'
   require 'template.rb'
+  require 'string.rb'
 rescue LoadError => e
   raise "Missing gem or lib #{e}"
 end
 
-# add a few methods for manipulating text
-class String
-  def to_green
-    "\033[32m#{self}\033[0m"
-  end
-
-  def to_red
-    "\033[31m#{self}\033[0m"
-  end
-
-  def indent(double_space_count = 1)
-    double_space_count.times { insert(0, '  ') }
-    self
-  end
-end
-
-def parse_opts
-  options = { :templates => [], :builders => [], :packer_dir => File.expand_path('./packer') }
-  banner = "Singel - Unified system image creation using Packer\n\n" \
-            "Usage: singel [action] [options]\n\n" \
-            "  Actions:\n" \
-            "    build: Build system images\n" \
-            "    list: List available image templates and builder types (AMI, Virtualbox, etc)\n\n" \
-            "  Options:\n"
-  OptionParser.new do |opts|
-    opts.banner = banner
-    opts.on('-t', '--templates t1.json,t2.json', Array, 'Build only the specified comma separated list of templates') do |t|
-      options[:templates] = t
-    end
-    opts.on('-b', '--builders type1,type2', Array, 'Build only the specified comma separated list of builder types') do |b|
-      options[:builders] = b
-    end
-    opts.on('-p', '--packer_dir PATH', 'Path to the packer dir containing templates and other files') do |p|
-      options[:packer_dir] = File.expand_path(p)
-    end
-    opts.on('-h', '--help', 'Displays Help') do
-      puts opts
-      exit
-    end
-  end.parse!(ARGV)
-
-  options
-end
-
-unless ARGV[0]
-  puts "You must provide an action for singel to execute on\n".to_red
-  ARGV << '-h'
-end
-
-# parse the user provided options
-options = parse_opts
-
-SingelOrchestrator.new(options).run
+Singel::SingelOrchestrator.new.run

data/lib/config.rb

@@ -0,0 +1,64 @@
+# encoding: UTF-8
+#
+# Author:: Tim Smith (<tim@cozy.co>)
+# Copyright:: Copyright (c) 2014 Tim Smith
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Singel
+  # allow fetching the config anywhere in the app
+  module Config
+    require 'string.rb'
+
+    # return the config object or parse the options fresh
+    def self.config
+      @config ||= parse_opts
+    end
+
+    # parse options passed from the command line
+    def self.parse_opts
+      options = { :templates => [], :builders => [], :packer_dir => File.expand_path('./packer') }
+      banner = "Singel - Unified system image creation using Packer\n\n" \
+                "Usage: singel [action] [options]\n\n" \
+                "  Actions:\n" \
+                "    build: Build system images\n" \
+                "    list: List available image templates and builder types (AMI, Virtualbox, etc)\n\n" \
+                "  Options:\n"
+      OptionParser.new do |opts|
+        opts.banner = banner
+        opts.on('-t', '--templates t1.json,t2.json', Array, 'Build only the specified comma separated list of templates') do |t|
+          options[:templates] = t
+        end
+        opts.on('-b', '--builders type1,type2', Array, 'Build only the specified comma separated list of builder types') do |b|
+          options[:builders] = b
+        end
+        opts.on('-p', '--packer_dir PATH', 'Path to the packer dir containing templates and other files') do |p|
+          options[:packer_dir] = File.expand_path(p)
+        end
+        opts.on('-h', '--help', 'Displays Help') do
+          puts opts
+          exit
+        end
+      end.parse!(ARGV)
+
+      options
+    end
+
+    # if no argument was passed or the first arg starts with - (aka it's not actually an action)
+    if ARGV[0].nil? || ARGV[0][0] == '-'
+      puts "\nYou must provide an action for singel to execute on:\n".to_red
+      ARGV << '-h'
+    end
+  end
+end

data/lib/executor.rb

@@ -16,47 +16,59 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# executes packer commands against template object
-class PackerExecutor
-  def initialize(template, builders)
-    @template = template
-    @file_path = template.path
-    @template_builders = template.builders
-    @specified_builders = builders
-  end
+module Singel
+  # executes packer commands against template object
+  class PackerExecutor
+    def initialize(template, builders)
+      @template = template
+      @file_path = template.path
+      @template_builders = template.builders
+      @specified_builders = builders
+    end
 
-  # print out the builders for this template
-  def list
-    puts File.basename(@file_path, '.json') + ':'
+    # print out the builders for this template
+    def list
+      puts File.basename(@file_path, '.json') + ':'
 
-    builders = @template.builders_hash
-    if builders.empty?
-      puts '- No builders found'.indent.to_red
-    else
-      builders.each_pair do |name, type|
-        puts "- #{name} (type: #{type})".indent
+      builders = @template.builders_hash
+      if builders.empty?
+        puts '- No builders found'.indent.to_red
+      else
+        builders.each_pair do |name, type|
+          puts "- #{name} (type: #{type})".indent
+        end
       end
     end
-  end
 
-  def build
-    puts "Building #{File.basename(@file_path, '.json')}:".to_green
-    stream_cmd("packer build #{build_options} #{@file_path}")
-  end
+    def build
+      puts "Building #{File.basename(@file_path, '.json')}:".to_green
+      stream_cmd("packer build #{build_options} #{@file_path}")
+    end
 
-  # specify the builders if any were passed
-  def build_options
-    "-only=#{@specified_builders.join(',')}" unless @specified_builders.empty?
-  end
+    # specify the builders if any were passed
+    def build_options
+      "-only=#{@specified_builders.join(',')}" unless @specified_builders.empty?
+    end
+
+    def stream_cmd(command)
+      PTY.spawn(command) do |r, _w, pid|
+        begin
+          r.each { |line| print line; }
+        rescue Errno::EIO
+          # this is an expected behavior when an app is done sending output
+        ensure
+          Process.wait(pid)
+        end
+      end
+      exit_error unless $CHILD_STATUS == 0
+    rescue PTY::ChildExited
+      exit_error unless $CHILD_STATUS == 0
+    end
 
-  def stream_cmd(command)
-    PTY.spawn(command) do |r, _w, _pid|
-      begin
-       r.each { |line| print line; }
-    rescue Errno::EIO
-     end
+    # throw and error message and exit with and error status
+    def exit_error
+      puts "An error occured during the packer run.\nSee the above output for more details.".to_red
+      exit!
     end
- rescue PTY::ChildExited
-   puts 'The child process exited!'
   end
 end

data/lib/orchestrator.rb

@@ -16,86 +16,90 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# class to control validation of configs / prereqs and to
-# fire off the individual executor instances to build each template
-class SingelOrchestrator
-  def initialize(options)
-    @options = options
-  end
+module Singel
+  # class to control validation of configs / prereqs and to
+  # fire off the individual executor instances to build each template
+  class SingelOrchestrator
+    include Singel::Config
 
-  # main method used to kick off the run
-  def run
-    puts "\nsingel - unified image creation tool"
-    puts "-----------------------------------------\n\n"
+    def initialize
+      @options = Singel::Config.config
+    end
 
-    check_dirs
-    check_executables
-    @templates = find_templates
-    check_aws_keys
+    # main method used to kick off the run
+    def run
+      puts "\nsingel - unified image creation tool"
+      puts "-----------------------------------------\n\n"
 
-    execute_command(ARGV[0])
-  end
+      check_dirs
+      check_executables
+      @templates = find_templates
+      check_aws_keys
 
-  # check to make sure the packer dir exists
-  def check_dirs
-    unless Dir.exist?(@options[:packer_dir])
-      puts "#{@options[:packer_dir]} not present.".to_red
-      puts "See help for information on specifying an alternate dir.\n".to_red
-      exit!
+      execute_command(ARGV[0])
     end
-  end
-
-  # make a test connection using the AWS keys to determine if they're valid
-  def check_aws_keys
-    ec2 = Aws::EC2::Client.new(region: 'us-east-1')
-    ec2.describe_instance_status
-  rescue
-    puts 'Could not connect to EC2. Check your local AWS credentials before continuing.'.to_red
-    exit!
-  end
 
-  # check to make sure the prereq binaries present
-  def check_executables
-    { 'Virtualbox' => 'vboxwebsrv', 'Packer' => 'packer' }.each_pair do |name, binary|
-      `which #{binary} 2>&1`
-      unless $CHILD_STATUS.success?
-        puts "Could not find #{name} binary #{binary}. You must install #{name} before continuing.".to_red unless $CHILD_STATUS
+    # check to make sure the packer dir exists
+    def check_dirs
+      unless Dir.exist?(@options[:packer_dir])
+        puts "#{@options[:packer_dir]} not present.".to_red
+        puts "See help for information on specifying an alternate dir.\n".to_red
         exit!
       end
     end
-  end
 
-  # find the available packer templates on the host
-  def find_templates
-    # find packer templates on disk since none were passed via args
-    if @options[:templates].empty?
-      templates = []
-      Dir.foreach(@options[:packer_dir]) do |item|
-        templates << File.join(@options[:packer_dir], item) if File.extname(item).downcase == '.json'
+    # make a test connection using the AWS keys to determine if they're valid
+    def check_aws_keys
+      ec2 = Aws::EC2::Client.new(region: 'us-east-1')
+      ec2.describe_instance_status
+    rescue
+      puts 'Could not connect to EC2. Check your local AWS credentials before continuing.'.to_red
+      exit!
+    end
+
+    # check to make sure the prereq binaries present
+    def check_executables
+      { 'Virtualbox' => 'vboxwebsrv', 'Packer' => 'packer' }.each_pair do |name, binary|
+        `which #{binary} 2>&1`
+        unless $CHILD_STATUS.success?
+          puts "Could not find #{name} binary #{binary}. You must install #{name} before continuing.".to_red unless $CHILD_STATUS
+          exit!
+        end
       end
+    end
 
-      # throw and error and exist if we still dont find any templates
-      if templates.empty?
-        puts "No packer templates found in the 'packer' dir. Cannot continue.".to_red
-        exit!
+    # find the available packer templates on the host
+    def find_templates
+      # find packer templates on disk since none were passed via args
+      if @options[:templates].empty?
+        templates = []
+        Dir.foreach(@options[:packer_dir]) do |item|
+          templates << File.join(@options[:packer_dir], item) if File.extname(item).downcase == '.json'
+        end
+
+        # throw and error and exist if we still dont find any templates
+        if templates.empty?
+          puts "No packer templates found in the 'packer' dir. Cannot continue.".to_red
+          exit!
+        end
+        templates
+      else # parse the arg provided template list
+        @options[:templates].map { |x| File.join(@options[:packer_dir], x) }
       end
-      templates
-    else # parse the arg provided template list
-      @options[:templates].map { |x| File.join(@options[:packer_dir], x) }
     end
-  end
 
-  # run the passed command per packer template
-  def execute_command(cmd)
-    @templates.each do |t|
-      template = PackerTemplate.new(t)
-      executor = PackerExecutor.new(template, @options[:builders])
-      puts "Packer template validation for #{template.path} failed.\n".to_red unless template.validates?
-      begin
-        executor.send(cmd)
-      rescue NoMethodError
-        puts "Action \"#{cmd}\" not found.  Cannot continue".to_red
-        exit!
+    # run the passed command per packer template
+    def execute_command(cmd)
+      @templates.each do |t|
+        template = PackerTemplate.new(t)
+        executor = PackerExecutor.new(template, @options[:builders])
+        puts "Packer template validation for #{template.path} failed.\n".to_red unless template.validates?
+        begin
+          executor.send(cmd)
+        rescue NoMethodError
+          puts "Action \"#{cmd}\" not found.  Cannot continue".to_red
+          exit!
+        end
       end
     end
   end

data/lib/string.rb

@@ -0,0 +1,33 @@
+# encoding: UTF-8
+#
+# Author:: Tim Smith (<tim@cozy.co>)
+# Copyright:: Copyright (c) 2014 Tim Smith
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# add a few methods for manipulating text
+class String
+  def to_green
+    "\033[32m#{self}\033[0m"
+  end
+
+  def to_red
+    "\033[31m#{self}\033[0m"
+  end
+
+  def indent(double_space_count = 1)
+    double_space_count.times { insert(0, '  ') }
+    self
+  end
+end

data/lib/template.rb

@@ -16,38 +16,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'json'
+module Singel
+  # instance of a single packer template with methods to validate and extract data
+  class PackerTemplate
+    attr_accessor :path, :name
 
-# instance of a single packer template with methods to validate and extract data
-class PackerTemplate
-  attr_accessor :path, :name
-
-  def initialize(path)
-    @path = File.expand_path(path)
-    @name = File.basename(@path, '.json')
-    @file = File.read(path)
-  end
+    def initialize(path)
+      @path = File.expand_path(path)
+      @name = File.basename(@path, '.json')
+      @file = File.read(path)
+    end
 
-  def json
-    @parsed || @parsed = JSON.parse(@file)
-  end
+    def json
+      @parsed || @parsed = JSON.parse(@file)
+    end
 
-  def builders
-    json['builders'].map { |b| b['name'] }
-  end
+    def builders
+      json['builders'].map { |b| b['name'] }
+    end
 
-  def builders_hash
-    builders = {}
-    json['builders'].each do |builder|
-      builders[builder['name']] = builder['type']
+    def builders_hash
+      builders = {}
+      json['builders'].each do |builder|
+        builders[builder['name']] = builder['type']
+      end
+      builders
     end
-    builders
-  end
 
-  # shell out to packer to validate the config files for correctness
-  def validates?
-    Dir.chdir(File.dirname(@path))
-    `packer validate #{@path} 2>&1`
-    $CHILD_STATUS.success? ? true : false
+    # shell out to packer to validate the config files for correctness
+    def validates?
+      Dir.chdir(File.dirname(@path))
+      `packer validate #{@path} 2>&1`
+      $CHILD_STATUS.success? ? true : false
+    end
   end
 end

data/lib/uploader.rb

@@ -16,13 +16,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# uploads the packer artifacts to S3
-class SingelUploader
-  def initialize(template)
-    @file_path = template
-  end
+module Singel
+  # uploads the packer artifacts to S3
+  class SingelUploader
+    def initialize(template)
+      @file_path = template
+    end
 
-  def push
-    puts "- Would be uploading the artifact for #{File.basename(@file_path, '.json')}".to_green.indent
+    def push
+      puts "- Would be uploading the artifact for #{File.basename(@file_path, '.json')}".to_green.indent
+    end
   end
 end

data/singel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'singel'
-  s.version     = '0.2.1'
+  s.version     = '0.2.2'
   s.date        = Date.today.to_s
   s.platform = Gem::Platform::RUBY
   s.extra_rdoc_files = ['README.md', 'LICENSE']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singel
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -68,8 +68,10 @@ files:
 - README.md
 - Rakefile
 - bin/singel
+- lib/config.rb
 - lib/executor.rb
 - lib/orchestrator.rb
+- lib/string.rb
 - lib/template.rb
 - lib/uploader.rb
 - singel.gemspec