qb 0.1.67 → 0.1.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bfcdf4a94119b5ca496cb1f0723bcaaa8dc1a0e
-  data.tar.gz: a91cb4f150803e5eb65a072c1d14a290777e1442
+  metadata.gz: d5cea6b175ce538d419a13ff2f8e93f9b60c312b
+  data.tar.gz: 4c9c82929111f60a0a53e21d28143baa9f979288
 SHA512:
-  metadata.gz: c5a5f2f6900672fec6f8b780942da85d64932beb267bb6493accb0be594ccbeb32abc7863d6de1f3b6f1222b78c3a952d3d5e84eb240c8f18e99ddd1debf37a9
-  data.tar.gz: aeb9f9693ddc76268ce3b13ed9a7c0e73d4ba59f108a94f07cfd02bb816b389a3a8c8f84a8d8f3e95890c06c93907dbdd9ac36b4c6cc3df69279767529fb0835
+  metadata.gz: 39bc6172c05b614b998ffc28fa3894267c617e587137080c57609aa4a89f6258681b0f08962b246a2c5d43474c078cd18588a368e44eef0ebd355b0e37f01a5d
+  data.tar.gz: cec0fb8aa6771e21661bb50b4f146ef27b4544ebfbd0b844dc29dd59eee0eb260b11f224c25b185671640427f476d60209b43e8740d7ea521d819b5063e8c729

data/exe/qb

@@ -410,16 +410,22 @@ def main args
   end
   
   with_clean_env do
-    # boot up stdio services so that ansible modules can stream to our
+    # boot up stdio out services so that ansible modules can stream to our
     # stdout and stderr to print stuff (including debug lines) in real-time
-    stdio_services = {'out' => $stdout, 'err' => $stderr}.map do |name, dest|
-      QB::Util::STDIO::Service.new(name, dest).tap {|s| s.open! }
-    end
+    stdio_out_services = {'out' => $stdout, 'err' => $stderr}.
+      map {|name, dest|
+        QB::Util::STDIO::OutService.new(name, dest).tap { |s| s.open! }
+      }
+    
+    # and an in service so that modules can prompt for user input
+    user_in_service = QB::Util::STDIO::InService.new('in', $stdin).
+      tap { |s| s.open! }
     
     status = cmd.stream
     
     # close the stdio services
-    stdio_services.each {|s| s.close! }
+    stdio_out_services.each {|s| s.close! }
+    user_in_service.close!
     
     if status != 0
       puts "ERROR ansible-playbook failed."

data/lib/qb/ansible_module.rb

@@ -12,6 +12,18 @@ module QB
       @@arg_types[name.to_sym] = type
     end
     
+    def debug *args
+      if @qb_stdio_err
+        header = "<QB::AnsibleModule #{ self.class.name }>"
+        
+        if args[0].is_a? String
+          header += " " + args.shift
+        end
+        
+        QB.debug header, *args
+      end
+    end
+    
     def initialize
       @changed = false
       @input_file = ARGV[0]
@@ -19,17 +31,27 @@ module QB
       @args = JSON.load @input
       @facts = {}
       
+      @qb_stdio_out = nil
+      @qb_stdio_err = nil
+      @qb_stdio_in = nil
+      
       # if QB_STDIO_ env vars are set send stdout and stderr
       # to those sockets to print in the parent process
       
       if ENV['QB_STDIO_OUT']
-        $stdout = UNIXSocket.new ENV['QB_STDIO_OUT']
+        @qb_stdio_out = $stdout = UNIXSocket.new ENV['QB_STDIO_OUT']
       end
       
       if ENV['QB_STDIO_ERR']
-        $stderr = UNIXSocket.new ENV['QB_STDIO_ERR']
+        @qb_stdio_err = $stderr = UNIXSocket.new ENV['QB_STDIO_ERR']
       end
       
+      if ENV['QB_STDIO_IN']
+        @qb_stdio_in = UNIXSocket.new ENV['QB_STDIO_IN']
+      end
+      
+      debug "HERE!"
+      
       @@arg_types.each {|key, type|
         var_name = "@#{ key.to_s }"
         

data/lib/qb/role.rb

@@ -194,14 +194,21 @@ module QB
         return namespaceless_prefix_matches 
       end
       
-      # see if we word match any relative paths
+      # see if we prefix match any display paths
+      path_prefix_matches = available.select {|role|
+        role.display_path.start_with? input
+      }
+      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
+    end # .matches
     
     # find exactly one matching role for the input string or raise.
     def self.require input

data/lib/qb/util.rb

@@ -14,8 +14,16 @@ module QB
       # 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
       
+      QB.debug "HERE",
+        input_words: input_words,
+        full_string_words: full_string_words
+      
       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

data/lib/qb/util/stdio.rb

@@ -16,9 +16,8 @@ module QB::Util::STDIO
   # their output to it, which is in turn printed to the console `qb` is running
   # in.
   class Service
-    def initialize name, dest
+    def initialize name
       @name = name
-      @dest = dest
       @thread = nil
       @server = nil
       @socket = nil
@@ -54,9 +53,7 @@ module QB::Util::STDIO
         @server = UNIXServer.new @path.to_s
         @socket = @server.accept
         
-        while (line = @socket.gets) do
-          @dest.puts line
-        end
+        work_in_thread
       end
       
       # set the env key so children can find the socket path
@@ -73,14 +70,46 @@ module QB::Util::STDIO
       # 
       debug "closing..."
       
-      @thread.kill unless @thread.nil?
       @socket.close unless @socket.nil?
       @socket = nil
       @server.close unless @server.nil?
       @server = nil
       FileUtils.rm(@path) if @path.exist?
+      @thread.kill unless @thread.nil?
       
       debug "closed."
     end
   end # Service
+  
+  # QB STDIO Service to proxy output from modules back to the main user 
+  # process.
+  class OutService < Service
+    def initialize name, dest
+      super name
+      @dest = dest
+    end
+    
+    def work_in_thread
+      while (line = @socket.gets) do
+        @dest.puts line
+      end
+    end
+  end # OutService
+  
+  # QB STDIO Service to proxy interactive user input from the main process
+  # to modules.
+  class InService < Service
+    def initialize name, src
+      super name
+      @src = src
+    end
+    
+    def work_in_thread
+      while (line = @src.gets) do
+        @socket.puts line
+      end
+      
+      close!
+    end
+  end # InService
 end # QB::Util::STDIO

data/lib/qb/version.rb

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

data/library/path_facts

@@ -87,6 +87,27 @@ class PathFacts < QB::AnsibleModule
         end
       }
       
+      git.is_clean = Cmds.chomp!('git status --porcelain 2>/dev/null').empty?
+      
+      rev_parse = Cmds.capture 'git rev-parse HEAD'
+      
+      if rev_parse.ok?
+        git.head = rev_parse.out.chomp
+        git.head_short = git.head[0...7]
+      else
+        git.head = git.head_short = nil
+      end
+      
+      branch = Cmds.capture 'git branch --no-color 2> /dev/null'
+      
+      git.branch = if branch.ok?
+        if line = branch.out.lines.find {|line| line.start_with? '*'}
+          if m = line.match(/\*\s+(\S+)/)
+            m[0]
+          end
+        end
+      end
+      
       git.origin = begin
         Cmds.chomp! "git remote get-url origin"
       rescue
@@ -184,9 +205,11 @@ class PathFacts < QB::AnsibleModule
     # To stay consistent with Gem
     npm.name = npm.package_json['name']
     
-    npm.version = QB::Package::Version.from_npm_version(
-      npm.package_json['version']
-    )
+    if npm.package_json['version']
+      npm.version = QB::Package::Version.from_npm_version(
+        npm.package_json['version']
+      )
+    end
   end
   
   # Run the module.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.67
+  version: 0.1.68
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler