mtik 3.1.0 → 3.1.1

data/README.txt

@@ -34,6 +34,10 @@ Additional documentation is available at
 * http://www.aarongifford.com/computers/mtik/
 * http://wiki.mikrotik.com/wiki/API_Ruby_class
 
+Source code is available on GitHub:
+
+* http://www.github.com/astounding/mtik/
+
 For documentation on the MikroTik RouterOS APi, see
 
 * http://wiki.mikrotik.com/wiki/API
@@ -53,8 +57,13 @@ under a BSD-style license.  (See the LICENSE.txt file.)
 
 == Report Bugs
 
-Please report bugs by going to the author's web site and clicking on the
-"Contact Me" link in the left-hand menu.  The direct URL is:
+Bugs/issues may also be reported via GitHub:
+
+* http://www.github.com/astounding/mtik/issues/
+
+ALSO, please send the author a note regarding the issue by clicking on the
+"Contact Me" link in the left-hand menu of the author's web site.
+The direct URL is:
 
 * http://www.aarongifford.com/leaveanote.html
 

data/VERSION.txt

@@ -1 +1 @@
-3.1.0
+3.1.1

data/examples/tikfetch.rb

@@ -44,8 +44,8 @@ require 'mtik'
 ## output of all API interactions:
 #MTik::verbose = true
 
-if ARGV.length < 5 || ARGV.length % 2 != 1
-  print "Usage: #{$0} <device> <user> <pass> <url> <localfilename> [<url> <localfilename>...]\n"
+if ARGV.length < 4
+  print "Usage: #{$0} <device> <user> <pass> <url> [<localfilename> [<url> [<localfilename> ... ]]]\n"
   exit
 end
 
@@ -55,7 +55,7 @@ pass = ARGV.shift
 begin
   mt = MTik::Connection.new(:host=>host, :user=>user, :pass=>pass)
 rescue Errno::ETIMEDOUT, Errno::ENETUNREACH, Errno::EHOSTUNREACH, MTik::Error => e
-  print ">>> ERROR CONNECTING: #{e}"
+  print ">>> ERROR CONNECTING: #{e}\n"
   exit
 end
 
@@ -68,27 +68,55 @@ mt.get_reply_each('/file/getall') do |req, s|
 end
 
 while ARGV.length > 0
-  url, filename = ARGV.shift, ARGV.shift
+  url = ARGV.shift
+  if ARGV.length > 0
+    filename = ARGV.shift
+  else
+    filename = File.basename(url)
+  end
   if files.key?(filename)
     print ">>> ERROR: There is a file named '#{filename}' already on the device.\n"
   else
     print ">>> OK: Fetching file '#{filename}' from URL '#{url}'...\n"
+    oldbytes = 0
+    totalbytes = nil
+    oldtime  = starttime = Time.now
     mt.fetch(url, filename, 120) do |status, total, bytes, req|
+      now = Time.now
       case status
-      when 'failed'
-        print ">>> ERROR: File '#{filename}' download failed!\n"
-      when 'finished'
-        print ">>> OK: File '#{filename}' download finished.\n"
       when 'connecting'
+        starttime = now
         print ">>> OK: Connecting to '#{url}' to download file '#{filename}'\n"
+      when 'requesting'
+        starttime = now
+        print ">> OK: Connected.  Sending request for '#{filename}'...\n"
       when 'downloading'
-        print ">>> OK: Downloaded #{bytes} bytes of #{total} of file " +
-              "'#{filename}' " +
-              (total > 0 ? '%0.2f' % (100.0*bytes/total) : '0') +
-              "%\n"
+        # Unfortunately, the 'total' parameter is only valid for a
+        # 'downloading' status update, so we save the value.
+        totalbytes = total if totalbytes.nil?
+        print (
+          ">>> OK: Downloaded #{bytes} KB of #{total} KB " +
+          '(%0.2f KBps, %0.2f avgKBps) of ' +
+          "'#{filename}' " +
+          (total > 0 ? '%0.2f' % (100.0*bytes/total) : '0') +
+          '%%' + (oldbytes == bytes ? ' *STALLED*' : '') +  "\n"
+        ) % [(bytes-oldbytes)/(now-oldtime), bytes/(now-starttime)]
+        oldbytes = bytes
+      when 'finished'
+        unless totalbytes.nil?
+          print (
+            ">>> OK: Downloaded #{totalbytes} KB of #{totalbytes} KB " +
+            '(%0.2f KBps, %0.2f avgKBps) of ' +
+            "'#{filename}' 100.00%%\n"
+          ) % [(totalbytes-oldbytes)/(now-oldtime), totalbytes/(now-starttime)]
+        end
+        print ">>> OK: File '#{filename}' download finished in #{'%0.2f' % [now-starttime]} seconds.\n"
+      when 'failed'
+        print ">>> ERROR: File '#{filename}' download failed!\n"
       else
         print ">>> ERROR: The following trap error occured: #{status}\n"
       end
+      oldtime  = now
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Aaron D. Gifford
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -06:00
+date: 2010-12-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -53,6 +53,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -60,6 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -69,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mtik
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: MTik implements the MikroTik RouterOS API for use in Ruby.