cmd-utils 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19937d5ab0376abd84254c084edaec772b501d42
-  data.tar.gz: 130e9b5ec4997a36db8c4e46503650ca55f53288
+  metadata.gz: fce02fbcbd166ba24d890457e77eb21414efabda
+  data.tar.gz: 208ac2a33a259f801c17e50e5e864c0b568d36fe
 SHA512:
-  metadata.gz: a1fe074ab79e0f4e541f3ab7c3325ad60e836e40ff8895168591131ea1391433347eb5f3dbb1e3d9a25eb053643105c48ccd2f66e7303fbd91e75da28c87c9ac
-  data.tar.gz: 9f359fed8970713e8a5ce436ce031a9b5d67d0ac80383691a89daa195d275c001f84f573e039664f776a8f2dcfe7e4ec539e0e9a897c60291ab4268bd14d7d0b
+  metadata.gz: 5c40c5d2aca9229db112702ddfceef3793c3879a02e4ce55e3519ee7c3b464d54c0bb0925ee864231c15ad853664ba0f27e97ca373cb51b1ce27029b6de6f4c4
+  data.tar.gz: 14caa6507a0cb6343d496d6f77ad3ebc6662ee18002d92b6e6acd13ab4d6113ac867553e283b0a67eee1d9e6efb0798c02a9776ea230363760ca07245c82c50a

data/README.md

@@ -54,49 +54,57 @@ Talk:
       talk    msg         - print msg on STDERR unless $quiet
       talk  { msg }
       talkf fmt,   args ..
-      talkf(fmt) { args .. }
+      talkf(fmt) {[args,..]}
 
 Debug talk:
 
      dtalk    msg         - print msg on STDERR if $debug
      dtalk  { msg }
      dtalkf fmt,   args ..
-     dtalkf(fmt) { args .. }
+     dtalkf(fmt) {[args,..]}
 
 Quiet talk:
 
      qtalk   msg         - print msg on STDERR if     $quiet
      qtalk { msg }
      qtalkf fmt,   args ..
-     qtalkf(fmt) { args .. }
+     qtalkf(fmt) {[args,..]}
 
 Verbose talk:
 
      vtalk   msg         - print msg on STDERR if     $verbose
      vtalk { msg }
      vtalkf fmt,   args ..
-     vtalkf(fmt) { args .. }
+     vtalkf(fmt) {[args,..]}
 
 No-run talk:
 
     nrtalk   msg         - print msg on STDERR if     $norun || $verbose
     nrtalk { msg }
     nrtalkf fmt,   args ..
-    nrtalkf(fmt) { args .. }
+    nrtalkf(fmt) {[args, ..]}
 
 Non-verbose talk:
 
     nvtalk   msg         - print msg on STDERR unless $verbose
     nvtalk { msg }
     nvtalkf fmt,   args ..
-    nvtalkf(fmt) { args .. }
+    nvtalkf(fmt) {[args ..]}
+
+No-run or verbose talk:
+
+    nvrtalk   msg         - print msg on STDERR prefixed with '(norun) ' or '>> '
+    nvrtalk { msg }
+    nvrtalkf fmt,    args ..
+    nvrtalkf(fmt) {[args, ..]}
+    nvrtalkf {[ fmt, args, ...]}
 
 Error output:
 
-    error      [code,] msg   - print msg on STDERR, exit with CODE [default:1]
-    error  { [ [code,] msg ] }
-    errorf     [code,] fmt, args ..
-    errorf { [ [code,] fmt, args .. ] }
+    error    [code,] msg   - print msg on STDERR, exit with CODE [default:1]
+    error  {[[code,] msg]}
+    errorf   [code,] fmt, args ..
+    errorf {[[code,] fmt, args ..]}
 
 The `error` routine take an optional numeric first argument which is used to
 set the exit code.  If not given, the exit code is 1.

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/cmd-utils.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cmd-utils 1.2.0 ruby lib
+# stub: cmd-utils 1.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cmd-utils"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/run-utils.rb

