qb 0.1.38 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3db6c782539a18c0595a06811de825a145c6554
-  data.tar.gz: 9b0f932cbf62a32649e8742fd7e1d273fbda591e
+  metadata.gz: 6207437cc02ce11da7b368a69409b8c8e6db027f
+  data.tar.gz: 7883329101be0289c09981a39bec698ff8fbf89a
 SHA512:
-  metadata.gz: 005c10da52d51cf20e1624d59622471944f3358b5f3f747e2e471ce4f598c90ee3aba9f2039e0997aca4857b3273c311759f9676f71493127ea3e2754562cde4
-  data.tar.gz: e4c764c6a9cbed12327362e497c608174f2e6c28e88b5ccb52054214c7b18813564b4fb6a1800e709c9205ea5cb976312ca49ecf7fc5e5152c01e7c1f13842e1
+  metadata.gz: 9407784735ecbc1fc00c6b205710981b3b8aceb36bb7dd0fef9a0545ed138bd1d5cc9e6f2e1f598a57aecbca39151e8cd44b67a9a9cb0c2017c5a3ea9251874d
+  data.tar.gz: a361762772045fe1ea6e39430adb5bee64ef7717243655e0539b5a5a690e982db27e3487cd5dbb0af2bb31a16c81e1524f5b395ecc7e73927c055220ef8442fe

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

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

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

@@ -0,0 +1,7 @@
+---
+# meta file for stream
+
+allow_duplicates: yes
+
+dependencies: []
+# - role: qb.stream

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

@@ -0,0 +1,44 @@
+---
+# meta/qb.yml file for stream
+# 
+# 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/stream/tasks/main.yml

@@ -0,0 +1,4 @@
+---
+# tasks file for stream
+- stream:
+    cmd: ping nrser.com

data/dev/setup.yml

@@ -6,10 +6,14 @@
 
   pre_tasks:
   - name: load dev_setup facts
+    tags:
+    - always
     dev_setup_facts:
 
   roles:
   - role: nrser.dev_setup
+    tags:
+    - dev-setup
     # repos that are co-developed
     dev_setup_repos:
     - owner: nrser

data/exe/qb

@@ -286,6 +286,77 @@ def main args
   playbook_path = Pathname.new(Dir.getwd) + '.qb-playbook.yml'
   debug playbook_path: playbook_path.to_s
   
+  tmp_roles_path = QB::ROOT + 'tmp' + 'roles'
+  
+  ansible_roles_path = (
+    [
+      role.path.expand_path.dirname,
+      tmp_roles_path
+    ] + QB::Role.search_path
+  ).join(':')
+  
+  ansible_library_path = [
+    ROOT + 'library',
+  ].join(':')
+  
+  ansible_filter_plugins_path = ROOT.join 'plugins', 'filter_plugins'
+  
+  template = []
+  template << "ANSIBLE_ROLES_PATH=<%= roles_path %>"
+  template << "ANSIBLE_LIBRARY=<%= library_path %>"
+  template << "ANSIBLE_FILTER_PLUGINS=<%= filter_plugins_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 %>"
+  
+  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(',') },",
+    tags: (qb_options['tags'] ? qb_options['tags'].join(',') : nil),
+    filter_plugins_path: ansible_filter_plugins_path.to_s,
+  }
+  
+  # print
+  # =====
+  # 
+  # print useful stuff for debugging / running outside of qb
+  # 
+  
+  if qb_options['print'].include? 'options'
+    puts "SET OPTIONS:\n\n#{ YAML.dump set_options }\n\n"
+  end
+  
+  if qb_options['print'].include? 'cmd'
+    puts "COMMAND:\n\n#{ cmd }\n\n"
+  end
+  
+  if qb_options['print'].include? 'playbook'
+    puts "PLAYBOOK:\n\n#{ YAML.dump playbook }\n\n"
+  end
+  
+  # stop here if we're not supposed to run
+  exit 0 if !qb_options['run']
+  
+  # run
+  # ===
+  # 
+  # stuff below here does stuff
+  # 
+  
   playbook_path.open('w') do |f|
     f.write YAML.dump(playbook)
   end
@@ -312,50 +383,8 @@ def main args
     end
   end
   
-  tmp_roles_path = QB::ROOT + 'tmp' + 'roles'
-  
-  ansible_roles_path = (
-    [
-      role.path.expand_path.dirname,
-      tmp_roles_path
-    ] + QB::Role.search_path
-  ).join(':')
-  
-  ansible_library_path = [
-    ROOT + 'library',
-  ].join(':')
-  
   Dir.chdir QB::ROOT do    
-    with_clean_env do      
-      template = []
-      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 %>"
-      
-      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(',') },",
-        tags: (qb_options['tags'] ? qb_options['tags'].join(',') : nil),
-      }
-      
-      puts "COMMAND: #{ cmd }"
-      
+    with_clean_env do
       # boot up stdio services so that ansible modules can stream to our
       # stdout and stderr to print stuff (including debug lines) in real-time
       stdio_services = {'out' => $stdout, 'err' => $stderr}.map do |name, dest|

data/lib/qb.rb

@@ -32,7 +32,7 @@ module QB
     end
     
     # $stderr.puts("DEBUG " + format(msg, values))
-    $stderr.puts YAML.dump(dumpObj)
+    $stderr.puts dumpObj.pretty_inspect
   end
   
   def self.get_default_dir role, cwd, options

data/lib/qb/options.rb

@@ -162,6 +162,9 @@ module QB
       qb_options = {
         'hosts' => ['localhost'],
         'facts' => true,
+        'print' => ['cmd'],
+        'verbose' => false,
+        'run' => true,
       }
       
       if role.meta['default_user']
@@ -200,14 +203,24 @@ module QB
         end
         
         opts.on(
-          '-V',
-          '--VERBOSE[=LEVEL]',
-          "run playbook in verbose mode"
+          '-V[LEVEL]',
+          "run playbook in verbose mode. use like -VVV or -V3."
         ) do |value|
+          # QB.debug "verbose", value: value
+          
           qb_options['verbose'] = if value.nil?
             1
           else
-            value.to_i
+            case value
+            when '0'
+              false
+            when /^[1-4]$/
+              value.to_i
+            when /^[V]{1,3}$/i
+              value.length + 1
+            else
+              raise "bad verbose value: #{ value.inspect }"
+            end
           end
         end
         
@@ -218,6 +231,21 @@ module QB
           qb_options['facts'] = false
         end
         
+        opts.on(
+          '--PRINT=FLAGS',
+          Array,
+          "set what to print before running."
+        ) do |value|
+          qb_options['print'] = value
+        end
+        
+        opts.on(
+          '--NO-RUN',
+          "don't run the playbook (useful to just print stuff)",
+        ) do |value|
+          qb_options['run'] = false
+        end
+        
         add opts, role_options, role
         
         opts.on_tail("-h", "--help", "Show this message") do

data/lib/qb/role.rb

@@ -136,9 +136,9 @@ module QB
         return namespaceless_prefix_matches 
       end
       
-      # see if we word match any names
+      # see if we word match any relative paths
       name_word_matches = available.select {|role|
-        QB::Util.words_start_with? role.name, input
+        QB::Util.words_start_with? role.rel_path.to_s, input
       }
       return name_word_matches unless name_word_matches.empty?
       

data/lib/qb/version.rb

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

data/library/stream

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# WANT_JSON
+
+# init bundler in dev env
+if ENV['QB_DEV_ENV']
+  ENV.each {|k, v|
+    if k.start_with? 'QB_DEV_ENV_'
+      ENV[k.sub('QB_DEV_ENV_', '')] = v
+    end
+  }
+  require 'bundler/setup'
+end
+
+require 'qb'
+require 'cmds'
+
+class Stream < QB::AnsibleModule
+  def main
+    Dir.chdir @args['chdir'] if @args['chdir']
+    
+    status = Cmds.stream @args['cmd']
+    
+    changed!
+  end
+end
+
+Stream.new.run

data/plugins/filter_plugins/string.py

@@ -0,0 +1,84 @@
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import sys
+import re
+
+from ansible.errors import AnsibleError
+
+def cap(string):
+    '''just upper-case the first damn letter.
+    
+    >>> cap("DoSomething")
+    'DoSomething'
+    
+    >>> cap('doSomething')
+    'DoSomething'
+    '''
+    return string[0].upper() + string[1:]
+    
+
+def words(string):
+    '''break a string into words
+    
+    >>> words('git_submodule_update')
+    ['git', 'submodule', 'update']
+    
+    >>> words("qb.DoSomething")
+    ['qb', 'DoSomething']
+    '''
+    return re.split('[\W\_]+', string)
+
+
+def camel_case(string):
+    '''convert a name to camel case.
+    
+    >>> camel_case("git_submodule_update")
+    'gitSubmoduleUpdate'
+    
+    >>> camel_case("git-submodule-update")
+    'gitSubmoduleUpdate'
+    
+    >>> camel_case("qb.do_something")
+    'qbDoSomething'
+    
+    >>> camel_case("qb.DoSomething")
+    'qbDoSomething'
+    '''
+    w = words(string)
+    return w[0] + "".join(cap(s) for s in w[1:])
+
+
+def cap_camel_case(string):
+    '''convert a string to camel case with a leading capital.
+    
+    >>> upper_camel_case("git_submodule_update")
+    'GitSubmoduleUpdate'
+    
+    >>> upper_camel_case("git-submodule-update")
+    'GitSubmoduleUpdate'
+    
+    >>> upper_camel_case("qb.do_something")
+    'QbDoSomething'
+    '''
+    return cap(camel_case(string))
+
+
+class FilterModule(object):
+    ''' some string filters '''
+
+    def filters(self):
+        return {
+            'cap': cap,
+            'words': words,
+            'camel_case': camel_case,
+            'cap_camel_case': cap_camel_case,
+            'class_case': cap_camel_case,
+        }
+
+
+# testing - call camel_case on first cli arg and print result
+if __name__ == '__main__':
+    import doctest
+    doctest.testmod()
+    

