qb 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae9aeb0e2f878eadc6e1cf220a2a7e26783fd358
-  data.tar.gz: c13dd57a5475abe283a69ca5b941b14df7cf7394
+  metadata.gz: 2c2374013aa43093a1e6faafe2a950b5afb5f91d
+  data.tar.gz: 4d205b08c8bd2a79dd3d4ab1b78e0eaeb38fdf28
 SHA512:
-  metadata.gz: 94c65c40bee65ff720d9cb28ab0e119a4da69f62d831e0dbef002e0f9b77f4649d78ee97e85ca9e4d8f650e92075c81a80d3479d3db880185238fde38e18bdd2
-  data.tar.gz: 851f4d7785b1b68310b7003393d2deb1a638345da45de47912c85651f931936a79013132f90c79307f435a65ecf89d50254c91fa7b3a4ecacb4fb73abc200998
+  metadata.gz: 92b37faef82d48f9c2220721c3e41ce1b90b54884b0cae9b790611f982cf0bee6064e7daf8d66031bb667eaea54e21310b789e770ed7bdaa0b35ee6813ee669e
+  data.tar.gz: 1d53cce2a2734001aecddd5d11b2db2d170b497431b4908eae46c75aeeee2e7f9214c65130cc4dadc1fa7d0474df11a335afd9519e4d9823a879c77892c55555

data/lib/qb/version.rb

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

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

@@ -168,16 +168,7 @@ def check_file_attrs(module, changed, message):
         message += "ownership, perms or SE linux context changed"
 
     return message, changed
-
-
-def startswith_lines(marker, lines, index):
-    for i in range(0, len(marker)):
-        if lines[i] == marker[0 + index]:
-            pass
-        else:
-            return False
-    return True
-
+    
 
 def main():
     module = AnsibleModule(
@@ -194,7 +185,10 @@ def main():
             beginmarker=dict(default=None, type='str'),
             endmarker=dict(default=None, type='str'),
         ),
-        mutually_exclusive=[['insertbefore', 'insertafter']],
+        mutually_exclusive=[
+            ['insertbefore', 'insertafter'],
+            ['block', 'src'],
+        ],
         add_file_common_args=True,
         supports_check_mode=True
     )
@@ -213,16 +207,22 @@ def main():
             module.fail_json(rc=257,
                              msg='Destination %s does not exist !' % dest)
         original = ''
-        lines = []
     else:
         f = open(dest, 'rb')
         original = f.read()
         f.close()
-        lines = original.splitlines()
 
     insertbefore = params['insertbefore']
     insertafter = params['insertafter']
-    block = params['block']
+    
+    # accept `src` as a file for the block contents
+    if params['src']:
+        srcFile = open(params['src'], 'rb')
+        block = srcFile.read()
+        srcFile.close()
+    else:
+        block = params['block']
+    
     marker = params['marker']
     present = params['state'] == 'present'
 
@@ -253,7 +253,6 @@ def main():
             marker0 = re.sub('', marker0, '')
             marker1 = re.sub('', marker1, '')
     else:
-        # blocklines = []
         pass
     
     # make sure each chunk ends with a newline if it doens't already
@@ -271,7 +270,7 @@ def main():
     # module.fail_json(msg=pprint.pformat(replacement))
 
     exact_re = re.compile(
-        (re.escape(marker0) + re.escape(block) + re.escape(marker1)),
+        re.escape(marker0 + block + marker1),
         (re.MULTILINE | re.DOTALL)
     )
     
@@ -303,10 +302,10 @@ def main():
     # 4.  insert - the markers 
     else:
         lines = original.splitlines()
-        blocklines = replacement.splitlines()
         
         n0 = None
         if insertre is not None:
+            match = insertre.search(original)    
             for i, line in enumerate(lines):
                 if insertre.search(line):
                     n0 = i
@@ -319,13 +318,18 @@ def main():
         else:
             n0 = len(lines)  # insertafter=EOF
         
-        lines[n0:n0] = blocklines
-
-        if lines:
-            result = '\n'.join(lines)+'\n'
-        else:
-            result = ''
+        before = "\n".join(lines[:n0])
+        
+        if before != '':
+            before = before + "\n"
+        
+        after = "\n".join(lines[n0:])
+        
+        if after != '' and original.endswith("\n"):
+            after = after + "\n"
         
+        result = "".join([before, replacement, after])
+                
     if original == result:
         msg = ''
         changed = False

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

@@ -10,7 +10,12 @@ var_prefix: null
 # how to get a default for `dir` if it's not provided as the 
 default_dir: null
 
-vars:  
+vars:
+- name: force
+  type: boolean
+  description: force operations (overwrite)
+  short: f
+
 - name: role_name
   type: string
   description: name of the role.
@@ -24,7 +29,7 @@ vars:
 - name: files
   type: boolean
   description: create a files directory.
-  short: f
+  short: i
 
 - name: handlers
   type: boolean

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

@@ -13,7 +13,7 @@
   template:
     src: defaults/main.yml.j2
     dest: "{{ dir }}/defaults/main.yml"
-    force: false
+    force: "{{ role_force }}"
   when: role_defaults
 
 # files
@@ -31,7 +31,7 @@
   copy:
     content: ""
     dest: "{{ dir }}/files/.gitkeep"
-    force: false
+    force: "{{ role_force }}"
   when: role_files
 
 # handlers
@@ -47,7 +47,7 @@
   template:
     src: handlers/main.yml.j2
     dest: "{{ dir }}/handlers/main.yml"
-    force: false
+    force: "{{ role_force }}"
   when: role_handlers
 
 # meta
@@ -63,7 +63,7 @@
   template:
     src: meta/main.yml.j2
     dest: "{{ dir }}/meta/main.yml"
-    force: false
+    force: "{{ role_force }}"
   when: role_meta
 
 # tasks
@@ -79,7 +79,7 @@
   template:
     src: tasks/main.yml.j2
     dest: "{{ dir }}/tasks/main.yml"
-    force: false
+    force: "{{ role_force }}"
   when: role_tasks
 
 # templates
@@ -97,7 +97,7 @@
   copy:
     content: ""
     dest: "{{ dir }}/templates/.gitkeep"
-    force: false
+    force: "{{ role_force }}"
   when: role_templates
 
 # vars
@@ -113,5 +113,5 @@
   template:
     src: vars/main.yml.j2
     dest: "{{ dir }}/vars/main.yml"
-    force: false
+    force: "{{ role_force }}"
   when: role_vars

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler