qb 0.1.51 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8354a2e7a722ed65253867f9ba61d18f32548c7e
-  data.tar.gz: c3b3a05ac92ff16657beb5e53c01e5d29ad3a43d
+  metadata.gz: 4eb77728b9631d555c6a89235d5d35758b3e1bdb
+  data.tar.gz: f5cc90e7df63159f635978bdd5eaad774e22d955
 SHA512:
-  metadata.gz: 7f22505b21269bc2b63b14cbb9c9dfddf16d9fd4a046dc797d1609adda79598d9ff6778eb7486bfccbd44e8e80dce046aaf91fdbdaa56b9092663c3c6e4fd1e4
-  data.tar.gz: '048192659773f4e26e6de355ffa1b32c9f5af7507bf4245adcfa3a6566ab7f80fbb70c4b965759997966c0a12ae923e541f9ad349f4f7c2a6e7ecf8f709d5c1b'
+  metadata.gz: bcd9bc04f888ee108616752b683e1708422cada4147c789685402d5f64ae60814b2e261539f3f9349624cff0b9ff4776724dd0377332e90e0a010c1f97a66588
+  data.tar.gz: bc314c628a3643aa8f4dc071bce7d149e951614107be96cd56aad8287d5852393f875f8e4b811f5cb41249fba32b719c6806c5b04ece36a5931fb0ec33a7ce52

data/exe/qb

@@ -18,28 +18,10 @@ DEBUG_ARGS = ['-D', '--DEBUG']
 # globals
 # =======
 
-# @api util
-# *pure*
-#
-# format a debug message with optional key / values to print
-#
-# @param msg [String] message to print.
-# @param dump [Hash] optional hash of keys and values to dump.
-def format msg, dump = {}
-  unless dump.empty?
-    msg += "\n" + dump.map {|k, v| "  #{ k }: #{ v.inspect }" }.join("\n")
-  end
-  msg
-end
-
-def debug *args
-  QB.debug *args
-end
-
 def set_debug! args
   if DEBUG_ARGS.any? {|arg| args.include? arg}
     ENV['QB_DEBUG'] = 'true'
-    debug "ON"
+    QB.debug "ON"
     DEBUG_ARGS.each {|arg| args.delete arg}
   end
 end
@@ -83,9 +65,6 @@ def with_clean_env &block
       
       qb_env.each {|k, v| ENV[k] = v}
       
-      # and set QB_DEV_ENV=true
-      ENV['QB_DEV_ENV'] = 'true'
-      
       # invoke the block
       block.call
     end
@@ -123,12 +102,12 @@ end
 
 def main args
   set_debug! args
-  debug args: args
+  QB.debug args: args
   
   QB.check_ansible_version
   
   role_arg = args.shift
-  debug "role arg" => role_arg
+  QB.debug "role arg" => role_arg
   
   help if role_arg.nil? || ['-h', '--help', 'help'].include?(role_arg)
   
@@ -143,10 +122,13 @@ def main args
     exit 1
   end
   
-  options, qb_options = QB::Options.parse! role, args
+  options = QB::Options.new role, args
+  
+  QB.debug "role options set on cli", options.role_options.select {|k, o|
+    !o.value.nil?
+  }
   
-  debug "options set on cli", options.select {|k, o| !o.value.nil?}
-  debug "qb options", qb_options
+  QB.debug "qb options", options.qb
   
   cwd = Dir.getwd
   
@@ -160,7 +142,7 @@ def main args
       # 
       # in some cases (like projects) the dir can be figured out in other ways:
       # 
-      role.default_dir cwd, options
+      role.default_dir cwd, options.role_options
       
     when 1
       # there is a single positional arg, which is used as dir
@@ -172,12 +154,12 @@ def main args
       
     end
     
-    debug "input_dir", dir
+    QB.debug "input_dir", dir
     
     # normalize to expanded path (has no trailing slash)
     dir = File.expand_path dir
     
-    debug "normalized_dir", dir
+    QB.debug "normalized_dir", dir
     
     # create the dir if it doesn't exist (so don't have to cover this in
     # every role)
