device_api-android 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e77d3bd4b44ae65dc199357e33267135f49755b
-  data.tar.gz: f932b652920fe7e0750de2f579ffbf4d066df4b6
+  metadata.gz: cc299fd6553b73df6928d551ceb30f7bbfc43e87
+  data.tar.gz: 18327f25f6fed8d4c9401ec2ff7d42a75800058d
 SHA512:
-  metadata.gz: 7e7069f51f3f3b171789c121a18673e6e149be5d80f371fc7ff12e71aae242c803b748a70faeec1dcf08beacc9578860488fe7dd717d9905519bb8511711b7c6
-  data.tar.gz: de2ed91ce9f797e4d4afa7eac87af0848c88e4667064069c06ea7ba0eb673733986dde40ca9660a7e003221e731e96eb251968969688d9d7abdc59215c9b8738
+  metadata.gz: 1c7268f823bd12658fff01b5c186f83a62a05d5d68e937eaf06bc0245f0777bdafd4672a24365fc3d35681532a29dc9a05441753acbf9296b6e35ded3d58dfb4
+  data.tar.gz: fd850b7e8544c44cba97ddbbee27260590164b5fd448c67db0d2c49a6def61b44f1bac420e7db2e90d982dcec2d83de16ec307eabe0cde89050af75012e1ff76

data/lib/device_api/android/adb.rb

@@ -69,6 +69,11 @@ module DeviceAPI
         process_dumpsys('(.*):\s+(.*)', lines)
       end
 
+      def self.get_network_interface(serial, interface)
+        result = shell(serial, "ifconfig #{interface}")
+        result.stdout
+      end
+
       # Get the network information
       def self.get_network_info(serial)
         lines = shell(serial, 'netcfg')

data/lib/device_api/android/device.rb

@@ -257,16 +257,26 @@ module DeviceAPI
 
       # Returns the Wifi IP address
       def ip_address
-        network = get_network_info
-        wlan0 = network.detect { |a| a[:name] == 'wlan0' }
-        wlan0[:ip] unless wlan0.nil?
+        interface = ADB.get_network_interface(serial, 'wlan0')
+        if interface.match(/ip (.*) mask/)
+          Regexp.last_match[1]
+        elsif interface.match(/inet addr:(.*)\s+Bcast/)
+          Regexp.last_match[1].strip
+        else
+          # No match, wifi down?
+        end
       end
 
       # Returns the Wifi mac address
       def wifi_mac_address
-        network = get_network_info
-        wifi = network.detect { |a| a[:name] == 'wlan0' }
-        wifi[:mac] unless wifi.nil?
+        interface = ADB.get_network_interface(serial, 'wlan0')
+        if interface.match(/HWaddr (.*)/)
+          Regexp.last_match[1].strip
+        else
+          network = get_network_info
+          wifi = network.detect { |a| a[:name] == 'wlan0' }
+          wifi[:mac] unless wifi.nil?
+        end
       end
       
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_api-android
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - David Buckhurst
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Android Device Management API