device_api-android 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dfe569584ed7b09ceb48bb274a0c974798f10f6
-  data.tar.gz: 8269d27b46ae49ff8bf354f06dfa8abb8bc713ce
+  metadata.gz: 24478f4505667886d868853cf59a63cfcf9b7853
+  data.tar.gz: 97885cb308584d1443e7520df7f382c17c24e747
 SHA512:
-  metadata.gz: 95d0ded27c12b01421de3d766a7373ef79d18effc903ae420a5091e81af378fed9a7ef845998db7d25496826c7d8f5d9e4d2a7b22fb85ee4481185c90eb9d3de
-  data.tar.gz: 4ae9c1c9b96d4df37ad18cbb41ef01344e47204baf03c92cbeab6231f5b9aa60356d7eb53c34e8e21cfedd8dabff876dfe3fd91d9b9c8f3993298643e51617cd
+  metadata.gz: b4f53c262ba558dd8b63fd501a752d32dc1b334cf3af4567c77c0645e591ad62d82ea8aab244b1148f8e16cd914a8119b3e42a3238e4a81d5f159a1b111118c2
+  data.tar.gz: 3eedf4979a134ae4521a421a9db11faf4f742c71304ff59203bc4bd8d3fa5492f882e13b5cca9386f4570dfa7e3de06aa3db007a93eadf9cba2c20f2376ee411

data/lib/device_api/android/adb.rb

@@ -71,6 +71,15 @@ module DeviceAPI
         process_dumpsys('(.*):\s+(.*)', lines)
       end
 
+      # Get the network information
+      def self.get_network_info(serial)
+        lines = execute("adb -s #{serial} shell netcfg")
+        lines.stdout.split("\n").map do |a|
+          b = a.split(" ")
+          { name: b[0], ip: b[2].split('/')[0], mac: b[4] }
+        end
+      end
+
       # Processes the results from dumpsys to format them into a hash
       # @param [String] regex_string regex string used to separate the results from the keys
       # @param [Array] data data returned from dumpsys

data/lib/device_api/android/device.rb

@@ -195,7 +195,8 @@ module DeviceAPI
       # Check if the devices screen is currently turned on
       # @return [Boolean] true if the screen is on, otherwise false
       def screen_on?
-        return true if get_powerinfo['mScreenOn'].to_s.downcase == 'true'
+        power = get_powerinfo
+        return true if power['mScreenOn'].to_s.downcase == 'true' || power['Display Power: state'].to_s.downcase == 'on'
         false
       end
 
@@ -252,9 +253,27 @@ module DeviceAPI
       def uptime
         ADB.get_uptime(serial)
       end
+
+      # Returns the Wifi IP address
+      def ip_address
+        network = get_network_info
+        wlan0 = network.detect { |a| a[:name] == 'wlan0' }
+        wlan0[:ip]
+      end
+
+      # Returns the Wifi mac address
+      def wifi_mac_address
+        network = get_network_info
+        wifi = network.detect { |a| a[:name] == 'wlan0' }
+        wifi[:mac]
+      end
       
       private
 
+      def get_network_info
+        ADB.get_network_info(serial)
+      end
+
       def get_disk_info
         @diskstat = DeviceAPI::Android::Plugin::Disk.new(serial: serial) unless @diskstat
         @diskstat.process_stats      

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_api-android
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - David Buckhurst
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api