wombat-cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a1385b339efd13cc101dba5b385915f2cb21265
-  data.tar.gz: 327d68edbc797dce831d4e3ae53101f3625a0826
+  metadata.gz: dc2a49c4d8120a5421a09bb71a1ccd43b11d81ee
+  data.tar.gz: 9f3f59613fd739f1902a5be5fae389f83b595735
 SHA512:
-  metadata.gz: 6134c463249083075e7bd4ba5b9c16ee5883af1d744509aa5206e3935c48bd6a8d3af9df5953797a6bf6700842243f83cb10da863f5f06cb2d786be044695ce3
-  data.tar.gz: 364be3f32ffdac77f61a9d2405eba09527041fc47088242080ca2aacd4e092b96eaded8195612cd00f2dd04494dc92076c5527c52788fdcbcf00bc742ae8c405
+  metadata.gz: 8686a4aca69bc596561fd37e59a694deff12935481213de4ad469d9b91814a7b59b21ae49ee59367bf0635c1ebac34d6f91019a787477224d277ebccf44c4fe0
+  data.tar.gz: 21d805f89f60acf24918cff6aed1415cbec9f2a1ac6a0d5b15581027373f5bd0b7cbbd55289f4ce507b9c4d6443ee86b5cba55e31044286f84ef82818070b6ac

data/lib/wombat/build.rb

@@ -7,12 +7,11 @@ class BuildRunner
 
   include Common
 
-  attr_reader :templates, :builder, :config, :parallel
+  attr_reader :templates, :builder, :parallel
 
   def initialize(opts)
     @templates = opts.templates.nil? ? calculate_templates : opts.templates
     @builder = opts.builder.nil? ? "amazon-ebs" : opts.builder
-    @config = opts.config
     @parallel = opts.parallel
   end
 
@@ -151,6 +150,12 @@ class BuildRunner
   def log(template, builder, options)
     cloud = b_to_c(builder)
     case template
+    when /automate/
+      log_name = "#{cloud}-automate-#{linux}"
+    when /chef-server/
+      log_name = "#{cloud}-chef-server-#{linux}"
+    when /compliance/
+      log_name = "#{cloud}-compliance-#{linux}"
     when /build-node/
       log_name = "#{cloud}-build-node-#{options['node-number']}-#{linux}"
     when /workstation/
@@ -161,8 +166,6 @@ class BuildRunner
       else
         log_name = "#{cloud}-infranodes-#{options['node-name']}-#{linux}"
       end
-    else
-     log_name = "#{cloud}-#{template}-#{linux}"
     end
     log_file = "#{conf['log_dir']}/#{log_name}.log"
   end

data/lib/wombat/cli.rb

@@ -56,10 +56,6 @@ class Options
         parser: OptionParser.new { |opts|
           opts.banner = "Usage: #{NAME} build [options] TEMPLATE[ TEMPLATE ...]"
 
-          opts.on("-c CONFIG", "--config CONFIG", "Use config file") do |opt|
-            options.config = opt
-          end
-
           opts.on("-o BUILDER", "--only BUILDER", "Use config file") do |opt|
             options.builder = opt
           end

data/lib/wombat/common.rb

@@ -218,7 +218,7 @@ module Common
           name = log.split('-')[2]
           copy['amis'][region]['infranodes'].store(name, parse_log(log, cloud))
         else
-          instance = log.match("#{cloud}-(.*)-(.*)\.log")[1]
+          instance = log.match("#{cloud}-(.*)-#{linux}\.log")[1]
           copy['amis'][region].store(instance, parse_log(log, cloud))
         end
       end

data/lib/wombat/version.rb

@@ -1,3 +1,3 @@
 module Wombat
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wombat-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andre Elizondo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake