net-ping 1.3.5 → 1.3.6

data/CHANGES

@@ -1,3 +1,10 @@
+== 1.3.6 - 4-Sep-2010
+* Fixed variable naming issue in Net::Ping::External. Thanks go to taw
+  for the spot.
+* Added a default Rake task.
+* Refactored the tests for Net::Ping::External to take advantage of the
+  features of test-unit 2.x.
+
 == 1.3.5 - 3-Sep-2010
 * Allow for custom user agent in Net::Ping::HTTP. Thanks go to Michael
   Reinsch for the patch.

data/Rakefile

@@ -82,3 +82,5 @@ namespace 'test' do
      t.test_files = FileList['test/test_net_ping_wmi.rb']
   end
 end
+
+task :default => :test

data/lib/net/ping/external.rb

@@ -35,7 +35,7 @@ module Net
     def ping(host = @host)
       super(host)
 
-      input, output, error = ""
+      stdin, stdout, stderr = ""
       pstring = "ping "
       bool    = false
       orig_cp = nil
@@ -63,12 +63,12 @@ module Net
         err = nil
 
         Timeout.timeout(@timeout){
-          input, output, error = Open3.popen3(pstring)
-          err = error.gets # Can't chomp yet, might be nil
+          stdin, stdout, stderr = Open3.popen3(pstring)
+          err = stderr.gets # Can't chomp yet, might be nil
         }
 
-        input.close
-        error.close
+        stdin.close
+        stderr.close
 
         if CWINDOWS && GetConsoleCP() != orig_cp
           SetConsoleCP(orig_cp)
@@ -83,8 +83,8 @@ module Net
           end
         # The "no answer" response goes to stdout, not stderr, so check it
         else
-          lines = output.readlines
-          output.close
+          lines = stdout.readlines
+          stdout.close
           if lines.nil? || lines.empty?
             bool = true
           else
@@ -109,9 +109,9 @@ module Net
       rescue Exception => error
         @exception = error.message 
       ensure
-        input.close if input && !input.closed?
-        error.close if error && !error.closed?
-        output.close if output && !output.closed?
+        stdin.close  if stdin  && !stdin.closed?
+        stdout.close if stdout && !stdout.closed?
+        stderr.close if stderr && !stderr.closed?
       end
 
       # There is no duration if the ping failed

data/lib/net/ping/ping.rb

@@ -10,7 +10,7 @@ module Net
    #
    class Ping
       # The version of the net-ping library.
-      VERSION = '1.3.5'
+      VERSION = '1.3.6'
 
       # The host to ping. In the case of Ping::HTTP, this is the URI.
       attr_accessor :host

data/net-ping.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |gem|
   gem.name      = 'net-ping'
-  gem.version   = '1.3.5'
+  gem.version   = '1.3.6'
   gem.license   = 'Artistic 2.0'
   gem.author    = 'Daniel J. Berger'
   gem.email     = 'djberg96@gmail.com'

data/test/test_net_ping.rb

@@ -21,6 +21,6 @@ end
 
 class TC_Net_Ping < Test::Unit::TestCase
   def test_net_ping_version
-    assert_equal('1.3.5', Net::Ping::VERSION)
+    assert_equal('1.3.6', Net::Ping::VERSION)
   end
 end

data/test/test_net_ping_external.rb

@@ -18,64 +18,98 @@ class TC_Net_Ping_External < Test::Unit::TestCase
     @bad   = Net::Ping::External.new(@bogus)
   end
 
-  def test_ping
+  test "ping basic functionality" do
     assert_respond_to(@pe, :ping)
+  end
+
+  test "ping with no arguments" do
     assert_nothing_raised{ @pe.ping }
+  end
+
+  test "ping accepts a hostname" do
     assert_nothing_raised{ @pe.ping(@host) }
   end
 
-  def test_ping_aliases
+  test "ping returns a boolean" do
+    assert_boolean(@pe.ping)
+    assert_boolean(@bad.ping)
+  end
+
+  test "ping? alias" do
     assert_respond_to(@pe, :ping?)
-    assert_respond_to(@pe, :pingecho)
-    assert_nothing_raised{ @pe.ping? }
-    assert_nothing_raised{ @pe.ping?(@host) }
+    assert_alias_method(@pe, :ping?, :ping)
+  end
+
+  test "pingecho alias" do
     assert_nothing_raised{ @pe.pingecho }
-    assert_nothing_raised{ @pe.pingecho(@host) }
+    assert_alias_method(@pe, :pingecho, :ping)
   end
 
-  def test_good_ping     
-    assert_equal(true, @pe.ping?)
+  test "pinging a good host returns true" do
+    assert_true(@pe.ping?)
   end
 
-  def test_bad_ping
-    assert_equal(false, @bad.ping?)
-    assert_equal(false, @bad.exception.nil?, "Bad exception data")
+  test "pinging a bogus host returns false" do
+    assert_false(@bad.ping?)
   end
 
-  def test_duration
+  test "duration basic functionality" do
     assert_nothing_raised{ @pe.ping }
     assert_respond_to(@pe, :duration)
     assert_kind_of(Float, @pe.duration)
   end
 
-  def test_host
+  test "host getter basic functionality" do
     assert_respond_to(@pe, :host)
-    assert_respond_to(@pe, :host=)
     assert_equal('www.ruby-lang.org', @pe.host)
   end
 
-  def test_port
+  test "host setter basic functionality" do
+    assert_respond_to(@pe, :host=)
+    assert_nothing_raised{ @pe.host = @bad }
+    assert_equal(@bad, @pe.host)
+  end
+
+  test "port getter basic functionality" do
     assert_respond_to(@pe, :port)
-    assert_respond_to(@pe, :port=)
     assert_equal(7, @pe.port)
   end
 
-  def test_timeout
+  test "port setter basic functionality" do
+    assert_respond_to(@pe, :port=)
+    assert_nothing_raised{ @pe.port = 90 }
+    assert_equal(90, @pe.port)
+  end
+
+  test "timeout getter basic functionality" do
     assert_respond_to(@pe, :timeout)
-    assert_respond_to(@pe, :timeout=)
     assert_equal(5, @pe.timeout)
   end
 
-  def test_exception
+  test "timeout setter basic functionality" do
+    assert_respond_to(@pe, :timeout=)
+    assert_nothing_raised{ @pe.timeout = 30 }
+    assert_equal(30, @pe.timeout)
+  end
+
+  test "exception method basic functionality" do
     assert_respond_to(@pe, :exception)
-    assert_nothing_raised{ @pe.ping }
-    assert_nothing_raised{ @bad.ping }
     assert_nil(@pe.exception)
+  end
+
+  test "pinging a bogus host stores exception data" do
+    assert_nothing_raised{ @bad.ping? }
     assert_not_nil(@bad.exception)
   end
 
-  def test_warning
+  test "pinging a good host results in no exception data" do
+    assert_nothing_raised{ @pe.ping }
+    assert_nil(@pe.exception)
+  end
+
+  test "warning basic functionality" do
     assert_respond_to(@pe, :warning)
+    assert_nil(@pe.warning)
   end
 
   def teardown

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 -06:00
+date: 2010-09-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency