qb 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a41610bee660bf726351cbf23ad0b6c508d848b
-  data.tar.gz: 78160fa1e066a2c4a4a66ccf88ba473810698f2e
+  metadata.gz: aac656a40513fcf8c1f6acc71036dce971733b9a
+  data.tar.gz: 554f6fe57718822c2afadaf72476804fa997d8c6
 SHA512:
-  metadata.gz: ea76aa5ff561c6ee5aa6b338bf32d58356c49b342b666aad3575c2eb4abd6f71ae197e79d6cb646cc7f381f9716c7500e5ec2453a40070f5a7c7eb1c7b1b7683
-  data.tar.gz: 320385cf69110aab19c9ca6ad94be24e6f055d0734bbeb52ea9d36b732721b7e473a4cf27384b7e8aa717c61c72dac96940d3e1570545568c1fa267b273ef139
+  metadata.gz: 7417819a6a7f768dc16b10605c6ef931a3b74d1965fdec6beba320b74bc4cf23fb331317c3526c752800af65948fe6980a65791c7213314d126d7d51de536b8f
+  data.tar.gz: aa2201ebaef641282e34f523c574b92e90303151163c3f0915a3fea9ae963d2a0b17e1e9fa0af719a520424a6398330543a2d9234626dad20c4298375ffe6e53

data/dev/scratch/empty/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+# defaults file for empty

data/dev/scratch/empty/meta/main.yml

@@ -0,0 +1,8 @@
+---
+# meta file for empty
+
+allow_duplicates: yes
+
+dependencies: []
+# - role: role-name
+

data/dev/scratch/empty/meta/qb.yml

@@ -0,0 +1,44 @@
+---
+# meta/qb.yml file for empty
+# 
+# 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 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: cwd
+
+# default user to become for play
+default_user: null
+
+# set to false to not save options in .qb-options.yml files
+save_options: true
+
+options: []
+# - name: example
+#   description: an example of a variable.
+#   required: false
+#   type: boolean # boolean (default) | string
+#   short: e

data/dev/scratch/empty/tasks/main.yml

@@ -0,0 +1,2 @@
+---
+# tasks file for empty

data/exe/qb

@@ -16,7 +16,7 @@ require 'qb'
 ROOT = QB::ROOT
 ROLES_DIR = QB::ROLES_DIR
 ROLES = Pathname.glob(ROLES_DIR + 'qb.*').map {|path| path.basename.to_s}
-DEBUG_ARGS = ['-D', '--debug']
+DEBUG_ARGS = ['-D', '--DEBUG']
 TMP_DIR = ROOT + 'tmp'
 
 # globals
@@ -236,7 +236,7 @@ def main args
   
   debug "playbook", playbook
   
-  playbook_path = ROOT + '.qb-playbook.yml'
+  playbook_path = Pathname.new(Dir.getwd) + '.qb-playbook.yml'
   debug playbook_path: playbook_path.to_s
   
   playbook_path.open('w') do |f|
@@ -268,34 +268,50 @@ def main args
   tmp_roles_path = QB::ROOT + 'tmp' + 'roles'
   
   ansible_roles_path = (
-    [tmp_roles_path] +
-    QB::Role.search_path
+    [
+      role.path.expand_path.dirname,
+      tmp_roles_path
+    ] + QB::Role.search_path
   ).join(':')
   
-  Dir.chdir ROOT do
-    # install requirements
-    # unless (TMP_DIR + 'roles').directory?
-    #   with_clean_env do
-    #     Cmds.stream! "ANSIBLE_ROLES_PATH=<%= roles_path %> ansible-galaxy install --ignore-errors -r <%= req_path%>",
-    #       req_path: (ROOT + 'requirements.yml'),
-    #       roles_path: tmp_roles_path.to_s
-    #   end
-    # end
-    
-    # the `gem` ansible module doesn't work right when the bunlder env vars 
+  ansible_library_path = [
+    ROOT + 'library',
+  ].join(':')
+  
+  Dir.chdir QB::ROOT do
+    # the `gem` ansible module doesn't work right when the bundler env vars 
     # are set... so we need to clear them.
     with_clean_env do
       template = []
-      template << "ANSIBLE_ROLES_PATH=<%= roles_path %> ansible-playbook"
+      template << "ANSIBLE_ROLES_PATH=<%= roles_path %>"
+      template << "ANSIBLE_LIBRARY=<%= library_path %>"
+      template << "ansible-playbook"
+      
       if play['hosts'] != ['localhost']
         template << "-i <%= hosts %>"
       end
+      
+      if qb_options['tags']
+        template << "--tags=<%= tags %>"
+      end
+      
+      if qb_options['verbose']
+        template << "-#{ 'v' * qb_options['verbose'] }"
+      end
+      
       template << "<%= playbook_path %>"
       
-      status = Cmds.stream template.join(" "), 
+      cmd = Cmds.sub template.join(" "), [], {
         roles_path: ansible_roles_path,
+        library_path: ansible_library_path,
         playbook_path: playbook_path.to_s,
-        hosts: "#{ play['hosts'].join(',') },"
+        hosts: "#{ play['hosts'].join(',') },",
+        tags: (qb_options['tags'] ? qb_options['tags'].join(',') : nil),
+      }
+      
+      puts "COMMAND: #{ cmd }"
+      
+      status = Cmds.stream cmd
       
       if status != 0
         puts "ERROR ansible-playbook failed."

data/lib/qb/options.rb

@@ -196,11 +196,25 @@ module QB
           qb_options['user'] = value
         end
         
-        add opts, role_options, role
+        opts.on(
+          '-T',
+          '--TAGS=TAGS',
+          Array,
+          "playbook tags",
+        ) do |value|
+          qb_options['tags'] = value
+        end
         
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          exit
+        opts.on(
+          '-V',
+          '--VERBOSE[=LEVEL]',
+          "run playbook in verbose mode"
+        ) do |value|
+          qb_options['verbose'] = if value.nil?
+            1
+          else
+            value.to_i
+          end
         end
       end
       

data/lib/qb/role.rb

@@ -97,6 +97,14 @@ module QB
     
     # find exactly one matching role for the input string or raise.
     def self.require input
+      
+      as_pathname = Pathname.new(input)
+        
+      # allow a path to a role dir
+      if role_dir? as_pathname
+        return Role.new as_pathname
+      end
+      
       matches = self.matches input
       
       role = case matches.length

data/lib/qb/version.rb

@@ -1,7 +1,7 @@
 module QB
   GEM_NAME = 'qb'
   
-  VERSION = "0.1.28"
+  VERSION = "0.1.29"
   
   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.28
+  version: 0.1.29
 platform: ruby
 authors:
 - nrser
@@ -138,6 +138,10 @@ files:
 - dev/hosts
 - dev/requirements.yml
 - dev/scratch/case.rb
+- dev/scratch/empty/defaults/main.yml
+- dev/scratch/empty/meta/main.yml
+- dev/scratch/empty/meta/qb.yml
+- dev/scratch/empty/tasks/main.yml
 - dev/setup.yml
 - exe/qb
 - lib/qb.rb