ronin-support 0.4.0 → 0.4.1

data/lib/ronin/ui/output/terminal/raw.rb

@@ -37,7 +37,7 @@ module Ronin
           # @api private
           #
           def self.write(data)
-            STDOUT.write(data)
+            $stdout.write(data)
           end
 
           #
@@ -51,7 +51,7 @@ module Ronin
           # @api private
           #
           def self.print_info(message)
-            puts "[-] #{message}"
+            $stdout.puts "[-] #{message}"
           end
 
           #
@@ -65,7 +65,7 @@ module Ronin
           # @api private
           #
           def self.print_debug(message)
-            puts "[=] #{message}"
+            $stdout.puts "[=] #{message}"
           end
 
           #
@@ -79,7 +79,7 @@ module Ronin
           # @api private
           #
           def self.print_warning(message)
-            puts "[*] #{message}"
+            $stdout.puts "[*] #{message}"
           end
 
           #
@@ -93,7 +93,7 @@ module Ronin
           # @api private
           #
           def self.print_error(message)
-            puts "[!] #{message}"
+            $stdout.puts "[!] #{message}"
           end
 
         end

data/spec/extensions/string_spec.rb

@@ -157,21 +157,23 @@ describe String do
     end
   end
 
-  describe "#dump" do
-    it "should dump printable strings" do
-      "hello".dump.should == '"hello"'
-    end
+  if RUBY_VERSION < '1.9'
+    describe "#dump" do
+      it "should dump printable strings" do
+        "hello".dump.should == '"hello"'
+      end
 
-    it "should dump strings containing control characters" do
-      "hello\n\b\a".dump.should == '"hello\n\b\a"'
-    end
+      it "should dump strings containing control characters" do
+        "hello\n\b\a".dump.should == '"hello\n\b\a"'
+      end
 
-    it "should dump strings containing non-printable characters" do
-      "hello\x90\x05\xEF".dump.should == '"hello\x90\x05\xEF"'
-    end
+      it "should dump strings containing non-printable characters" do
+        "hello\x90\x05\xEF".dump.should == '"hello\x90\x05\xEF"'
+      end
 
-    it "should dump the string when calling the inspect method" do
-      "hello\x90\x05\xEF".inspect.should == '"hello\x90\x05\xEF"'
+      it "should dump the string when calling the inspect method" do
+        "hello\x90\x05\xEF".inspect.should == '"hello\x90\x05\xEF"'
+      end
     end
   end
 end

data/spec/network/dns_spec.rb

@@ -82,7 +82,7 @@ describe Network::DNS do
 
     describe "#dns_lookup_all" do
       it "should lookup all addresses for a hostname" do
-        subject.dns_lookup_all(hostname).should == [address]
+        subject.dns_lookup_all(hostname).should include(address)
       end
 
       it "should return an empty Array for unknown hostnames" do
@@ -90,11 +90,11 @@ describe Network::DNS do
       end
 
       it "should accept non-String hostnames" do
-        subject.dns_lookup_all(hostname.to_sym).should == [address]
+        subject.dns_lookup_all(hostname.to_sym).should include(address)
       end
 
       it "should accept an additional nameserver argument" do
-        subject.dns_lookup_all(hostname,server).should == [address]
+        subject.dns_lookup_all(hostname,server).should include(address)
       end
     end
 
@@ -118,7 +118,7 @@ describe Network::DNS do
 
     describe "#dns_reverse_lookup_all" do
       it "should lookup all addresses for a hostname" do
-        subject.dns_reverse_lookup_all(address).should == [reverse_hostname]
+        subject.dns_reverse_lookup_all(address).should include(reverse_hostname)
       end
 
       it "should return an empty Array for unknown hostnames" do
@@ -126,11 +126,11 @@ describe Network::DNS do
       end
 
       it "should accept non-String addresses" do
-        subject.dns_reverse_lookup_all(IPAddr.new(address)).should == [reverse_hostname]
+        subject.dns_reverse_lookup_all(IPAddr.new(address)).should include(reverse_hostname)
       end
 
       it "should accept an additional nameserver argument" do
-        subject.dns_reverse_lookup_all(address,server).should == [reverse_hostname]
+        subject.dns_reverse_lookup_all(address,server).should include(reverse_hostname)
       end
     end
   end

data/spec/network/tcp_spec.rb

@@ -30,10 +30,10 @@ describe Network::TCP do
       end
 
       it "should bind to a local host and port" do
-        socket        = subject.tcp_connect(host,port,nil,local_port)
+        socket     = subject.tcp_connect(host,port,nil,local_port)
+        bound_port = socket.addr[1]
 
-        local_address = socket.local_address
-        local_address.ip_port.should == local_port
+        bound_port.should == local_port
 
         socket.close
       end
@@ -65,10 +65,10 @@ describe Network::TCP do
        end
 
       it "should bind to a local host and port" do
-        socket = subject.tcp_connect_and_send(data,host,port,nil,local_port)
+        socket     = subject.tcp_connect_and_send(data,host,port,nil,local_port)
+        bound_port = socket.addr[1]
 
-        local_address = socket.local_address
-        local_address.ip_port.should == local_port
+        bound_port.should == local_port
 
         socket.close
       end
@@ -102,13 +102,13 @@ describe Network::TCP do
       end
 
       it "should bind to a local host and port" do
-        local_address = nil
+        bound_port = nil
 
         subject.tcp_session(host,port,nil,local_port) do |socket|
-          local_address = socket.local_address
+          bound_port = socket.addr[1]
         end
 
-        local_address.ip_port.should == local_port
+        bound_port.should == local_port
       end
     end
 
@@ -142,8 +142,8 @@ describe Network::TCP do
     end
 
     describe "#tcp_send" do
-      let(:server)      { TCPServer.new(server_host,nil) }
-      let(:server_port) { server.local_address.ip_port }
+      let(:server)      { TCPServer.new(server_host,0) }
+      let(:server_port) { server.addr[1] }
 
       let(:data)       { "hello\n" }
       let(:local_port) { 1024 + rand(65535 - 1024) }
@@ -164,10 +164,10 @@ describe Network::TCP do
       it "should bind to a local host and port" do
         subject.tcp_send(data,server_host,server_port,nil,local_port)
 
-        client = server.accept
+        client      = server.accept
+        client_port = client.peeraddr[1]
 
-        client_address = client.remote_address
-        client_address.ip_port.should == local_port
+        client_port.should == local_port
 
         client.close
       end
@@ -186,11 +186,12 @@ describe Network::TCP do
       end
 
       it "should bind to a specific port and host" do
-        server = subject.tcp_server(server_port,server_host)
+        server     = subject.tcp_server(server_port,server_host)
+        bound_host = server.addr[3]
+        bound_port = server.addr[1]
 
-        local_address = server.local_address
-        local_address.ip_address.should == server_ip
-        local_address.ip_port.should    == server_port
+        bound_host.should == server_ip
+        bound_port.should == server_port
 
         server.close
       end
@@ -224,14 +225,16 @@ describe Network::TCP do
       end
 
       it "should bind to a specific port and host" do
-        local_address = nil
+        bound_host = nil
+        bound_port = nil
         
         subject.tcp_server_session(server_port,server_host) do |yielded_server|
-          local_address = yielded_server.local_address
+          bound_host = yielded_server.addr[3]
+          bound_port = yielded_server.addr[1]
         end
 
-        local_address.ip_address.should == server_ip
-        local_address.ip_port.should    == server_port
+        bound_host.should == server_ip
+        bound_port.should == server_port
       end
     end
 

data/spec/network/udp_spec.rb

@@ -29,11 +29,11 @@ describe Network::UDP do
         socket.close
       end
 
-      it "should bind to a local host and port" do
-        socket        = subject.udp_connect(host,port,nil,local_port)
+      it "should bind to a local port" do
+        socket      = subject.udp_connect(host,port,nil,local_port)
+        bound_port = socket.addr[1]
 
-        local_address = socket.local_address
-        local_address.ip_port.should == local_port
+        bound_port.should == local_port
 
         socket.close
       end
@@ -65,11 +65,11 @@ describe Network::UDP do
           socket.close
         end
 
-        it "should bind to a local host and port" do
-          socket = subject.udp_connect_and_send(data,host,port,nil,local_port)
+        it "should bind to a local port" do
+          socket      = subject.udp_connect_and_send(data,host,port,nil,local_port)
+          bound_port = socket.addr[1]
 
-          local_address = socket.local_address
-          local_address.ip_port.should == local_port
+          bound_port.should == local_port
 
           socket.close
         end
