device_api-android 1.2.15 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 212e7370956150bfc7b757c63aef3e3438d5727b
-  data.tar.gz: 2fac6552d5f192b7642b3a1d5f33f9c2fca4e712
+  metadata.gz: a60d874192e707106199039e8d1163d7ef5a9ca0
+  data.tar.gz: 66017f7dbf4e46e8ea407c6a7c0b7d0f2dc2eed7
 SHA512:
-  metadata.gz: 628adbda037fd374334e589e73411b2bf1624fdf2762a3d02cac191b66d16b8328b9ef8dabbf5e6494456cf87225b96dc33b98fbcd2e9c25fc590db211c0d564
-  data.tar.gz: c4559aa1717b8be083fa8fd8c9734d8c3cf9a51b4e7438030e982af07c09ce61fddbb4e54850278c015d97d42ec418770a39c098f575ab14f575ae9e9c3489b2
+  metadata.gz: d990e5a3d73eb9e27e77302ca8a98e172b4f04f2ee352f93fd78abd17ace2ee6818eab4768014a635c7919b3ac0a0ff70a9aca24dac3f2d0310e3586634ebca8
+  data.tar.gz: e205e6b2789fd07565e0bb0765d207afbce0a76a8d473c28c0a45ef31a42bfd1dce3dbc5f7f5f9a2d2d4457cb2c900d397d077c06499a1ab53afdc6859434734

data/lib/device_api/android/adb.rb

@@ -237,9 +237,13 @@ module DeviceAPI
         
         filename = args[:filename] or raise "filename not provided (:filename => '/tmp/myfile.png')"
         
-        convert_carriage_returns = %q{perl -pe 's/\x0D\x0A/\x0A/g'}
-        cmd = "screencap -p | #{convert_carriage_returns} > #{filename}"
-        
+        if getprop(qualifier)['ro.build.version.release'].to_i < 7
+          convert_carriage_returns = %q{perl -pe 's/\x0D\x0A/\x0A/g'} 
+          cmd = "screencap -p | #{convert_carriage_returns} > #{filename}"
+        else
+          cmd = "screencap -p > #{filename}"
+        end
+
         shell(qualifier, cmd)
       end
       

data/lib/device_api/android/device.rb

@@ -124,13 +124,13 @@ module DeviceAPI
       # Return the battery level
       # @return (String) device battery level
       def battery_level
-        get_battery_info['level']
+        get_battery_info.level
       end
 
       # Is the device currently being powered?
       # @return (Boolean) true if it is being powered in some way, false if it is unpowered
       def powered?
-        !get_battery_info.select { |keys| keys.include?('powered')}.select { |_,v| v == 'true' }.empty?
+        get_battery_info.powered
       end
 
       def block_package(package)

data/lib/device_api/android/plugins/battery.rb

@@ -2,7 +2,7 @@ module DeviceAPI
   module Android
     module Plugin
       class Battery
-        attr_reader :current_temp, :max_temp, :max_current, :voltage, :level, :health, :status
+        attr_reader :current_temp, :max_temp, :max_current, :voltage, :level, :health, :status, :powered
 
         def initialize(options = {})
           qualifier = options[:qualifier]
@@ -14,6 +14,7 @@ module DeviceAPI
           @level          = props["level"]
           @health         = props["health"]
           @status         = props["status"]
+          @powered        = props["USB powered"]
         end
       end
     end

metadata

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