qb 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3fd3a036ee3a1411833a1e6ac82066a7ee291c0
-  data.tar.gz: 9caacbd64094d48b491115d62a80940e1932438f
+  metadata.gz: 3e3857fd48613a9211357d03cfd036acb2ecc589
+  data.tar.gz: a2ad6ea73512c132ce1ba5975e62503ee42d0dbd
 SHA512:
-  metadata.gz: bf5bbd2d09e43ba8be882cfbf5fee05669c124c7366eda20b31e1ad86e13ec844dc7c9a237d342475994a187c12565ab7f8d8d21d5f88ab92b79bf128dbfae1b
-  data.tar.gz: 4f6351760bb78e66626ea2870d74c48468d6b5a102d12371a5caab719718dd799178762c4ac0ec755c55b73f9aed756572ca708c191b859293703a57914c7e22
+  metadata.gz: 49b2fc25bac49cdbd6f85fd95f1fe0927e1031a3fc44b426d8a1932ef0a249f8457002b8e38dfef88131d9c7fa2808642cd31502c7c49b561ca8302c57361489
+  data.tar.gz: f94a7b6b066b97171e9fe09167ad6e53b7e3998738954adcfccc1a9f26033c6c1e45620925acd21dc4abf088d00ac558ebfec7e7f2e67e48eb22f1b822eb366b

data/lib/python/qb/interop.py

@@ -0,0 +1,90 @@
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+from ansible.errors import AnsibleError
+
+import subprocess
+import yaml
+import os
+from ansible.parsing.yaml.dumper import AnsibleDumper
+
+
+QB_ROOT = os.path.realpath(
+    os.path.join(
+        os.path.dirname(os.path.realpath(__file__)), # //lib/python/qb
+        '..', # //lib/python
+        '..', # //lib
+        '..', # //
+    )
+)
+
+INTEROP_RECEIVE_EXE = os.path.join( QB_ROOT, 'exe', '.qb_interop_receive' )
+
+
+def send_payload( payload ):
+    '''
+    Send a payload to QB Ruby code via a subprocess.
+    '''
+    
+    input = yaml.dump( payload, Dumper=AnsibleDumper )
+    
+    process = subprocess.Popen(
+        [ INTEROP_RECEIVE_EXE ],
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        env=os.environ,
+    )
+    
+    out, err = process.communicate( input )
+    
+    if process.returncode != 0:
+        raise AnsibleError('''
+            qb_send failed!
+            
+            ERROR:
+                %s
+        ''' % (err))
+    
+    try:
+        result = yaml.safe_load(out)
+    except Exception as error:
+        raise AnsibleError('''
+            qb_send failed to parse response:
+            
+            %s
+        ''' % out)
+    
+    return result
+
+
+def send( data, method, *args, **kwds ):
+    '''
+    Load data as an object in ruby and send it a message (call a method).
+    '''
+    
+    return send_payload({
+        'data': data,
+        'method': method,
+        'args': args,
+        'kwds': kwds,
+    })
+
+
+def send_const( name, method, *args, **kwds ):
+    '''
+    Send a message (call a method) to a Ruby constant by name.
+    '''
+    
+    return send_payload({
+        'const': name,
+        'method': method,
+        'args': args,
+        'kwds': kwds,
+    })
+
+
+# Testing with doctest
+if __name__ == '__main__':
+    import doctest
+    doctest.testmod()

data/lib/qb/version.rb

@@ -4,7 +4,7 @@ module QB
   
   GEM_NAME = 'qb'
   
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
   
   MIN_ANSIBLE_VERSION = Gem::Version.new '2.1.2'
   

data/plugins/filter_plugins/ruby_interop_plugins.py

@@ -1,86 +1,28 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+import os
+import sys
+
 from ansible.errors import AnsibleError
 
-import subprocess
-import yaml
-import os
-from ansible.parsing.yaml.dumper import AnsibleDumper
 
+HERE = os.path.dirname(os.path.realpath(__file__))
 
