qb 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edfdd80c095e4ab8bb69552dc2657d0f684dcda5
-  data.tar.gz: 12bcfa8f876ffdc439a652ebde87f0a8ed817df6
+  metadata.gz: 30b0e75719390dfd0ee97d04dee5d35f94ba7c2b
+  data.tar.gz: 4fe81370e5657c73552b159c025ca61aca44adc5
 SHA512:
-  metadata.gz: f1f671dfa6971a2a13dcf51772b0dd426babe6948dcd84d7b6920e6a581dc70058ee3cf1984e4c4f65029afbabc599515893325b0bc9ccc8cf23125615bc695f
-  data.tar.gz: 50c90d54f4f5433d91edbd762d0bb9b835e67d4f599cba565b17ce4e1c6bbd30eaec85215d614069f4c63b879b1eada0b8c11e9ebde3b997acf792f279d32112
+  metadata.gz: 8b6633ad2e732a83ca29707080ce328af5fa617b00bd1261a5bb0fdaf689e0442a5305b1ba0bf9a4a3acfcf929910af8d087611f9c03863e5c7c5865f01a9a40
+  data.tar.gz: 70985650858f352883521cee66af25b194ec9d48b264b34ca04e9e3015dad60f62ab1b4db8ff9062814467a031850a6f9b9376590aa6a9ed747dbe3f36c09a04

data/exe/qb

@@ -177,6 +177,16 @@ def main args
     end
   end
   
+  # check that required options are present
+  missing = options.values.select {|option|
+    option.required? && option.value.nil?
+  }
+  
+  unless missing.empty?
+    puts "ERROR: options #{ missing.map {|o| o.cli_name } } are required."
+    exit 1
+  end
+  
   set_options = options.select {|k, o| !o.value.nil?}
   
   debug "set options", set_options
@@ -282,10 +292,16 @@ def main args
       end
       template << "<%= playbook_path %>"
       
-      Cmds.stream! template.join(" "), 
+      status = Cmds.stream template.join(" "), 
         roles_path: ansible_roles_path,
         playbook_path: playbook_path.to_s,
         hosts: "#{ play['hosts'].join(',') },"
+      
+      if status != 0
+        puts "ERROR ansible-playbook failed."
+      end
+      
+      exit status
     end
   end
 end

data/lib/qb/options.rb

@@ -175,10 +175,12 @@ module QB
             when nil
               raise MetadataError,
                 "must provide type in qb metadata for option #{ option.meta_name }"
-            when 'string'
+            when 'string', 'str'
               String
-            when 'array'
+            when 'array', 'list'
               Array
+            when 'integer', 'int'
+              Integer
             when Hash
               if option.meta['type'].key? 'one_of'
                 klass = Class.new
@@ -217,15 +219,19 @@ module QB
           
           on_args << option.description
           
+          if option.required?
+            on_args << "REQUIRED."
+          end
+          
           if role.defaults.key? option.var_name
             on_args << if option.meta['type'] == 'boolean'
               if role.defaults[option.var_name]
-                "default --#{ option.cli_name }"
+                "DEFAULT: --#{ option.cli_name }"
               else
-                "default --no-#{ option.cli_name }"
+                "DEFAULT: --no-#{ option.cli_name }"
               end
             else
-              "default = #{ role.defaults[option.var_name] }"
+              "DEFAULT: #{ role.defaults[option.var_name] }"
             end
           end
           
@@ -263,7 +269,7 @@ module QB
           '---hosts=HOSTS',
           Array,
           "set playbook host",
-          "default: localhost"
+          "DEFAULT: localhost"
         ) do |value|
           qb_options['hosts'] = value
         end

data/lib/qb/version.rb

@@ -1,7 +1,7 @@
 module QB
   GEM_NAME = 'qb'
   
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
   
   def self.gemspec
     Gem.loaded_specs[GEM_NAME]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - nrser