qb 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 318feb9ed96e8436116afdc7ca6e9c0c36d3f856
-  data.tar.gz: 270846ed027667040daf691f77d63e657118b6a2
+  metadata.gz: ca9d3309b203357ca3f60f6dadcc234a6deb6b0e
+  data.tar.gz: ea834af63ce3b9e275c9f51d80d3400db317ca56
 SHA512:
-  metadata.gz: e8cac0e79f2255e01a801111e7bdc94aba54dddd5c553ae3be646e9348aa04df8dc0690a405193db4135c5f191a325ba033c937c45fa6e6ee6ed2dc81d378ba8
-  data.tar.gz: 5202c0c0154ac74d51d2322c514b9556b5c924370d4405d4db2ec45edbb61d4fd0e79900b9193f74379ee4513e583186806ed7fc24b56b78d89a465f7b3ee212
+  metadata.gz: e77e6ddbca93822961261a701b5054ed523978af86d80bcfff0e940f108ff4bfdf189fc17450eefca050c6d5219c514cb9db1e911f10394f5afac3442cce07b4
+  data.tar.gz: 2e25ae51fc342efaf90179b2baae6c0289888e100e2dc9042b4ddb0e46bdc3f9ab4dbdb27df928dfd1d599065a8a615fc38155fe90562d675ec1c6207c207eb7

data/bin/qb

@@ -2,11 +2,12 @@
 # stub instead of `bundle exec qb ...`
 
 # so you know you're using the local repo version (vs an installed gem)...
-puts "*** LOADING REPO VERSION ***\n\n"
+puts "*** LOADING REPO VERSION ***"
 
 root = File.dirname(File.realpath(File.join(__FILE__, '..')))
 
 puts "source: #{ root }"
+puts 
 
 Dir.chdir root do
   require 'bundler/setup'

data/exe/qb

@@ -28,7 +28,7 @@ TMP_DIR = ROOT + 'tmp'
 # format a debug message with optional key / values to print
 #
 # @param msg [String] message to print.
-# @param dump [Hash] optional hash of keys and vaues to dump.
+# @param dump [Hash] optional hash of keys and values to dump.
 def format msg, dump = {}
   unless dump.empty?
     msg += "\n" + dump.map {|k, v| "  #{ k }: #{ v.inspect }" }.join("\n")
@@ -103,9 +103,10 @@ def main args
     exit 1
   end
   
-  options = QB::Options.parse! role, args
+  options, qb_options = QB::Options.parse! role, args
   
   debug "options set on cli", options.select {|k, o| !o.value.nil?}
+  debug "qb options", qb_options
   
   cwd = Dir.getwd
   
@@ -193,29 +194,35 @@ def main args
     playbook_role[option.var_name] = option.value
   end
   
-  playbook = [
-    {
-      'hosts' => 'localhost',
-      'vars' => playbook_vars,
-      'pre_tasks' => [
-        # need ansible 2.1.2.0 at least to run
-        {
-          'assert' => {
-            'that' => "'ansible 2.1.2' in lookup('pipe', 'ansible --version')",
-          },
+  play =
+  {
+    'hosts' => qb_options['hosts'],
+    'vars' => playbook_vars,
+    'pre_tasks' => [
+      # need ansible 2.1.2.0 at least to run
+      {
+        'assert' => {
+          'that' => "'ansible 2.1.2' in lookup('pipe', 'ansible --version')",
         },
-        {
-          'qb_facts' => {
-            'qb_dir' => dir,
-          }
-        },
-      ],
-      'roles' => [
-        'nrser.blockinfile',
-        playbook_role
-      ],
-    }
-  ]
+      },
+      {
+        'qb_facts' => {
+          'qb_dir' => dir,
+        }
+      },
+    ],
+    'roles' => [
+      'nrser.blockinfile',
+      playbook_role
+    ],
+  }
+  
+  if qb_options['user']
+    play['become'] = true
+    play['become_user'] = qb_options['user']
+  end
+  
+  playbook = [play]
   
   debug "playbook", playbook
   

data/lib/qb/options.rb

@@ -243,15 +243,40 @@ module QB
     end # add 
     
     def self.parse! role, args      
-      options = {}
+      role_options = {}
+      
+      qb_options = {
+        'hosts' => ['localhost'],
+      }
+      
+      if role.meta['default_user']
+        qb_options['user'] = role.meta['default_user']
+      end
       
       opt_parser = OptionParser.new do |opts|
-        opts.banner = "qb #{ role.name } [OPTIONS] DIRECTORY"
+        opts.banner = role.banner
+        
+        opts.on(
+          '-H',
+          '---hosts=HOSTS',
+          Array,
+          "set playbook host",
+          "default: localhost"
+        ) do |value|
+          qb_options['hosts'] = value
+        end
+        
+        opts.on(
+          '-U',
+          '---user=USER',
+          String,
+          "ansible become user for the playbook"
+        ) do |value|
+          qb_options['user'] = value
+        end
         
-        add opts, options, role
+        add opts, role_options, role
         
-        # No argument, shows at tail.  This will print an options summary.
-        # Try it and see!
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit
@@ -260,7 +285,7 @@ module QB
       
       opt_parser.parse! args
       
-      options
+      [role_options, qb_options]
     end # parse!
   end # Options
 end # QB

data/lib/qb/role.rb

@@ -235,6 +235,26 @@ module QB
       !!meta_or('mkdir', true)
     end
     
+    # get the CLI banner for the role
+    def banner
+      lines = []
+      
+      name_line = "#{ name } role"
+      lines << name_line
+      lines << "=" * name_line.length
+      lines << ''
+      if meta['description']
+        lines << meta['description']
+        lines << ''
+      end
+      lines << 'usage:'
+      lines << "  qb #{ name } [OPTIONS] DIRECTORY"
+      lines << ''
+      lines << 'options:'
+      
+      lines.join("\n")
+    end
+    
     private
     
     # get the value at the first found of the keys or the default.

data/lib/qb/version.rb

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

data/library/qb_facts.py

@@ -40,6 +40,8 @@ def main():
         try:
             value = subprocess.check_output(cmd).rstrip()
             facts[key] = value
+            # depreciated old name
+            facts[key[3:]] = value
         except subprocess.CalledProcessError as e:
             pass
     
@@ -59,10 +61,6 @@ def main():
         
         facts['qb_gem_info'] = gem_info
     
-    # depreciated namespaceless names
-    facts['git_user_name'] = facts['qb_git_user_name']
-    facts['git_user_email'] = facts['qb_git_user_email']
-    
     changed = False
 
     module.exit_json(

data/roles/qb.qb_role/templates/qb.yml.j2

@@ -4,10 +4,30 @@
 # qb settings for this role. see README.md for more info.
 #
 
+# description of the role to show in it's help output.
+description: null
+
 # prefix for role variables
 var_prefix: null
 
-# how to get a default for `dir` if it's not provided as the 
+# how to get a default for `dir` if it's not provided as the only
+# positional argument. if a positional argument is provided it will
+# override the method defined here.
+# 
+# options:
+# 
+# -   null
+#     -   require the value on the command line.
+# -   git_root
+#     -   use the git root fof the directory that the `qb` command is invoked
+#         from. useful for 'project-centric' commands so they can be invoked
+#         from anywhere in the repo.
+# -   cwd
+#     -   use the directory the `qb` command is invoked form.
+# -   {exe: PATH}
+#     -   invoke an execuable, passing a JSON serialization of the options 
+#         mapping their CLI names to values. path can be relative to role
+#         directory.
 default_dir: null
 
 # set to false to not save options in .qb-options.yml files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler