cmd-utils 1.1.2 → 1.2.0

data/test/test-lookup.rb

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 # test-cmd-utils.rb -- simple tester for cmd-utils
 #
+$:.unshift '.', 'lib'
+
 require 'rubygems'
-gem 'minitest'
-require 'minitest/autorun'
+require 'helper'
+
 require 'lookup'
 
 class NilClass ; def to_s ; '' ; end ; end

data/test/test-run-utils.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# test-run-utils.rb -- simple tester for cmd-utils
+
+$:.unshift '.', 'lib', '../lib'
+
+require 'rubygems'
+require 'helper'
+
+require 'run-utils'
+
+# these routines produce output on STDERR depending on $norun, $verbose, and $quiet.
+
+class TestRunUtils < Minitest::Test
+
+  include Run_Test
+
+  def test_run_output
+    run_test("run 1", 'n', false,     "(norun) echo 'hello'\n") { cmd_run "echo 'hello'" }
+    run_test("run 2", 'v', "hello\n", ">> echo 'hello'\n")      { cmd_run "echo 'hello'" }
+    run_test("run 3", '',  "hello\n", false)                    { cmd_run "echo 'hello'" }
+    run_test("run 4", '',  false,     "hello\n")                { cmd_run "echo 'hello' 1>&2" }
+    run_test("run 5", '',  false,     false)                    { cmd_run "echo"        }
+  end
+
+  def test_run_errmsg
+    run_test("run 11", 'n', false,     "(norun) ( exit 1)\n")        { cmd_run "( exit 1)", 'error 11' }
+    run_test("run 12", 'v', false,     ">> ( exit 1)\nerror 12\n")   { cmd_run "( exit 1)", 'error 12' }
+    run_test("run 13", 'v', false,     ">> ( exit 0)\n")             { cmd_run "( exit 0)", 'no error 13' }
+    run_test("run 14", ' ', false,     false)                        { cmd_run "( exit 0)", 'no error 13' }
+  end
+end

data/test/{test-cmd-utils.rb → test-talk-utils.rb}

@@ -1,55 +1,17 @@
 #!/usr/bin/env ruby
-# test-cmd-utils.rb -- simple tester for cmd-utils
+# test-talk-utils.rb -- simple tester for cmd-utils
 #
+$:.unshift '.', 'lib', '../lib'
 require 'rubygems'
-#require 'minitest'
-require 'minitest/autorun'
-require 'cmd-utils'
+require 'helper'
+
+require 'talk-utils'
 
 # these routines produce output on STDERR depending on $norun, $verbose, and $quiet.
 
-class TestCmdUtils < Minitest::Test
+class TestTalkUtils < Minitest::Test
 
-  #def gen_test name, norun, verbose, quiet, debug, output
-  def gen_test name, flags, output
-    $norun   = flags.include?('n')
-    $verbose = flags.include?('v')
-    $quiet   = flags.include?('q')
-    $debug   = flags.include?('d')
-    out, err = capture_io { yield }
-    assert_empty(out, "#{name} $stdout should be empty")
-    io_assert :stderr, name, err, output
-  end
-
-  def run_test name, flags, output=nil, errput=nil
-    $norun   = flags.include?('n')
-    $verbose = flags.include?('v')
-    $quiet   = flags.include?('q')
-    $debug   = flags.include?('d')
-    begin
-      out, err = capture_subprocess_io do
-        begin
-          yield
-        rescue
-        end
-      end
-    rescue
-    end
-    io_assert :stdout, name, out, output
-    io_assert :stderr, name, err, errput
-    true
-  end
-
-  def io_assert ioname, name, actual, expected
-    if expected
-      case expected
-      when TrueClass  then refute_empty(actual, "#{name} $#{ioname} should not be empty")
-      when FalseClass then assert_empty(actual, "#{name} $#{ioname} should be empty")
-      when String     then assert_match(actual, expected, "#{name} $#{ioname}: expected '#{expected}', got: '#{actual}'")
-      end
-    end
-    true
-  end
+  include Gen_Test
 
   def test_talk_arg
     gen_test('talk_arg', '    ', true)    { talk "hello" }
@@ -294,18 +256,5 @@ class TestCmdUtils < Minitest::Test
     gen_test('talkf_default_content', '   ', "-hello-there-") { talkf { [ "-%s-%s-", "hello", "there" ] } }
   end
 
-  def test_run_output
-    run_test("run 1", 'n', false,     "(norun) echo 'hello'\n") { cmd_run "echo 'hello'" }
-    run_test("run 2", 'v', "hello\n", ">> echo 'hello'\n")      { cmd_run "echo 'hello'" }
-    run_test("run 3", '',  "hello\n", false)                    { cmd_run "echo 'hello'" }
-    run_test("run 4", '',  false,     "hello\n")                { cmd_run "echo 'hello' 1>&2" }
-    run_test("run 5", '',  false,     false)                    { cmd_run "echo"        }
-  end
-
-  def test_run_errmsg
-    run_test("run 11", 'n', false,     "(norun) ( exit 1)\n")        { cmd_run "( exit 1)", 'error 11' }
-    run_test("run 12", 'v', false,     ">> ( exit 1)\nerror 12\n")   { cmd_run "( exit 1)", 'error 12' }
-    run_test("run 13", 'v', false,     ">> ( exit 0)\n")             { cmd_run "( exit 0)", 'no error 13' }
-    run_test("run 14", ' ', false,     false)                        { cmd_run "( exit 0)", 'no error 13' }
-  end
 end
+# end of test-talk-utils.rb

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: cmd-utils
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Alan K. Stebbens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: Several ruby libraries for building command-line utilities.
 email: aks@stebbens.org
 executables: []
@@ -96,13 +82,17 @@ files:
 - Rakefile
 - VERSION
 - cmd-utils.gemspec
+- lib/arg-utils.rb
 - lib/cmd-utils.rb
+- lib/error-utils.rb
 - lib/lookup.rb
+- lib/run-utils.rb
 - lib/ssh-utils.rb
+- lib/talk-utils.rb
 - test/helper.rb
-- test/test-cmd-utils.rb
 - test/test-lookup.rb
-- test/test_cmd-utils.rb.off
+- test/test-run-utils.rb
+- test/test-talk-utils.rb
 homepage: http://bitbucket.org/aks_/cmd-utils
 licenses:
 - MIT

data/test/test_cmd-utils.rb.off

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestCmdUtils < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end