qb 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9234ff3dddbac0d5c2b4c640f63873e53a18d9b2
-  data.tar.gz: a9a33b610f3691b8873efef6fa9b7cce0f6a113c
+  metadata.gz: 36d941451916fb21a0e92a4c73520240b12a7b4a
+  data.tar.gz: 6e11fb934d559165fe98096924e3afe27c80b684
 SHA512:
-  metadata.gz: cdee8091f290db8ccd416b1463d95cb1e7ce949c284a63b6941d5aac6d5ac7c603b78317968749026e77af09dc3573009f4cb20992e83d11f6d4929685041c01
-  data.tar.gz: 40dfc00d62b08512ae3a02ddf863f4618bb7623440fb9a99600ccd1b12cd2534da30d76a5890f2ebb00640cef1e1722dc3357f1de0b891945cdc3380241b245b
+  metadata.gz: b43a422d14c11a56580fa543f3fa6679ee0c3187d7379b6bfe942fc6c3d194baa74a8da76dd8f6a4fe74acbbe8633f4129c2173e23ed59c7c383566e1ef59bec
+  data.tar.gz: 657b3bd019e0cc539a21dc072d5a6d498a68a1e4b73af6e70ce517299d5445512d78de6316942f31ed46c0905c08af51d9658aa1400a7c1f1d68d37244f5cb7f

data/exe/qb

@@ -55,6 +55,8 @@ def main args
     [:run, args.rest]
   when 'setup'
     [:setup, args.rest]
+  when 'list', 'ls'
+    [:list, *args.rest]
   else
     # default to `run` on the full args
     [:run, args]

data/lib/qb/cli.rb

@@ -12,6 +12,7 @@ require_relative './cli/help'
 require_relative './cli/play'
 require_relative './cli/run'
 require_relative './cli/setup'
+require_relative './cli/list'
 
 
 # Requirements

data/lib/qb/cli/list.rb

@@ -1,15 +1,3 @@
-# Requirements
-# =====================================================================
-
-# package
-
-
-# Declarations
-# =======================================================================
-
-module QB; end
-
-
 # Definitions
 # =======================================================================
 
@@ -37,11 +25,17 @@ module QB::CLI
   #   Error exit status - we don't want `qb ... && ...` to move on to the
   #   second command when we end up falling back to `help`.
   # 
-  def self.list args = []
-    puts QB::Role.available
+  def self.list pattern = nil
+    roles = if pattern
+      QB::Role.matches pattern
+    else
+      QB::Role.available
+    end
+    
+    puts roles
     puts
     
-    return 1
+    return 0
   end # .help
   
 end # module QB::CLI

data/lib/qb/package/version.rb

@@ -93,8 +93,8 @@ class QB::Package::Version < QB::Util::Resource
   prop :major,          type: NUMBER_SEGMENT
   prop :minor,          type: NUMBER_SEGMENT,         default: 0
   prop :patch,          type: NUMBER_SEGMENT,         default: 0
-  prop :prerelease,     type: t.array(MIXED_SEGMENT), default: []
-  prop :build,          type: t.array(MIXED_SEGMENT), default: []
+  prop :prerelease,     type: t.array(MIXED_SEGMENT), default: ->{ [] }
+  prop :build,          type: t.array(MIXED_SEGMENT), default: ->{ [] }
 
   prop :release,        type: t.str,            source: :@release
   prop :is_release,     type: t.bool,           source: :release?

data/lib/qb/role.rb

@@ -7,16 +7,16 @@
 require 'yaml'
 require 'cmds'
 
-
 # deps
 # ----------------------------------------------------------------------------
 
-
 # package
 # ----------------------------------------------------------------------------
 
 # Breakouts
 require 'qb/role/errors'
+require 'qb/role/search_path'
+require 'qb/role/matches'
 require 'qb/role/name'
 require 'qb/role/default_dir'
 
@@ -24,14 +24,8 @@ require 'qb/role/default_dir'
 # Refinements
 # =======================================================================
 
-require 'nrser/refinements'
 using NRSER
-
-
-# Declarations
-# =======================================================================
-
-module QB; end
+using NRSER::Types
 
 
 # Contains info on a QB role.
@@ -44,134 +38,9 @@ class QB::Role
   include SemanticLogger::Loggable
   
   
-  # Constants
-  # =====================================================================
-  
-  # Array of string paths to directories to search for roles or paths to
-  # `ansible.cfg` files to look for an extract role paths from.
-  # 
-  # For the moment at least you can just mutate this value like you would
-  # `$LOAD_PATH`:
-  # 
-  #     QB::Role::PATH.unshift '~/where/some/roles/be'
-  #     QB::Role::PATH.unshift '~/my/ansible.cfg'
-  # 
-  # The paths are searched from first to last.
-  # 
-  # **WARNING**
-  # 
-  #   Search is **deep** - don't point this at large directory trees and
-  #   expect any sort of reasonable performance (any directory that
-  #   contains `node_modules` is usually a terrible idea for instance).
-  # 
-  BUILTIN_PATH = [
-    
-    # Development Paths
-    # =================
-    # 
-    # These come first because:
-    # 
-    # 1.  They are working dir-local.
-    # 
-    # 2.  They should only be present in local development, and should be
-    #     capable of overriding roles in other local directories to allow
-    #     custom development behavior (the same way `./dev/bin` is put in
-    #     front or `./bin`).
-    # 
-    
-    # Role paths declared in ./dev/ansible.cfg, if it exists.
-    File.join('.', 'dev', 'ansible.cfg'),
-    
-    # Roles in ./dev/roles
-    File.join('.', 'dev', 'roles'),
-    
-    
-    # Working Directory Paths
-    # =======================
-    # 
-    # Next up, `ansible.cfg` and `roles` directory in the working dir.
-    # Makes sense, right?
-    # 
-    
-    # ./ansible.cfg
-    File.join('.', 'ansible.cfg'),
-    
-    # ./roles
-    File.join('.', 'roles'),
-    
-    
-    # Working Directory-Local Ansible Directory
-    # =========================================
-    # 
-    # `ansible.cfg` and `roles` in a `./ansible` directory, making a common
-    # place to put Ansible stuff in an project accessible when running from
-    # the project root.
-    # 
-    
-    # ./ansible/ansible.cfg
-    File.join('.', 'ansible', 'ansible.cfg'),
-    
-    # ./ansible/roles
-    File.join('.', 'ansible', 'roles'),
-    
-    # TODO  Git repo root relative?
-    #       Some sort of flag file for a find-up?
-    #       System Ansible locations?
-    
-    
-    # QB Gem Role Directories
-    # =======================
-    # 
-    # Last, but far from least, paths provided by the QB Gem to the user's
-    # QB role install location and the roles that come built-in to the gem.
-    
-    QB::USER_ROLES_DIR,
-    
-    QB::GEM_ROLES_DIR,
-  ].freeze
-  
-  
-  # Array of string paths to directories to search for roles or paths to
-  # `ansible.cfg` files to look for an extract role paths from.
-  # 
-  # Value is a duplicate of the frozen {QB::Role::BUILTIN_PATH}. You can
-  # reset to those values at any time via {QB::Role.reset_path!}.
-  # 
-  # For the moment at least you can just mutate this value like you would
-  # `$LOAD_PATH`:
-  # 
-  #     QB::Role::PATH.unshift '~/where/some/roles/be'
-  #     QB::Role::PATH.unshift '~/my/ansible.cfg'
-  # 
-  # The paths are searched from first to last.
-  # 
-  # **WARNING**
-  # 
-  #   Search is **deep** - don't point this at large directory trees and
-  #   expect any sort of reasonable performance (any directory that
-  #   contains `node_modules` is usually a terrible idea for instance).
-  # 
-  PATH = BUILTIN_PATH.dup
-
-  
   # Class Methods
   # =======================================================================
   
-  # Reset {QB::Role::PATH} to the original built-in values in
-  # {QB::Role::BUILTIN_PATH}.
-  # 
-  # Created for testing but might be useful elsewhere as well.
-  # 
-  # @return [Array<String>]
-  #   The reset {QB::Role::PATH}.
-  # 
-  def self.reset_path!
-    PATH.clear
-    BUILTIN_PATH.each { |path| PATH << path }
-    PATH
-  end # .reset_path!
-  
-  
   # true if pathname is a QB role directory.
   def self.role_dir? pathname
     # must be a directory
@@ -181,54 +50,15 @@ class QB::Role
   end
   
   
-  # @param dir [Pathname] dir to include.
-  def self.roles_paths dir
-    cfg_roles_path(dir) + [
-      dir.join('roles'),
-      dir.join('roles', 'tmp'),
-    ]
-  end
-  
-  # places to look for qb role directories. these paths are also included
-  # when qb runs a playbook.
-  # 
-  # TODO resolution order:
-  # 
-  # 1.  paths specific to this run:
-  #     a.  TODO paths provided on the cli.
-  # 2.  paths specific to the current directory:
-  #     a.  paths specified in ./ansible.cfg (if it exists)
-  #     b.  ./roles
-  #     d.  paths specified in ./ansible/ansible.cfg (if it exists)
-  #     e.  ./ansible/roles
-  #     g.  paths specified in ./dev/ansible.cfg (if it exists)
-  #     h.  ./dev/roles
-  #     i.  ./dev/roles/tmp
-  #         -   used for roles that are downloaded but shouldn't be included
-  #             in source control.
-  # 3.
-  # 
-  # @return [Array<Pathname>]
-  #   places to look for role dirs.
-  # 
-  def self.search_path
-    QB::Role::PATH.
-      map { |path|
-        if QB::Ansible::ConfigFile.end_with_config_file?(path)
-          if File.file?(path)
-            QB::Ansible::ConfigFile.new(path).defaults.roles_path
-          end
-        else
-          QB::Util.resolve path
-        end
-      }.
-      flatten.
-      reject(&:nil?)
-  end
-  
-  # array of QB::Role found in search path.
+  # All {QB::Role} found in search path.
+  # 
+  # Does it's best to remove duplicates that end up being reached though
+  # multiple search paths (happens most in development).
+  # 
+  # @return [Array<QB::Role>]
+  # 
   def self.available
-    search_path.
+    self.search_path.
       select {|search_dir|
         # make sure it's there (and a directory)
         search_dir.directory?
@@ -241,93 +71,11 @@ class QB::Role
             }
         }
       }.
-      flatten(1).
-      map {|args|
-        QB::Role.new *args
-      }.
+      flatten( 1 ).
+      map { |args| QB::Role.new *args }.
       uniq
   end
   
-  # Get an array of QB::Role that match an input string.
-  # 
-  # @return [Array<QB::Role>]
-  # 
-  def self.matches input
-    # keep this here to we don't re-gen every loop
-    available = self.available
-    
-    # first off, see if input matches any relative paths exactly
-    available.each {|role|
-      return [role] if role.display_path.to_s == input
-    }
-    
-    # create an array of "separator" variations to try *exact* matching
-    # against. in order of preference:
-    # 
-    # 1.  exact input
-    #     -   this means if you ended up with roles that actually *are*
-    #         differnetiated by '_/-' differences (which, IMHO, is a
-    #         horrible fucking idea), you can get exactly what you ask for
-    #         as a first priority
-    # 2.  input with '-' changed to '_'
-    #     -   prioritized because convetion is to underscore-separate
-    #         role names.
-    # 3.  input with '_' changed to '-'
-    #     -   really just for convience's sake so you don't really have to
-    #         remember what separator is used.
-    #     
-    separator_variations = [
-      input,
-      input.gsub('-', '_'),
-      input.gsub('_', '-'),
-    ]
-    
-    separator_variations.each { |variation|
-      available.each { |role|
-        # exact match to full name
-        return [role] if role.name == variation
-      }.each { |role|
-        # exact match without the namespace prefix ('qb.' or similar)
-        return [role] if role.namespaceless == variation
-      }
-    }
-    
-    # see if we prefix match any full names
-    separator_variations.each { |variation|
-      name_prefix_matches = available.select { |role|
-        role.name.start_with? variation
-      }
-      return name_prefix_matches unless name_prefix_matches.empty?
-    }
-    
-    # see if we prefix match any name
-    separator_variations.each { |variation|
-      namespaceless_prefix_matches = available.select { |role|
-        role.namespaceless.start_with? variation
-      }
-      unless namespaceless_prefix_matches.empty?
-        return namespaceless_prefix_matches
-      end
-    }
-    
-    # see if we prefix match any display paths
-    separator_variations.each { |variation|
-      path_prefix_matches = available.select { |role|
-        role.display_path.start_with? variation
-      }
-      return path_prefix_matches unless path_prefix_matches.empty?
-    }
-    
-    # see if we word match any display paths
-    name_word_matches = available.select { |role|
-      QB::Util.words_start_with? role.display_path.to_s, input
-    }
-    return name_word_matches unless name_word_matches.empty?
-    
-    # nada
-    []
-  end # .matches
-  
   
   # Find exactly one matching role for the input string or raise.
   # 
@@ -499,8 +247,15 @@ class QB::Role
   # Instance Methods
   # =====================================================================
   
+  # Just a string version of {#display_path}
+  # 
+  def display_name
+    display_path.to_s
+  end
+  
+  
   def options_key
-    @display_path.to_s
+    display_name
   end
   
   # load qb metadata from meta/qb.yml or from executing meta/qb and parsing

data/lib/qb/role/matches.rb

@@ -0,0 +1,165 @@
+# frozen_string_literal: true
+
+##
+# {QB::Role.matches} method, which is the (messy) bulk of figuring out what
+# role to run based on user input.
+# 
+# Broken out from the main `//lib/qb/role.rb` file because it was starting to
+# get long and unwieldy.
+# 
+##
+
+# Refinements
+# =======================================================================
+
+using NRSER
+using NRSER::Types
+
+
+# Definitions
+# =======================================================================
+
+class QB::Role
+  
+  # Get an array of {QB::Role} that match an input string.
+  # 
+  # This is the meat of whats needed to support {QB::Role.require}.
+  # 
+  # How it works is... tricky. Read the comments and play around with it is
+  # the bast I can offer right now.
+  # 
+  # @param [String] input
+  #   The input string to match against role paths and names. Primarily what
+  #   the user typed after `qb run` on the CLI.
+  # 
+  # @return [Array<QB::Role>]
+  # 
+  def self.matches input
+    # keep this here to we don't re-gen every loop
+    available = self.available
+    
+    # first off, see if input matches any relative paths exactly
+    available.each {|role|
+      return [role] if role.display_path.to_s == input
+    }
+    
+    # create an array of "separator" variations to try *exact* matching
+    # against. in order of preference:
+    # 
+    # 1.  exact input
+    #     -   this means if you ended up with roles that actually *are*
+    #         differentiated by '_/-' differences (which, IMHO, is a
+    #         horrible fucking idea), you can get exactly what you ask for
+    #         as a first priority
+    # 2.  input with '-' changed to '_'
+    #     -   prioritized because convention is to underscore-separate
+    #         role names.
+    # 3.  input with '_' changed to '-'
+    #     -   really just for convenience's sake so you don't really have to
+    #         remember what separator is used.
+    #     
+    separator_variations = [
+      input,
+      input.gsub('-', '_'),
+      input.gsub('_', '-'),
+    ]
+    
+    # {QB::Role} method names to check against, from highest to lowest
+    # precedence
+    method_names = [
+      # 1.  The path we display to the user. This comes first because typing
+      #     in exactly what they see should always work.
+      :display_name,
+      
+      # 2.  The role's full name (with namespace) as it is likely to be used
+      #     in Ansible
+      :name,
+      
+      # 3.  The part of the role after the namespace, which is far less
+      #     specific, but nice short-hand if it's unique
+      :namespaceless
+    ]
+    
+    # 1.  Exact matches (allowing `-`/`_` substitution)
+    #     
+    #     Highest precedence, guaranteeing that exact verbatim matches will
+    #     always work (or that's the intent).
+    # 
+    method_names.each { |method_name|
+      separator_variations.each { |variation|
+        matches = available.select { |role|
+          role.public_send( method_name ) == variation
+        }
+        return matches unless matches.empty?
+      }
+    }
+    
+    # 2.  Prefix matches
+    #     
+    #     Do any of {#display_path}, {#name} or {#namespaceless} or start with
+    #     the input pattern?
+    # 
+    method_names.each { |method_name|
+      separator_variations.each { |variation|
+        matches = available.select { |role|
+          role.public_send( method_name ).start_with? variation
+        }
+        return matches unless matches.empty?
+      }
+    }
+    
+    # 3.  Word slice full matches
+    #     
+    #     Split the {#display_name} and input first by `/` and `.` segments,
+    #     then {String#downcase} each segments and split it into words (using
+    #     {NRSER.words}).
+    #     
+    #     Then see if the input appears in the role name.
+    #     
+    #     We test only {#display_name} because it should always contain
+    #     {#name} and {#namesaceless}, so it's pointless to test the other
+    #     two after it).
+    # 
+    
+    word_parse = ->( string ) {
+      string.split( /[\/\.]/ ).map { |seg| seg.downcase.words }
+    }
+    
+    input_parse = word_parse.call input
+    
+    exact_word_slice_matches = available.select { |role|
+      word_parse.call( role.display_name ).slice? input_parse
+    }
+    
+    return exact_word_slice_matches unless exact_word_slice_matches.empty?
+    
+    # 4.  Word slice prefix matches
+    #     
+    #     Same thing as (3), but do a prefix match instead of the entire
+    #     words.
+    # 
+    name_word_matches = available.select { |role|
+      word_parse.call( role.display_name ).
+        slice?( input_parse ) { |role_words, input_words|
+          # Use a custom match block to implement prefix matching
+          # 
+          # We want to match if each input word is the start of the
+          # corresponding role name word
+          # 
+          if role_words.length >= input_words.length
+            input_words.each_with_index.all? { |input_word, index|
+              role_words[index].start_with? input_word
+            }
+          else
+            false
+          end
+        }
+      QB::Util.words_start_with? role.display_path.to_s, input
+    }
+    return name_word_matches unless name_word_matches.empty?
+    
+    # nada
+    []
+  end # .matches
+  
+end # class QB::Role

data/lib/qb/role/name.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 ##
 # {QB::Role} methods for dealing with role names.
 # 
-# Broken out from the main `//lib/qb/role.rb` file because it was starting to 
+# Broken out from the main `//lib/qb/role.rb` file because it was starting to
 # get long and unwieldy.
 # 
 ##
@@ -23,12 +25,8 @@ require 'qb/util'
 # Refinements
 # =======================================================================
 
-require 'nrser/refinements'
 using NRSER
-
-
-# Declarations
-# =======================================================================
+using NRSER::Types
 
 
 # Definitions
@@ -66,8 +64,8 @@ class QB::Role
     # Find the first directory in the search path that contains the path,
     # if any do.
     # 
-    # It *could* be in more than one in funky situations like overlapping 
-    # search paths or link silliness, but that doesn't matter - we consider 
+    # It *could* be in more than one in funky situations like overlapping
+    # search paths or link silliness, but that doesn't matter - we consider
     # the first place we find it to be the relevant once, since the search
     # path is most-important-first.
     # 

data/lib/qb/role/search_path.rb

@@ -0,0 +1,176 @@
+# frozen_string_literal: true
+
+##
+# {QB::Role} methods for dealing with role search path.
+# 
+# Broken out from the main `//lib/qb/role.rb` file because it was starting to
+# get long and unwieldy.
+# 
+##
+
+# Refinements
+# =======================================================================
+
+using NRSER
+using NRSER::Types
+
+
+# Definitions
+# =======================================================================
+
+class QB::Role
+  
+  # Constants
+  # =====================================================================
+
+  # "Factory defaults" that {QB::Role::PATH} is initialized to, and what it
+  # gets reset to when {QB::Role.reset_path!} is called.
+  # 
+  # Read the {QB::Role::PATH} docs for details on how QB role paths work.
+  # 
+  # This value is deeply frozen, and you should not attempt to change it -
+  # mess with {QB::Role::PATH} instead.
+  # 
+  # @return [Array<String>]
+  # 
+  BUILTIN_PATH = [
+    
+    # Development Paths
+    # =================
+    # 
+    # These come first because:
+    # 
+    # 1.  They are working dir-local.
+    # 
+    # 2.  They should only be present in local development, and should be
+    #     capable of overriding roles in other local directories to allow
+    #     custom development behavior (the same way `./dev/bin` is put in
+    #     front or `./bin`).
+    # 
+    
+    # Role paths declared in ./dev/ansible.cfg, if it exists.
+    File.join('.', 'dev', 'ansible.cfg'),
+    
+    # Roles in ./dev/roles
+    File.join('.', 'dev', 'roles'),
+    
+    
+    # Working Directory Paths
+    # =======================
+    # 
+    # Next up, `ansible.cfg` and `roles` directory in the working dir.
+    # Makes sense, right?
+    # 
+    
+    # ./ansible.cfg
+    File.join('.', 'ansible.cfg'),
+    
+    # ./roles
+    File.join('.', 'roles'),
+    
+    
+    # Working Directory-Local Ansible Directory
+    # =========================================
+    # 
+    # `ansible.cfg` and `roles` in a `./ansible` directory, making a common
+    # place to put Ansible stuff in an project accessible when running from
+    # the project root.
+    # 
+    
+    # ./ansible/ansible.cfg
+    File.join('.', 'ansible', 'ansible.cfg'),
+    
+    # ./ansible/roles
+    File.join('.', 'ansible', 'roles'),
+    
+    # TODO  Git repo root relative?
+    #       Some sort of flag file for a find-up?
+    #       System Ansible locations?
+    
+    
+    # QB Gem Role Directories
+    # =======================
+    # 
+    # Last, but far from least, paths provided by the QB Gem to the user's
+    # QB role install location and the roles that come built-in to the gem.
+    
+    QB::USER_ROLES_DIR,
+    
+    QB::GEM_ROLES_DIR,
+  ].freeze
+
+
+  # Array of string paths to directories to search for roles or paths to
+  # `ansible.cfg` files to look for an extract role paths from.
+  # 
+  # Value is a duplicate of the frozen {QB::Role::BUILTIN_PATH}. You can
+  # reset to those values at any time via {QB::Role.reset_path!}.
+  # 
+  # For the moment at least you can just mutate this value like you would
+  # `$LOAD_PATH`:
+  # 
+  #     QB::Role::PATH.unshift '~/where/some/roles/be'
+  #     QB::Role::PATH.unshift '~/my/ansible.cfg'
+  # 
+  # The paths are searched from first to last.
+  # 
+  # **WARNING**
+  # 
+  #   Search is **deep** - don't point this at large directory trees and
+  #   expect any sort of reasonable performance (any directory that
+  #   contains `node_modules` is usually a terrible idea for instance).
+  # 
+  # @return [Array<String>]
+  # 
+  PATH = BUILTIN_PATH.dup
+  
+  
+  # Class Methods
+  # ======================================================================
+  
+  # Reset {QB::Role::PATH} to the original built-in values in
+  # {QB::Role::BUILTIN_PATH}.
+  # 
+  # Created for testing but might be useful elsewhere as well.
+  # 
+  # @return [Array<String>]
+  #   The reset {QB::Role::PATH}.
+  # 
+  def self.reset_path!
+    PATH.clear
+    BUILTIN_PATH.each { |path| PATH << path }
+    PATH
+  end # .reset_path!
+  
+  
+  # Gets the array of paths to search for QB roles based on {QB::Role::PATH}
+  # and the working directory at the time it's called.
+  # 
+  # QB then uses the returned value to figure out what roles are available.
+  # 
+  # The process:
+  # 
+  # 1.  Resolve relative paths against the working directory.
+  #     
+  # 2.  Load up any `ansible.cfg` files on the path and add any `roles_path`
+  #     they define where the `ansible.cfg` entry was in {QB::Role::PATH}.
+  # 
+  # @return [Array<Pathname>]
+  #   Directories to search for QB roles.
+  # 
+  def self.search_path
+    QB::Role::PATH.
+      map { |path|
+        if QB::Ansible::ConfigFile.end_with_config_file?(path)
+          if File.file?(path)
+            QB::Ansible::ConfigFile.new(path).defaults.roles_path
+          end
+        else
+          QB::Util.resolve path
+        end
+      }.
+      flatten.
+      reject(&:nil?)
+  end
+  
+end # class QB::Role

