device_api-android 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24478f4505667886d868853cf59a63cfcf9b7853
-  data.tar.gz: 97885cb308584d1443e7520df7f382c17c24e747
+  metadata.gz: 696b2120302134357a63763b3bded0f733d9e3a4
+  data.tar.gz: 50845791f6c53132d0718d5648c1960c44e78c67
 SHA512:
-  metadata.gz: b4f53c262ba558dd8b63fd501a752d32dc1b334cf3af4567c77c0645e591ad62d82ea8aab244b1148f8e16cd914a8119b3e42a3238e4a81d5f159a1b111118c2
-  data.tar.gz: 3eedf4979a134ae4521a421a9db11faf4f742c71304ff59203bc4bd8d3fa5492f882e13b5cca9386f4570dfa7e3de06aa3db007a93eadf9cba2c20f2376ee411
+  metadata.gz: 4454f5cf73cba899c4f4b7a63054712cbd39b1594a9c86c67d53038e011106735b7561fada022599fbb2342b67ad5721ec08e4d95d19413fba76db18f160d943
+  data.tar.gz: a0a41ab17b179a5339ee522b1bc45760e0510e88d33b4c871899e156814305ad453a5ea4b2217601c0f410aefbf03d3ce4188f2cfa9031b8c707ea0396fe1dca

data/lib/device_api/android.rb

@@ -4,6 +4,7 @@ require 'device_api/android/device'
 require 'device_api/android/signing'
 
 # Load plugins
+require 'device_api/android/plugins/audio'
 require 'device_api/android/plugins/memory'
 require 'device_api/android/plugins/battery'
 require 'device_api/android/plugins/disk'

data/lib/device_api/android/adb.rb

@@ -38,9 +38,7 @@ module DeviceAPI
       # @param serial serial number of device
       # @return (Hash) hash containing device properties
       def self.getprop(serial)
-        result = execute("adb -s #{serial} shell getprop")
-
-        raise ADBCommandError.new(result.stderr) if result.exit != 0
+        result = shell(serial, 'getprop')
 
         lines = result.stdout.encode('UTF-16', 'UTF-8', invalid: :replace, replace: '').encode('UTF-8', 'UTF-16').split("\n")
 
@@ -73,7 +71,7 @@ module DeviceAPI
 
       # Get the network information
       def self.get_network_info(serial)
-        lines = execute("adb -s #{serial} shell netcfg")
+        lines = shell(serial, 'netcfg')
         lines.stdout.split("\n").map do |a|
           b = a.split(" ")
           { name: b[0], ip: b[2].split('/')[0], mac: b[4] }
@@ -119,8 +117,7 @@ module DeviceAPI
       # @param serial serial number of device
       # @return (Array) array of results from adb shell dumpsys
       def self.dumpsys(serial, command)
-        result = execute("adb -s #{serial} shell dumpsys #{command}")
-        raise ADBCommandError.new(result.stderr) if result.exit != 0
+        result = shell(serial, "dumpsys #{command}")
         result.stdout.split("\n").map { |line| line.strip }
       end
 
@@ -172,9 +169,7 @@ module DeviceAPI
       # @param serial serial number of device
       # @return (Float) uptime in seconds
       def self.get_uptime(serial)
-        result = execute("adb -s #{serial} shell cat /proc/uptime")
-
-        raise ADBCommandError.new(result.stderr) if result.exit != 0
+        result = shell(serial, 'cat /proc/uptime')
 
         lines = result.stdout.split("\n")
         uptime = 0
@@ -210,11 +205,11 @@ module DeviceAPI
         seed = args[:seed]
         throttle = args[:throttle]
 
-        cmd = "adb -s #{serial} shell monkey -p #{package} -v #{events}"
+        cmd = "monkey -p #{package} -v #{events}"
         cmd = cmd + " -s #{seed}" if seed
         cmd = cmd + " -t #{throttle}" if throttle
 
-        execute(cmd)
+        shell(serial, cmd)
       end
       
       # Take a screenshot from the device
@@ -228,9 +223,9 @@ 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 = "adb -s #{serial} shell screencap -p | #{convert_carriage_returns} > #{filename}"
+        cmd = "screencap -p | #{convert_carriage_returns} > #{filename}"
         
-        execute(cmd)
+        shell(serial, cmd)
       end
 
       # Returns wifi status and access point name
@@ -238,21 +233,34 @@ module DeviceAPI
       # @example
       #   DeviceAPI::ADB.wifi(serial)
       def self.wifi(serial)
-        result = execute("adb -s #{serial} shell dumpsys wifi | grep mNetworkInfo")
-        if result.exit != 0
-          raise ADBCommandError.new(result.stderr) 
-        else
-          result = {:status => result.stdout.match("state:(.*?),")[1].strip, :access_point => result.stdout.match("extra:(.*?),")[1].strip.gsub(/"/,'')}
-        end
-        result
+        result = shell(serial, 'dumpsys wifi | grep mNetworkInfo')
+
+        {:status => result.stdout.match("state:(.*?),")[1].strip, :access_point => result.stdout.match("extra:(.*?),")[1].strip.gsub(/"/,'')}
       end
 
       # Sends a key event to the specified device
       # @param [String] serial serial number of device
       # @param [String] keyevent keyevent to send to the device
       def self.keyevent(serial, keyevent)
-        result = execute("adb -s #{serial} shell input keyevent #{keyevent}")
-        raise ADBCommandError.new(result.stderr) if result.exit != 0
+        shell(serial, "input keyevent #{keyevent}").stdout
+      end
+
+      # ADB Shell command
+      # @param [String] serial serial number of device
+      # @param [String] command command to execute
+      def self.shell(serial, command)
+        result = execute("adb -s #{serial} shell #{command}")
+
+        case result.stderr
+        when /^error: device unauthorized./
+          raise DeviceAPI::UnauthorizedDevice, result.stderr
+        when /^error: device not found/
+          raise DeviceAPI::DeviceNotFound, result.stderr
+        else
+          raise ADBCommandError.new(result.stderr)
+        end if result.exit != 0
+
+        result
       end
 
       # Sends a swipe command to the specified device
@@ -263,8 +271,7 @@ module DeviceAPI
       # @option coords [String] :y_from (0) Coordinate to start from on the Y axis
       # @option coords [String] :y_to (0) Coordinate to end on on the Y axis
       def self.swipe(serial, coords = {x_from: 0, x_to: 0, y_from: 0, y_to: 0 })
-        result = execute("adb -s #{serial} shell input swipe #{coords[:x_from]} #{coords[:x_to]} #{coords[:y_from]} #{coords[:y_to]}")
-        raise ADBCommandError.new(result.stderr) if result.exit != 0
+        shell(serial, "input swipe #{coords[:x_from]} #{coords[:x_to]} #{coords[:y_from]} #{coords[:y_to]}").stdout
       end
 
       # Starts intent using adb 
@@ -274,9 +281,7 @@ module DeviceAPI
       # @example
       # DeviceAPI::ADB.am(serial, "start -a android.intent.action.MAIN -n com.android.settings/.wifi.WifiSettings")
       def self.am(serial, command)
-        result = execute("adb -s #{serial} shell am #{command}")
-        raise ADBCommandError.new(result.stderr) if result.exit != 0
-        return result.stdout
+        shell(serial, "am #{command}").stdout
       end
 
       # Package manager commands
@@ -284,9 +289,7 @@ module DeviceAPI
       # @param command command to issue to the package manager
       # @example DeviceAPI::ADB.pm(serial, 'list packages')
       def self.pm(serial, command)
-        result = execute("adb -s #{serial} shell pm #{command}")
-        raise ADBCommandError.new(result.stderr) if result.exit != 0
-        return result.stdout
+        shell(serial, "pm #{command}").stdout
       end
 
       # Blocks a package, used on Android versions less than KitKat
@@ -306,6 +309,8 @@ module DeviceAPI
         result = pm(serial, "hide #{package}")
         result.include?('true')
       end
+
+
     end
 
     # ADB Error class
@@ -315,6 +320,5 @@ module DeviceAPI
       end
     end
 
-
   end
 end

data/lib/device_api/android/device.rb

@@ -258,14 +258,14 @@ module DeviceAPI
       def ip_address
         network = get_network_info
         wlan0 = network.detect { |a| a[:name] == 'wlan0' }
-        wlan0[:ip]
+        wlan0[:ip] unless wlan0.nil?
       end
 
       # Returns the Wifi mac address
       def wifi_mac_address
         network = get_network_info
         wifi = network.detect { |a| a[:name] == 'wlan0' }
-        wifi[:mac]
+        wifi[:mac] unless wifi.nil?
       end
       
       private

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

@@ -0,0 +1,76 @@
+module DeviceAPI
+  module Android
+    module Plugin
+      class Audio
+
+        attr_reader :serial
+
+        def initialize(options)
+          @serial = options #[:serial]
+        end
+
+        def get_volume_steps
+          audio = ADB.dumpsys( @serial, 'audio' )
+          vol_steps = audio.detect { |a| a.include?('volume steps:') }
+          return nil if vol_steps.nil?
+
+          vol_steps.scan(/volume steps: (.*)/).flatten.first.to_i
+        end
+
+        def get_current_volume
+          system = get_system_volume
+          volume = system.select { |a| a.include?('Current') }.first
+          volume.scan(/Current: 2:\s(.*?),(:?.*)/).flatten.first.to_i
+
+        end
+
+        def is_muted?
+          system = get_system_volume
+          mute = system.select { |a| a.include?('Mute') }.first
+          mute.scan(/Mute count: (.*)/).flatten.first.to_i > 0
+        end
+
+        def volume
+          return 0 if is_muted?
+          steps = get_volume_steps
+          vol = get_current_volume
+          ((vol.to_f / steps.to_f) * 100).to_i
+        end
+
+        def max_volume
+          vol = get_current_volume
+          steps = get_volume_steps
+
+          change_volume(steps - vol, 24)
+
+          get_current_volume == steps
+        end
+
+        def min_volume
+          vol = get_current_volume
+          change_volume(vol, 25)
+
+          get_current_volume == 0
+          # adb shell service call audio 4 i32 1 i32 0 i32 1
+        end
+
+        private
+
+        def change_volume(op, key)
+          op.times do
+            ADB.keyevent(@serial, key )
+          end
+        end
+
+        def get_system_volume
+          audio = ADB.dumpsys( @serial, 'audio' )
+          index = audio.index('- STREAM_SYSTEM:')
+
+          return nil if index.nil?
+
+          audio[index+1..index+2]
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device_api-android
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - David Buckhurst
@@ -11,42 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Android implementation of DeviceAPI
 email: david.buckhurst@bbc.co.uk
 executables: []
@@ -60,6 +54,7 @@ files:
 - lib/device_api/android/device.rb
 - lib/device_api/android/device/kindle.rb
 - lib/device_api/android/device/samsung.rb
+- lib/device_api/android/plugins/audio.rb
 - lib/device_api/android/plugins/battery.rb
 - lib/device_api/android/plugins/disk.rb
 - lib/device_api/android/plugins/memory.rb
@@ -84,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Android Device Management API