mtik 3.0.2 → 3.0.3

data/CHANGELOG.txt

@@ -1,3 +1,9 @@
+2010-03-11 (11 MAR 2010)  VERSION 3.0.3  Aaron D. Gifford (http://www.aarongifford.com)
+  * Bug fix to lib/mtik.rb command() method so when executing multiple commands
+    response array order matches command array order.
+  * Cosmetic change for hex encoding with a little simplification, and one very small
+    readability change in lib/mtik/connection.rb
+
 2010-02-05 (05 FEB 2010)  VERSION 3.0.2  Aaron D. Gifford (http://www.aarongifford.com)
   * Typo fixes to example tikfetch.rb
   * Multi-command functionality added to interactive client and to tikcommand.rb example

data/Rakefile

@@ -0,0 +1,43 @@
+require 'rubygems'
+require 'rake/gempackagetask'
+
+gemspec = Gem::Specification.new do |spec|
+  spec.name         = 'mtik'
+  spec.version      = File.open('VERSION.txt','r').to_a.join.strip
+  spec.date         = File.mtime('VERSION.txt')
+  spec.author       = 'Aaron D. Gifford'
+  spec.email        = 'email_not_accepted@aarongifford.com'
+  spec.homepage     = 'http://www.aarongifford.com/computers/mtik/'
+  spec.summary      = 'MTik implements the MikroTik RouterOS API for use in Ruby.'
+  spec.description  = 'MTik implements the MikroTik RouterOS API for use in Ruby.'
+  spec.has_rdoc     = true ## Only partially true currently
+  spec.rubyforge_project = 'mtik'
+  spec.extra_rdoc_files  = [ 'README.txt' ]
+  spec.require_paths     = [ 'lib' ]
+  spec.files             = [
+    'CHANGELOG.txt',
+    'LICENSE.txt',
+    'README.txt',
+    'VERSION.txt',
+    'Rakefile',
+    'examples/tikcli.rb',
+    'examples/tikcommand.rb',
+    'examples/tikfetch.rb',
+    'examples/tikjson.rb',
+    'lib/mtik.rb',
+    'lib/mtik/connection.rb',
+    'lib/mtik/error.rb',
+    'lib/mtik/fatalerror.rb',
+    'lib/mtik/reply.rb',
+    'lib/mtik/request.rb',
+    'lib/mtik/timeouterror.rb'
+  ]
+end
+
+Rake::GemPackageTask.new(gemspec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
+end
+
+task :default => [ 'pkg/mtik-'  + File.open('VERSION.txt','r').to_a.join.strip + '.gem' ]
+

data/VERSION.txt

@@ -1 +1 @@
-3.0.2
+3.0.3

data/lib/mtik.rb

@@ -211,7 +211,8 @@ module MTik
       cmd = [ cmd ]
     end
 
-    cmd.each do |c|
+    cmd.each_index do |i|
+      c = cmd[i]
       replycount = 1
       tk.send_request(false, c[0], c[1,c.length-1]) do |req, sentence|
         replycount += 1
@@ -229,7 +230,7 @@ module MTik
           req.cancel
         end
         if sentence.key?('!done')
-          replies.push(req.reply)
+          replies[i] = req.reply
         end
       end
     end

data/lib/mtik/connection.rb

@@ -75,13 +75,14 @@ class MTik::Connection
   end
   attr_reader :requests, :host, :port, :user, :pass, :conn_timeout, :cmd_timeout
 
-  ## Utility to pack a binary string as an ASCII hex string
-  ## (Ruby really needs pack method for the String class--like
-  ## "deadbeef".pack("H*")--then this would be unnecessary.)
-  def hexpack(str)
+  ## Internal utility function:
+  ## Sugar-coat ["0deadf0015"].pack('H*') so one can just do
+  ## "0deadf0015".hex2bin instead.  Prepend a '0' if the hex
+  ## string doesn't have an even number of digits.
+  def hex2bin(str)
     return str.length % 2 == 0 ?
-      [str].pack('H'+str.length.to_s) :
-      [str[0,1]].pack('h') + [str[1,str.length-1]].pack('H'+(str.length-1).to_s)
+      [str].pack('H*') :
+      ['0'+str].pack('H*')
   end
 
   ## Connect and login to the device using the API
@@ -99,7 +100,7 @@ class MTik::Connection
     end
 
     ## Grab the challenge from first (only) sentence in the reply:
-    challenge = hexpack(reply[0]['ret'])
+    challenge = hex2bin(reply[0]['ret'])
 
     ## Generate reply MD5 hash and convert binary hash to hex string:
     response  = Digest::MD5.hexdigest(0.chr + @pass + challenge)
@@ -171,7 +172,8 @@ class MTik::Connection
             return sentence
           else
             ## Add word to sentence
-            if m = /^=?([^=]+)=(.*)$/.match(word)
+            m = /^=?([^=]+)=(.*)$/.match(word)
+            unless m.nil?
               sentence[m[1]] = m[2]
             else
               sentence[word] = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mtik
 version: !ruby/object:Gem::Version 
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors: 
 - Aaron D. Gifford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -07:00
+date: 2010-03-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +26,7 @@ files:
 - LICENSE.txt
 - README.txt
 - VERSION.txt
+- Rakefile
 - examples/tikcli.rb
 - examples/tikcommand.rb
 - examples/tikfetch.rb
@@ -39,6 +40,8 @@ files:
 - lib/mtik/timeouterror.rb
 has_rdoc: true
 homepage: http://www.aarongifford.com/computers/mtik/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -59,9 +62,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mtik
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: MTik implements the MikroTik RouterOS API for use in Ruby.
 test_files: []