qb 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30b0e75719390dfd0ee97d04dee5d35f94ba7c2b
-  data.tar.gz: 4fe81370e5657c73552b159c025ca61aca44adc5
+  metadata.gz: 8dfe61f1565472727bdae6b030b59ef7bdeca300
+  data.tar.gz: 75c4ca2512edb66c32d35c4b24c16e2199fa5ca1
 SHA512:
-  metadata.gz: 8b6633ad2e732a83ca29707080ce328af5fa617b00bd1261a5bb0fdaf689e0442a5305b1ba0bf9a4a3acfcf929910af8d087611f9c03863e5c7c5865f01a9a40
-  data.tar.gz: 70985650858f352883521cee66af25b194ec9d48b264b34ca04e9e3015dad60f62ab1b4db8ff9062814467a031850a6f9b9376590aa6a9ed747dbe3f36c09a04
+  metadata.gz: 8d20ad6373ec039f0e45cc97a8885ae6e0871fa18a559550b5ea284f2b6af2598d98bad66063c8c74ddc60e5d42ff42636d7627932d15ed6b9d76f35a90e139a
+  data.tar.gz: f74ada30a77323db4e41705a9cb57fab452b795c0da82412e9a944c0ba7a5ca430a2825f0d50008dfe2ae4ed7044b23e97d23339fbca5f6b0c8398e4f06bd323

data/lib/qb/options.rb

@@ -1,5 +1,6 @@
 require 'optparse'
-require 'weakref'
+
+require_relative "options/option"
 
 module QB
   module Options
@@ -30,94 +31,6 @@ module QB
       option_name.gsub '-', '_'
     end
     
-    # 
-    class Option
-      # the role that this option is for
-      # attr_reader :role
-      
-      # the entry from the qb metadata for this option
-      attr_reader :meta
-      
-      # array of strings representing how this option was included
-      # empty for top-level options
-      attr_reader :include_path
-      
-      # the name of the option in the qb metadata, equal to #meta['name']
-      attr_reader :meta_name
-      
-      # the name that this option will be available in the cli as
-      attr_reader :cli_name
-      
-      # the name that the value will be passed to ansible as
-      attr_reader :var_name
-      
-      # the value of the option, or `nil` if we never assign one
-      attr_accessor :value
-      
-      def initialize role, meta, include_path
-        # @role = WeakRef.new role
-        @meta = meta
-        @include_path = include_path
-        
-        @meta_name = meta.fetch 'name'
-        
-        @cli_name = if @include_path.empty?
-          Options.cli_ize_name @meta_name
-        else
-          Options.cli_ize_name "#{ @include_path.join('-') }-#{ @meta_name }"
-        end
-        
-        @var_name = if role.var_prefix
-          Options.var_ize_name "#{ role.var_prefix }_#{ @meta_name }"
-        else
-          Options.var_ize_name @meta_name
-        end
-        
-        @value = nil
-      end
-      
-      # if the option is required in the cli
-      def required?
-        !!meta_or(['required', 'require'], false)
-      end
-      
-      # if we should save the option value in .qb-options.yml
-      def save?
-        !!meta_or('save', true)
-      end
-      
-      def description
-        value = meta_or 'description',
-          "set the #{ @var_name } role variable"
-          
-        if @meta['type'].is_a?(Hash) && @meta['type'].key?('one_of')
-          line_break = "\n" + "\t" * 5
-          value += " options:" + 
-            "#{ line_break }#{ @meta['type']['one_of'].join(line_break) }"
-        end
-        
-        value
-      end
-      
-      private
-      
-      # get the value at the first found of the keys or the default.
-      # 
-      # `nil` (`null` in yaml files) are treated like they're not there at
-      # all. you need to use `false` if you want to tell QB not to do something.
-      # 
-      def meta_or keys, default
-        keys = [keys] if keys.is_a? String
-        keys.each do |key|
-          if meta.key?(key) && !meta[key].nil?
-            return meta[key]
-          end
-        end
-        default
-      end
-      
-    end # Option
-    
     def self.include_role opts, options, include_meta, include_path
       role_name = include_meta['include']
       role = QB::Role.require role_name
@@ -145,7 +58,7 @@ module QB
     def self.add opts, options, role, include_path = []
       QB.debug "adding options", "role" => role
       
-      role.options.each do |option_meta|
+      role.option_metas.each do |option_meta|
         if option_meta.key? 'include'
           include_role opts, options, option_meta, include_path
           
@@ -159,8 +72,8 @@ module QB
             :OPTIONAL
           end
           
-          # on_args = [arg_style]
-          on_args = []
+          on_args = [arg_style]
+          # on_args = []
           
           if option.meta['type'] == 'boolean'
             # don't use short names when included (for now)
@@ -266,7 +179,7 @@ module QB
         
         opts.on(
           '-H',
-          '---hosts=HOSTS',
+          '--HOSTS=HOSTS',
           Array,
           "set playbook host",
           "DEFAULT: localhost"
@@ -276,7 +189,7 @@ module QB
         
         opts.on(
           '-U',
-          '---user=USER',
+          '--USER=USER',
           String,
           "ansible become user for the playbook"
         ) do |value|

data/lib/qb/options/option.rb

@@ -0,0 +1,104 @@
+module QB
+  module Options
+    class Option
+      
+      
+      # the role that this option is for
+      # attr_reader :role
+      
+      # the entry from the qb metadata for this option
+      attr_reader :meta
+      
+      # array of strings representing how this option was included
+      # empty for top-level options
+      attr_reader :include_path
+      
+      # the name of the option in the qb metadata, equal to #meta['name']
+      attr_reader :meta_name
+      
+      # the name that this option will be available in the cli as
+      attr_reader :cli_name
+      
+      # the name that the value will be passed to ansible as
+      attr_reader :var_name
+      
+      # the value of the option, or `nil` if we never assign one
+      attr_accessor :value
+      
+      def initialize role, meta, include_path
+        # @role = WeakRef.new role
+        @meta = meta
+        @include_path = include_path
+        
+        @meta_name = meta.fetch 'name'
+        
+        @cli_name = if @include_path.empty?
+          Options.cli_ize_name @meta_name
+        else
+          Options.cli_ize_name "#{ @include_path.join('-') }-#{ @meta_name }"
+        end
+        
+        @var_name = if role.var_prefix
+          Options.var_ize_name "#{ role.var_prefix }_#{ @meta_name }"
+        else
+          Options.var_ize_name @meta_name
+        end
+        
+        @value = nil
+      end
+      
+      # if the option is required in the cli
+      def required?
+        !!meta_or(['required', 'require'], false)
+      end
+      
+      # if we should save the option value in .qb-options.yml
+      def save?
+        !!meta_or('save', true)
+      end
+      
+      def description
+        value = meta_or 'description',
+          "set the #{ @var_name } role variable"
+          
+        if @meta['type'].is_a?(Hash) && @meta['type'].key?('one_of')
+          line_break = "\n" + "\t" * 5
+          value += " options:" + 
+            "#{ line_break }#{ @meta['type']['one_of'].join(line_break) }"
+        end
+        
+        value
+      end
+      
+      def boolean?
+        ['boolean', 'bool'].include? meta['type'].downcase
+      end
+      
+      def usage
+        if boolean?
+          "--[no-]#{ option.cli_name }"
+        else
+          "--#{ cli_name }=#{ meta_name.upcase }"
+        end
+      end
+      
+      private
+      
+      # get the value at the first found of the keys or the default.
+      # 
+      # `nil` (`null` in yaml files) are treated like they're not there at
+      # all. you need to use `false` if you want to tell QB not to do something.
+      # 
+      def meta_or keys, default
+        keys = [keys] if keys.is_a? String
+        keys.each do |key|
+          if meta.key?(key) && !meta[key].nil?
+            return meta[key]
+          end
+        end
+        default
+      end
+      
+    end # Option
+  end # Options
+end # QB

data/lib/qb/role.rb

@@ -113,6 +113,38 @@ module QB
       role
     end
     
+    # get the include path for an included role based on the 
+    # option metadata that defines the include and the current
+    # include path.
+    # 
+    # @param role [Role]
+    #   the role to include.
+    # 
+    # @param option_meta [Hash]
+    #   the entry for the option in qb.yml
+    # 
+    # @param current_include_path [Array<string>]
+    # 
+    # @return [Array<string>]
+    #   include path for the included role.
+    # 
+    def self.get_include_path role, option_meta, current_include_path      
+      new_include_path = if option_meta.key? 'as'
+        case option_meta['as']
+        when nil, false
+          # include it in with the parent role's options
+          current_include_path
+        when String
+          current_include_path + [option_meta['as']]
+        else
+          raise MetadataError.new,
+            "bad 'as' value: #{ option_meta.inspect }"
+        end
+      else
+        current_include_path + [role.namespaceless]
+      end      
+    end
+    
     # instance methods
     # ================
     
@@ -187,12 +219,22 @@ module QB
     end
     
     # get the options from the metadata, defaulting to [] if none defined
-    def options
+    def option_metas
       meta_or ['options', 'opts', 'vars'], []
     end
     
-    # old name
-    alias_method :vars, :options
+    # get an array of Option for the role, including any included roles
+    def options include_path = []
+      option_metas.map {|option_meta|
+        if option_meta.key? 'include'
+          role_name = option_meta['include']
+          role = QB::Role.require role_name
+          role.options Role.get_include_path(role, option_meta, include_path)
+        else
+          QB::Options::Option.new self, option_meta, include_path
+        end
+      }.flatten
+    end
     
     # loads the defaults from vars/main.yml and defaults/main.yml,
     # caching by default. vars override defaults values.
@@ -235,6 +277,17 @@ module QB
       !!meta_or('mkdir', true)
     end
     
+    def usage
+      parts = ['qb', name]
+      options.each {|option|
+        if option.required?
+          parts << option.usage
+        end
+      }
+      parts << '[OPTIONS] DIRECTORY'
+      parts.join(' ')
+    end
+    
     # get the CLI banner for the role
     def banner
       lines = []
@@ -248,7 +301,8 @@ module QB
         lines << ''
       end
       lines << 'usage:'
-      lines << "  qb #{ name } [OPTIONS] DIRECTORY"
+      # lines << "  qb #{ name } [OPTIONS] DIRECTORY"
+      lines << "  #{ usage }"
       lines << ''
       lines << 'options:'
       
@@ -270,6 +324,6 @@ module QB
         end
       end
       default
-    end
-  end
-end
+    end # meta_or
+  end # Role
+end # QB

data/lib/qb/version.rb

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

data/roles/qb.hack_npm/meta/qb.yml

@@ -29,17 +29,6 @@ options:
   description: the repo owner
   short: o
 
-- name: dest_dir
-  type: string
-  description: qb_dir relative dir to put the submodule in under it's name.
-  short: d
-
-- name: dest_path
-  type: string
-  description: >
-    qb_dir relative path to put the submodule at. supercedes dest_dir.
-  short: p
-
 - name: create
   type: boolean
   description: create a new npm package to hack

data/roles/qb.hack_npm/tasks/create.yml

@@ -5,7 +5,7 @@
   args:
     chdir: "{{ qb_dir }}"
 
-- name: add commit everything 
+- name: commit everything 
   command: git commit -m "init"
   args:
     chdir: "{{ qb_dir }}"

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

@@ -16,7 +16,7 @@
     
       vars = {}
       
-      # get the root of the git repot that we're operating from
+      # get the root of the git repo that we're operating from
       Dir.chdir qb_cwd do
         begin
           vars['repo_root'] = Cmds.out!('git rev-parse --show-toplevel').strip
@@ -38,6 +38,14 @@
       
       vars
 
+# - debug:
+#     msg:
+#       repo_root: "{{ hack_npm_repo_root }}"
+#       rel_dir: "{{ hack_npm_rel_dir }}"
+# 
+# - fail:
+#     msg: HERE
+
 - include: create.yml
   when: hack_npm_create
 
@@ -47,28 +55,28 @@
       git@github.com:{{ hack_npm_owner }}/{{ hack_npm_name }}.git
       {{ hack_npm_rel_dir }}
   args:
-    chdir: "{{ qb_cwd }}"
+    chdir: "{{ hack_npm_repo_root }}"
     creates: "{{ qb_dir }}"
 
-- name: add linking to dev/setup.yml
-  # - name: npm link nrser.js for jash so it can build
-  #   tags:
-  #   - npm-link
-  #   command: npm link ../nrser.js
-  #   args:
-  #     chdir: "{{ dev_setup_project_root }}/packages/{{ item }}"
-  #   with_items:
-  #   - jash
-  state:
-    debug: w
-    yaml:
-      key: "{{ qb_cwd }}/dev/setup.yml:0:tasks"
-      array_contains:
-        name: "npm link {{ hack_npm_rel_dir }}"
-        tags:
-        - npm-link
-        command: "npm link {{ hack_npm_rel_dir }}"
-        args:
-          chdir: "{{ '{{ dev_setup_project_root }}' }}"
-      create: true
+# - name: add linking to dev/setup.yml
+#   # - name: npm link nrser.js for jash so it can build
+#   #   tags:
+#   #   - npm-link
+#   #   command: npm link ../nrser.js
+#   #   args:
+#   #     chdir: "{{ dev_setup_project_root }}/packages/{{ item }}"
+#   #   with_items:
+#   #   - jash
+#   state:
+#     debug: w
+#     yaml:
+#       key: "{{ qb_cwd }}/dev/setup.yml:0:tasks"
+#       array_contains:
+#         name: "npm link {{ hack_npm_rel_dir }}"
+#         tags:
+#         - npm-link
+#         command: "npm link {{ hack_npm_rel_dir }}"
+#         args:
+#           chdir: "{{ '{{ dev_setup_project_root }}' }}"
+#       create: true
       

data/roles/qb.hack_npm/vars/main.yml

@@ -2,8 +2,6 @@
 # vars file for qb.hack_npm
 hack_npm_name: "{{ qb_dir | basename }}"
 hack_npm_owner: "{{ git_user_name }}"
-# hack_npm_dest_dir: "{{ qb_dir }}/dev/packages"
-# hack_npm_dest_path: "{{ hack_npm_dest_dir }}/{{ hack_npm_name }}"
 hack_npm_create: false
 
 # overrides

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

@@ -13,5 +13,6 @@ npm_package_main: "index.js"
 npm_package_keywords: []
 npm_package_license: "{{ 'UNLICENSED' if npm_package_private else 'ISC' }}"
 npm_package_author: "{{ npm_package_scope if npm_package_scope else git_user_name }}"
+npm_package_scripts: {}
 
 npm_package_project: false

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

@@ -24,4 +24,12 @@
     main: "{{ npm_package_main }}"
     keywords: "{{ npm_package_keywords | to_json }}"
     license: "{{ npm_package_license }}"
-    author: "{{ npm_package_author }}"
+    author: "{{ npm_package_author }}"
+
+- name: set package.json scripts
+  state:
+    json:
+      key: "{{ npm_package_json_path }}:scripts:{{ item.key }}"
+      set: "{{ item.value }}"
+      create: true
+  with_dict: "{{ npm_package_scripts }}"

data/roles/qb.nrser_js/.qb-options.yml

@@ -0,0 +1,6 @@
+---
+qb.qb_role:
+  defaults: false
+  files: true
+  templates: false
+  vars: true

data/roles/qb.nrser_js/files/.babelrc

@@ -0,0 +1,69 @@
+{
+  "passPerPreset": true,
+  
+  "presets": [
+    "stage-2",
+    "react",
+    "es2015"
+  ],
+  
+  "env": {
+    "development": {
+      "plugins": [
+        ["metalog", {
+          "strip": {
+            "labels": {
+              "trace": false
+            }
+          },
+          "extraLabels": [
+            "errorRefs",
+            "warnRefs",
+            "infoRefs",
+            "debugRefs",
+            "traceRefs",
+            "notif",
+            "errorNotif",
+            "warnNotif",
+            "infoNotif",
+            "debugNotif",
+            "traceNotif"
+          ]
+        }],
+        "syntax-flow",
+        "transform-export-extensions",
+        ["tcomb", {
+          "skipAsserts": true
+        }],
+        "transform-flow-strip-types"
+      ]
+    },
+  
+    "production": {
+      "plugins": [
+        ["metalog", {
+          "strip": true,
+          "extraLabels": [
+            "errorRefs",
+            "warnRefs",
+            "infoRefs",
+            "debugRefs",
+            "traceRefs",
+            "notif",
+            "errorNotif",
+            "warnNotif",
+            "infoNotif",
+            "debugNotif",
+            "traceNotif"
+          ]
+        }],
+        "syntax-flow",
+        "transform-export-extensions",
+        ["tcomb", {
+          "skipAsserts": true
+        }],
+        "transform-flow-strip-types"
+      ]
+    }
+  }
+}

data/roles/qb.nrser_js/files/gulpfile.js

@@ -0,0 +1,4 @@
+const gulp = require('gulp');
+const ugh = require('./ughfile');
+
+ugh.createGulpTasks(gulp);

data/roles/qb.nrser_js/files/ughfile.js

@@ -0,0 +1,7 @@
+const Ugh = require('nrser/lib/ugh').Ugh;
+
+const ugh = new Ugh({packageDir: __dirname});
+
+ugh.autoTasks();
+
+module.exports = ugh;

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

@@ -0,0 +1,17 @@
+---
+# meta file for nrser.js
+
+allow_duplicates: yes
+
+dependencies:
+- role: nrser.state_mate
+
+- role: qb.npm_package
+  
+- role: qb.npm_package
+  npm_package_main: lib/index.js
+  npm_package_scripts:
+    clean: gulp clean
+    build: "npm run clean && gulp babel"
+    test: "npm run build && gulp mocha"
+    watch: "npm run clean && gulp babel && gulp watch"

data/roles/qb.nrser_js/meta/qb.yml

@@ -0,0 +1,47 @@
+---
+# meta/qb.yml file for nrser.js
+# 
+# qb settings for this role. see README.md for more info.
+#
+
+# description of the role to show in it's help output.
+description: null
+
+# prefix for role variables
+var_prefix: null
+
+# how to get a default for `dir` if it's not provided as the only
+# positional argument. if a positional argument is provided it will
+# override the method defined here.
+# 
+# options:
+# 
+# -   null
+#     -   require the value on the command line.
+# -   git_root
+#     -   use the git root fof the directory that the `qb` command is invoked
+#         from. useful for 'project-centric' commands so they can be invoked
+#         from anywhere in the repo.
+# -   cwd
+#     -   use the directory the `qb` command is invoked form.
+# -   {exe: PATH}
+#     -   invoke an execuable, passing a JSON serialization of the options 
+#         mapping their CLI names to values. path can be relative to role
+#         directory.
+default_dir: null
+
+# default user to become for play
+default_user: null
+
+# set to false to not save options in .qb-options.yml files
+save_options: true
+
+options:
+# - name: example
+#   description: an example of a variable.
+#   required: false
+#   type: boolean # boolean (default) | string
+#   short: e
+
+- include: qb.npm_package
+  as: package

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

@@ -0,0 +1,63 @@
+---
+# tasks file for nrser.js
+
+- name: add deps to package.json
+  state:
+    json:
+      key: "{{ npm_package_json_path }}:dependencies:{{ item.key }}"
+      set: "{{ item.value }}"
+      create: true
+  with_dict: "{{ nrser_js_deps }}"
+
+- name: add dev deps to package.json
+  state:
+    json:
+      key: "{{ npm_package_json_path }}:devDependencies:{{ item.key }}"
+      set: "{{ item.value }}"
+      create: true
+  with_dict: "{{ nrser_js_dev_deps }}"
+
+- name: "create {{ item }} dir"
+  file:
+    dest: "{{ qb_dir }}/{{ item }}"
+    state: directory
+  with_items:
+  - src
+  - test/src
+
+- name: "create {{ item }} file"
+  copy:
+    dest: "{{ qb_dir }}/{{ item }}"
+    content: ''
+  with_items:
+  - src/index.js
+  - test/src/index.tests.js
+
+- name: add .babelrc
+  copy:
+    src: .babelrc
+    dest: "{{ qb_dir }}/.babelrc"
+
+- name: add ughfile.js
+  copy:
+    src: ughfile.js
+    dest: "{{ qb_dir }}/ughfile.js"
+
+- name: add gulpfile.js
+  copy:
+    src: gulpfile.js
+    dest: "{{ qb_dir }}/gulpfile.js"
+
+- name: flow init
+  command: node_modules/.bin/flow init
+  args:
+    chdir: "{{ qb_dir }}"
+    creates: "{{ qb_dir }}/.flowconfig"
+
+- name: "ignore {{ item }}"
+  lineinfile:
+    line: "{{ item }}"
+    dest: "{{ qb_dir }}/.gitignore"
+  with_items:
+  - /lib
+  - /test/lib

data/roles/qb.nrser_js/vars/main.yml

@@ -0,0 +1,28 @@
+---
+# vars file for nrser.js
+
+nrser_js_deps:
+  lodash: "^3.1.0"
+  nrser: "^0.2.1"
+  tcomb: "^3.2.13"
+
+nrser_js_dev_deps:
+  babel-cli: "^6.14.0"
+  babel-core: "^6.14.0"
+  babel-plugin-metalog: "^0.1.0"
+  babel-plugin-tcomb: "^0.3.13"
+  babel-plugin-transform-export-extensions: "^6.8.0"
+  babel-polyfill: "^6.13.0"
+  babel-preset-es2015: "^6.14.0"
+  babel-preset-react: "^6.11.1"
+  babel-preset-stage-2: "^6.17.0"
+  chai: "^3.5.0"
+  flow-bin: "^0.32.0"
+  gulp: "^3.9.1"
+  gulp-babel: "^6.1.2"
+  gulp-spawn-mocha: "^3.1.0"
+  gulp-util: "^3.0.7"
+  istanbul: "^0.4.5"
+  kexec: "^3.0.0"
+  mocha: "^3.1.2"
+  node-notifier: "^4.6.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ files:
 - exe/qb
 - lib/qb.rb
 - lib/qb/options.rb
+- lib/qb/options/option.rb
 - lib/qb/role.rb
 - lib/qb/version.rb
 - library/git_mkdir.py
@@ -478,6 +479,15 @@ files:
 - roles/qb.npm_package/meta/main.yml
 - roles/qb.npm_package/meta/qb.yml
 - roles/qb.npm_package/tasks/main.yml
+- roles/qb.nrser_js/.qb-options.yml
+- roles/qb.nrser_js/files/.babelrc
+- roles/qb.nrser_js/files/.gitkeep
+- roles/qb.nrser_js/files/gulpfile.js
+- roles/qb.nrser_js/files/ughfile.js
+- roles/qb.nrser_js/meta/main.yml
+- roles/qb.nrser_js/meta/qb.yml
+- roles/qb.nrser_js/tasks/main.yml
+- roles/qb.nrser_js/vars/main.yml
 - roles/qb.project/.qb-options.yml
 - roles/qb.project/defaults/main.yml
 - roles/qb.project/files/ansible.cfg