improve io_assert arg names; fix test bugs

Author: aks

Gemfile

@@ -6,8 +6,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "minitest", '~> 5.3'
-  gem "rdoc",     "~> 4.1"
-  gem "bundler",  "~> 1.0"
-  gem "jeweler",  "~> 2.0"
+  gem "minitest", ">= 5.10.1"
+  gem "rdoc", ">= 5.0.0"
+  gem "bundler", ">= 1.0"
+  gem "jeweler", ">= 2.3.2"
 end

Gemfile.lock

@@ -1,59 +1,65 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.8)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     builder (3.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
-    github_api (0.12.4)
+    git (1.3.0)
+    github_api (0.11.3)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.4)
+      descendants_tracker (~> 0.0.1)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
+      hashie (>= 1.2)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.6)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (3.4.3)
+    hashie (3.4.6)
     highline (1.7.8)
-    jeweler (2.0.1)
+    jeweler (2.3.2)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    jwt (1.5.2)
-    mini_portile (0.6.2)
-    minitest (5.8.3)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
+      semver2
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.6.6.3)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.4)
-    rake (10.4.2)
-    rdoc (4.2.0)
+      rack (>= 1.2, < 3)
+    psych (2.2.2)
+    public_suffix (2.0.5)
+    rack (2.0.1)
+    rake (12.0.0)
+    rdoc (5.0.0)
+    semver2 (3.4.2)
     thread_safe (0.3.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0)
-  jeweler (~> 2.0)
-  minitest (~> 5.3)
-  rdoc (~> 4.1)
+  bundler (>= 1.0)
+  jeweler (>= 2.3.2)
+  minitest (>= 5.10.1)
+  rdoc (>= 5.0.0)
 
 BUNDLED WITH
-   1.10.6
+   1.13.7

cmd-utils.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Alan K. Stebbens"]
-  s.date = "2015-11-18"
+  s.date = "2017-01-11"
   s.description = "Several ruby libraries for building command-line utilities."
   s.email = "[email protected]"
   s.extra_rdoc_files = [
@@ -41,28 +41,28 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://bitbucket.org/aks_/cmd-utils"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5.1"
+  s.rubygems_version = "2.5.1"
   s.summary = "Utilities for building CLIs"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 5.3"])
-      s.add_development_dependency(%q<rdoc>, ["~> 4.1"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_development_dependency(%q<minitest>, [">= 5.10.1"])
+      s.add_development_dependency(%q<rdoc>, [">= 5.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 2.3.2"])
     else
-      s.add_dependency(%q<minitest>, ["~> 5.3"])
-      s.add_dependency(%q<rdoc>, ["~> 4.1"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<minitest>, [">= 5.10.1"])
+      s.add_dependency(%q<rdoc>, [">= 5.0.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0"])
+      s.add_dependency(%q<jeweler>, [">= 2.3.2"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 5.3"])
-    s.add_dependency(%q<rdoc>, ["~> 4.1"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<minitest>, [">= 5.10.1"])
+    s.add_dependency(%q<rdoc>, [">= 5.0.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0"])
+    s.add_dependency(%q<jeweler>, [">= 2.3.2"])
   end
 end
 

test/helper.rb

@@ -19,9 +19,12 @@ module IO_Assert
   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}'")
+      when TrueClass
+        refute_empty(actual, "#{name} $#{ioname} should not be empty")
+      when FalseClass
+        then assert_empty(actual, "#{name} $#{ioname} should be empty")
+      when String, Regexp
+        then assert_match(expected, actual, "#{name} $#{ioname}: expected '#{expected.inspect}', got: '#{actual}'")
       end
     end
     true
@@ -32,35 +35,35 @@ module Gen_Test
   include IO_Assert
 
   #def gen_test name, norun, verbose, quiet, debug, output
-  def gen_test name, flags, output
+  def gen_test name, flags, expected_err
     $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
+    actual_out, actual_err = capture_io { yield }
+    assert_empty(actual_out, "#{name} $stdout should be empty")
+    io_assert :stderr, name, actual_err, expected_err
   end
 end
 
 module Run_Test
   include IO_Assert
-  def run_test name, flags, output=nil, errput=nil
+  def run_test name, flags, expected_out=nil, expected_err=nil
     $norun   = flags.include?('n')
     $verbose = flags.include?('v')
     $quiet   = flags.include?('q')
     $debug   = flags.include?('d')
     begin
-      out, err = capture_subprocess_io do
+      actual_out, actual_err = capture_subprocess_io do
         begin
           yield
         rescue
         end
       end
     rescue
     end
-    io_assert :stdout, name, out, output
-    io_assert :stderr, name, err, errput
+    io_assert :stdout, name, actual_out, expected_out
+    io_assert :stderr, name, actual_err, expected_err
     true
   end
 end

test/test-run-utils.rb

@@ -23,9 +23,9 @@ def test_run_output
   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' }
+    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/m) { 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

test/test-talk-utils.rb

@@ -239,8 +239,8 @@ def test_dtalk_block
   def test_dtalkf_content
     gen_test('dtalkf_content',         '   d', "-hello-") { dtalkf "-%s-",   "hello" }
     gen_test('dtalkf_content',         '   d', "-hello-") { dtalkf("-%s-") { "hello" } }
-    gen_test('dtalkf_default_content', '   d', "-hello-") { dtalkf           "hello" }
-    gen_test('dtalkf_default_content', '   d', "-hello-") { dtalkf         { "hello" } }
+    gen_test('dtalkf_default_content', '   d', "hello")   { dtalkf           "hello" }
+    gen_test('dtalkf_default_content', '   d', "hello")   { dtalkf         { "hello" } }
 
     gen_test('dtalkf_content',         '    ', false)     { dtalkf "-%s-",   "hello" }
     gen_test('dtalkf_content',         '    ', false)     { dtalkf("-%s-") { "hello" } }