scmd 2.1.1 → 2.1.2

data/test/support/smaller-than-64k.txt

@@ -0,0 +1 @@
+01234556789

data/test/unit/command_tests.rb

@@ -1,21 +1,20 @@
 require "assert"
 require 'scmd/command'
 
-module Scmd
+class Scmd::Command
 
-  class CommandTests < Assert::Context
-    desc "a command"
+  class UnitTests < Assert::Context
+    desc "Scmd::Command"
     setup do
-      @success_cmd = Command.new("echo hi")
-      @failure_cmd = Command.new("cd /path/that/does/not/exist")
+      @success_cmd = Scmd::Command.new("echo hi")
+      @failure_cmd = Scmd::Command.new("cd /path/that/does/not/exist")
     end
     subject { @success_cmd }
 
     should have_readers :cmd_str, :pid, :exitstatus, :stdout, :stderr
-    should have_instance_methods :run, :run!
-    should have_instance_methods :start, :wait, :stop, :kill
-    should have_instance_methods :running?, :success?
-
+    should have_imeths :run, :run!
+    should have_imeths :start, :wait, :stop, :kill
+    should have_imeths :running?, :success?
 
     should "know and return its cmd string" do
       assert_equal "echo hi", subject.cmd_str
@@ -35,7 +34,7 @@ module Scmd
       assert_not_nil @success_cmd.pid
       assert_equal 0, @success_cmd.exitstatus
       assert @success_cmd.success?
-      assert_equal 'hi', @success_cmd.stdout
+      assert_equal "hi\n", @success_cmd.stdout
       assert_equal '', @success_cmd.stderr
 
       @failure_cmd.run
@@ -66,7 +65,7 @@ module Scmd
     end
 
     should "start and be running until `wait` is called and the cmd exits" do
-      cmd = Command.new("sleep .1")
+      cmd = Scmd::Command.new("sleep .1")
       assert_not cmd.running?
 
       cmd.start
@@ -103,10 +102,10 @@ module Scmd
 
   end
 
-  class InputTests < CommandTests
+  class InputTests < UnitTests
     desc "that takes input on stdin"
     setup do
-      @cmd = Command.new("sh")
+      @cmd = Scmd::Command.new("sh")
     end
     subject { @cmd }
 
@@ -114,23 +113,23 @@ module Scmd
       subject.run "echo hi"
 
       assert @cmd.success?
-      assert_equal 'hi', @cmd.stdout
+      assert_equal "hi\n", @cmd.stdout
     end
 
     should "run the command given multiple lines of input" do
       subject.run ["echo hi", "echo err 1>&2"]
 
       assert @cmd.success?
-      assert_equal 'hi', @cmd.stdout
-      assert_equal 'err', @cmd.stderr
+      assert_equal "hi\n",  @cmd.stdout
+      assert_equal "err\n", @cmd.stderr
     end
 
   end
 
-  class LongRunningTests < CommandTests
+  class LongRunningTests < UnitTests
     desc "that is long running"
     setup do
-      @long_cmd = Command.new("sleep .3 && echo hi")
+      @long_cmd = Scmd::Command.new("sleep .3 && echo hi")
     end
 
     should "not timeout if wait timeout is longer than cmd time" do
@@ -139,11 +138,11 @@ module Scmd
         @long_cmd.wait(1)
       end
       assert @long_cmd.success?
-      assert_equal 'hi', @long_cmd.stdout
+      assert_equal "hi\n", @long_cmd.stdout
     end
 
     should "timeout if wait timeout is shorter than cmd time" do
-      assert_raises(TimeoutError) do
+      assert_raises(Scmd::TimeoutError) do
         @long_cmd.start
         @long_cmd.wait(0.1)
       end
@@ -167,4 +166,28 @@ module Scmd
 
   end
 
+  class BufferDeadlockTests < UnitTests
+    desc "when capturing data from an output buffer"
+    setup do
+      @small_path = File.join(ROOT_PATH, 'test/support/smaller-than-64k.txt')
+      @small_data = File.read(@small_path)
+      @small_cmd  = Scmd::Command.new("cat #{@small_path}")
+
+      @big_path = File.join(ROOT_PATH, 'test/support/bigger-than-64k.txt')
+      @big_data = File.read(@big_path)
+      @big_cmd  = Scmd::Command.new("cat #{@big_path}")
+    end
+
+    should "not deadlock, just stream the data from the buffer" do
+      @small_cmd.start
+      assert_nothing_raised{ @small_cmd.wait(1) }
+      assert_equal @small_data, @small_cmd.stdout
+
+      @big_cmd.start
+      assert_nothing_raised{ @big_cmd.wait(1) }
+      assert_equal @big_data, @big_cmd.stdout
+    end
+
+  end
+
 end

data/test/unit/scmd_tests.rb

@@ -1,14 +1,57 @@
 require "assert"
 require 'scmd'
 
-class ScmdTest < Assert::Context
-  desc "Scmd"
-  subject { Scmd }
+require 'scmd/command'
 
-  should have_instance_method :new
+module Scmd
+
+  class UnitTests < Assert::Context
+    desc "Scmd"
+    subject{ Scmd }
+
+    should have_instance_method :new
+
+    should "build a `Command` with the `new` method" do
+      assert_kind_of Scmd::Command, subject.new('echo hi')
+    end
+
+  end
+
+  class TimeoutErrorTests < UnitTests
+    desc "TimeoutError"
+    setup do
+      @error = Scmd::TimeoutError.new('test')
+    end
+    subject{ @error }
+
+    should "be a RuntimeError" do
+      assert_kind_of ::RuntimeError, subject
+    end
+
+  end
+
+  class RunErrorTests < UnitTests
+    desc "RunError"
+    setup do
+      @error = Scmd::RunError.new('test')
+    end
+    subject{ @error }
+
+    should "be a RuntimeError" do
+      assert_kind_of ::RuntimeError, subject
+    end
+
+    should "set its backtrace to the caller by default" do
+      assert_match /scmd_tests.rb:.*$/, subject.backtrace.first
+    end
+
+    should "allow passing a custom backtrace" do
+      called_from = caller
+      error = Scmd::RunError.new('test', called_from)
+
+      assert_equal called_from, error.backtrace
+    end
 
-  should "build a `Command` with the `new` method" do
-    assert_kind_of Scmd::Command, subject.new('echo hi')
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scmd
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,26 +16,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-12 00:00:00 Z
+date: 2013-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
   prerelease: false
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        version: "2.3"
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: posix-spawn
   prerelease: false
-  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,6 +45,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :runtime
   version_requirements: *id002
 description: Build and run system commands.
 email: 
@@ -62,16 +63,23 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bench/results.txt
+- bench/runner.rb
 - lib/scmd.rb
 - lib/scmd/command.rb
 - lib/scmd/version.rb
+- log/.gitkeep
 - scmd.gemspec
+- script/bench.rb
 - test/helper.rb
+- test/support/bigger-than-64k.txt
+- test/support/smaller-than-64k.txt
 - test/unit/command_tests.rb
 - test/unit/scmd_tests.rb
+- tmp/.gitkeep
 homepage: http://github.com/redding/scmd
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -98,11 +106,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Build and run system commands.
 test_files: 
 - test/helper.rb
+- test/support/bigger-than-64k.txt
+- test/support/smaller-than-64k.txt
 - test/unit/command_tests.rb
 - test/unit/scmd_tests.rb