data/lib/qb/util.rb

@@ -8,47 +8,29 @@ using NRSER
 
 module QB
   module Util
-    # split a string into 'words' for word-based matching
+    
+    # Split a string into 'words' for word-based matching
+    # 
+    # @return [Array<String>]
+    #   Array of non-empty words in `string`.
+    # 
     def self.words string
-      string.split(/[\W_\-\/]+/).reject {|w| w.empty?}
+      string.words
     end # .words
     
+    
+    def self.words_slice? full_string, input, &is_match
+      full_string.words.slice? input.words, &is_match
+    end # .words_include?
+    
+    
     # see if words from an input match words
     def self.words_start_with? full_string, input
-      # QB.debug "does #{ input } match #{ full_string }?"
-      
-      input_words = words input
-      
-      # short-circuit if there are no input words ('./' for example)
-      return false if input_words.empty?
-      
-      full_string_words = words full_string
-      
-      full_string_words.each_with_index {|word, start_index|
-        # compute the end index in full_string_words
-        end_index = start_index + input_words.length - 1
-        
-        # short-circuit if can't match (more input words than full words left)
-        if end_index >= full_string_words.length
-          return false
-        end
-        
-        # create the slice to test against
-        slice = full_string_words[start_index..end_index]
-        
-        # see if every word in the slice starts with the corresponding word
-        # in the input
-        if slice.zip(input_words).all? {|full_word, input_word|
-          full_word.start_with? input_word
-        }
-          # got a match!
-          return true
-        end
-      }
-      
-      # no match
-      false
-    end # .match_words?
+      words_slice? full_string, input do |full_string_word, input_word|
+        full_string_word.start_with? input_word
+      end
+    end # .words_start_with?
+    
     
     # @return [Pathname] absolute resolved path.
     def self.resolve *segments

