ruby-network-manager 1.0.12 → 1.0.16

data/VERSION

@@ -1 +1 @@
-1.0.12
+1.0.16

data/lib/network_manager/modem.rb

@@ -1,8 +1,12 @@
 # encoding: utf-8
+require 'pry'
+
 class NetworkManager
   class Modem
     attr_reader :bus_path, :service
 
+    class NotValid < StandardError ; end
+
     def initialize(opts = {})
       opts.each do |k,v|
         instance_variable_set("@#{k}", v) unless v.nil?
@@ -17,7 +21,8 @@ class NetworkManager
       @proxy = @service.object(@bus_path)
       @proxy.introspect
 
-      @properties = @proxy[NetworkManager::DBUS_PROPERTIES]
+      @properties = @proxy.dup
+      @properties.default_iface = NetworkManager::DBUS_PROPERTIES
       @properties.introspect
 
       @s_modem = @proxy[NetworkManager::MM_DBUS_INTERFACE_MODEM_SIMPLE]
@@ -26,6 +31,11 @@ class NetworkManager
       @ussd    = @proxy[NetworkManager::MM_DBUS_INTERFACE_MODEM_GSM_USSD]
 
       @device_info = @properties.GetInfo[0] rescue nil
+      raise NetworkManager::Modem::NotValid unless valid?
+    end
+
+    def valid?
+      @properties.interfaces.size > 0
     end
 
     def enable!
@@ -131,7 +141,11 @@ class NetworkManager
       def fetch(paths_array, opts = {})
         devices = []
         paths_array.compact.reject {|x| x && x.size <= 0 }.each do |path|
-          devices << self.new(opts.merge({bus_path: path}))
+          begin
+            devices << self.new(opts.merge({bus_path: path}))
+          rescue NetworkManager::Modem::NotValid => e 
+            puts "Bus #{path} contains empty object, skipping"
+          end
         end
         devices
       end

data/lib/ruby-network-manager.rb

@@ -18,12 +18,12 @@ class NetworkManager
   def initialize(opts = {})
     set_options opts
     @bus        = DBus::SystemBus.instance
-    @mm_service = @bus.service(@modem_service)
-    @mm_object  = @mm_service.object(@modem_bus_path)
   end
 
   # Discover all enabled devices
   def modems(opts = {})
+    @mm_service = @bus.service(@modem_service)
+    @mm_object  = @mm_service.object(@modem_bus_path)
     @mm_object.introspect
     NetworkManager::Modem.fetch(@mm_object.EnumerateDevices()[0], service: @mm_service)
   end

data/ruby-network-manager.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-network-manager"
-  s.version = "1.0.12"
+  s.version = "1.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernest Bursa"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-network-manager
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2938569556196178749
+      hash: -1380551862488981491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: