net-proto 1.0.3-x86-mswin32-60 → 1.0.4-x86-mswin32-60

data/CHANGES

@@ -1,3 +1,12 @@
+== 1.0.4 - 6-Jan-2008
+* The struct returned by Net::Proto.getprotoent is now frozen. This is
+  strictly read-only data.
+* It is now explicitly illegal to call Net::Proto.new.
+* Some minor modifications to extconf.rb in terms of how and where the
+  the source is built in order to be potentially more friendly to Rubygems.
+* Renamed and refactored the test suite. This library now requires test-unit
+  version 2.0.2 or later.
+
 == 1.0.3 - 13-Aug-2007
 * Fix for OS X (whining about malloced pointer).
 * Added a Rakefile along with tasks for installation and testing.

data/MANIFEST

@@ -10,4 +10,4 @@
 * ext/linux/linux.c
 * ext/sunos/sunos.c 
 * ext/windows/windows.c
-* test/tc_netproto.rb
+* test/test_net_proto.rb

data/ext/windows/windows.c

@@ -16,6 +16,11 @@ extern "C"
  *
  * Given a protocol string, returns the corresponding number, or nil if not
  * found.
+ *
+ * Examples:
+ *
+ *    Net::Proto.getprotobyname("tcp")   # => 6
+ *    Net::Proto.getprotobyname("bogus") # => nil
 */
 static VALUE np_getprotobyname(VALUE klass, VALUE rbProtoName){
    struct protoent* p;
@@ -36,6 +41,11 @@ static VALUE np_getprotobyname(VALUE klass, VALUE rbProtoName){
  *
  * Given a protocol number, returns the corresponding string, or nil if not
  * found.
+ *
+ * Examples:
+ *
+ *    Net::Proto.getprotobynumber(6)   # => "tcp"
+ *    Net::Proto.getprotobynumber(999) # => nil
  */
 static VALUE np_getprotobynumber(VALUE klass, VALUE v_proto_num)
 {
@@ -64,7 +74,10 @@ void Init_proto()
    rb_define_singleton_method(cProto,"getprotobyname",np_getprotobyname,1);
    rb_define_singleton_method(cProto,"getprotobynumber",np_getprotobynumber,1);
 
-   /* 1.0.3: The version of this package. This is a string, not a number */
+   /* There is no constructor */
+   rb_funcall(cProto, rb_intern("private_class_method"), 1, ID2SYM(rb_intern("new")));
+
+   /* 1.0.4: The version of this library. This is a string, not a number */
    rb_define_const(cProto, "VERSION", rb_str_new2(NET_PROTO_VERSION));
 }
 

data/test/test_net_proto.rb

@@ -0,0 +1,126 @@
+###########################################################################
+# test_net_netproto.rb
+#
+# Test suite for net-proto - all platforms. This test suite should be run
+# via the 'rake test' task.
+###########################################################################
+require 'rubygems'
+gem 'test-unit'
+
+require 'net/proto'
+require 'test/unit'
+
+class TC_Net_Proto < Test::Unit::TestCase
+
+   # These were the protocols listed in my own /etc/protocols file on Solaris 9
+   def self.startup
+      @@protocols = %w/
+         ip icmp igmp ggp ipip tcp cbt egp igp pup udp mux hmp
+         xns-idp rdp idpr idpr-cmtp sdrp idrp rsvp gre
+         mobile ospf pim ipcomp vrrp sctp hopopt ipv6
+         ipv6-route ipv6-frag esp ah ipv6-icmp ipv6-nonxt ipv6-opts
+      /
+   end
+
+   def setup
+      @protoent = nil
+   end
+
+   def test_version
+      assert_equal('1.0.4', Net::Proto::VERSION)
+   end
+
+   def test_getprotobynumber_basic
+      assert_respond_to(Net::Proto, :getprotobynumber)
+      assert_nothing_raised{ 0.upto(132){ |n| Net::Proto.getprotobynumber(n) } }
+      assert_kind_of(String, Net::Proto.getprotobynumber(1))
+   end
+
+   def test_getprotobynumber_result_expected
+      assert_equal('icmp', Net::Proto.getprotobynumber(1))
+      assert_equal('tcp', Net::Proto.getprotobynumber(6))
+   end
+
+   def test_getprotbynumber_result_not_expected
+      assert_equal(nil, Net::Proto.getprotobynumber(9999999))
+      assert_equal(nil, Net::Proto.getprotobynumber(-1))
+   end
+
+   def test_getprotobynumber_expected_errors
+      assert_raise(TypeError){ Net::Proto.getprotobynumber('foo') }
+      assert_raise(TypeError){ Net::Proto.getprotobynumber(nil) }
+      assert_raise(RangeError){ Net::Proto.getprotobynumber(999999999999) }
+   end
+
+   def test_getprotobyname_basic
+      assert_respond_to(Net::Proto, :getprotobyname)
+      @@protocols.each{ |n| assert_nothing_raised{ Net::Proto.getprotobyname(n) } }
+   end
+
+   def test_getprotobyname_result_expected
+      assert_equal(1, Net::Proto.getprotobyname('icmp'))
+      assert_equal(6, Net::Proto.getprotobyname('tcp'))
+   end
+
+   def test_getprotobyname_result_not_expected
+      assert_equal(nil, Net::Proto.getprotobyname('foo'))
+      assert_equal(nil, Net::Proto.getprotobyname('tcpx'))
+      assert_equal(nil, Net::Proto.getprotobyname(''))
+   end
+
+   def test_getprotobyname_expected_errors
+      assert_raises(TypeError){ Net::Proto.getprotobyname(1) }
+      assert_raises(TypeError){ Net::Proto.getprotobyname(nil) }        
+   end
+
+   def test_getprotoent_basic
+      omit_if(Config::CONFIG['host_os'].match('mswin'), 'Skipped on MS Windows')
+
+      assert_respond_to(Net::Proto, :getprotoent)    
+      assert_nothing_raised{ Net::Proto.getprotoent }
+      assert_kind_of(Array, Net::Proto.getprotoent)
+   end
+
+   def test_getprotoent
+      omit_if(Config::CONFIG['host_os'].match('mswin'), 'Skipped on MS Windows')
+
+      assert_kind_of(Struct::ProtoStruct, Net::Proto.getprotoent.first)
+      assert_nil(Net::Proto.getprotoent{})
+   end
+
+   def test_getprotoent_struct
+      omit_if(Config::CONFIG['host_os'].match('mswin'), 'Skipped on MS Windows')
+
+      @protoent = Net::Proto.getprotoent.first
+      assert_equal(['name', 'aliases', 'proto'], @protoent.members)
+      assert_kind_of(String, @protoent.name)
+      assert_kind_of(Array, @protoent.aliases)
+      assert_kind_of(Integer, @protoent.proto)
+   end
+
+   def test_getprotoent_struct_aliases_member
+      omit_if(Config::CONFIG['host_os'].match('mswin'), 'Skipped on MS Windows')
+
+      @protoent = Net::Proto.getprotoent.first
+      assert_true(@protoent.aliases.all?{ |e| e.is_a?(String) })
+   end
+
+   def test_getprotoent_struct_frozen
+      omit_if(Config::CONFIG['host_os'].match('mswin'), 'Skipped on MS Windows')
+
+      @protoent = Net::Proto.getprotoent.first
+      assert_true(@protoent.frozen?)
+   end
+   
+   def test_constructor_illegal
+      assert_raise(NoMethodError){ Net::Proto.new }      
+   end
+
+   def teardown
+      @protoent = nil
+   end
+   
+   def self.shutdown
+      @@protocols = nil
+   end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-proto
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: x86-mswin32-60
 authors: 
 - Daniel J. Berger
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-07 00:00:00 -06:00
+date: 2009-01-07 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
 description: The net-proto package provides the getprotobyname(), getprotobynumber() and the getprotoent() methods for Ruby.
 email: djberg96@gmail.com
 executables: []
@@ -27,13 +36,12 @@ extra_rdoc_files:
 - ext/windows/windows.c
 files: 
 - doc/netproto.txt
-- test/tc_netproto.rb
-- lib/net
+- test/test_net_proto.rb
 - lib/net/proto.so
-- ext/windows/windows.c
 - CHANGES
 - README
 - MANIFEST
+- ext/windows/windows.c
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/sysutils
 post_install_message: 
@@ -56,9 +64,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sysutils
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: The net-proto package provides the getprotobyname(), getprotobynumber() and the getprotoent() methods for Ruby.
 test_files: 
-- test/tc_netproto.rb
+- test/test_net_proto.rb

data/test/tc_netproto.rb

@@ -1,71 +0,0 @@
-###########################################################################
-# tc_netproto.rb
-#
-# Test suite for net-proto - all platforms. This test suite should be run
-# via the 'rake test' task.
-###########################################################################
-require "net/proto"
-require "test/unit"
-include Net
-
-class TC_Net_Proto < Test::Unit::TestCase
-   # These were the protocols listed in my
-   # own /etc/protocols file on Solaris 9.
-   def setup
-      @protocols = %w/
-         ip icmp igmp ggp ipip tcp cbt egp igp pup udp mux hmp
-         xns-idp rdp idpr idpr-cmtp sdrp idrp rsvp gre
-         mobile ospf pim ipcomp vrrp sctp hopopt ipv6
-         ipv6-route ipv6-frag esp ah ipv6-icmp ipv6-nonxt ipv6-opts
-      /
-   end
-	
-   def test_version
-      assert_equal("1.0.3", Proto::VERSION)
-   end
-
-   def test_getprotobynumber
-      assert_respond_to(Proto, :getprotobynumber)
-      assert_raises(TypeError){ Proto.getprotobynumber("foo") }
-      assert_raises(TypeError){ Proto.getprotobynumber(nil) }
-      assert_equal(nil, Proto.getprotobynumber(9999999))
-      assert_equal("tcp", Proto.getprotobynumber(6))
-      assert_nothing_raised{
-         0.upto(132){ |n| Proto.getprotobynumber(n) }
-      }
-   end
-
-   def test_getprotobyname
-      assert_respond_to(Proto, :getprotobyname)
-      assert_raises(TypeError){ Proto.getprotobyname(1) }
-      assert_raises(TypeError){ Proto.getprotobyname(nil) }       	
-      assert_equal(nil, Proto.getprotobyname("foo"))
-      assert_equal(6, Proto.getprotobyname("tcp"))
-      @protocols.each{ |prot|
-         assert_nothing_raised{ Proto.getprotobyname(prot) }
-      }
-   end
-
-   def test_getprotoent
-      if File::ALT_SEPARATOR
-         msg = "The getprotoent() function is not supported on this "
-         msg += "platform - test skipped"
-         STDERR.puts msg
-      else
-    	 assert_respond_to(Proto, :getprotoent)    
-         p = Proto.getprotoent.first
-         assert_kind_of(Struct::ProtoStruct, p)
-         assert_equal(%w/name aliases proto/,p.members)
-         assert_kind_of(String, p.name, "Bad type for name")
-         assert_kind_of(Array, p.aliases, "Bad type for aliases")
-         assert_kind_of(Integer, p.proto, "Bad type for proto")
-         p.aliases.each{ |a|
-            assert_kind_of(String, a, "Bad type for aliases member")
-         }
-      end
-   end
-	
-   def teardown
-      @protocols = nil
-   end
-end