singel 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaa5865dd1830b229c430c5846b5ef4b28c586b0
-  data.tar.gz: 54c9c871c502e99a8e9f9103868ae7355217e1bd
+  metadata.gz: 93309ed4bb6ca45ba817b03388085fb3f5fe8b9a
+  data.tar.gz: 8607257c32a674deac60097d3e88349fabe5d4fd
 SHA512:
-  metadata.gz: d27fb80019dd99723ae69fd2e9c18a2be5316cea852457a8072851b9c84cd67b99157c0db4efb486f7cc5b58d5fbe6087c68a4d8dbb73e0c240a90d597a63483
-  data.tar.gz: f61553aed236cdf546ce82fb544213d8ad51d6eb0215e6e02a79c565f87fc14a5b408a79a42f90adbbbbecd9132e578e7ee53beef1ef58bc573c0b0bfa54357f
+  metadata.gz: 8aa63e39b2eb98bcfcbe4af326a3e996c178bbc1e6e8ef48913c53afd60d4396c4f3bf7b37cf4f2cffb767a05d64032f6ca63d382d485a9db7bc2aab0cb53fa0
+  data.tar.gz: 1652fe4e7d25d9ac23e99cbdc18ed63844047ae3aa4518466a6d019768e28cd305be73beac370570662a4752927ab5c90c940bc324b8a9f4bbbacb23c975c0e6

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
+cache:
+  - bundler
+install:
+  - bundle install
 rvm:
-- 1.9.3
-- 2.1.5
-- 2.2.0
+- 2.1.6
+- 2.2.2
 script:
   - bundle exec rake test
 

data/Gemfile

@@ -1,8 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'aws-sdk-core'
-
-group :test do
-  gem 'rubocop', '~> 0.28.0'
-  gem 'rake', '~> 10.0'
-end
+gemspec

data/bin/singel

@@ -25,14 +25,9 @@ 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'
+  require 'singel.rb'
 rescue LoadError => e
   raise "Missing gem or lib #{e}"
 end
 
-Singel::SingelOrchestrator.new.run
+Singel.run

data/lib/singel.rb

@@ -0,0 +1,108 @@
+# 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.
+
+# main orchestrator of singel runs
+module Singel
+  require 'singel/config.rb'
+  require 'singel/executor.rb'
+  require 'singel/uploader.rb'
+  require 'singel/template.rb'
+  require 'string.rb'
+
+  include Singel::Config
+
+  # main method used to kick off the run
+  def self::run
+    @options = Config.config
+    puts "\nsingel - unified image creation tool"
+    puts "-----------------------------------------\n\n"
+
+    check_dirs
+    check_executables
+    @templates = find_templates
+    check_aws_keys
+
+    execute_command(ARGV[0])
+  end
+
+  private
+
+  # check to make sure the packer dir exists
+  def self::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
+
+  # make a test connection using the AWS keys to determine if they're valid
+  def self::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 self::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
+
+  # find the available packer templates on the host
+  def self::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
+  end
+
+  # run the passed command per packer template
+  def self::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/{executor.rb → singel/executor.rb}

@@ -54,7 +54,7 @@ module Singel
       PTY.spawn(command) do |r, _w, pid|
         begin
           r.each { |line| print line; }
-        rescue Errno::EIO
+        rescue Errno::EIO # rubocop: disable Lint/HandleExceptions
           # this is an expected behavior when an app is done sending output
         ensure
           Process.wait(pid)

data/lib/{template.rb → singel/template.rb}

@@ -29,6 +29,9 @@ module Singel
 
     def json
       @parsed || @parsed = JSON.parse(@file)
+      rescue JSON::ParserError
+        puts "Invalid JSON in the Packer config #{@name}.\nValidate your JSON before running Singel again.".to_red
+        exit!
     end
 
     def builders

data/singel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'singel'
-  s.version     = '0.2.2'
+  s.version     = '0.2.3'
   s.date        = Date.today.to_s
   s.platform = Gem::Platform::RUBY
   s.extra_rdoc_files = ['README.md', 'LICENSE']
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
   s.add_dependency 'aws-sdk-core'
   s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'rubocop', '~> 0.28.0'
+  s.add_development_dependency 'rubocop', '~> 0.30.0'
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singel
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.30.0
 description: Unified system image creation using Packer
 email: tim@cozy.co
 executables:
@@ -68,12 +68,12 @@ files:
 - README.md
 - Rakefile
 - bin/singel
-- lib/config.rb
-- lib/executor.rb
-- lib/orchestrator.rb
+- lib/singel.rb
+- lib/singel/config.rb
+- lib/singel/executor.rb
+- lib/singel/template.rb
+- lib/singel/uploader.rb
 - lib/string.rb
-- lib/template.rb
-- lib/uploader.rb
 - singel.gemspec
 homepage: http://www.github.com/tas50/singel
 licenses:

data/lib/orchestrator.rb

@@ -1,106 +0,0 @@
-# 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
-  # class to control validation of configs / prereqs and to
-  # fire off the individual executor instances to build each template
-  class SingelOrchestrator
-    include Singel::Config
-
-    def initialize
-      @options = Singel::Config.config
-    end
-
-    # main method used to kick off the run
-    def run
-      puts "\nsingel - unified image creation tool"
-      puts "-----------------------------------------\n\n"
-
-      check_dirs
-      check_executables
-      @templates = find_templates
-      check_aws_keys
-
-      execute_command(ARGV[0])
-    end
-
-    # 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
-
-    # 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
-
-    # 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
-    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!
-        end
-      end
-    end
-  end
-end