qb 0.3.12 → 0.3.13

data/roles/nrser.blockinfile/library/blockinfile.py

@@ -26,6 +26,12 @@ from itertools import chain
 
 import pprint
 
+try:
+    from __main__ import display
+except ImportError:
+    from ansible.utils.display import Display
+    display = Display()
+
 DOCUMENTATION = """
 ---
 module: blockinfile
@@ -289,18 +295,26 @@ def main():
     #     removed along with the content.
     # 
     if not present or block == '':
+        display.debug("removing block")
+        
         result = different_re.sub('', original)
     
     # 2.  no-op - the exact text is already present
     elif exact_re.search(original):
+        display.debug("block already present")
+        
         pass
         
     # 3. replace - the markers are present but the content is different
     elif different_re.search(original):
+        display.debug("block present but different, replacing")
+        
         result = different_re.sub(replacement, original)
     
     # 4.  insert - the markers 
     else:
+        display.debug("block not present, inserting")
+        
         lines = original.splitlines()
         
         n0 = None

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

@@ -21,7 +21,7 @@
     Tell Git to ignore OSX artifacts 
   when: ansible_distribution == "MacOSX"
   include_role:
-    name: qb.gitignore
+    name: qb/git/ignore
   vars:
     gitignore_name: Global/macOS
     gitignore_dest: >-
@@ -30,7 +30,7 @@
 - name: >-
     Tell Git to ignore QB artifacts
   include_role:
-    name: qb.gitignore
+    name: qb/git/ignore
   vars:
     gitignore_name: QB
     gitignore_dest: >-
@@ -43,7 +43,7 @@
   loop_control:
     loop_var: name
   include_role:
-    name: qb.gitignore
+    name: qb/git/ignore
   vars:
     gitignore_name: >-
       {{ name }}

data/roles/qb.npm_package/meta/main.yml

@@ -6,11 +6,11 @@ allow_duplicates: yes
 dependencies:
 - role: nrser.state_mate
 
-- role: qb.gitignore
+- role: qb/git/ignore
   gitignore_name: Node
   gitignore_force: "{{ npm_package_force }}"
   
-- role: qb.project
+- role: qb/project
   project_private: "{{ npm_package_private }}"
   project_force: "{{ npm_package_force }}"
   when: npm_package_project

data/roles/qb.npm_package/meta/qb.yml

@@ -20,7 +20,7 @@ vars:
 #   type: boolean # boolean (default) | string
 #   short: e
 - name: force
-  description: force stuff (npm init, qb.gitigore, qb.project).
+  description: force stuff (npm init, qb/git/ignore, qb/project).
   type: boolean
   short: f
   save: false
@@ -65,8 +65,8 @@ vars:
   type: string
 
 - name: project
-  description: include qb.project role.
+  description: include qb/project role.
   type: boolean
   short: p
 
-- include: qb.project
+- include: qb/project

data/roles/qb.vars/meta/qb.yml

@@ -11,11 +11,12 @@ var_prefix: null
 default_dir: null
 
 # set to false to not save options in .qb-options.yml files
-save_options: true
+save_options: false
 
-options: []
-# - name: example
-#   description: an example of a variable.
-#   required: false
-#   type: boolean # boolean (default) | string
-#   short: e
+options:
+- name: output
+  description: >-
+    Dump to a file instead of using `debug` module.
+  required: false
+  type: path
+  short: o

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

@@ -1,6 +1,15 @@
 ---
 # tasks file for qb.vars
 
-- name: vars
+- when: vars_output is defined
+  local_action:
+    module: copy
+    content: >-
+      {{ vars | to_nice_yaml }}
+    dest: >-
+      {{ vars_output }}
+  
+- when: vars_output is not defined
+  name: vars
   debug:
     msg: "{{ vars }}"

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

@@ -0,0 +1,2 @@
+---
+# defaults file for qb/call

data/roles/qb/call/meta/main.yml

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

data/roles/qb/call/meta/qb.yml

@@ -0,0 +1,68 @@
+---
+# meta/qb.yml file for qb/call
+# 
+# qb settings for this role. see README.md for more info.
+#
+
+# description of the role to show in it's help output.
+description: null
+
+# Gemspec-style requirements. Right now only `gems:qb` is used, but plan to
+# generalize in the future.
+requirements:
+  gems:
+    qb: ~> 0.3.0
+
+# prefix for role variables
+var_prefix: call
+
+
+# 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.
+# -   false
+#     -   don't provide qb_dir (means doesn't load or save options either).
+# -   git_root
+#     -   use the git root of 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 executable, passing a JSON serialization of the options 
+#         mapping their CLI names to values. path can be relative to role
+#         directory.
+# -   {find_up: FILENAME}
+#     -   starting at the current directory and climbing up to parent 
+#         directories, use the first one that contains FILENAME. error
+#         if none is found.
+default_dir: null
+
+# If `true`, QB will ensure the default dir exists before starting the play.
+# 
+# For legacy reasons, this defaults to `true` if not present, but we want to 
+# default declare it as `false` here so new roles can turn it on only if 
+# they need it.
+# 
+mkdir: false
+
+# 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 to pass to ansible-playbook
+ansible_options: {}
+
+options: []
+# - name: example
+#   description: an example of a variable.
+#   required: false
+#   type: boolean # boolean (default) | string
+#   short: e

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

@@ -0,0 +1,92 @@
+---
+# tasks file for qb/call
+
+- when: qb_call_args_stack is not defined
+  name: >-
+    Define empty `qb_call_args_stack`
+  set_fact:
+    qb_call_args_stack: []
+
+- debug:
+    msg:
+      role: >-
+        {{ role }}
+      args: >-
+        {{ args }}
+      qb_call_args_stack: >-
+        {{ qb_call_args_stack }}
+
+- name: >-
+    Set up variables
+  set_fact:
+    qb_call_role_path: >-
+      ./roles/{{ role }}
+    
+    qb_call_role_name: >-
+      {{ role }}
+
+- name: >-
+    Load the default args
+  include_vars:
+    file: >-
+      {{ qb_call_role_path | path_join( 'defaults', 'args.yml' ) }}
+    name: qb_call_default_args
+
+- debug: var=qb_call_default_args
+    
+- name: >-
+    Merge current args into defaults to create new internal args and push
+    to stack
+  set_fact:
+    qb_call_args_stack: >-
+      {{ qb_call_args_stack + [ qb_call_default_args | combine( args ) ] }}
+
+- name: >-
+    Set the global args variable
+  set_fact:
+    args: >-
+      {{ qb_call_args_stack | last }}
+    _args: >-
+      {{ qb_call_args_stack | last }}
+
+- debug:
+    msg:
+      role: >-
+        {{ role }}
+      args: >-
+        {{ args }}
+      _args: >-
+        {{ _args }}
+      qb_call_args_stack: >-
+        {{ qb_call_args_stack }}
+
+- name: >-
+    Include the role
+  include_role:
+    name: >-
+      {{ qb_call_role_name }}
+
+- name: >-
+    Pop the args back off the stack
+  set_fact:
+    qb_call_args_stack: >-
+      {{ qb_call_args_stack | slice( (qb_call_args_stack | length) - 1 ) }}
+
+- name: >-
+    Set the global args back to what it was when we entered
+  set_fact:
+    args: >-
+      {{ qb_call_args_stack | last }}
+    _args: >-
+      {{ qb_call_args_stack | last }}
+
+- debug:
+    msg:
+      role: >-
+        {{ role }}
+      args: >-
+        {{ args }}
+      _args: >-
+        {{ _args }}
+      qb_call_args_stack: >-
+        {{ qb_call_args_stack }}

data/roles/qb/gem/new/meta/qb.yml

@@ -79,7 +79,7 @@ options:
   type: boolean
   short: p
 
-- include: qb.project
+- include: qb/project
   as: false
 
 - name: force

data/roles/qb/gem/new/tasks/main.yml

@@ -10,16 +10,16 @@
   - Ruby
   - Gem
   include_role:
-    name: qb.gitignore
+    name: qb/git/ignore
   vars:
     gitignore_name: >-
       {{ item }}
 
 - when: gem_is_project
   name: >-
-    Include `qb.project` role.
+    Include `qb/project` role.
   include_role:
-    name: qb.project
+    name: qb/project
   vars:
     project_name: >-
       {{ gem_name }}

data/roles/qb/gem/release/tasks/main.yml

@@ -25,12 +25,10 @@
       {{ gem_root | path_join( 'dev', 'hooks', 'pre-release' ) }}
   register: gem_pre_release_script_stat
 
-- debug: var=gem_pre_release_script_stat
-
 
 # NOTE  Contrary to how it might seems in the [docs][1],
 #       the `stat` object seems to *only* have the `exists` property if the
-#       path does not exist (set to `false`), necessitating we 
+#       path does not exist (set to `false`), necessitating we
 # 
 # [1]: http://docs.ansible.com/ansible/latest/stat_module.html
 # 
@@ -60,7 +58,7 @@
       end
       
       # The gem *may already be loaded*, which would break the standard gemspec
-      # approach because the `require` will be a no-op, resulting in the 
+      # approach because the `require` will be a no-op, resulting in the
       # already loaded version number being used instead of the one in the
       # file.
       # 
@@ -114,7 +112,7 @@
 
 - when: gem_current_version != gem_release_version
   name: >-
-    Change version in `{{ gem_version_path }}` from current 
+    Change version in `{{ gem_version_path }}` from current
     `{{ gem_current_version }}` to `{{ gem_release_version }}`.
   block:
   - name: >-

data/roles/{qb.gitignore → qb/git/ignore}/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-# defaults file for qb.gitignore
+# defaults file for qb/git/ignore
 
 gitignore_dest: "{{ qb_dir }}"
 gitignore_tag: "{{ gitignore_name }}.gitingore"

data/roles/{qb.gitignore → qb/git/ignore}/files/gitignore/Actionscript.gitignore

@@ -1,9 +1,8 @@
 # Build and Release Folders
-bin/
 bin-debug/
 bin-release/
-[Oo]bj/ # FlashDevelop obj
-[Bb]in/ # FlashDevelop bin
+[Oo]bj/
+[Bb]in/
 
 # Other files and folders
 .settings/

data/roles/{qb.gitignore → qb/git/ignore}/files/gitignore/Android.gitignore

@@ -32,7 +32,7 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Intellij
+# IntelliJ
 *.iml
 .idea/workspace.xml
 .idea/tasks.xml
@@ -41,7 +41,8 @@ captures/
 .idea/libraries
 
 # Keystore files
-*.jks
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild

data/roles/{qb.gitignore → qb/git/ignore}/files/gitignore/Autotools.gitignore

@@ -31,3 +31,12 @@ Makefile.in
 # http://www.gnu.org/software/texinfo
 
 /texinfo.tex
+
+# http://www.gnu.org/software/m4/
+
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+autom4te.cache