android-adb-extension 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d030a43a54c1a8949d2ac227a7de859756229b
-  data.tar.gz: 5ed107c87cbf4510787ca855e34951901d125508
+  metadata.gz: 132e495adcd4e5ba874c6e033d7df8f65e7be31b
+  data.tar.gz: a868a9b814ac86e7d75416c037de78a8c6c2022b
 SHA512:
-  metadata.gz: 2e8bf9aeeeb70314d703a41da178355cd943d3e41ffc788f5c4b1e8627e5804cd0f617467f6021e0224f0c759b8005119ffec24b3a1db12d14bb73e9b95453e2
-  data.tar.gz: 1e3370f903f6e9248e66c16ee81d6cb60c0e3f17a1aa188ce086c3b2b9fe0d2dba560d9e6ce7891a2499b127aa8c7903045006c2e74d715e16f740cb1eb74948
+  metadata.gz: a151a6cdb29ce70b339c9acba22dc7a46a029f549a932c322df3a720d0f6296bb956f09c7b7164215e19e50ccf674a248e70b9a8b9c729ba0492b1bc52e4da16
+  data.tar.gz: 10af7aea987d2db31f3f0ca241fabfde6602a9dc4210fa5ad9855b5ac0695536281907edcf833cf6e0a6f4e5f732723498e33ad827ebc8f178c232a8ecc685e2

data/lib/android-adb-extension/adb.rb

@@ -3,11 +3,11 @@
 class ADB
   class << self
     def sdk
-      `adb shell getprop ro.build.version.sdk`.strip.to_i
+      `#{adb_shell_command} getprop ro.build.version.sdk`.strip.to_i
     end
 
     def release
-      `adb shell getprop ro.build.version.release`.strip
+      `#{adb_shell_command} getprop ro.build.version.release`.strip
     end
 
     def major
@@ -15,7 +15,7 @@ class ADB
     end
 
     def orientation
-      `adb shell dumpsys input |
+      `#{adb_shell_command} dumpsys input |
        grep 'SurfaceOrientation' |
        awk '{ print $2 }'`.strip.to_i
     end
@@ -43,7 +43,7 @@ class ADB
     end
 
     def airplane_mode
-      `adb shell settings get global airplane_mode_on`.strip.to_i
+      `#{adb_shell_command} settings get global airplane_mode_on`.strip.to_i
     end
 
     def airplane_mode?
@@ -59,28 +59,28 @@ class ADB
     end
 
     def monkey(aPackageName, aEventCount = 500)
-      `adb shell monkey -p #{aPackageName} #{aEventCount}`
+      `#{adb_shell_command} monkey -p #{aPackageName} #{aEventCount}`
     end
 
     def lock
-      cmd = 'adb shell input keyevent 26'
+      cmd = "#{adb_shell_command} input keyevent 26"
       `#{cmd}`
       res = `#{cmd}`
       res.empty? ? nil : res
     end
 
     def unlock
-      res = `adb shell input keyevent 82`
+      res = `#{adb_shell_command} input keyevent 82`
       res.empty? ? nil : res
     end
 
     def send_to_background
-      res = `adb shell input keyevent 3`
+      res = `#{adb_shell_command} input keyevent 3`
       res.empty? ? nil : res
     end
 
     def bring_to_foreground(aPackage, aActivity)
-      res = `adb shell am start -n #{aPackage}/#{aActivity}`
+      res = `#{adb_shell_command} am start -n #{aPackage}/#{aActivity}`
       res.empty? ? nil : res
     end
 
@@ -93,7 +93,7 @@ class ADB
     private
 
     def change_accelerometer_control(aMode)
-      command = 'adb shell content insert'
+      command = "#{adb_shell_command} content insert"
       param1 = '--uri content://settings/system'
       param2 = '--bind name:s:accelerometer_rotation'
       param3 = "--bind value:i:#{aMode}"
@@ -102,7 +102,7 @@ class ADB
     end
 
     def change_device_orientation(aOrientation)
-      command = 'adb shell content insert'
+      command = "#{adb_shell_command} content insert"
       param1 = '--uri content://settings/system'
       param2 = '--bind name:s:user_rotation'
       param3 = "--bind value:i:#{aOrientation}"
@@ -111,12 +111,28 @@ class ADB
     end
 
     def change_airplane_mode(aMode)
-      command1 = "adb shell settings put global airplane_mode_on #{aMode}"
-      command2 = 'adb shell am broadcast'
+      command1 = "#{adb_shell_command} settings put global airplane_mode_on #{aMode}"
+      command2 = "#{adb_shell_command} am broadcast"
       param1 = '-a android.intent.action.AIRPLANE_MODE'
       param2 = "--ez state #{aMode.to_boolean}"
 
       `#{command1} & #{command2} #{param1} #{param2}`
     end
+
+    def multiple_devices?
+      !adb_device_arg.nil?
+    end
+
+    def device_id
+      adb_device_arg
+    end
+
+    def adb_device_arg
+      ENV['ADB_DEVICE_ARG']
+    end
+
+    def adb_shell_command
+      multiple_devices? ? "adb -s #{device_id} shell" : 'adb shell'
+    end
   end
 end

data/lib/android-adb-extension/version.rb

@@ -1,5 +1,5 @@
 # Gem version
 #
 module AndroidAdbExtension
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: android-adb-extension
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jani Jegoroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: to_boolean
@@ -116,4 +116,3 @@ signing_key:
 specification_version: 4
 summary: Android debug bridge extension.
 test_files: []
-has_rdoc: