singel 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8523164bf81e274258f9fd9df632e69e0073def
-  data.tar.gz: 591fe73ad0d036a8d0f015f47a142494f7a3a837
+  metadata.gz: 1ee381a02993b614f5755e85d1f245423a4b0433
+  data.tar.gz: c42b7f3206eef7232508b63031fdbc39feed355f
 SHA512:
-  metadata.gz: 7e48ba26e94473f9d535a24d0866314c7e7e162e77ae2e0dc761b513631b2e6acf2ad874426b44008ab6102b45d9ca824ef14e08a0df02b6cd1d8b651f5ca706
-  data.tar.gz: e34077f5eb6321a36ccf4a8da79f3f32aa461e9cc909b51cdf5a829f5781858e78b9b326be823fb0891f99cf994ca49f7425cbfe998ee765a49d91fa0cfb60dd
+  metadata.gz: d0cbeb4027d312aa825eabfd05e1be3d0728b2f65ff2b4cf4c1b7b58bc49ad7c0e3902b77b45a0647a0e7da970152c640a1ef332351878c24545b47e860e9226
+  data.tar.gz: 0e54f2c167cb5b7452128995a1ed31254eddd99823d92edd993e1ca4c54363dbe0e2e9794b318c63ceeeb552be328a700f8e31fb4f008cf4c83a51f7be1aaa3d

data/bin/singel

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 # encoding: UTF-8
 #
 # Author:: Tim Smith (<tim@cozy.co>)
@@ -16,8 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-lib =  File.expand_path('../../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 begin
   require 'optparse'
@@ -27,6 +27,7 @@ begin
   require 'orchestrator.rb'
   require 'executor.rb'
   require 'uploader.rb'
+  require 'template.rb'
 rescue LoadError => e
   raise "Missing gem or lib #{e}"
 end

data/lib/executor.rb

@@ -16,52 +16,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# executes packer commands against template files
-class SingelExecutor
-  def initialize(template)
-    @file_path = template
-    @packer_dir = File.dirname(template)
-    @builders = {}
-  end
-
-  # shell out to packer to validate the config files for correctness
-  def validates?
-    Dir.chdir(@packer_dir)
-    `packer validate #{@file_path} 2>&1`
-    $CHILD_STATUS.success? ? true : false
-  end
-
-  # inspect the json file to determine the name and type of the builders
-  def parse_builders
-    template_file = File.read(@file_path)
-    template_json = JSON.parse(template_file)
-    template_json['builders'].each do |builder|
-      @builders[builder['name']] = builder['type']
-    end
-  rescue Errno::ENOENT
-    puts "- Could not find the passed template file #{@file_path}".indent.to_red
-    exit
+# 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') + ':'
-    parse_builders
-    if @builders.empty?
+
+    builders = @template.builders_hash
+    if builders.empty?
       puts '- No builders found'.indent.to_red
     else
-      @builders.each_pair do |name, type|
+      builders.each_pair do |name, type|
         puts "- #{name} (type: #{type})".indent
       end
     end
   end
 
+  # specify the builders if any were passed
+  def build_options
+    "-only=#{@specified_builders.join(',')}" unless @specified_builders.empty?
+  end
+
   def build
     puts "Building #{File.basename(@file_path, '.json')}:".to_green
-    IO.popen("packer build #{@file_path}") do |cmd|
+    IO.popen("packer build #{build_options} #{@file_path}") do |cmd|
       cmd.each { |line| puts line }
     end
-
-    SingelUploader.new(@file_path).push
   end
 end

data/lib/orchestrator.rb

@@ -38,7 +38,11 @@ class SingelOrchestrator
 
   # check to make sure the packer dir exists
   def check_dirs
-    (puts "#{@options[:packer_dir]} not present. Cannot continue".to_red && exit) unless Dir.exist?(@options[:packer_dir])
+    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
 
   # make a test connection using the AWS keys to determine if they're valid
@@ -47,7 +51,7 @@ class SingelOrchestrator
     ec2.describe_instance_status
   rescue
     puts 'Could not connect to EC2. Check your local AWS credentials before continuing.'.to_red
-    exit
+    exit!
   end
 
   # check to make sure the prereq binaries present
@@ -56,39 +60,42 @@ class SingelOrchestrator
       `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
+        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'
       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
+        exit!
       end
       templates
-    else
+    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 |template|
-      packer = SingelExecutor.new(template)
-      puts "Packer template validation for #{template} failed.\n".to_red unless packer.validates?
+    @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
-        packer.send(cmd)
+        executor.send(cmd)
       rescue NoMethodError
         puts "Action \"#{cmd}\" not found.  Cannot continue".to_red
-        exit
+        exit!
       end
     end
   end

data/lib/template.rb

@@ -0,0 +1,53 @@
+# 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.
+
+require 'json'
+
+# 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 json
+    @parsed || @parsed = JSON.parse(@file)
+  end
+
+  def builders
+    json['builders'].map { |b| b['name'] }
+  end
+
+  def builders_hash
+    builders = {}
+    json['builders'].each do |builder|
+      builders[builder['name']] = builder['type']
+    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
+  end
+end

data/singel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'singel'
-  s.version     = '0.1.1'
+  s.version     = '0.2.0'
   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.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -70,6 +70,7 @@ files:
 - bin/singel
 - lib/executor.rb
 - lib/orchestrator.rb
+- lib/template.rb
 - lib/uploader.rb
 - singel.gemspec
 homepage: http://www.github.com/tas50/singel