data/lib/qb/version.rb

@@ -4,7 +4,7 @@ module QB
   
   GEM_NAME = 'qb'
   
-  VERSION = "0.3.17"
+  VERSION = "0.3.18"
   
   MIN_ANSIBLE_VERSION = Gem::Version.new '2.1.2'
   

data/qb.gemspec

@@ -195,7 +195,7 @@ Gem::Specification.new do |spec|
   # ----------------------------------------------------------------------------
   
   spec.add_dependency "cmds",             '~> 0.0', ">= 0.2.7"
-  spec.add_dependency "nrser",            '~> 0.1', ">= 0.1.3"
+  spec.add_dependency "nrser",            '~> 0.1', ">= 0.1.4"
   spec.add_dependency "state_mate",       '~> 0.0', ">= 0.1.0"
   
   # Used to parse `ansible.cfg` files

data/roles/{qb.vars → qb/dump/vars}/.qb-options.yml

@@ -1,3 +1,3 @@
 ---
-qb.qb_role:
+qb/role/qb:
   defaults: false

data/roles/{qb.vars → qb/dump/vars}/meta/main.yml

@@ -1,8 +1,7 @@
 ---
-# meta file for qb.vars
+# meta file for qb/dump/vars
 
 allow_duplicates: yes
 
 dependencies: []
 # - role: role-name
-

data/roles/{qb.vars → qb/dump/vars}/meta/qb.yml

@@ -1,5 +1,5 @@
 ---
-# meta/qb.yml file for qb.vars
+# meta/qb.yml file for qb/dump/vars
 # 
 # qb settings for this role. see README.md for more info.
 #
@@ -7,7 +7,7 @@
 # prefix for role variables
 var_prefix: null
 
-# how to get a default for `dir` if it's not provided as the 
+# how to get a default for `dir` if it's not provided as the
 default_dir: null
 
 # set to false to not save options in .qb-options.yml files

data/roles/{qb.vars → qb/dump/vars}/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-# tasks file for qb.vars
+# tasks file for qb/dump/vars
 
 - when: vars_output is defined
   local_action:

data/roles/qb/git/check/clean/meta/qb.yml

@@ -10,7 +10,7 @@
 
 # Shown in help output, etc.
 description: >-
-  TODO describe qb/git/check/clean role
+  Fail if Git repo working directory isn't clean
 
 # Gemspec-style requirements. Right now only `.gems.qb` is used.
 requirements:

data/roles/{qb.git_repo → qb/git/repo}/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for qb.git_repo
+# defaults file for qb/git/repo
 git_repo_dest: "{{ qb_dir }}"
 git_repo_gitignores: []

data/roles/qb/git/repo/meta/main.yml

@@ -0,0 +1,4 @@
+---
+# meta file for qb/git/repo
+
+dependencies: []

data/roles/qb/git/repo/meta/qb.yml

@@ -0,0 +1,6 @@
+# Shown in help output, etc.
+description: >-
+  Ensure directory is a Git repo - init and add basic ignore sections
+
+# Prefix for role variables
+var_prefix: git_repo

data/roles/{qb.git_repo → qb/git/repo}/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-# tasks file for qb.git_repo
+# tasks file for qb/git/repo
 
 - name: >-
     Create {{ git_repo_dest }} directory

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

@@ -2,5 +2,6 @@
 # meta file for qb/project
 
 dependencies:
-- role: qb.git_repo
-  git_repo_dest: "{{ project_dest }}"
+- role: qb/git/repo
+  git_repo_dest: >-
+    {{ project_dest }}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,7 +143,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -153,7 +153,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: state_mate
   requirement: !ruby/object:Gem::Requirement
@@ -310,7 +310,9 @@ files:
 - lib/qb/role.rb
 - lib/qb/role/default_dir.rb
 - lib/qb/role/errors.rb
+- lib/qb/role/matches.rb
 - lib/qb/role/name.rb
+- lib/qb/role/search_path.rb
 - lib/qb/util.rb
 - lib/qb/util/bundler.rb
 - lib/qb/util/docker_mixin.rb
@@ -370,10 +372,6 @@ files:
 - roles/nrser.state_mate/test/ansible/ansible.cfg
 - roles/nrser.state_mate/test/ansible/hosts
 - roles/nrser.state_mate/test/ansible/template.yml
-- roles/qb.git_repo/defaults/main.yml
-- roles/qb.git_repo/meta/main.yml
-- roles/qb.git_repo/meta/qb.yml
-- roles/qb.git_repo/tasks/main.yml
 - roles/qb.git_submodule_update/.qb-options.yml
 - roles/qb.git_submodule_update/README.md
 - roles/qb.git_submodule_update/defaults/main.yml
@@ -416,11 +414,6 @@ files:
 - roles/qb.unhack_gem/meta/main.yml
 - roles/qb.unhack_gem/meta/qb.yml
 - roles/qb.unhack_gem/tasks/main.yml
-- roles/qb.vars/.qb-options.yml
-- roles/qb.vars/README.md
-- roles/qb.vars/meta/main.yml
-- roles/qb.vars/meta/qb.yml
-- roles/qb.vars/tasks/main.yml
 - roles/qb.yarn_release/defaults/main.yml
 - roles/qb.yarn_release/meta/main.yml
 - roles/qb.yarn_release/meta/qb.yml
@@ -433,6 +426,11 @@ files:
 - roles/qb/dev/ref/repo/git/meta/main.yml
 - roles/qb/dev/ref/repo/git/meta/qb.yml
 - roles/qb/dev/ref/repo/git/tasks/main.yml
+- roles/qb/dump/vars/.qb-options.yml
+- roles/qb/dump/vars/README.md
+- roles/qb/dump/vars/meta/main.yml
+- roles/qb/dump/vars/meta/qb.yml
+- roles/qb/dump/vars/tasks/main.yml
 - roles/qb/facts/defaults/main.yml
 - roles/qb/facts/meta/main.yml
 - roles/qb/facts/meta/qb.yml
@@ -637,6 +635,10 @@ files:
 - roles/qb/git/ignore/meta/main.yml
 - roles/qb/git/ignore/meta/qb
 - roles/qb/git/ignore/tasks/main.yml
+- roles/qb/git/repo/defaults/main.yml
+- roles/qb/git/repo/meta/main.yml
+- roles/qb/git/repo/meta/qb.yml
+- roles/qb/git/repo/tasks/main.yml
 - roles/qb/github/pages/setup/defaults/main.yml
 - roles/qb/github/pages/setup/meta/main.yml
 - roles/qb/github/pages/setup/meta/qb.yml

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

@@ -1,4 +0,0 @@
----
-# meta file for qb.git_repo
-
-dependencies: []