qb 0.1.55 → 0.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82118c8f18b2147d380af7b988da02cf1c81d965
-  data.tar.gz: ad75036b23b4e2ec7a4d59ecc1fedc46179f2ea5
+  metadata.gz: a3ccd247eed4ac55327f18af1328683369b781c8
+  data.tar.gz: 036e4e71a58d83a99137b27c61e44a6bbbf99247
 SHA512:
-  metadata.gz: 88d65f3c512013f500b1110bde91f993e557da913f476b5242391059b07e5c799750d3715b22a13dc992ac63807f9e18627f249cb13aaaff656eb8dc9fa869db
-  data.tar.gz: 3443133b5aa046953e3d4a62b3b0dfa7e2d4eff36e02696f159aa1f27495f61f144321189526835f2c396179b0909cd129975478255b4b426e6e2609139eef0c
+  metadata.gz: b9034e575a08fd1fffb4973fcc5f7c4e3a7055927c8bf07be2cf01e828a3d314cee408b283223cf4458e14dc4217f603d7ba37aaccc84f912022b2a1ba28b39e
+  data.tar.gz: 2593c3192c626701c2017d51c55cdf30df3359c52245acf69a09616f5e47ea635fff64865d14845bd783eade72cff24d1524420c9dc054ddda68747d85e372fc

data/lib/qb/ansible_module.rb

@@ -2,10 +2,16 @@ require 'json'
 
 module QB
   class AnsibleModule
+    @@arg_types = {}
+    
     def self.stringify_keys hash
       hash.map {|k, v| [k.to_s, v]}.to_h
     end
     
+    def self.arg name, type
+      @@arg_types[name.to_sym] = type
+    end
+    
     def initialize
       @changed = false
       @input_file = ARGV[0]
@@ -23,6 +29,20 @@ module QB
       if ENV['QB_STDIO_ERR']
         $stderr = UNIXSocket.new ENV['QB_STDIO_ERR']
       end
+      
+      @@arg_types.each {|key, type|
+        var_name = "@#{ key.to_s }"
+        
+        unless instance_variable_get(var_name).nil?
+          raise ArgumentError.new NRSER.squish <<-END
+            an instance variable named #{ var_name } exists
+            with value #{ instance_variable_get(var_name).inspect }
+          END
+        end
+        
+        instance_variable_set var_name,
+                              type.check(@args.fetch(key.to_s))
+      }
     end
     
     def run

data/lib/qb/version.rb

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

data/roles/nrser.rb/library/{vars.rb → vars.rb.rb}

@@ -2,10 +2,14 @@
 # WANT_JSON
 # ^ i think this is something telling ansible to provide JSON args?
 
+# stdlib
 require 'json'
 require 'shellwords'
 require 'pp'
 
+# deps
+require 'nrser'
+
 def namespace prefix, hash
   Hash[
     hash.map {|key, value|
@@ -33,7 +37,7 @@ def main
       end
     end
     
-    result = b.eval args['src']
+    result = b.eval args.fetch('src')
     
     if result.is_a? Hash
       result = namespace(args['namespace'], result) if args['namespace']
@@ -47,13 +51,30 @@ def main
     })
     
   rescue Exception => e
+    path = File.join Dir.pwd, "ansible-error.log"
+    msg = NRSER.squish <<-END
+      vars.rb failed: #{ e.message } (#{ e.class.name }).
+      See #{ path } for details.
+    END
+    
+    File.open(path, 'w') {|f|
+      f.puts "ERROR:\n\n"
+      f.puts NRSER.indent(NRSER.format_exception(e))
+      
+      f.puts "\nINPUT:\n\n"
+      f.puts NRSER.indent(input) if defined? input
+      
+      f.puts "\nARGS:\n\n"
+      f.puts NRSER.indent(args.pretty_inspect) if defined? args
+      
+      f.puts "\nRUBY:\n"
+      f.puts NRSER.indent("VERSION: #{ RUBY_VERSION }")
+      f.puts NRSER.indent("PATH: #{ RbConfig.ruby }")
+    }
+    
     print JSON.dump({
       'failed' => true,
-      'msg' => e.message,
-      # 'input' => input,
-      # 'args' => args,
-      # 'ARGV' => ARGV,
-      # 'ruby' => RUBY_VERSION,
+      'msg' => msg,
     })
   end
 end

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

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

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

@@ -0,0 +1,19 @@
+---
+# tasks file for qb.git_check_clean
+
+- name: >
+    get git status for repo {{ git_check_clean_dir }}
+  shell: git status --porcelain 2>/dev/null
+  args:
+    chdir: "{{ git_check_clean_dir }}"
+  register: git_check_clean_status
+  changed_when: false
+
+- name: >
+    fail if the repo has any untracked or modified files
+  fail:
+    msg: >
+      repo at {{ git_check_clean_dir }} can not have any untracked or
+      modified files, please commit or stash and retry.
+  when: (git_check_clean_status.stdout_lines | length) != 0
+

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

@@ -4,5 +4,3 @@
 # default the encapsulated qb.role's `role-dest` to `qb_dir` so we can be
 # sure to be able to use it here... not sure if needed.
 role_dest: "{{ qb_dir }}"
-
-qb_role_modules: []

data/roles/qb.qb_role/meta/qb.yml

@@ -10,19 +10,6 @@ var_prefix: null
 # how to get a default for `dir` if it's not provided as the 
 default_dir: null
 
-options:
-- name: modules
-  description: >-
-    create ruby module boilerplate(s) in library using QB::AnsibleModule.
-  type: array
-  required: false
-  # TODO not yet implemented
-  implies: library
-  examples:
-  - |
-    produces library/some_module execuable with a module named SomeModule
-    
-    --modules=some_module
-  
+options:  
 - include: qb.role
   as: false

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

@@ -11,9 +11,4 @@
     src: qb.yml.j2
     dest: "{{ role_dest }}/meta/qb.yml"
     force: false
-
-- include: module.yml
-  with_items: "{{ qb_role_modules }}"
-  loop_control:
-    loop_var: qb_role_module
   

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

@@ -13,6 +13,9 @@ role_vars: false
 role_readme: false
 role_library: false
 
+# modules
+qb_role_modules: []
+
 # galaxy
 role_galaxy: false
 role_author: "{{ git_user_name }}"

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

@@ -76,6 +76,19 @@ vars:
   type: boolean
   description: create a project repo for this role
   short: p
+  
+- name: modules
+  description: >-
+    create ruby module boilerplate(s) in library using QB::AnsibleModule.
+  type: array
+  required: false
+  # TODO not yet implemented
+  implies: library
+  examples:
+  - |
+    produces library/some_module execuable with a module named SomeModule
+    
+    --modules=some_module
 
 - include: qb.project
   

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

@@ -141,4 +141,11 @@
     dest: "{{ role_dest }}/library/.gitkeep"
     force: "{{ role_force }}"
   when: role_library
-  
+
+# modules
+# =======
+  
+- include: module.yml
+  with_items: "{{ role_modules }}"
+  loop_control:
+    loop_var: role_module

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

@@ -0,0 +1,20 @@
+---
+- set_fact:
+    role_module_class: "{{ role_module | class_case }}"
+    role_module_path: "{{ role_dest }}/library/{{ role_module }}"
+
+- name: create library directory
+  file:
+    dest: "{{ role_module_path | dirname }}"
+    state: directory
+  
+- name: "create {{ role_module }} module"
+  template:
+    src: library/module.rb.j2
+    dest: "{{ role_module_path }}"
+    force: "{{ role_force }}"
+
+- name: "make library/{{ role_module }} executable"
+  file:
+    path: "{{ role_module_path }}"
+    mode: a+x

data/roles/qb.role/templates/library/module.rb.j2

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+# WANT_JSON
+
+# 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
+
+require 'qb'
+require 'nrser'
+
+class {{ role_module_class }} < QB::AnsibleModule
+  # define arg names to NRSER::Types::Type instances here and they
+  # will be type checked and set as @<name>
+  # 
+  # example:
+  # 
+  #     arg :x, NRSER::Types.array(String)
+  # 
+  # will check that the input json has a key named 'x' and that it's value
+  # is an Array of String instances, then set it's value as `@x`.
+  # 
+  
+  # entry point for the module. invoked by {\#run}.
+  # 
+  # @return [nil | {Symbol => #to_json}]
+  #   when returning:
+  #   
+  #   -   `nil`: module will successfully exit with no additional changes.
+  #       
+  #   -   `{Symbol => #to_json}`: Hash will be merged over @facts that 
+  #       are returned by the module to be set in the Ansible runtime and
+  #       the module will exit successfully.
+  #       
+  def main
+    return nil
+  end # #main
+end # {{ role_module_class }}
+
+{{ role_module_class }}.new.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.55
+  version: 0.1.56
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -276,8 +276,8 @@ files:
 - roles/nrser.blockinfile/tests/test-replace.yml
 - roles/nrser.blockinfile/tests/test-state.yml
 - roles/nrser.rb/.gitignore
-- roles/nrser.rb/library/sync.rb
-- roles/nrser.rb/library/vars.rb
+- roles/nrser.rb/library/sync.rb.rb
+- roles/nrser.rb/library/vars.rb.rb
 - roles/nrser.rb/meta/main.yml
 - roles/nrser.rbenv_gem/README.md
 - roles/nrser.rbenv_gem/VERSION
@@ -328,6 +328,8 @@ files:
 - roles/qb.gem/templates/spec.rb.j2
 - roles/qb.gem/templates/spec_helper.rb.j2
 - roles/qb.gem/templates/version.rb.j2
+- roles/qb.git_check_clean/meta/main.yml
+- roles/qb.git_check_clean/tasks/main.yml
 - roles/qb.git_repo/defaults/main.yml
 - roles/qb.git_repo/meta/main.yml
 - roles/qb.git_repo/meta/qb.yml
@@ -575,9 +577,7 @@ files:
 - roles/qb.qb_role/meta/main.yml
 - roles/qb.qb_role/meta/qb.yml
 - roles/qb.qb_role/tasks/main.yml
-- roles/qb.qb_role/tasks/module.yml
 - roles/qb.qb_role/templates/.gitkeep
-- roles/qb.qb_role/templates/module.rb.j2
 - roles/qb.qb_role/templates/qb.yml.j2
 - roles/qb.read_json/defaults/main.yml
 - roles/qb.read_json/meta/main.yml
@@ -596,10 +596,12 @@ files:
 - roles/qb.role/meta/main.yml
 - roles/qb.role/meta/qb.yml
 - roles/qb.role/tasks/main.yml
+- roles/qb.role/tasks/module.yml
 - roles/qb.role/templates/.gitkeep
 - roles/qb.role/templates/README.md.j2
 - roles/qb.role/templates/defaults/main.yml.j2
 - roles/qb.role/templates/handlers/main.yml.j2
+- roles/qb.role/templates/library/module.rb.j2
 - roles/qb.role/templates/meta/main.yml.j2
 - roles/qb.role/templates/tasks/main.yml.j2
 - roles/qb.role/templates/vars/main.yml.j2

data/roles/qb.qb_role/tasks/module.yml

@@ -1,20 +0,0 @@
----
-- set_fact:
-    qb_role_module_class: "{{ qb_role_module | class_case }}"
-    qb_role_module_path: "{{ role_dest }}/library/{{ qb_role_module }}"
-
-- name: create library directory
-  file:
-    dest: "{{ qb_role_module_path | dirname }}"
-    state: directory
-  
-- name: "create {{ qb_role_module }} module"
-  template:
-    src: module.rb.j2
-    dest: "{{ qb_role_module_path }}"
-    force: "{{ role_force }}"
-
-- name: "make library/{{ qb_role_module }} executable"
-  file:
-    path: "{{ qb_role_module_path }}"
-    mode: a+x

data/roles/qb.qb_role/templates/module.rb.j2

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-# WANT_JSON
-
-# 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
-
-require 'qb'
-
-class {{ qb_role_module_class }} < QB::AnsibleModule
-  def main
-    nil
-  end
-end
-
-{{ qb_role_module_class }}.new.run