mtik 4.0.2 → 4.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0faffc781b693499b3a24a0b07cc918c146903a6
+  data.tar.gz: 2415ca8ad18b2f83e55ca29e81bfe776f507700c
+SHA512:
+  metadata.gz: 82acc2725c7f074df88f22585a13a1395ffedd4bf9194daa167e893f1d33d11da70bb4a9825c25c294863b7bd88b8bdf3c435d848461862402bf22cf26824e58
+  data.tar.gz: 04e7aca873f26094fdcd701431bba659ad0663f7528b2ab03ddc9192276cafbda3b80f6d68698d366c9ae74c1049e33602adf8a59b2b625e177f0d2b8c2474ad

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+2014-02-14 (14 FEB 2014)  VERSION 4.2.3  Aaron D. Gifford (http://www.aarongifford.com)
+ * Update to fetch() utility, along with some very minor some cosmetic changes
+
 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!

data/VERSION.txt

@@ -1 +1 @@
-4.0.2
+4.0.3

data/examples/tikjson.rb

@@ -2,11 +2,13 @@
 ########################################################################
 #--
 #
-# FILE:     json.rb -- Example of using the Ruby MikroTik API in Ruby
+# FILE:  tikjson.rb -- Example of using the Ruby MikroTik API in Ruby
+#                      to execute an API command and retrieve results
+#                      in JSON format
 #
 #++
 # Author::    Aaron D. Gifford - http://www.aarongifford.com/
-# Copyright:: Copyright (c) 2009-2011, InfoWest, Inc.
+# Copyright:: Copyright (c) 2009-2014, InfoWest, Inc.
 # License::   BSD license
 #--
 # Redistribution and use in source and binary forms, with or without

data/lib/mtik/connection.rb

@@ -134,7 +134,7 @@ class MTik::Connection
     begin
       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
@@ -142,10 +142,10 @@ class MTik::Connection
         if ready
           @sock
         else
-          raise Errno::ETIMEDOUT 
+          raise Errno::ETIMEDOUT
       end
     end
-      
+
     rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Errno::ENETUNREACH,
            Errno::EHOSTUNREACH => e
       @sock = nil
@@ -257,7 +257,7 @@ class MTik::Connection
       sentence = get_sentence  ## This call must be ATOMIC or re-entrant safety fails
 
       ## Check for '!fatal' before checking for a tag--'!fatal'
-      ## is never(???) tagged: 
+      ## is never(???) tagged:
       if sentence.key?('!fatal')
         ## FATAL ERROR has occured! (Or a '/quit' command was issued...)
         if @data.length > 0
@@ -356,7 +356,7 @@ class MTik::Connection
   ## +args+::              Zero or more arguments to the command
   ## +callback+::          Proc/lambda code (or code block if not provided as
   ##                       an argument) to be called.  (See the +await_completion+
-  ##                    
+  ##
   def send_request(await_completion, command, *args, &callback)
     if await_completion.is_a?(MTik::Request)
       req = await_completion
@@ -525,16 +525,53 @@ class MTik::Connection
   ## +total+::    Final expected file size in bytes
   ## +bytes+::    Number of bytes transferred so far
   ## +request+::  The MTik::Request object
-  def fetch(url, filename, timeout=nil, &callback)
+  def fetch(url, filename=nil, timeout=nil, &callback)
+    require 'uri'
+
+    uri = URI(url)
+    filename = File.basename(uri.path) if filename.nil?
+
     total  = bytes = oldbytes = 0
     status = ''
     done   = false
     lastactivity = Time.now
-    req = get_reply_each(
-      '/tool/fetch',
-      '=url=' + url,
-      '=dst-path=' + filename
-    ) do |r, s|
+
+    ## RouterOS versions 4.9 and prior (not sure if this version cut-off
+    ## is exactly right) would accept the url parameter, but failed to
+    ## download the files.  So for versions older than this, we'll use
+    ## the mode/src-path/port parameters instead if possible.
+    if !@os_version.nil? && lambda {|a,b|
+      sr = %r{(?:\.|rc|beta|alpha)}
+      a = a.split(sr).map{|i| i.to_i}
+      b = b.split(sr).map{|i| i.to_i}
+      i = 0
+      while i < a.size && i < b.size
+        return -1 if a[i] < b[i]
+        return  1 if a[i] > b[i]
+        i += 1
+      end
+      return a.size <=> b.size
+    }.call(@os_version, '4.9') < 1
+      command = [
+        '/tool/fetch', '=mode=' + uri.scheme,
+        '=src-path=' + uri.path + (uri.query.size > 0 ? '?' + uri.query : ''),
+        '=dst-path=' + filename
+      ]
+      case uri.scheme
+      when 'http'
+        command << '=port=80'
+      when 'https'
+        command << '=port=443'
+      end
+    else
+      command = [
+        '/tool/fetch',
+        '=url=' + url,
+        '=dst-path=' + filename
+      ]
+    end
+
+    req = get_reply_each(command[0], *command[1..-1])  do |r, s|
       if s.key?('!re') && !done
         unless s.key?('status')
           raise MTik::Error.new("Unknown response to '/tool/fetch': missing 'status' in response.")
@@ -624,7 +661,7 @@ class MTik::Connection
           else
             raise MTik::Error.new("Invalid settings match class '#{keyitem}' (expected Array, Regexp, or String)")
           end
-            
+
           if s.key?(key)
             ## A key matches! && s[k] != v
             oldv = s[k]

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtik
 version: !ruby/object:Gem::Version
-  version: 4.0.2
-  prerelease: 
+  version: 4.0.3
 platform: ruby
 authors:
 - Aaron D. Gifford
@@ -24,12 +23,12 @@ files:
 - CHANGELOG.txt
 - LICENSE.txt
 - README.txt
-- VERSION.txt
 - Rakefile
-- examples/tikjson.rb
+- VERSION.txt
 - bin/tikcli
 - bin/tikcommand
 - bin/tikfetch
+- examples/tikjson.rb
 - lib/mtik.rb
 - lib/mtik/connection.rb
 - lib/mtik/error.rb
@@ -39,26 +38,25 @@ files:
 - lib/mtik/timeouterror.rb
 homepage: http://www.aarongifford.com/computers/mtik/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mtik
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MTik implements the MikroTik RouterOS API for use in Ruby.
 test_files: []