-QB_ROOT = os.path.realpath(
+PROJECT_ROOT = os.path.realpath(
     os.path.join(
-        os.path.dirname(os.path.realpath(__file__)), # /plugins/filter_plugins
-        '..', # /plugins
-        '..', # /
+        HERE, # //plugins/filter_plugins
+        '..', # //plugins
+        '..', # //
     )
 )
 
-INTEROP_RECEIVE_EXE = os.path.join( QB_ROOT, 'exe', '.qb_interop_receive' )
-
-
-def send_to_interop( payload ):
-    '''
-    Send a payload to QB Ruby code via a subprocess.
-    '''
-    
-    input = yaml.dump( payload, Dumper=AnsibleDumper )
-    
-    process = subprocess.Popen(
-        [ INTEROP_RECEIVE_EXE ],
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        env=os.environ,
-    )
-    
-    out, err = process.communicate( input )
-    
-    if process.returncode != 0:
-        raise AnsibleError('''
-            qb_send failed!
-            
-            ERROR:
-                %s
-        ''' % (err))
-    
-    try:
-        result = yaml.safe_load(out)
-    except Exception as error:
-        raise AnsibleError('''
-            qb_send failed to parse response:
-            
-            %s
-        ''' % out)
-    
-    return result
-
+LIB_PYTHON_DIR = os.path.join( PROJECT_ROOT, 'lib', 'python' )
 
-def qb_send( data, method, *args, **kwds ):
-    '''
-    Load data as an object in ruby and send it a message (call a method).
-    '''
-    
-    return send_to_interop({
-        'data': data,
-        'method': method,
-        'args': args,
-        'kwds': kwds,
-    })
+if not (LIB_PYTHON_DIR in sys.path):
+    sys.path.insert(0, LIB_PYTHON_DIR)
 
-
-def qb_send_const( name, method, *args, **kwds ):
-    '''
-    Send a message (call a method) to a Ruby constant by name.
-    '''
-    
-    return send_to_interop({
-        'const': name,
-        'method': method,
-        'args': args,
-        'kwds': kwds,
-    })
+import qb.interop
 
 
 class FilterModule( object ):
@@ -90,14 +32,14 @@ class FilterModule( object ):
 
     def filters( self ):
         return {
-            'qb_send':          qb_send,
-            'qb_send_const':    qb_send_const,
+            'qb_send':          qb.interop.send,
+            'qb_send_const':    qb.interop.send_const,
         }
     # filters()
 # FilterModule
 
 
-# testing - call camel_case on first cli arg and print result
+# Testing with doctest
 if __name__ == '__main__':
     import doctest
     doctest.testmod()

data/plugins/filter_plugins/version_plugins.py

@@ -126,6 +126,14 @@ def qb_version_parse(version_string):
     return version
 
 
+def qb_read_version(file_path):
+    '''Read a QB::Package::Version from a file.
+    '''
+    
+    with open(file_path, 'r') as file:
+        return qb_version_parse(file.read())
+    
+
 class FilterModule(object):
     ''' version manipulation filters '''
 
@@ -134,6 +142,7 @@ class FilterModule(object):
             'semver_inc': semver_inc,
             'semver_parse': semver_parse,
             'qb_version_parse': qb_version_parse,
+            'qb_read_version': qb_read_version,
         }
     # filters()
 # FilterModule

data/plugins/lookup_plugins/version.py

@@ -0,0 +1,63 @@
+# Be more Python 3
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import sys
+import os
+
+from ansible.errors import AnsibleError, AnsibleParserError
+from ansible.plugins.lookup import LookupBase
+
+try:
+    from __main__ import display
+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
+
+
+class LookupModule(LookupBase):
+
+    def run(self, terms, variables=None, **kwargs):
+        path = os.path.join(*terms)
+        
+        if not os.path.isabs(path):
+            path = os.path.join(variables['qb_dir'], path)
+        
+        if not os.path.isfile(path):
+            path_with_version = os.path.join(path, 'VERSION')
+            
+            if not os.path.isfile(path_with_version):
+                raise AnsibleError(
+                    "Neither path %s or %s exists" % (path, path_with_version)
+                )
+            
+            path = path_with_version
+        
+        with open(path, 'r') as file:
+            raw = file.read().strip()
+            
+            version = qb.interop.send_const(
+                'QB::Package::Version',
+                'from_string',
+                raw,
+            )
+            
+            return version

data/qb.gemspec

@@ -97,7 +97,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard"
   spec.add_development_dependency "pry"
   
-  spec.add_dependency "cmds", '~> 0.0', ">= 0.2.2"
+  spec.add_dependency "cmds", '~> 0.0', ">= 0.2.3"
   spec.add_dependency "nrser", '~> 0.0', ">= 0.0.28"
   spec.add_dependency "nrser-extras", '~> 0.0', ">= 0.0.3"
   spec.add_dependency "state_mate", '~> 0.0', ">= 0.0.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2017-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: nrser
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +250,8 @@ files:
 - ansible.cfg
 - exe/.qb_interop_receive
 - exe/qb
+- lib/python/qb/__init__.py
+- lib/python/qb/interop.py
 - lib/qb.rb
 - lib/qb/ansible.rb
 - lib/qb/ansible/cmds/playbook.rb
@@ -306,6 +308,7 @@ files:
 - plugins/filter_plugins/version_plugins.py
 - plugins/lookup_plugins/every.py
 - plugins/lookup_plugins/resolve.py
+- plugins/lookup_plugins/version.py
 - qb.gemspec
 - roles/nrser.blockinfile/CONTRIBUTING.md
 - roles/nrser.blockinfile/README.md