@@ -67,7 +67,7 @@ end
 def cmd_run *args
   args = _msgargs(args, block_given?) { yield }
   if $norun
-    nrtalk(args.first)
+    nrvtalk(args.first)
   elsif args.size > 0
     safe_run(*args)
   end

data/lib/talk-utils.rb

@@ -53,6 +53,7 @@ end
 #     dtalk { msg }
 #     dtalkf fmt,    args ..
 #     dtalkf fmt { [ args .. ] }
+#     dtalkf { [ fmt, args ..  ] }
 
 def dtalk *args
   if $debug && (args.size > 0 || block_given?)
@@ -75,6 +76,7 @@ end
 #     qtalk { msg }
 #     qtalkf fmt,    args ..
 #     qtalkf fmt { [ args .. ] }
+#     qtalkf { [ fmt, args, ... ] }
 
 def qtalk *args
   if $quiet && (args.size > 0 || block_given?)
@@ -97,6 +99,7 @@ end
 #     vtalk { msg }
 #     vtalkf fmt, args ..
 #     vtalkf fmt { args .. }
+#     vtalkf { [ fmt, args ... ] }
 
 def vtalk *args
   if $verbose && (args.size > 0 || block_given?)
@@ -139,22 +142,61 @@ end
 #     nrtalk      { msg }
 #     nrtalkf fmt,  msg
 #     nrtalkf fmt { msg }
+#     nrtalkf { [ fmt, msg ] }
 
 def nrtalk *args
   if $norun && (args.size > 0 || block_given?)
-    newargs = _msgargs(args, block_given?) { yield }
-    newargs[0] = '(norun) ' + newargs[0] unless newargs.size == 0 || newargs[0].nil? || newargs[0].include?('(norun)')
-    $stderr.puts(*newargs)
+    $stderr.puts(*_prefix_arg0(_msgargs(args, block_given?){yield},'(norun) '))
   end
 end
 
 def nrtalkf *args
   if $norun && (args.size > 0 || block_given?)
-    newargs = _fmtargs(args, block_given?) { yield }
-    newargs[0] = '(norun) ' + newargs[0] unless newargs.size == 0 || newargs[0].nil? || newargs[0].include?('(norun)')
-    $stderr.printf(*newargs)
+    $stderr.printf(*_prefix_arg0(_fmtargs(args, block_given?){yield},'(norun) '))
   end
 end
 
+# nrvtalk -- "no run" or verbose talk
+#
+# Print msg, possibly prefixed with "(norun)" or ">>" (verbose), on STDERR only
+# if $norun or $verbose are set.
+#
+# :call-seq:
+#     nrvtalk          msg
+#     nrvtalk        { msg }
+#     nrvtalkf   fmt,    args, ..
+#     nrvtalkf   fmt { [ args, ..] }
+#     nrvtalkf { [ fmt,  args .. ] }
+
+def nrvtalk *args
+  _args = _msgargs(args, block_given?) { yield }
+  if $norun && _args.size > 0
+    nrtalk(*_args)
+  elsif $verbose && _args.size > 0
+    vtalk(*_prefix_arg0(_args, '>> '))
+  end
+end
+
+def nrvtalkf *args
+  _args = _fmtargs(args, block_given?) { yield }
+  if $norun && _args.size > 0
+    nrtalkf(*_args)
+  elsif $verbose && _args.size > 0
+    vtalkf(*_prefix_arg0(_args, '>> '))
+  end
+end
+
+# _prefix_arg0( args, prefix )
+#
+# Prefix args[0] if the prefix is not already there, and if the args[0] value is
+# not nill.
+
+def _prefix_arg0(args, prefix)
+  if args.size > 0 && !args[0].nil? && !args[0].include?(prefix)
+    args[0] = prefix + args[0]
+  end
+  args
+end
+
 # end of talk-utils.sh
 # vim: set ai sw=2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmd-utils
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Alan K. Stebbens