Merge pull request #675 from jpmens/assemble1

convert sfromm's assemble to module-magic

assemble

@@ -38,14 +38,6 @@ except ImportError:
 # ===========================================
 # Support methods
 
-def exit_json(rc=0, **kwargs):
-   print json.dumps(kwargs)
-   sys.exit(rc)
-
-def fail_json(**kwargs):
-   kwargs['failed'] = True
-   exit_json(rc=1, **kwargs)
-
 def assemble_from_fragments(path):
     ''' assemble a file from a directory of fragments '''
     assembled = []
@@ -61,47 +53,23 @@ def write_temp_file(data):
     os.close(fd)
     return path
 
-def md5(filename):
-    ''' Return MD5 hex digest of local file, or None if file is not present. '''
-    if not os.path.exists(filename):
-        return None
-    digest = _md5()
-    blocksize = 64 * 1024
-    infile = open(filename, 'rb')
-    block = infile.read(blocksize)
-    while block:
-        digest.update(block)
-        block = infile.read(blocksize)
-    infile.close()
-    return digest.hexdigest()
-
-# ===========================================
-
-if len(sys.argv) == 1:
-   fail_json(msg="the assemble module requires arguments (-a)")
+# ==============================================================
+# main
 
-argfile = sys.argv[1]
-if not os.path.exists(argfile):
-   fail_json(msg="Argument file not found")
+def main():
     
-args = open(argfile, 'r').read()
-items = shlex.split(args)
-syslog.openlog('ansible-%s' % os.path.basename(__file__))
-syslog.syslog(syslog.LOG_NOTICE, 'Invoked with %s' % args)
-
-if not len(items):
-   fail_json(msg="the assemble module requires arguments (-a)")
-
-params = {}
-for x in items:
-    (k, v) = x.split("=")
-    params[k] = v
+    module = AnsibleModule(
+        argument_spec = dict(
+            src = dict(required=True),
+            dest = dict(required=True),
+        )
+    )
     
     changed=False
     pathmd5 = None
     destmd5 = None
-src  = params.get('src', None)
-dest = params.get('dest', None)
+    src = os.path.expanduser(module.params['src'])
+    dest = os.path.expanduser(module.params['dest'])
   
     if src:
         src = os.path.expanduser(src)
@@ -115,13 +83,22 @@ if not os.path.isdir(src):
         fail_json(msg="Source (%s) is not a directory" % src)
     
     path = write_temp_file(assemble_from_fragments(src))
-pathmd5 = md5(path)
+    pathmd5 = module.md5(path)
     
     if os.path.exists(dest):
-    destmd5 = md5(dest)
+        destmd5 = module.md5(dest)
     
     if pathmd5 != destmd5:
         shutil.copy(path, dest)
         changed = True
     
-exit_json(md5sum=pathmd5, changed=changed)
+
+    # Mission complete
+    module.exit_json(src=src, dest=dest, md5sum=destmd5, 
+        changed=changed, msg="OK",
+        daisychain="file", daisychain_args=module.params)
+
+# this is magic, see lib/ansible/module_common.py
+#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+
+main()