@@ -104,13 +104,13 @@ describe Network::UDP do
       end
 
       it "should bind to a local host and port" do
-        local_address = nil
+        bound_port = nil
 
         subject.udp_session(host,port,nil,local_port) do |socket|
-          local_address = socket.local_address
+          bound_port = socket.addr[1]
         end
 
-        local_address.ip_port.should == local_port
+        bound_port.should == local_port
       end
     end
 
@@ -148,10 +148,10 @@ describe Network::UDP do
     describe "#udp_send" do
       let(:server) do
         socket = UDPSocket.new
-        socket.bind(server_host,nil)
+        socket.bind(server_host,0)
         socket
       end
-      let(:server_port) { server.local_address.ip_port }
+      let(:server_port) { server.addr[1] }
 
       let(:data)       { "hello\n" }
       let(:local_port) { 1024 + rand(65535 - 1024) }
@@ -189,11 +189,12 @@ describe Network::UDP do
       end
 
       it "should bind to a specific port and host" do
-        server = subject.udp_server(server_port,server_host)
+        server      = subject.udp_server(server_port,server_host)
+        bound_host = server.addr[3]
+        bound_port = server.addr[1]
 
-        local_address = server.local_address
-        local_address.ip_address.should == server_ip
-        local_address.ip_port.should    == server_port
+        bound_host.should == server_ip
+        bound_port.should == server_port
 
         server.close
       end
@@ -227,14 +228,16 @@ describe Network::UDP do
       end
 
       it "should bind to a specific port and host" do
-        local_address = nil
+        bound_host = nil
+        bound_port = nil
         
         subject.udp_server_session(server_port,server_host) do |yielded_server|
-          local_address = yielded_server.local_address
+          bound_host = yielded_server.addr[3]
+          bound_port = yielded_server.addr[1]
         end
 
-        local_address.ip_address.should == server_ip
-        local_address.ip_port.should    == server_port
+        bound_host.should == server_ip
+        bound_port.should == server_port
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ronin-support
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chars
-  requirement: &21873340 !ruby/object:Gem::Requirement
+  requirement: &17665600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *21873340
+  version_requirements: *17665600
 - !ruby/object:Gem::Dependency
   name: hexdump
-  requirement: &21872300 !ruby/object:Gem::Requirement
+  requirement: &17664640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *21872300
+  version_requirements: *17664640
 - !ruby/object:Gem::Dependency
   name: combinatorics
-  requirement: &21871660 !ruby/object:Gem::Requirement
+  requirement: &17663420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *21871660
+  version_requirements: *17663420
 - !ruby/object:Gem::Dependency
   name: uri-query_params
-  requirement: &21837140 !ruby/object:Gem::Requirement
+  requirement: &17646180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *21837140
+  version_requirements: *17646180
 - !ruby/object:Gem::Dependency
   name: data_paths
-  requirement: &21834740 !ruby/object:Gem::Requirement
+  requirement: &17645620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *21834740
+  version_requirements: *17645620
 - !ruby/object:Gem::Dependency
   name: parameters
-  requirement: &21831580 !ruby/object:Gem::Requirement
+  requirement: &17645080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *21831580
+  version_requirements: *17645080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21758280 !ruby/object:Gem::Requirement
+  requirement: &17644240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,29 +87,29 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *21758280
+  version_requirements: *17644240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &21752700 !ruby/object:Gem::Requirement
+  requirement: &17643400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *21752700
+  version_requirements: *17643400
 - !ruby/object:Gem::Dependency
   name: yard-parameters
-  requirement: &21749860 !ruby/object:Gem::Requirement
+  requirement: &17642480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *21749860
+  version_requirements: *17642480
 description: Ronin Support is a support library for Ronin. Ronin Support contains
   many of the convenience methods used by Ronin and additional libraries.
 email: postmodern.mod3@gmail.com
@@ -173,6 +173,8 @@ files:
 - lib/ronin/network/dns.rb
 - lib/ronin/network/esmtp.rb
 - lib/ronin/network/extensions.rb
+- lib/ronin/network/extensions/dns.rb
+- lib/ronin/network/extensions/dns/net.rb
 - lib/ronin/network/extensions/esmtp.rb
 - lib/ronin/network/extensions/esmtp/net.rb
 - lib/ronin/network/extensions/http.rb
@@ -322,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A support library for Ronin.