Updated to work with more recent dependencies

Author: janlindblom

.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.2

Gemfile

@@ -1,17 +1,14 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem 'celluloid', '~> 0.17'
+
 group :development do
-  gem "rspec", "~> 2.8.0"
-  gem "yard", "~> 0.7"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
+  gem "rspec", "~> 3"
+  gem "yard", '~> 0.8'
+  gem "rdoc", '~> 4.2'
+  gem "bundler", "> 1.3"
+  gem "jeweler", "~> 2"
   gem "simplecov", ">= 0"
   gem 'thread_safe', '~> 0.3'
-  gem 'celluloid'
+#  gem 'celluloid', '~> 0.16.1'
 end

Rakefile

@@ -14,11 +14,11 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "ruby-dovado"
-  gem.homepage = "https://bitbucket.org/lilycode/ruby-dovado"
+  gem.homepage = "https://bitbucket.org/janlindblom/ruby-dovado"
   gem.license = "MIT"
   gem.summary = "Ruby library for interfacing Dovado routers."
   gem.description = "Ruby library for interfacing Dovado routers."
-  gem.email = "jan@janlindblom.se"
+  gem.email = "janlindblom@fastmail.fm"
   gem.authors = ["Jan Lindblom"]
   gem.add_dependency 'thread_safe', '~> 0.3'
   gem.add_dependency 'celluloid', '~> 0.15'

lib/dovado.rb

@@ -1,5 +1,6 @@
 require 'thread_safe'
-require 'celluloid'
+#require 'celluloid'
+require 'celluloid/current'
 
 require 'dovado/utilities'
 require 'dovado/client'

lib/dovado/client.rb

@@ -3,14 +3,13 @@
 module Dovado
   class Client
     include Celluloid
-    include Celluloid::Logger
-    
-    @@server = nil
+
+    @server = nil
     @address = nil
     @user = nil
     @password = nil
-    @@authenticated = nil
-    
+    @authenticated = nil
+
     def initialize(args=nil)
       # Defaults
       @address   = '192.168.0.1'
@@ -21,63 +20,62 @@ def initialize(args=nil)
         @user     = args[:user]     unless      args[:user].nil?
         @password = args[:password] unless  args[:password].nil?
       end
-      debug "Starting up #{self.class.to_s}..."
     end
-    
+
     def command(text=nil)
       unless text.nil?
-        #connect
-        #authenticate
-    
-        res = @@server.puts(text)
-        res = @@server.waitfor(/>>\s/)
+        #connect unless connected?
+        #authenticate unless authenticated?
+
+        res = @server.puts(text)
+        res = @server.waitfor(/>>\s/)
         #disconnect
         res
       end
     end
 
     def connect
-      if @@server.nil?
-        @@server = Net::Telnet.new('Host' => @address, 'Port' => 6435, 'Telnetmode' => false, 'Prompt' => />>\s/)
+      if @server.nil?
+        @server = Net::Telnet.new('Host' => @address, 'Port' => 6435, 'Telnetmode' => false, 'Prompt' => />>\s/)
       end
     end
 
     def disconnect
-      unless @@server.nil?
-        @@server.close
+      unless @server.nil?
+        @server.close
       end
     end
 
     def connected?
-      unless @@server.nil?
+      unless @server.nil?
         true
       else
         false
       end
     end
 
     def authenticate
-      unless @@server.nil?
+      unless @server.nil?
         unless authenticated?
           user = @user unless @user.nil?
           password = @password unless @password.nil?
 
-          @@server.cmd("user #{user}")
-          @@server.waitfor(/>>\s/)
-          @@server.cmd("pass #{password}")
+          @server.cmd("user #{user}")
+          @server.waitfor(/>>\s/)
+          @server.cmd("pass #{password}")
 
           # TODO: verify authentication
-          @@authenticated = true
+          @authenticated = true
         else
-          @@authenticated = false
+          @authenticated = false
         end
       else
-        @@authenticated = false
+        @authenticated = false
       end
     end
 
     def authenticated?
-      @@authenticated
+      @authenticated
     end
 
   end

lib/dovado/router.rb

@@ -2,7 +2,6 @@
 module Dovado
   class Router
     include Celluloid
-    include Celluloid::Logger
 
     @address = nil
     @connected = nil
@@ -11,7 +10,6 @@ class Router
     # network.
     #
     def initialize(args=nil)
-      debug "Starting up #{self.class.to_s}..."
 
       # Defaults
       @address    = '192.168.0.1'
@@ -24,21 +22,15 @@ def initialize(args=nil)
         password  = args[:password] if args[:password]
       end
 
-      Dovado::Client.supervise_as :client, {
+      Dovado::Client.supervise as: :client, args: [{
         server:     @address,
         user:       user,
         password:   password
-      }
-
-      Dovado::Router::Info.supervise_as :router_info
-      router_info = Actor[:router_info]
-      router_info.local_ip = @address
-
-      Dovado::Router::Services.supervise_as :router_services
-      #info "Starting up..."
+      }]
     end
 
     def services
+      Dovado::Router::Services.supervise as: :router_services unless Actor[:router_services]
       client = Actor[:client]
       router_services = Actor[:router_services]
       unless router_services.valid?
@@ -47,14 +39,19 @@ def services
         string = client.command('services')
         router_services.create_from_string string
       end
+      Dovado::Router::Sms.supervise as: :sms unless Actor[:sms]
       if router_services.list[:sms] == 'enabled'
+        Dovado::Router::Info.supervise as: :router_info unless Actor[:router_info]
         router_info = Actor[:router_info]
         router_info.sms.enabled = true
       end
       router_services
     end
 
     def info
+      Dovado::Router::Info.supervise as: :router_info unless Actor[:router_info]
+      router_info = Actor[:router_info]
+      router_info.local_ip = @address
       client = Actor[:client]
       router_info = Actor[:router_info]
       unless router_info.valid?
@@ -63,26 +60,12 @@ def info
         info = client.command('info')
         router_info.create_from_string info
       end
+      services
       router_info
     end
 
     def sms
-      client = Actor[:client]
-      router_info = Actor[:router_info]
-      if router_info.valid?
-        unless router_info.sms.valid?
-          client.connect
-          client.authenticate
-          unless Actor[:sms]
-            Dovado::Router::Sms.supervise_as :sms
-          end
-          sms = Actor[:sms]
-          sms.async.create_from_string(client.command('sms list'))
-          router_info.sms = sms
-          sms.load_messages
-        end
-      end
-      router_info.sms
+      info.sms
     end
 
   end

lib/dovado/router/info.rb

@@ -6,8 +6,7 @@ module Dovado
   class Router
     class Info
       include Celluloid
-      include Celluloid::Logger
-      
+
       @data = nil
       @up_to_date = false
 
@@ -20,12 +19,11 @@ def initialize(args=nil)
         unless args.nil?
           @data = args
         end
-        debug "Starting up #{self.class.to_s}..."
       end
 
       def create_from_string data_string=nil
         unless Actor[:sms]
-          Dovado::Router::Sms.supervise_as :sms
+          Dovado::Router::Sms.supervise as: :sms
         end
         sms = Actor[:sms]
         data_array = data_string.split("\n")
@@ -121,15 +119,15 @@ def traffic_modem_up
       end
 
       def traffic_modem_up= traffic_modem_up=nil
-        @data[:traffic_modem_tx] = traffic_modem_up
+        @data[:traffic_modem_tx] = traffic_modem_up.to_i
       end
 
       def traffic_modem_down
         @data[:traffic_modem_rx]
       end
 
       def traffic_modem_down= traffic_modem_down=nil
-        @data[:traffic_modem_rx] = traffic_modem_down
+        @data[:traffic_modem_rx] = traffic_modem_down.to_i
       end
 
       def connection
@@ -183,7 +181,7 @@ def time= time=nil
       def sms
         if @data[:sms].nil?
           unless Actor[:sms]
-            Dovado::Router::Sms.supervise_as :sms
+            Dovado::Router::Sms.supervise as: :sms
           end
           @data[:sms] = Actor[:sms]
         end

lib/dovado/router/info/operator.rb

@@ -4,7 +4,6 @@ class Router
     class Info
       class Operator
         include Celluloid
-        include Celluloid::Logger
 
         attr_accessor :number, :name, :commands
 
@@ -14,7 +13,6 @@ def initialize(args=nil)
           unless args.nil?
             @number = args[:number] unless args[:number].nil?
           end
-          debug "Starting up #{self.class.to_s}..."
         end
 
       end

lib/dovado/router/services.rb

@@ -3,7 +3,6 @@ module Dovado
   class Router
     class Services
       include Celluloid
-      include Celluloid::Logger
 
       attr_accessor :list
       @up_to_date = nil
@@ -17,7 +16,6 @@ def initialize(args=nil)
           end
           @up_to_date = true
         end
-        debug "Starting up #{self.class.to_s}..."
       end
 
       def create_from_string data_string=nil

lib/dovado/router/sms.rb

@@ -2,13 +2,12 @@ module Dovado
   class Router
     class Sms
       include Celluloid
-      include Celluloid::Logger
 
       attr_accessor :unread, :total, :enabled, :ids
       @ids = nil
 
       def initialize(args=nil)
-        Dovado::Router::Sms::Messages.supervise_as :messages
+        Dovado::Router::Sms::Messages.supervise as: :messages
         messages = Actor[:messages]
         @enabled = false
         @ids = ThreadSafe::Array.new
@@ -18,7 +17,6 @@ def initialize(args=nil)
         end
         client = Actor[:client]
         create_from_string(client.command('sms list'))
-        debug "Starting up #{self.class.to_s}..."
       end
 
       def messages
@@ -55,7 +53,6 @@ def load_messages
         client = Actor[:client]
         messages = Actor[:messages]
         @ids.each do |id|
-          debug "Dovado::Router::Sms#load_messages: #{id}"
           messages.add_message Dovado::Router::Sms::Message.from_string(client.command("sms recvtxt #{id}"))
         end
       end