ruby-network-manager 0.14.1 → 1.0.10

data/Gemfile

@@ -1,7 +1,4 @@
 source "https://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
 gem 'ruby-dbus', require: 'dbus', git: 'git://github.com/mvidner/ruby-dbus.git'
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/mvidner/ruby-dbus.git
-  revision: f25a6953df050ea53dd3bd455660ffabaa5dae75
+  revision: 617fb1a53a1ade138f1d7845e1937a901c302442
   specs:
-    ruby-dbus (0.9.0)
+    ruby-dbus (0.9.1)
 
 GEM
   remote: https://rubygems.org/

data/README.rdoc

@@ -12,10 +12,27 @@ To fetch all available modems call:
   
     require 'ruby-network-manager'
     @network_mgr = NetworkManager.new
-    @devices = @network_mgr.modem_devices
+    @devices = @network_mgr.modems
 
 *modem_devices* method returns array of *NetworkManager::Modem#Object*.
 
+Available methods on *NetworkManager::Modem#Object*:
+* status
+* enabled? / disabled?
+* enable! / disable!
+* model
+* operator_code
+* vendor
+* version
+* signal
+* imei
+* imsi
+* scan
+* send_ussd
+* device
+* ussd_state
+* to_h
+
 == Contributing to ruby-network-manager 
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.14.1
+1.0.10

data/lib/network_manager/modem.rb

@@ -8,6 +8,11 @@ class NetworkManager
         instance_variable_set("@#{k}", v) unless v.nil?
       end
 
+      unless defined?(@service)
+        @bus        ||= DBus::SystemBus.instance
+        @service    = @bus.service(NetworkManager::MM_DBUS_SERVICE) 
+      end
+
       # Set DBUS proxy
       @proxy = @service.object(@bus_path)
       @proxy.introspect
@@ -24,16 +29,6 @@ class NetworkManager
       @device_info = @properties.GetInfo[0] rescue nil
     end
 
-    def enabled?
-      begin
-        status
-        return true
-      rescue => e
-        return !e.message.include?('device is not enabled')
-      end
-      nil
-    end
-
     def enable!
       @modem.Enable(true) == [] if disabled?
     end
@@ -51,8 +46,9 @@ class NetworkManager
     end
 
     def status
-      @s_modem.GetStatus[0]
+      @properties['org.freedesktop.ModemManager.Modem']['Enabled']
     end
+    alias :enabled? :status
 
     def operator_code
       status["operator_code"] rescue nil
@@ -83,14 +79,55 @@ class NetworkManager
     end
 
     def send_ussd(message)
-      @ussd.Cancel
-      @ussd.Initiate(message)
+      rsp = case ussd_state
+      when 'idle'
+        @ussd.Initiate(message)
+      when 'active'
+        @ussd.Cancel rescue nil
+        @ussd.Initiate(message)
+      when 'user-response'
+        @ussd.Respond(message)
+      end
+
+      # @ussd.Cancel rescue nil
+      rsp[0] if rsp.is_a?(Array)
+    end
+
+    def device
+      {
+        model: model,
+        port: @properties[MM_DBUS_INTERFACE_MODEM]['Device'],
+        unlock_required: @properties[MM_DBUS_INTERFACE_MODEM]['UnlockRequired'],
+        master_device: @properties[MM_DBUS_INTERFACE_MODEM]['MasterDevice'],
+        dbus_path: @bus_path
+      }
+    end
+
+    def ussd_state
+      @properties['org.freedesktop.ModemManager.Modem.Gsm.Ussd']['State']
     end
 
     def inspect
-      "#<NetworkManager::Modem##{object_id} IMEI: #{imei} Device: #{vendor} #{model} #{version} >"
+      if enabled?
+        "#<NetworkManager::Modem##{object_id} IMEI: #{imei} Device: #{vendor} #{model} #{version} USSD_STATE: #{ussd_state}>"
+      else
+        "#<NetworkManager::Modem##{object_id} DISABLED Device: #{vendor} #{model} #{version}"
+      end
     end
 
+    def to_h
+      {
+        imei: imei,
+        imsi: imsi,
+        signal: signal,
+        operator_code: operator_code, 
+        device: device,
+        status: (enabled? ? :enabled : :disabled )
+      }
+    end
+
+    alias :dbus_path :bus_path
+
     class << self
       def fetch(paths_array, opts = {})
         devices = []

data/lib/ruby-network-manager.rb

@@ -5,6 +5,7 @@ require 'network_manager/modem'
 class NetworkManager
   attr_reader :modem_service, :modem_bus_path
 
+  MODEM_MANAGER_BUS_PATH              = '/org/freedesktop/ModemManager'
   DBUS_PROPERTIES                     = 'freedesktop.DBus.Properties'
   MM_DBUS_SERVICE                     = 'org.freedesktop.ModemManager'
   MM_DBUS_INTERFACE_MODEM             = 'org.freedesktop.ModemManager.Modem'
@@ -17,26 +18,34 @@ 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 modem_devices(opts = {})
-    @mm_service ||= @bus[@modem_service]
-    @mm_object  ||= @mm_service.object(@modem_bus_path)
+  def modems(opts = {})
     @mm_object.introspect
-
     NetworkManager::Modem.fetch(@mm_object.EnumerateDevices()[0], service: @mm_service)
   end
 
-  class << self
+  # def on_device_add(&block)
+  #   @bus        = DBus::SystemBus.instance
+  #   @mm_service = @bus.service('org.freedesktop.ModemManager')
+  #   @mm_object  = @mm_service.object('/org/freedesktop/ModemManager')
+  #   @mm_object.introspect
 
-  end
+  #   @properties = @mm_object.dup
+  #   @properties.default_iface = DBUS_PROPERTIES
+  #   @properties.introspect
+
+  #   @properties.on_signal('DeviceAdded') {|x| puts x}
+  # end
 
   protected
 
   def set_options(opts = {})
-    @modem_service  ||= MM_DBUS_SERVICE || 'org.freedesktop.ModemManager'
-    @modem_bus_path ||= '/org/freedesktop/ModemManager'
+    @modem_service  ||= MM_DBUS_SERVICE
+    @modem_bus_path ||= MODEM_MANAGER_BUS_PATH
 
     opts.each do |k,v|
       instance_variable_set("@#{k}", v) unless v.nil?

data/ruby-network-manager.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-network-manager"
-  s.version = "0.14.1"
+  s.version = "1.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernest Bursa"]
-  s.date = "2013-04-20"
+  s.date = "2013-05-02"
   s.description = "This gem is simple binding for NetworkManager that aims to be tool for managing network interfaces such as 3G modems."
   s.email = "ernest@bzdury.pl"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-network-manager
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-dbus
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1807363723534505497
+      hash: -4413202439074915028
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: