qb 0.3.25 → 0.4.0

data/plugins/{filter_plugins/ruby_interop_plugins.py → filter/ruby_interop_filters.py}

@@ -6,22 +6,6 @@ import sys
 
 from ansible.errors import AnsibleError
 
-
-HERE = os.path.dirname(os.path.realpath(__file__))
-
-PROJECT_ROOT = os.path.realpath(
-    os.path.join(
-        HERE, # //plugins/filter_plugins
-        '..', # //plugins
-        '..', # //
-    )
-)
-
-LIB_PYTHON_DIR = os.path.join( PROJECT_ROOT, 'lib', 'python' )
-
-if not (LIB_PYTHON_DIR in sys.path):
-    sys.path.insert(0, LIB_PYTHON_DIR)
-
 import qb.interop
 
 
@@ -43,4 +27,4 @@ class FilterModule( object ):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-    
+    

data/plugins/{filter_plugins/string_plugins.py → filter/string_filters.py}

@@ -30,25 +30,6 @@ import os
 
 from ansible.errors import AnsibleError
 
-
-# Project Imports Setup
-# ----------------------------------------------------------------------------
-
-PROJECT_ROOT = os.path.realpath(
-    os.path.join(
-        os.path.dirname(os.path.realpath(__file__)), # //plugins/filter_plugins
-        '..', # //plugins
-        '..', # //
-    )
-)
-
-LIB_PYTHON_DIR = os.path.join( PROJECT_ROOT, 'lib', 'python' )
-
-if not (LIB_PYTHON_DIR in sys.path):
-    sys.path.insert(0, LIB_PYTHON_DIR)
-
-# Now we can import from `//lib/python`...
-
 import qb.strings
 
 
@@ -116,4 +97,4 @@ class FilterModule(object):
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
-    
+    

data/plugins/{filter_plugins/version_plugins.py → filter/version_filters.py}

@@ -8,27 +8,12 @@ import sys
 
 from ansible.errors import AnsibleError
 
-
-HERE = os.path.dirname(os.path.realpath(__file__))
-
-PROJECT_ROOT = os.path.realpath(
-    os.path.join(
-        HERE, # //plugins/filter_plugins
-        '..', # //plugins
-        '..', # //
-    )
-)
-
-LIB_PYTHON_DIR = os.path.join( PROJECT_ROOT, 'lib', 'python' )
-
-if not (LIB_PYTHON_DIR in sys.path):
-    sys.path.insert(0, LIB_PYTHON_DIR)
-
+import qb
 import qb.interop
 
 
 def get_semver_path():
-    bin_path = os.path.join(PROJECT_ROOT, 'node_modules', 'semver', 'bin', 'semver')
+    bin_path = os.path.join(qb.ROOT, 'node_modules', 'semver', 'bin', 'semver')
     
     if not os.path.isfile(bin_path):
         raise Exception("can't find semver at %s" % bin_path)
@@ -93,7 +78,7 @@ def semver_parse(version):
     
     out = subprocess.check_output(
         cmd,
-        cwd = PROJECT_ROOT
+        cwd = qb.ROOT
     )
     
     version = json.loads(out)

data/plugins/{lookup_plugins/version.py → lookup/version_lookups.py}

@@ -14,22 +14,6 @@ except ImportError:
     from ansible.utils.display import Display
     display = Display()
 
-
-HERE = os.path.dirname(os.path.realpath(__file__))
-
-PROJECT_ROOT = os.path.realpath(
-    os.path.join(
-        HERE, # //plugins/filter_plugins
-        '..', # //plugins
-        '..', # //
-    )
-)
-
-LIB_PYTHON_DIR = os.path.join( PROJECT_ROOT, 'lib', 'python' )
-
-if not (LIB_PYTHON_DIR in sys.path):
-    sys.path.insert(0, LIB_PYTHON_DIR)
-
 import qb.interop
 
 

data/plugins/test/dict_tests.py

@@ -0,0 +1,36 @@
+# Imports
+# ============================================================================
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import sys
+import re
+import os
+
+from ansible.errors import AnsibleError
+
+def key_prefix(key_and_value, prefix):
+    '''
+    
+    >>> key_prefix(('key', 'value'), 'k')
+    True
+    '''
+    
+    return key_and_value[0].startswith(prefix)
+
+
+class TestModule(object):
+    '''Some dict filters'''
+    
+    def tests(self):
+        return {
+            'key_prefix': key_prefix,
+        }
+
+
+# testing - call camel_case on first cli arg and print result
+if __name__ == '__main__':
+    import doctest
+    doctest.testmod()
+    

data/plugins/test/string_tests.py

@@ -0,0 +1,36 @@
+# Imports
+# ============================================================================
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import sys
+import re
+import os
+
+from ansible.errors import AnsibleError
+
+def startswith(string, prefix):
+    '''
+    >>> startswith('bigfoot', 'big')
+    True
+    '''
+    
+    return string.startswith( prefix )
+
+
+class TestModule(object):
+    '''Some string filters'''
+    
+    def tests(self):
+        return {
+            'startswith': startswith,
+            'startwith': startswith,
+        }
+
+
+# testing - call camel_case on first cli arg and print result
+if __name__ == '__main__':
+    import doctest
+    doctest.testmod()
+    

data/qb.gemspec

@@ -195,13 +195,13 @@ Gem::Specification.new do |spec|
   # ----------------------------------------------------------------------------
   
   # My guns
-  spec.add_dependency "nrser",            '~> 0.2.0'
+  spec.add_dependency 'nrser',            '~> 0.3.3'
   
   # My favorite wrapper
-  spec.add_dependency "cmds",             '~> 0.2.10'
+  spec.add_dependency "cmds",             '~> 0.2.11'
   
   # My gem to help manage system state
-  spec.add_dependency "state_mate",       '~> 0.1.3'
+  spec.add_dependency "state_mate",       '~> 0.1.4'
   
   # Used to parse `ansible.cfg` files
   spec.add_dependency 'parseconfig',      '~> 1.0', '>= 1.0.8'
@@ -218,6 +218,10 @@ Gem::Specification.new do |spec|
   # Ruby lib wrapping `git` binary system calls for use in {QB::Repo::Git}
   spec.add_dependency 'git',              '~> 1.3'
   
+  # Trying out a method decoration gem, aimed to be like Python (which I did
+  # really like, once you got past the confusion of it)
+  spec.add_dependency 'method_decorators', '~> 0.9.6'
+  
   
   # Development-Only Extra Metadata
   # ============================================================================

data/roles/nrser.rb/library/set_fact_with_ruby.rb

@@ -6,15 +6,9 @@
 # WANT_JSON
 # ^ tell Ansible to provide args as JSON encoded file.
 
-# 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
+# Reinstate Bundler ENV vars if they have been moved
+load ENV['QB_REBUNDLE_PATH'] if ENV['QB_REBUNDLE_PATH']
+
 
 # stdlib
 require 'json'

data/roles/nrser.state_mate/library/state

@@ -1,23 +1,9 @@
 #!/usr/bin/env ruby
 # WANT_JSON
 
-# ugh... we need to clear the bundler env vars before running
-# `ansible-playbook` because they break the `git` ansible modules, so we
-# don't have the bundler env vars here when we're in dev.
-# 
-# what we do is have exe/qb copy all the bundler env vars to
-# `QB_DEV_ENV_<NAME` ones around the env sanitization, along with adding
-# `QB_DEV_ENV=true`. then we pick those up here and restore them.
-# 
-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
+# Reinstate Bundler ENV vars if they have been moved
+load ENV['QB_REBUNDLE_PATH'] if ENV['QB_REBUNDLE_PATH']
+
 
 require 'pp'
 require 'json'

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

@@ -11,7 +11,7 @@ description: null
 # generalize in the future.
 requirements:
   gems:
-    qb: ~> 0.3.0
+    qb: '>= 0.3.0'
 
 # prefix for role variables
 var_prefix: call

data/roles/qb/dev/ref/repo/git/meta/qb.yml

@@ -11,7 +11,7 @@ description: null
 # generalize in the future.
 requirements:
   gems:
-    qb: ~> 0.3.0
+    qb: '>= 0.3.0'
 
 # prefix for role variables
 var_prefix: false

data/roles/qb/{ruby/rspec/setup → docker/mac/kubernetes}/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 ##############################################################################
-# Variable defaults for `qb/ruby/rspec/setup` role
+# Variable defaults for `qb/docker/mac/kubernetes` role
 #
 # @see http://docs.ansible.com/ansible/latest/playbooks_reuse_roles.html#role-default-variables
 # 

data/roles/qb/{ruby/rspec/setup → docker/mac/kubernetes}/meta/main.yml

@@ -1,9 +1,10 @@
 ---
 ##############################################################################
-# Ansible metadata for `qb/ruby/rspec/setup` role
+# Ansible metadata for `qb/docker/mac/kubernetes` role
 ##############################################################################
 
-allow_duplicates: no
+allow_duplicates: yes
 
 dependencies: []
 # - role: role-name
+

data/roles/qb/{ruby/rspec/setup → docker/mac/kubernetes}/meta/qb.yml

@@ -1,6 +1,6 @@
 ---
 ##############################################################################
-# QB metadata for `qb/ruby/rspec/setup` role.
+# QB metadata for `qb/docker/mac/kubernetes` role.
 # 
 # QB settings for this role.
 # 
@@ -10,21 +10,26 @@
 
 # Shown in help output, etc.
 description: >-
-  TODO describe qb/ruby/rspec/setup role
+  Setup steps for local dev with Kubernetes on Docker for Mac
 
 # Gemspec-style requirements. Right now only `.gems.qb` is used.
 requirements:
   gems:
-    qb: ~> 0.3.0
+    # Role options taking advantage of the {NRSER::Types} system require
+    # QB 0.4.
+    # 
+    # TODO  Change this to `>= 0.4.0` when 0.4.0 is released.
+    # 
+    qb: '>= 0.4.0.dev'
 
 # Prefix for role variables
-var_prefix: setup
+var_prefix: kubernetes
 
 # How to get a default for `DIRECTORY` arg if not provided by user.
 # 
 # @see http://www.rubydoc.info/gems/qb/file/doc/qb_roles/metadata/default_dir.md
 # 
-default_dir: null # means use *must* provide `DIRECTORY` arg
+default_dir: false # means use *must* provide `DIRECTORY` arg
 
 # If `true`, QB will ensure `DIRECTORY` exists before starting the play.
 mkdir: false
@@ -33,13 +38,13 @@ mkdir: false
 default_user: null
 
 # Save options in `.qb-options.yml` files
-save_options: true
+save_options: false
 
 # Options to pass to `ansible-playbook`
 ansible_options: {}
 
 # Role CLI options that become Ansible vars
-options: []
+options:
 # - name: example
 #   description: an example of a variable.
 #   required: false

data/roles/qb/docker/mac/kubernetes/tasks/main.yml

@@ -0,0 +1,45 @@
+---
+##############################################################################
+# Main tasks for `qb/docker/mac/kubernetes` role
+##############################################################################
+
+- name: |-
+    Use the `docker-for-desktop` kubectl context
+  command: >-
+    kubectl config use-context docker-for-desktop
+
+
+- name: |-
+    Install the Kubernetes dashboard
+    
+    https://rominirani.com/tutorial-getting-started-with-kubernetes-with-docker-on-mac-7f58467203fd
+  
+  command: >-
+    kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/recommended/kubernetes-dashboard.yaml
+
+
+- name: |-
+    Tap `nrser/versions` in Homebrew to get `kubernetes-helm@2.8.2`
+    
+    2.9 is busted: https://github.com/kubernetes/helm/issues/2520
+  
+  homebrew_tap:
+    name: nrser/versions
+
+
+- name: |-
+    Make sure `kubernetes-helm` is not linked in Homebrew
+  homebrew:
+    name: kubernetes-helm
+    state: unlinked
+
+
+- name: |-
+    Install `kubernetes-helm@2.8.2`
+  homebrew:
+    name: kubernetes-helm@2.8.2
+
+
+- name: |-
+    Init Helm
+  command: helm init

data/roles/qb/git/check/clean/meta/qb.yml

@@ -15,7 +15,7 @@ description: >-
 # Gemspec-style requirements. Right now only `.gems.qb` is used.
 requirements:
   gems:
-    qb: ~> 0.3.0
+    qb: '>= 0.3.0'
 
 # Prefix for role variables
 var_prefix: git_check_clean

data/roles/qb/git/ignore/meta/qb

@@ -12,13 +12,20 @@ names = Dir.chdir(GITIGNORE_DIR) do
 end
 
 puts JSON.pretty_generate({
+  requirements: {
+    gems: {
+      # The `type: {in: ...}` syntax for the `name` option requires QB 0.4
+      qb: '>= 0.4.0.dev',
+    }
+  },
+  
   save_options: false,
   
   default_dir: {
     find_up: '.gitignore',
   },
   
-  # TODO  added this to preserve prefix from when role was named 
+  # TODO  added this to preserve prefix from when role was named
   #       `qb.gitignore`, might want to change once we sort all that out.
   #     
   var_prefix: 'gitignore',
@@ -29,9 +36,9 @@ puts JSON.pretty_generate({
       description: "name of gitignore.",
       required: true,
       type: {
-        one_of: names,
+        in: names,
       },
       short: 'n',
     },
   ],
-})
+})