data/roles/qb.qb_role/.qb-options.yml

@@ -1,3 +1,4 @@
 ---
 qb.qb_role:
+  defaults: true
   templates: true

data/roles/qb.qb_role/defaults/main.yml

@@ -0,0 +1,4 @@
+---
+# defaults file for qb.qb_role
+qb_role_dest: "{{ qb_dir }}"
+qb_role_modules: []

data/roles/qb.qb_role/meta/qb.yml

@@ -11,5 +11,12 @@ var_prefix: null
 default_dir: null
 
 options:
+- name: modules
+  description: >-
+    create ruby module boilerplate(s) in library using QB::AnsibleModule.
+  type: array
+  required: false
+  implies: library
+  
 - include: qb.role
   as: false

data/roles/qb.qb_role/tasks/main.yml

@@ -10,4 +10,10 @@
   template:
     src: qb.yml.j2
     dest: "{{ dir }}/meta/qb.yml"
-    force: false
+    force: false
+
+- include: module.yml
+  with_items: "{{ qb_role_modules }}"
+  loop_control:
+    loop_var: qb_role_module
+  

data/roles/qb.qb_role/tasks/module.yml

@@ -0,0 +1,15 @@
+---
+- set_fact:
+    qb_role_module_class: "{{ qb_role_module | class_case }}"
+    qb_role_module_path: "{{ qb_role_dest }}/library/{{ qb_role_module }}"
+  
+- name: "create {{ qb_role_module }} module"
+  template:
+    src: module.rb.j2
+    dest: "{{ qb_role_module_path }}"
+    force: "{{ role_force }}"
+
+- name: "make library/{{ qb_role_module }} executable"
+  file:
+    path: "{{ qb_role_module_path }}"
+    mode: a+x

data/roles/qb.qb_role/templates/module.rb.j2

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# WANT_JSON
+
+# init bundler in dev env
+if ENV['QB_DEV_ENV']
+  ENV.each {|k, v|
+    if k.start_with? 'QB_DEV_ENV_'
+      ENV[k.sub('QB_DEV_ENV_', '')] = v
+    end
+  }
+  require 'bundler/setup'
+end
+
+require 'qb'
+
+class {{ qb_role_module_class }} < QB::AnsibleModule
+  def main
+    nil
+  end
+end
+
+{{ qb_role_module_class }}.new.run

data/roles/qb.role/defaults/main.yml

@@ -1,7 +1,8 @@
 ---
+role_dest: "{{ qb_dir }}"
 role_force: false
 # can't be named `role_name` 'cause ansible sets that?
-role_role_name: "{{ dir | basename }}"
+role_role_name: "{{ role_dest | basename }}"
 role_defaults: true
 role_files: false
 role_handlers: false
@@ -10,6 +11,7 @@ role_tasks: true
 role_templates: false
 role_vars: false
 role_readme: false
+role_library: false
 
 # galaxy
 role_galaxy: false

data/roles/qb.role/meta/qb.yml

@@ -67,6 +67,11 @@ vars:
   description: include README.md
   short: r
 
+- name: library
+  type: boolean
+  description: create library directory.
+  short: l
+
 - name: project
   type: boolean
   description: create a project repo for this role

data/roles/qb.role/tasks/main.yml

@@ -5,14 +5,14 @@
 
 - name: create defaults directory
   file:
-    path: "{{ dir }}/defaults"
+    path: "{{ role_dest }}/defaults"
     state: directory
   when: role_defaults
 
 - name: create defaults/main.yml
   template:
     src: defaults/main.yml.j2
-    dest: "{{ dir }}/defaults/main.yml"
+    dest: "{{ role_dest }}/defaults/main.yml"
     force: "{{ role_force }}"
   when: role_defaults
 
@@ -21,7 +21,7 @@
 
 - name: create files directory
   file:
-    path: "{{ dir }}/files"
+    path: "{{ role_dest }}/files"
     state: directory
   when: role_files
 
@@ -30,7 +30,7 @@
 - name: create a .gitkeep in the files directory
   copy:
     content: ""
-    dest: "{{ dir }}/files/.gitkeep"
+    dest: "{{ role_dest }}/files/.gitkeep"
     force: "{{ role_force }}"
   when: role_files
 
@@ -39,14 +39,14 @@
 
 - name: create handlers directory
   file:
-    path: "{{ dir }}/handlers"
+    path: "{{ role_dest }}/handlers"
     state: directory
   when: role_handlers
 
 - name: create handlers/main.yml
   template:
     src: handlers/main.yml.j2
-    dest: "{{ dir }}/handlers/main.yml"
+    dest: "{{ role_dest }}/handlers/main.yml"
     force: "{{ role_force }}"
   when: role_handlers
 
@@ -55,14 +55,14 @@
 
 - name: create meta directory
   file:
-    path: "{{ dir }}/meta"
+    path: "{{ role_dest }}/meta"
     state: directory
   when: role_meta
 
 - name: create meta/main.yml
   template:
     src: meta/main.yml.j2
-    dest: "{{ dir }}/meta/main.yml"
+    dest: "{{ role_dest }}/meta/main.yml"
     force: "{{ role_force }}"
   when: role_meta
 
@@ -71,14 +71,14 @@
 
 - name: create tasks directory
   file:
-    path: "{{ dir }}/tasks"
+    path: "{{ role_dest }}/tasks"
     state: directory
   when: role_tasks
 
 - name: create tasks/main.yml
   template:
     src: tasks/main.yml.j2
-    dest: "{{ dir }}/tasks/main.yml"
+    dest: "{{ role_dest }}/tasks/main.yml"
     force: "{{ role_force }}"
   when: role_tasks
 
@@ -87,7 +87,7 @@
 
 - name: create templates directory
   file:
-    path: "{{ dir }}/templates"
+    path: "{{ role_dest }}/templates"
     state: directory
   when: role_templates
 
@@ -96,7 +96,7 @@
 - name: create a .gitkeep in the templates directory
   copy:
     content: ""
-    dest: "{{ dir }}/templates/.gitkeep"
+    dest: "{{ role_dest }}/templates/.gitkeep"
     force: "{{ role_force }}"
   when: role_templates
 
@@ -105,14 +105,14 @@
 
 - name: create vars directory
   file:
-    path: "{{ dir }}/vars"
+    path: "{{ role_dest }}/vars"
     state: directory
   when: role_vars
 
 - name: create vars/main.yml
   template:
     src: vars/main.yml.j2
-    dest: "{{ dir }}/vars/main.yml"
+    dest: "{{ role_dest }}/vars/main.yml"
     force: "{{ role_force }}"
   when: role_vars
 
@@ -122,7 +122,23 @@
 - name: create README.md
   template:
     src: README.md.j2
-    dest: "{{ dir }}/README.md"
+    dest: "{{ role_dest }}/README.md"
     force: "{{ role_force }}"
   when: role_readme
+
+# library
+# =======
+
+- name: create library directory
+  file:
+    path: "{{ role_dest }}/library"
+    state: directory
+  when: role_library
+
+- name: create a .gitkeep in the library directory
+  copy:
+    content: ""
+    dest: "{{ role_dest }}/library/.gitkeep"
+    force: "{{ role_force }}"
+  when: role_library
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,6 +175,10 @@ files:
 - dev/scratch/stdio/meta/main.yml
 - dev/scratch/stdio/meta/qb.yml
 - dev/scratch/stdio/tasks/main.yml
+- dev/scratch/stream/defaults/main.yml
+- dev/scratch/stream/meta/main.yml
+- dev/scratch/stream/meta/qb.yml
+- dev/scratch/stream/tasks/main.yml
 - dev/setup.yml
 - exe/qb
 - lib/qb.rb
@@ -187,6 +191,8 @@ files:
 - lib/qb/version.rb
 - library/git_mkdir.py
 - library/qb_facts.py
+- library/stream
+- plugins/filter_plugins/string.py
 - qb.gemspec
 - roles/nrser.blockinfile/CONTRIBUTING.md
 - roles/nrser.blockinfile/README.md
@@ -549,10 +555,13 @@ files:
 - roles/qb.project/templates/bootstrap.yml.j2
 - roles/qb.project/templates/setup.yml.j2
 - roles/qb.qb_role/.qb-options.yml
+- roles/qb.qb_role/defaults/main.yml
 - roles/qb.qb_role/meta/main.yml
 - roles/qb.qb_role/meta/qb.yml
 - roles/qb.qb_role/tasks/main.yml
+- roles/qb.qb_role/tasks/module.yml
 - roles/qb.qb_role/templates/.gitkeep
+- roles/qb.qb_role/templates/module.rb.j2
 - roles/qb.qb_role/templates/qb.yml.j2
 - roles/qb.release_gem/defaults/main.yml
 - roles/qb.release_gem/meta/main.yml