mtik 4.0.1 → 4.0.2

data/CHANGELOG.txt

@@ -1,3 +1,14 @@
+2013-06-06 (06 JUN 2013)  VERSION 4.0.2  Aaron D. Gifford (http://www.aarongifford.com)
+                                         Bart Braem (http://www.lalunerouge.net/)
+ * Merged Bart Braem's implementation of timeouts and bumped up the version.  Thanks, Bart!
+ * Updated Rakefile to remove a bit of obsolescence
+
+2012-02-09 (09 FEB 2012)  VERSION 4.0.1  Aaron D. Gifford (http://www.aarongifford.com)
+ * Added os_version to connections.  Upon successful connect and login, the RouterOS
+   version is fetched and stored.  This will allow future updates to better support
+   some commands that differ (like fetch) depending on which RouterOS version is
+   installed on the device.
+
 2011-03-25 (25 MAR 2011)  VERSION 4.0.0  Aaron D. Gifford (http://www.aarongifford.com)
  * Per user suggestion, added a new optional cancel parameter to the MTik#command()
    method that will auto-cancel the supplied command after receiving the specified
@@ -13,6 +24,7 @@
    to symbol and fixed those, updated error messages to reflect state as a symbol,
    eliminated a few redundant key?() calls, and fixed a replycounter initialization
    typo (had set it to 1 instead of 0).
+
 2011-01-11 (11 JAN 2011)  VERSION 3.1.2  Aaron D. Gifford (http://www.aarongifford.com)
  * Added source file encoding comments and updated the copyright notices
  * Fixed a tiny bug in lib/mtik/connection.rb
@@ -85,3 +97,4 @@
       fetch.rb
   * Added VERSION.txt, CHANGELOG.txt, README.txt, LICENSE.txt, and *.gemspec files, moved
     the example files into the bin subdirectory
+

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/package_task'
+require 'rdoc/task'
 
 gemspec = Gem::Specification.new do |spec|
   spec.name         = 'mtik'
@@ -35,12 +35,12 @@ gemspec = Gem::Specification.new do |spec|
   spec.executables = [ 'tikcli', 'tikcommand', 'tikfetch' ]
 end
 
-Rake::GemPackageTask.new(gemspec) do |pkg|
+Gem::PackageTask.new(gemspec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
 end
 
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.name     = 'rdoc'
   rdoc.main     = 'README.txt'
   rdoc.rdoc_dir = 'doc'

data/VERSION.txt

@@ -1 +1 @@
-4.0.1
+4.0.2

data/lib/mtik/connection.rb

@@ -50,7 +50,7 @@ class MTik::Connection
   ## +user+:: Override the default API username ('admin')
   ## +pass+:: Override the default API password (blank)
   ## +conn_timeout+:: Override the default connection
-  ##                  timeout (60 seconds) -- *NOT USED*
+  ##                  timeout (60 seconds)
   ## +cmd_timeout+::  Override the default command timeout
   ##                  (60 seconds) -- the number of seconds
   ##                  to wait for additional API input.
@@ -130,9 +130,22 @@ class MTik::Connection
   ## Connect to the device
   def connect
     return unless @sock.nil?
-    ## TODO: Perhaps catch more errors; implement connection timeout
+    ## TODO: Perhaps catch more errors
     begin
-      @sock = TCPSocket::new(@host, @port)
+      addr = Socket.getaddrinfo(@host, nil)
+      @sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+      
+      begin
+        @sock.connect_nonblock(Socket.pack_sockaddr_in(@port, addr[0][3]))
+      rescue Errno::EINPROGRESS
+        ready = IO.select([@sock], [@sock], [], @conn_timeout)
+        if ready
+          @sock
+        else
+          raise Errno::ETIMEDOUT 
+      end
+    end
+      
     rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Errno::ENETUNREACH,
            Errno::EHOSTUNREACH => e
       @sock = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtik
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies: []
 description: MTik implements the MikroTik RouterOS API for use in Ruby.
 email: email_not_accepted@aarongifford.com
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mtik
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: MTik implements the MikroTik RouterOS API for use in Ruby.