@@ -197,23 +179,23 @@ def main args
           }.to_h
         ]
       }.to_h.tap {|saved_options|
-        debug "found saved options", saved_options
+        QB.debug "found saved options", saved_options
       }
     else
-      debug "no saved options"
+      QB.debug "no saved options"
       {}
     end
     
     if saved_options.key? role.options_key
       role_saved_options = saved_options[role.options_key]
       
-      debug "found saved options for role", role_saved_options
+      QB.debug "found saved options for role", role_saved_options
       
       role_saved_options.each do |option_cli_name, value|
-        option = options[option_cli_name]
+        option = options.role_options[option_cli_name]
         
         if option.value.nil?
-          debug "setting from saved options", option: option, value: value
+          QB.debug "setting from saved options", option: option, value: value
           
           option.value = value
         end
@@ -222,7 +204,7 @@ def main args
   end # unless default_dir == false
   
   # check that required options are present
-  missing = options.values.select {|option|
+  missing = options.role_options.values.select {|option|
     option.required? && option.value.nil?
   }
   
@@ -231,9 +213,9 @@ def main args
     exit 1
   end
   
-  set_options = options.select {|k, o| !o.value.nil?}
+  set_options = options.role_options.select {|k, o| !o.value.nil?}
   
-  debug "set options", set_options
+  QB.debug "set options", set_options
   
   playbook_role = {'role' => role.name}
   
@@ -251,18 +233,11 @@ def main args
   
   play =
   {
-    'hosts' => qb_options['hosts'],
+    'hosts' => options.qb['hosts'],
     'vars' => playbook_vars,
     # 'gather_subset' => ['!all'],
-    'gather_facts' => qb_options['facts'],
+    'gather_facts' => options.qb['facts'],
     'pre_tasks' => [
-      # need ansible 2.1.2.0 at least to run
-      # but this is obviously not flexible enough
-      # {
-      #   'assert' => {
-      #     'that' => "'ansible 2.1.2' in lookup('pipe', 'ansible --version')",
-      #   },
-      # },
       {
         'qb_facts' => {
           'qb_dir' => dir,
@@ -275,86 +250,110 @@ def main args
     ],
   }
   
-  if qb_options['user']
+  if options.qb['user']
     play['become'] = true
-    play['become_user'] = qb_options['user']
+    play['become_user'] = options.qb['user']
   end
   
   playbook = [play]
   
-  debug "playbook", playbook
+  QB.debug "playbook", playbook
   
   playbook_path = Pathname.new(Dir.getwd) + '.qb-playbook.yml'
-  debug playbook_path: playbook_path.to_s
+  QB.debug playbook_path: playbook_path.to_s
   
-  tmp_roles_path = QB::ROOT + 'tmp' + 'roles'
-  
-  ansible_roles_path = (
-    [
+  env = {
+    ANSIBLE_ROLES_PATH: [
+      # stick the role path in front to make sure we get **that** role
       role.path.expand_path.dirname,
-      tmp_roles_path
-    ] + QB::Role.search_path
-  ).join(':')
-  
-  ansible_library_path = [
-    QB::ROOT + 'library',
-  ].join(':')
-  
-  ansible_filter_plugins_path = QB::ROOT.join 'plugins', 'filter_plugins'
-  
-  template = []
-  template << "ANSIBLE_ROLES_PATH=<%= roles_path %>"
-  template << "ANSIBLE_LIBRARY=<%= library_path %>"
-  template << "ANSIBLE_FILTER_PLUGINS=<%= filter_plugins_path %>"
-  template << "ansible-playbook"
-  
-  if play['hosts'] != ['localhost']
-    template << "-i <%= hosts %>"
-  end
+      
+      # then include the full role search path
+      
+      # NOTE  this includes role paths pulled from a call-site local
+      #       ansible.cfg
+      QB::Role.search_path,
+    ].
+      flatten. # since QB::Role.search_path is an Array
+      map(&:to_s). # Pathname => String so uniq works 
+      uniq, # drop dups (seems to keep first instance so preserves priority)
+    
+    ANSIBLE_LIBRARY: [
+      QB::ROOT.join('library'),
+    ],
+    
+    ANSIBLE_FILTER_PLUGINS: [
+      QB::ROOT.join('plugins', 'filter_plugins'),
+    ],
+    
+    ANSIBLE_LOOKUP_PLUGINS: [
+      QB::ROOT.join('plugins', 'lookup_plugins'),
+    ],
+  }
   
-  if qb_options['tags']
-    template << "--tags=<%= tags %>"
-  end
+  cmd_options = options.ansible.clone
   
-  if qb_options['verbose']
-    template << "-#{ 'v' * qb_options['verbose'] }"
+  if options.qb['inventory']
+    cmd_options['inventory-file'] = options.qb['inventory']
+    
+  elsif play['hosts'] != ['localhost']
+    cmd_options['inventory-file'] = play['hosts']
+    
   end
-  
-  if qb_options['ask_vault_pass'] || role.ask_vault_pass?
-    template << "--ask-vault-pass"
+    
+  if options.qb['tags']
+    cmd_options['tags'] = options.qb['tags']
   end
   
-  template << "<%= playbook_path %>"
+  cmd_template = <<-END    
+    ansible-playbook
+    
+    <%= cmd_options %>
+    
+    <% if verbose %>
+      -<%= 'v' * verbose %>
+    <% end %>
+    
+    <%= playbook_path %>
+  END
   
-  cmd = Cmds.sub template.join(" "), [], {
-    roles_path: ansible_roles_path,
-    library_path: ansible_library_path,
-    playbook_path: playbook_path.to_s,
-    hosts: "#{ play['hosts'].join(',') },",
-    tags: (qb_options['tags'] ? qb_options['tags'].join(',') : nil),
-    filter_plugins_path: ansible_filter_plugins_path.to_s,
+  cmd = Cmds::Cmd.new cmd_template, {
+    env: env.map {|k, v| [k, v.is_a?(Array) ? v.join(':') : v]}.to_h,
+    
+    kwds: {
+      cmd_options: cmd_options,
+      
+      verbose: options.qb['verbose'],
+      
+      playbook_path: playbook_path.to_s,
+    },
+    
+    format: :pretty,
   }
-  
   # print
   # =====
   # 
   # print useful stuff for debugging / running outside of qb
   # 
   
-  if qb_options['print'].include? 'options'
+  if options.qb['print'].include? 'options'
     puts "SET OPTIONS:\n\n#{ YAML.dump set_options }\n\n"
   end
   
-  if qb_options['print'].include? 'cmd'
-    puts "COMMAND:\n\n#{ cmd }\n\n"
+  if options.qb['print'].include? 'env'
+    dump = YAML.dump env.map {|k, v| [k.to_s, v.map {|i| i.to_s}]}.to_h
+    puts "ENV:\n\n#{ dump }\n\n"
+  end
+  
+  if options.qb['print'].include? 'cmd'
+    puts "COMMAND:\n\n#{ cmd.prepare }\n\n"
   end
   
-  if qb_options['print'].include? 'playbook'
+  if options.qb['print'].include? 'playbook'
     puts "PLAYBOOK:\n\n#{ YAML.dump playbook }\n\n"
   end
   
   # stop here if we're not supposed to run
-  exit 0 if !qb_options['run']
+  exit 0 if !options.qb['run']
   
   # run
   # ===
@@ -397,7 +396,7 @@ def main args
         QB::Util::STDIO::Service.new(name, dest).tap {|s| s.open! }
       end
       
-      status = Cmds.stream cmd
+      status = cmd.stream
       
       # close the stdio services
       stdio_services.each {|s| s.close! }

data/lib/qb/options.rb

@@ -1,28 +1,42 @@
 require 'optparse'
 
+require_relative "options/errors"
 require_relative "options/option"
 
 module QB
-  module Options
-    # errors
-    # ======
+  class Options
+    # constants
+    # =======================================================================
     
-    # base for errors in the module, extends QB:Error
-    class Error < QB::Error
-    end
+    QB_DEFAULTS = {
+      'hosts' => ['localhost'],
+      'facts' => true,
+      'print' => ['cmd'],
+      'verbose' => false,
+      'run' => true,
+    }
     
-    # raised when an included role includes another, which we don't support
-    # (for now)
-    class NestedIncludeError < Error
-      def initialize
-        super "can't nest role includes"
-      end
-    end
+    # attributes
+    # =======================================================================
     
-    # raised when there's bad option metadata 
-    class MetadataError < Error
-    end
+    # @!attribute [r] ansible
+    #   @return [Hash<String, String>]
+    #     options to pass through to ansible-playbook.
+    attr_reader :ansible
+    
+    # @!attribute [r] role_options
+    #   @return [Hash<String, QB::Options::Option>]
+    #     options to pass through to ansible-playbook.
+    attr_reader :role_options
     
+    # @!attribute [r] qb
+    #   @return [Hash<String, *>]
+    #     common qb-level options.
+    attr_reader :qb
+    
+    # class methods
+    # =======================================================================
+
     # turn a name into a "command line" version by replacing underscores with
     # dashes.
     # 
@@ -66,7 +80,7 @@ module QB
         when String
           include_path + [include_meta['as']]
         else
-          raise MetadataError.new,
+          raise QB::Options::MetadataError.new,
             "bad 'as' value: #{ include_meta.inspect }"
         end
       else
@@ -103,7 +117,7 @@ module QB
           else
             ruby_type = case option.meta['type']
             when nil
-              raise MetadataError,
+              raise QB::Options::MetadataError,
                 "must provide type in qb metadata for option #{ option.meta_name }"
             when 'string', 'str'
               String
@@ -118,17 +132,17 @@ module QB
                   if option.meta['type']['one_of'].include? value
                     value
                   else
-                    raise MetadataError,
+                    raise QB::Options::MetadataError,
                       "option '#{ option.cli_name }' must be one of: #{ option.meta['type']['one_of'].join(', ') }"
                   end
                 }
                 klass
               else 
-                raise MetadataError,
+                raise QB::Options::MetadataError,
                   "bad type for option #{ option.meta_name }: #{ option.meta['type'].inspect }"
               end
             else
-              raise MetadataError,
+              raise QB::Options::MetadataError,
                 "bad type for option #{ option.meta_name }: #{ option.meta['type'].inspect }"
             end
             
@@ -180,8 +194,8 @@ module QB
       end # each var
     end # add 
     
-    # destructively removes options from `args` and populates hashes of
-    # role-specific options and general qb ones.
+    # destructively removes options from `@argv` and populates ansible, role,
+    # and qb option hashes.
     # 
     # @param [QB::Role] role
     #   the role to parse the options for.
@@ -199,23 +213,42 @@ module QB
     #   
     # @raise if bad options are found.
     # 
-    def self.parse! role, args      
-      role_options = {}
+    def self.parse! role, argv
+      options = self.new role, argv
+      [options.role_options, options.qb]
+    end
+    
+    # constructor
+    # =======================================================================
+    
+    # @param [Role] role
+    #   the role to parse the args for.
+    # 
+    def initialize role, argv
+      @role = role
+      @argv = argv
       
-      qb_options = {
-        'hosts' => ['localhost'],
-        'facts' => true,
-        'print' => ['cmd'],
-        'verbose' => false,
-        'run' => true,
-      }
+      parse!
+    end
+    
+    private
+    # =======================================================================
+    
+    # destructively removes options from `@argv` and populates ansible, role,
+    # and qb option hashes.
+    def parse!
+      parse_ansible!
       
-      if role.meta['default_user']
-        qb_options['user'] = role.meta['default_user']
+      @role_options = {}
+      
+      @qb = QB_DEFAULTS.clone
+      
+      if @role.meta['default_user']
+        @qb['user'] = @role.meta['default_user']
       end
       
       opt_parser = OptionParser.new do |opts|
-        opts.banner = role.banner
+        opts.banner = @role.banner
         
         opts.on(
           '-H',
@@ -224,7 +257,16 @@ module QB
           "set playbook host",
           "DEFAULT: localhost"
         ) do |value|
-          qb_options['hosts'] = value
+          @qb['hosts'] = value
+        end
+        
+        opts.on(
+          '-I',
+          '--INVENTORY=FILEPATH',
+          String,
+          "set inventory file",
+        ) do |value|
+          @qb['inventory'] = value
         end
         
         opts.on(
@@ -233,7 +275,7 @@ module QB
           String,
           "ansible become user for the playbook"
         ) do |value|
-          qb_options['user'] = value
+          @qb['user'] = value
         end
         
         opts.on(
@@ -242,7 +284,7 @@ module QB
           Array,
           "playbook tags",
         ) do |value|
-          qb_options['tags'] = value
+          @qb['tags'] = value
         end
         
         opts.on(
@@ -251,7 +293,7 @@ module QB
         ) do |value|
           # QB.debug "verbose", value: value
           
-          qb_options['verbose'] = if value.nil?
+          @qb['verbose'] = if value.nil?
             1
           else
             case value
@@ -271,7 +313,7 @@ module QB
           '--NO-FACTS',
           "don't gather facts",
         ) do |value|
-          qb_options['facts'] = false
+          @qb['facts'] = false
         end
         
         opts.on(
@@ -279,37 +321,61 @@ module QB
           Array,
           "set what to print before running."
         ) do |value|
-          qb_options['print'] = value
+          @qb['print'] = value
         end
         
         opts.on(
           '--NO-RUN',
           "don't run the playbook (useful to just print stuff)",
         ) do |value|
-          qb_options['run'] = false
-        end
-        
-        opts.on(
-          '--ASK-VAULT-PASS',
-          "ask for the vault password.",
-        ) do |value|
-          qb_options['ask_vault_pass'] = true
+          @qb['run'] = false
         end
         
-        add opts, role_options, role
+        self.class.add opts, @role_options, @role
         
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           
-          role.puts_examples
+          @role.puts_examples
           
           exit
         end
       end
       
-      opt_parser.parse! args
-      
-      [role_options, qb_options]
+      opt_parser.parse! @argv
     end # parse!
+    
+    # pull options that start with
+    #
+    # 1.  `--ANSIBLE_`
+    # 1.  `--ANSIBLE-`
+    # 2.  `---`
+    # 
+    # out of `@argv` and stick them in `@ansible`.
+    def parse_ansible!
+      @ansible = @role.default_ansible_options.clone
+      
+      reg_exs = [
+        /\A\-\-ANSIBLE[\-\_]/,
+        /\A\-\-\-/,
+      ]
+      
+      @argv.reject! {|shellword|
+        if re = reg_exs.find {|re| re =~ shellword}
+          name = shellword.sub re, ''
+          
+          value = true
+          
+          if name.include? '='
+            name, value = name.split('=', 2)
+          end
+          
+          @ansible[name] = value
+          
+          true
+        end
+      }
+    end # #parse_ansible!
+    
   end # Options
 end # QB

data/lib/qb/options/errors.rb

@@ -0,0 +1,11 @@
+module QB
+  class Options
+    # base for errors in the module, extends QB:Error
+    class Error < QB::Error
+    end
+    
+    # raised when there's bad option metadata 
+    class MetadataError < Error
+    end
+  end # Options
+end # QB

data/lib/qb/options/option.rb

@@ -1,5 +1,5 @@
 module QB
-  module Options
+  class Options
     class Option
       
       
@@ -79,7 +79,7 @@ module QB
       
       def usage
         if boolean?
-          "--[no-]#{ option.cli_name }"
+          "--[no-]#{ cli_name }"
         else
           "--#{ cli_name }=#{ meta_name.upcase }"
         end

data/lib/qb/role.rb

@@ -1,6 +1,9 @@
 require 'yaml'
 require 'cmds'
 require 'parseconfig'
+require 'nrser/refinements'
+
+using NRSER
 
 module QB
   # contains info on a QB role.
@@ -8,17 +11,31 @@ module QB
   # 
   class Role
     # attrs
-    # =====
+    # =======================================================================
+    
+    # @!attribute [r] path
+    #   @return [Pathname]
+    #     location of the role directory.
+    attr_reader :path
+    
+    # @!attribute [r] name
+    #   @return [String]
+    #     the role's ansible "name", which is it's directory name.
+    attr_reader :name
     
-    attr_accessor :path, :name, :rel_path
+    # @!attribute [r] rel_path
+    #   @return [Pathname]
+    #     relative path to the role's directory.
+    attr_reader :rel_path
     
     # @!attribute [r] meta_path
-    #   @return [String, nil] the path qb metadata was load from. `nil` if it's
-    #     never been loaded or doesn't exist.
-    attr_accessor :meta_path
+    #   @return [String, nil]
+    #     the path qb metadata was load from. `nil` if it's never been loaded
+    #     or doesn't exist.
+    attr_reader :meta_path
     
     # errors
-    # ======
+    # =======================================================================
     
     # base for errors in the module, extends QB:Error
     class Error < QB::Error
@@ -35,7 +52,7 @@ module QB
       end
     end
     
-    # rasied by `.require` when multiple roles match
+    # raised by `.require` when multiple roles match
     class MultipleMatchesError < Error
       attr_accessor :input, :matches
       
@@ -48,7 +65,7 @@ module QB
     end
     
     # static role utils
-    # =================
+    # =======================================================================
     
     # true if pathname is a QB role directory.
     def self.role_dir? pathname
@@ -261,7 +278,7 @@ module QB
         when String
           current_include_path + [option_meta['as']]
         else
-          raise MetadataError.new,
+          raise QB::Options::MetadataError.new,
             "bad 'as' value: #{ option_meta.inspect }"
         end
       else
@@ -270,23 +287,41 @@ module QB
     end
     
     # instance methods
-    # ================
+    # =======================================================================
     
+    # 
+    # @param [String|Pathname] path
+    #   location of the role directory
+    # 
     def initialize path
-      @path = path
+      @path = if path.is_a?(Pathname) then path else Pathname.new(path) end
       
-      @rel_path = if path.to_s.start_with? QB::GEM_ROLES_DIR.to_s
-        path.sub(QB::GEM_ROLES_DIR.to_s + '/', '')
-      elsif path.to_s.start_with? Dir.getwd
-        path.sub(Dir.getwd + '/', './')
+      # check it...
+      unless @path.exist?
+        raise Errno::ENOENT.new @path.to_s
+      end
+      
+      unless @path.directory?
+        raise Errno::ENOTDIR.new @path.to_s
+      end
+      
+      @meta_path = if (@path + 'meta' + 'qb').exist?
+        @path + 'meta' + 'qb'
+      elsif (@path + 'meta' + 'qb.yml').exist?
+        @path + 'meta' + 'qb.yml'
       else
-        path
+        raise Errno::ENOENT.new "#{ @path.join('meta').to_s }/[qb|qb.yml]"
       end
       
-      @name = path.to_s.split(File::SEPARATOR).last
+      @rel_path = if @path.to_s.start_with? QB::GEM_ROLES_DIR.to_s
+        @path.sub(QB::GEM_ROLES_DIR.to_s + '/', '')
+      elsif @path.to_s.start_with? Dir.getwd
+        @path.sub(Dir.getwd + '/', './')
+      else
+        @path
+      end
       
-      # gets filled in when {#meta_load}
-      @meta_path = nil
+      @name = @path.to_s.split(File::SEPARATOR).last
     end
     
     def to_s
@@ -315,17 +350,10 @@ module QB
     # if `cache` is true caches it as `@meta`
     # 
     def load_meta cache = true      
-      meta = if (@path + 'meta' + 'qb').exist?
-        @meta_path = @path + 'meta' + 'qb'
-        YAML.load(Cmds.out!(@meta_path.realpath.to_s)) || {}
-        
-      elsif (@path + 'meta' + 'qb.yml').exist?
-        @meta_path = @path + 'meta' + 'qb.yml'
+      meta = if @meta_path.extname == '.yml'
         YAML.load(@meta_path.read) || {}
-        
       else
-        {}
-        
+        YAML.load(Cmds.out!(@meta_path.realpath.to_s)) || {}
       end
       
       if cache
@@ -497,7 +525,7 @@ module QB
     # 
     # 
     def default_dir cwd, options
-      debug "get_default_dir",  role: self,
+      QB.debug "get_default_dir",  role: self,
                                 meta: self.meta,
                                 cwd: cwd,
                                 options: options
@@ -515,7 +543,7 @@ module QB
         raise "role does not use default directory (meta/qb.yml:default_dir = false)"
       
       when 'git_root'
-        debug "returning the git root relative to cwd"
+        QB.debug "returning the git root relative to cwd"
         NRSER.git_root cwd
       
       when 'cwd'
@@ -573,6 +601,13 @@ module QB
       end
     end # default_dir
     
+    # @return [Hash<String, *>]
+    #   default `ansible-playbook` CLI options from role qb metadata.
+    #   Hash of option name to value.
+    def default_ansible_options
+      meta_or 'ansible_options', {}
+    end
+    
     private
     
     # get the value at the first found of the keys or the default.

data/lib/qb/version.rb

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

data/node_modules/.bin/semver

@@ -1 +1 @@
-../semver/bin/semver
+node_modules/.bin/../semver/bin/semver

data/plugins/lookup_plugins/resolve.py

@@ -0,0 +1,28 @@
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+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()
+
+
+class LookupModule(LookupBase):
+
+    def run(self, terms, variables=None, **kwargs):
+
+        ret = []
+
+        for term in terms:
+            display.debug("resolve lookup term: %s" % term)
+
+            # Find the file in the expected search path
+            lookupfile = self.find_file_in_search_path(variables, 'files', term)
+            
+            ret.append(lookupfile)
+
+        return ret

data/qb.gemspec

@@ -93,7 +93,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "yard"
   
-  spec.add_dependency "cmds",'~> 0.0', ">= 0.0.9"
+  spec.add_dependency "cmds",'~> 0.0', ">= 0.1.2"
   spec.add_dependency "nrser-extras", '~> 0.0', ">= 0.0.3"
   spec.add_dependency "state_mate", '~> 0.0', ">= 0.0.9"
   spec.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'

data/roles/nrser.blockinfile/tests/expected/test-follow/link2.txt

@@ -1 +1 @@
-real2.txt
+roles/nrser.blockinfile/tests/expected/test-follow/real2.txt

data/roles/nrser.blockinfile/tests/fixtures/test-follow/link0.txt

@@ -1 +1 @@
-real0.txt
+roles/nrser.blockinfile/tests/fixtures/test-follow/real0.txt

data/roles/nrser.blockinfile/tests/fixtures/test-follow/link1.txt

@@ -1 +1 @@
-real1.txt
+roles/nrser.blockinfile/tests/fixtures/test-follow/real1.txt

data/roles/nrser.blockinfile/tests/fixtures/test-follow/link2.txt

@@ -1 +1 @@
-real2.txt
+roles/nrser.blockinfile/tests/fixtures/test-follow/real2.txt

data/roles/nrser.blockinfile/tests/roles/yaegashi.blockinfile

@@ -1 +1 @@
-../..
+roles/nrser.blockinfile/tests/roles/../..

data/roles/qb.gitignore/files/gitignore/Clojure.gitignore

@@ -1 +1 @@
-Leiningen.gitignore
+roles/qb.gitignore/files/gitignore/Leiningen.gitignore

data/roles/qb.gitignore/files/gitignore/Fortran.gitignore

@@ -1 +1 @@
-C++.gitignore
+roles/qb.gitignore/files/gitignore/C++.gitignore

data/roles/qb.gitignore/files/gitignore/Global/OSX.gitignore

@@ -1 +1 @@
-macOS.gitignore
+roles/qb.gitignore/files/gitignore/Global/macOS.gitignore

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

@@ -42,16 +42,19 @@
     dest: "{{ release_gem_version_path }}"
     regexp: "VERSION\\s*=\\s*\"{{ release_gem_current_version }}\""
     replace: "VERSION = \"{{ release_gem_release_version }}\""
+  when: release_gem_current_version != release_gem_release_version
 
 - name: add release version to git
   command: "git add {{ release_gem_version_path }}"
   args:
     chdir: "{{ qb_dir }}"
+  when: release_gem_current_version != release_gem_release_version
 
 - name: commit release version
   command: git commit -m "bump to v{{ release_gem_release_version }}"
   args:
     chdir: "{{ qb_dir }}"
+  when: release_gem_current_version != release_gem_release_version
 
 - name: release with bundler
   shell: bundle exec rake release

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

@@ -0,0 +1,5 @@
+---
+# defaults file for qb.yarn
+yarn_version: null
+yarn_homebrew_name: yarn
+yarn_state: present

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

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

data/roles/qb.yarn/meta/qb.yml

@@ -0,0 +1,72 @@
+---
+# meta/qb.yml file for qb.yarn
+# 
+# qb settings for this role. see README.md for more info.
+#
+
+# description of the role to show in it's help output.
+description: ensure yarn is installed and packages are present.
+
+# 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.
+# -   false
+#     -   don't provide qb_dir (means doesn't load or save options either).
+# -   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.
+# -   {find_up: FILENAME}
+#     -   starting at the current direcotry and climbing up to parent 
+#         directories, use the first one that contains FILENAME. error
+#         if none is found.
+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
+
+# ask for an ansible vault password
+ask_vault_pass: false
+
+options: # []
+# - name: example
+#   description: an example of a variable.
+#   required: false
+#   type: boolean # boolean (default) | string
+#   short: e
+- name: version
+  description: version to install.
+  type: string
+  short: v
+
+- name: state
+  description: >
+    present to install, absent to uninstall. the rest of the options are up to
+    you to much around with if you like.
+  see:
+  - http://docs.ansible.com/ansible/homebrew_module.html
+  type:
+    one_of:
+    - present
+    - absent
+    - latest
+    - head
+    - linked
+    - unlinked

data/roles/qb.yarn/tasks/distro/MacOSX.yml

@@ -0,0 +1,7 @@
+---
+- name: manage state on OSX via homebrew
+  homebrew:
+    name: "{{ yarn_setup_homebrew_name }}"
+    state: "{{ yarn_setup_state }}"
+    update_homebrew: "{{ update_homebrew | default(False) }}"
+    

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

@@ -0,0 +1,11 @@
+---
+# tasks file for qb.yarn
+
+- name: manage yarn installation
+  include: "distro/{{ ansible_distribution }}.yml"
+
+- name: add global packages
+  with_items: "{{ yarn_global_packages }}"
+  stream:
+    cmd: "yarn global add {{ item }}"
+  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.52
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: nrser-extras
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - lib/qb.rb
 - lib/qb/ansible_module.rb
 - lib/qb/options.rb
+- lib/qb/options/errors.rb
 - lib/qb/options/option.rb
 - lib/qb/role.rb
 - lib/qb/util.rb
@@ -180,6 +181,7 @@ files:
 - package.json
 - plugins/filter_plugins/string.py
 - plugins/filter_plugins/version.py
+- plugins/lookup_plugins/resolve.py
 - qb.gemspec
 - roles/nrser.blockinfile/CONTRIBUTING.md
 - roles/nrser.blockinfile/README.md
@@ -592,6 +594,11 @@ files:
 - roles/qb.vars/meta/main.yml
 - roles/qb.vars/meta/qb.yml
 - roles/qb.vars/tasks/main.yml
+- roles/qb.yarn/defaults/main.yml
+- roles/qb.yarn/meta/main.yml
+- roles/qb.yarn/meta/qb.yml
+- roles/qb.yarn/tasks/distro/MacOSX.yml
+- roles/qb.yarn/tasks/main.yml
 homepage: https://github.com/nrser/qb
 licenses:
 - MIT
@@ -612,7 +619,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: qb is all about projects. named after everyone's favorite projects.