Make sure it runs on rbx as well as mri.

Author: janlindblom

.ruby-version

@@ -0,0 +1 @@
+2.1.2

lib/dovado/router.rb

@@ -12,6 +12,7 @@ class Router
     #
     def initialize(args=nil)
       debug "Starting up #{self.class.to_s}..."
+      
       # Defaults
       @address    = '192.168.0.1'
       user        = nil
@@ -46,6 +47,10 @@ def services
         string = client.command('services')
         router_services.create_from_string string
       end
+      if router_services.list[:sms] == 'enabled'
+        router_info = Actor[:router_info]
+        router_info.sms.enabled = true
+      end
       router_services
     end
 
@@ -68,11 +73,13 @@ def sms
         unless router_info.sms.valid?
           client.connect
           client.authenticate
-          Dovado::Router::Sms.supervise_as :sms
+          unless Actor[:sms]
+            Dovado::Router::Sms.supervise_as :sms
+          end
           sms = Actor[:sms]
-          sms.create_from_string(client.command('sms list'))
+          sms.async.create_from_string(client.command('sms list'))
           router_info.sms = sms
-          sms.async.load_messages
+          sms.load_messages
         end
       end
       router_info.sms

lib/dovado/router/info.rb

@@ -14,7 +14,7 @@ class Info
       def initialize(args=nil)
         # Defaults
         @data = ThreadSafe::Cache.new
-        @data[:local_ip] = Addrinfo.ip '192.168.0.1'
+        @data[:local_ip] = '192.168.0.1'
 
         @up_to_date = false
         unless args.nil?
@@ -24,6 +24,10 @@ def initialize(args=nil)
       end
 
       def create_from_string data_string=nil
+        unless Actor[:sms]
+          Dovado::Router::Sms.supervise_as :sms
+        end
+        sms = Actor[:sms]
         data_array = data_string.split("\n")
         data_array.each do |data_entry|
           entry_array = data_entry.split('=')
@@ -37,17 +41,14 @@ def create_from_string data_string=nil
             when 'date'
               @data[:date] = Date.parse(val)
             when 'sms_unread'
-              @data[:sms] = Dovado::Router::Sms.new if @data[:sms].nil?
+              @data[:sms] = sms if @data[:sms].nil?
               @data[:sms].unread = val.to_i
             when 'sms_total'
-              @data[:sms] = Dovado::Router::Sms.new if @data[:sms].nil?
+              @data[:sms] = sms if @data[:sms].nil?
               @data[:sms].total = val.to_i
             when 'connected_devices'
               val = val.split(',')
               @data[keysym] = val
-            when 'external_ip'
-              val = Addrinfo.ip(val)
-              @data[keysym] = val
             else
               @data[keysym] = val
             end
@@ -160,7 +161,7 @@ def local_ip
       end
 
       def local_ip= ip=nil
-        @data[:local_ip] = Addrinfo.ip(ip) unless ip.nil?
+        @data[:local_ip] = ip unless ip.nil?
       end
 
       def date
@@ -180,8 +181,11 @@ def time= time=nil
       end
 
       def sms
-        unless @data[:sms].nil?
-          @data[:sms] = Dovado::Router::Sms.new
+        if @data[:sms].nil?
+          unless Actor[:sms]
+            Dovado::Router::Sms.supervise_as :sms
+          end
+          @data[:sms] = Actor[:sms]
         end
         @data[:sms]
       end

lib/dovado/router/services.rb

@@ -6,7 +6,6 @@ class Services
       include Celluloid::Logger
 
       attr_accessor :list
-      @list       = nil
       @up_to_date = nil
 
       def initialize(args=nil)

spec/ruby-dovado_spec.rb

@@ -16,6 +16,7 @@
   it "checks the router for info" do
     @router = Dovado::Router.new(address: '10.0.1.1')
 
+    @router.info.local_ip.should eq '10.0.1.1'
     puts @router.info.inspect
   end
 
@@ -26,6 +27,9 @@
 
   it "checks the router for sms" do
     @router = Dovado::Router.new(address: '10.0.1.1')
+
+    puts @router.sms.enabled
+    @router.sms.load_messages
     puts @router.sms.inspect
   end
 end