comfy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3ab50878b48d501e5a62cc1b50a619efc60079
-  data.tar.gz: c35ec93ae09d014d30246133dfe1198839809183
+  metadata.gz: 39e377b6deaf5a19408f045af23ac3638bfd6456
+  data.tar.gz: c3ba42298cddb96ec2593a08ee850ad7f5ffdbf5
 SHA512:
-  metadata.gz: 569853233e11d6cbc832a96dae9a0585b5397e84c8d194b0b47f3b4d1a4a341aa8381b009e565b6c3dfca47e105f420a3471b5d8c65c02cd327b5a88d8b1f566
-  data.tar.gz: 623454495ac94139aeca1bc5b473f8dc450244671e8727a5f787662373601c1f8301c67de11fcc71e35be597f900406c98fb5ffe38fa2b7b7d865fc71e82ac95
+  metadata.gz: 4d44cf78939556a0bc924d9ed5fcf577e319593e75032c1b0ca02bd0e46c0e53cb4abd8c1b481dddcc2b7d0ec8e37759ac5fc04a9d3c78fe21886787234e3f73
+  data.tar.gz: 8e0823ec012a5d3e5c81ec97e6320b6c3c7c50fa3ed264d6925c4d396ceffb795e2b8e9f6dd0d3e5260cd5530eac5387c7c352889c40b0288d51b610f5f0a680

data/config/comfy.yml

@@ -2,11 +2,12 @@
 production:
   output-dir: /opt/comfy/virtualmachines/ # Directory to which COMFY will produce virtual machine files
   cache-dir: /opt/comfy/packer_cache/ # Directory for packer's cache e.g. distribution installation images
-  #template-dir: /opt/comfy/templates/ # When used COMFY uses templates from this directory to create virtual machines
+  #template-dir: /opt/comfy/templates/ # When used, COMFY uses templates from this directory to create virtual machines
   formats:
     - qemu
   size: 10000
   description: true
+  #packer-binary: # When used, COMFY will use this binary to run Packer instead of the one found by the system in PATH 
   groups: # groups VM belongs to, used when creating cloud-appliance-descriptor
     - comfy
 # $t - timestamp

data/lib/comfy/command_executioner.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 
 class Comfy::CommandExecutioner < Thor
   class << self
-    
+
     # Method listing available distributions from template directory.
     #
     # @return [Hash] distributions structure containing info about them
@@ -148,6 +148,11 @@ class Comfy::CommandExecutioner < Thor
                   aliases: '-t',
                   default: Comfy::TEMPLATE_DIR,
                   desc: 'Directory COMFY uses templates from to build a VM'
+    method_option :'packer-binary',
+                  type: :string,
+                  aliases: '-p',
+                  default: Comfy::Settings['packer-binary'],
+                  desc: 'Path to Packer binary'
 
     class_eval %Q^
 desc '#{plain_name}', 'Builds VM with distribution #{name}'

data/lib/comfy/creator.rb

@@ -26,7 +26,7 @@ class Comfy::Creator
     @data = options.clone
   end
 
-  # Method representing thw whole creation process. Prepares enviroment,
+  # Method representing the whole creation process. Prepares enviroment,
   # prepare files and starts packer job.
   def create
     logger.info('Preparing for image creation...')
@@ -70,12 +70,15 @@ class Comfy::Creator
   # @param packer_file descriptor file with info for packer processing.
   def run_packer(packer_file)
     logger.info("Calling Packer - building distribution: '#{data[:distribution]}'.")
-    packer = Mixlib::ShellOut.new("packer validate #{packer_file}")
+
+    packer_binary = data[:'packer-binary'] || 'packer'
+
+    packer = Mixlib::ShellOut.new("#{packer_binary} validate #{packer_file}")
     packer.run_command
 
     fail Comfy::Errors::PackerValidationError, "Packer validation failed for distribution '#{data[:distribution]}': #{packer.stdout}" if packer.error?
 
-    packer = Mixlib::ShellOut.new("packer build -parallel=false #{packer_file}", timeout: 5400)
+    packer = Mixlib::ShellOut.new("#{packer_binary} build -parallel=false #{packer_file}", timeout: 5400)
     packer.live_stream = logger
     packer.run_command
 

data/lib/comfy/version.rb

@@ -1,3 +1,3 @@
 module Comfy
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Michal Kimle
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler