droid_adbs 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac7f6e3a9711e3e9ec664e93509a280403f82d9c
-  data.tar.gz: 699b44b24c108e2e2d6adbf14d07c97ce9149895
+  metadata.gz: cc1795d0ee56ebdaef3ea8102f5a2e259a7dbf64
+  data.tar.gz: e4387cfdd2c98f1b7610a98610a23e02a5aafc00
 SHA512:
-  metadata.gz: ca83e3c8988a3774cfe799525e5e996c7ac4b080faef2dc7b063a2505c3027805a1fcff040f9fc6f8cf19fb87400a4e48486079c68d5e6c7766a625d49e450f8
-  data.tar.gz: 35caa18e2a057e5a1aeff0197cd8e8a1643ffe7cd124d35ccebdbfbb8dbe02d34e744bd095e0a0705c1f488bf2bc7bf08379445fbc235c8a28c8313d1e169baa
+  metadata.gz: 882da2e19245b75b6316f39e9dce5d4e842598ae8218dfbe0e301a3ce758a94999cb6295869e592356c445d43e97b5a22864e9eb3042a0d051447b664ad2481a
+  data.tar.gz: cf42637973fe07c88482c89dc250fd373183372715d81a7b5266110af17433b503c7adce25b1aa62f73edf5f526cd2f13b025be04a7d44e908147a65851d1de2

data/lib/droid_adbs.rb

@@ -28,7 +28,7 @@ module DroidAdbs
 
     # @return [String] Get results of adb devices command
     def devices
-      `#{adb} devices`
+      `#{adb} devices`.strip
     end
 
     # @return [Array] array of serial number to specify adb command
@@ -39,7 +39,7 @@ module DroidAdbs
     # @param [String] app Application path
     # @return [String] message from adb command
     def install(app)
-      result = `#{adb_serial} install -r #{app}`
+      result = `#{adb_serial} install -r #{app}`.strip
       raise RuntimeError, result if result.include?("Error:")
       raise RuntimeError, "invalid APK" if result.include?("Invalid APK file:")
       raise RuntimeError, "failed to update apk because INSTALL_FAILED_VERSION_DOWNGRADE" if result.include?("INSTALL_FAILED_VERSION_DOWNGRADE")
@@ -49,7 +49,7 @@ module DroidAdbs
     # @param [String] app Application path
     # @return [String] message from adb command
     def install_with_grant(app)
-      result = `#{adb_serial} install -gr #{app}`
+      result = `#{adb_serial} install -gr #{app}`.strip
       raise RuntimeError, result if result.include?("Error:")
       raise RuntimeError, "invalid APK" if result.include?("Invalid APK file:")
       raise RuntimeError, "failed to update apk because INSTALL_FAILED_VERSION_DOWNGRADE" if result.include?("INSTALL_FAILED_VERSION_DOWNGRADE")
@@ -59,7 +59,7 @@ module DroidAdbs
     # @param [String] app Application path
     # @return [String] message from adb command
     def install_with(app, option = "")
-      result = `#{adb_serial} install #{option} #{app}`
+      result = `#{adb_serial} install #{option} #{app}`.strip
       raise RuntimeError, result if result.include?("Error:")
       raise RuntimeError, "invalid APK" if result.include?("Invalid APK file:")
       raise RuntimeError, "failed to update apk because INSTALL_FAILED_VERSION_DOWNGRADE" if result.include?("INSTALL_FAILED_VERSION_DOWNGRADE")
@@ -70,14 +70,14 @@ module DroidAdbs
     # @param [String] package A package name you would like to uninstall
     # @return [String] message from adb command
     def uninstall(package)
-      `#{adb_serial} uninstall #{package}`
+      `#{adb_serial} uninstall #{package}`.strip
     end
 
     # @param [String] package A package name you would like to uninstall similar ones
-    # @return [String] message from adb command
+    # @return [Array] messages from adb command
     def uninstall_similar(package)
       installed_packages = installed_similar(package)
-      installed_packages.each { |pack| `#{adb_serial} uninstall #{pack}` }
+      installed_packages.map { |pack| `#{adb_serial} uninstall #{pack}`.strip }
     end
 
     # @param [String] package A package name you would like to delete data in device local
@@ -85,34 +85,36 @@ module DroidAdbs
     def delete_data(package)
       result = `#{shell} pm clear #{package}`.strip
       puts "failed to delete data" unless result == "Success"
+      result
     end
 
     # @param [String] package A package name you would like to check installed or not
     # @return [Bool] If the package installed, return true. Else return false
     def installed?(package)
-      result = `#{shell} pm list packages -e #{package}`.strip
-      return true if result == "package:#{package}"
+      packages = `#{shell} pm list packages -e #{package}`.strip
+      result = packages.each_line.find { |p| p == "package:#{package}" }
+      return true if result
       false
     end
 
     # @param [String] package A package name you would like to collect similar package
     # @return [Array] all package names
     def installed_similar(package)
-      result = `#{shell} pm list packages -e #{package}`.strip
-      result.each_line.map { |pack|  pack.strip.sub("package:", "") }
+      packages = `#{shell} pm list packages -e #{package}`.strip
+      packages.each_line.map { |pack|  pack.strip.sub("package:", "") }
     end
 
     # @param [String] activity An activity name you would like to launch
     # @return [String] message from adb command
     def start(activity)
-      `#{shell} am start -n #{activity}`
+      `#{shell} am start -n #{activity}`.strip
     end
 
     # @param [String] account_type accountType of Android OS
     # @return [String] message from adb command
     def launch_login_activity(account_type)
       if ::DroidAdbs::Devices.device_build_version_sdk.to_i >= 21
-        `#{shell} am start -a android.settings.ADD_ACCOUNT_SETTINGS --esa authorities #{account_type}`
+        `#{shell} am start -a android.settings.ADD_ACCOUNT_SETTINGS --esa authorities #{account_type}`.strip
       else
         puts "Can't launch LoginActivity.java because version of sdk in the target device is lower than 21."
       end
@@ -121,14 +123,14 @@ module DroidAdbs
     # @param [String] package A package name you would like to stop
     # @return [String] message from adb command
     def force_stop(package)
-      `#{shell} am force-stop #{package}`
+      `#{shell} am force-stop #{package}`.strip
     end
 
     # @param [String] broadcats_item Target item for broadcast
     # @param [String] broadcast_extra putExtra to send broadcast.
     # @return [String] message from adb command
     def send_broadcast(broadcats_item, broadcast_extra = "")
-      `#{shell} am broadcast -a #{broadcats_item} #{broadcast_extra}`
+      `#{shell} am broadcast -a #{broadcats_item} #{broadcast_extra}`.strip
     end
 
     ## resources
@@ -140,38 +142,38 @@ module DroidAdbs
     ### Activity
     # @return [String] message from adb command regarding current activities
     def current_activity
-      `#{shell} dumpsys window windows | grep -E "mCurrentFocus|mFocusedApp"`
+      `#{shell} dumpsys window windows | grep -E "mCurrentFocus|mFocusedApp"`.strip
     end
 
     # @param referrer [String] To broadcast
     # @return [String] message from adb command
     def install_referrer_broadcast(referrer)
-      `#{shell} broadcast window -a com.android.vending.INSTALL_REFERRER --include-stopped-packages --es referrer #{referrer}`
+      `#{shell} broadcast window -a com.android.vending.INSTALL_REFERRER --include-stopped-packages --es referrer #{referrer}`.strip
     end
 
     # send referrer for TVs
     # @param [String] ref to broadcast
     # @return [String] message from adb command
     def broad_install_referrer(ref)
-      `#{shell} am broadcast -a com.android.vending.INSTALL_REFERRER --include-stopped-packages --es referrer #{ref}`
+      `#{shell} am broadcast -a com.android.vending.INSTALL_REFERRER --include-stopped-packages --es referrer #{ref}`.strip
     end
 
     # Emulator should be unlocked after launch emulator with -wipe-data option
     # Should unlock screen if current focus is like `mCurrentFocus=Window{2e85df18 u0 StatusBar}` .
     # @return [String] message from adb command
     def unlock_without_pin
-      `#{shell} input keyevent 82`
+      `#{shell} input keyevent 82`.strip
     end
 
     # @param [String] text Pin code to unlock
     # @return [String] message from adb command
     def unlock_with_pin(text)
-      `#{shell} input text #{text} && #{shell} input keyevent 66`
+      `#{shell} input text #{text} && #{shell} input keyevent 66`.strip
     end
 
     # @return [String] message from adb command
     def screen_on_or_off
-      `#{shell} input keyevent 26`
+      `#{shell} input keyevent 26`.strip
     end
 
     private

data/lib/droid_adbs/commons/backup.rb

@@ -8,7 +8,7 @@ module DroidAdbs
       # @return [String] message from adb command
       def enable_backup_logs
         raise RuntimeError, "Backup support over SDK 23(Android 6.0, M)" unless available_backup?
-        `#{::DroidAdbs.shell} setprop log.tag.BackupXmlParserLogging VERBOSE`
+        `#{::DroidAdbs.shell} setprop log.tag.BackupXmlParserLogging VERBOSE`.strip
       end
 
       # @param [String] package A package name you would like to backup
@@ -17,27 +17,28 @@ module DroidAdbs
       def full_backup(package)
         raise RuntimeError, "Backup support over SDK 23(Android 6.0, M)" unless available_backup?
         `#{::DroidAdbs.shell} bmgr run`
-        `#{::DroidAdbs.shell} bmgr fullbackup #{package}`
+        `#{::DroidAdbs.shell} bmgr fullbackup #{package}`.strip
       end
 
       # @param [String] package A package name you would like to backup
       # @return [String] message from adb command
       def restore(package)
         fail "Backup support over SDK 23(Android 6.0, M)" unless available_backup?
-        `#{::DroidAdbs.shell} bmgr restore #{package}`
+        `#{::DroidAdbs.shell} bmgr restore #{package}`.strip
       end
 
       # @return [String] message from adb command
       def transports
-        `#{::DroidAdbs.shell} bmgr list transports`
+        `#{::DroidAdbs.shell} bmgr list transports`.strip
       end
 
       # @param [String] transport
       # @param [String] package A package name you would like to backup
       # @return [String] message from adb command and puts message
       def clear_backup(transport, package)
-        `#{::DroidAdbs.shell} bmgr wipe #{transport} #{package}`
+        result = `#{::DroidAdbs.shell} bmgr wipe #{transport} #{package}`.strip
         puts "You can also clear the backup data and associated metadata wither by turning backup off and on in Settings > Backup."
+        result
       end
 
       # @return [Boolean] Return true if API Level against target device is over 23

data/lib/droid_adbs/commons/devices.rb

@@ -6,7 +6,7 @@ module DroidAdbs
       # @example result of message
       #     docomo/SO-04E_1274-2936/SO-04E:4.2.2/10.3.1.B.0.256/_753rg:user/release-keys
       def device_fingerprint
-        `#{::DroidAdbs.shell} getprop ro.build.fingerprint`.chomp
+        `#{::DroidAdbs.shell} getprop ro.build.fingerprint`.strip
       end
 
       ### device infos
@@ -14,41 +14,41 @@ module DroidAdbs
       # @example result of message
       #     SO-04E
       def device_model
-        `#{::DroidAdbs.shell} getprop ro.product.model`.chomp
+        `#{::DroidAdbs.shell} getprop ro.product.model`.strip
       end
 
       # @return [String] message from adb command
       # @example result of message
       #     4.2.2
       def device_build_version_release
-        `#{::DroidAdbs.shell} getprop ro.build.version.release`.chomp
+        `#{::DroidAdbs.shell} getprop ro.build.version.release`.strip
       end
 
       # @return [String] message from adb command
       # @example result of message
       #     17
       def device_build_version_sdk
-        `#{::DroidAdbs.shell} getprop ro.build.version.sdk`.chomp
+        `#{::DroidAdbs.shell} getprop ro.build.version.sdk`.strip
       end
 
       # @return [String] message from adb command
       # @example result of message
       #     "en"
       def current_language
-        language = `#{::DroidAdbs.shell} getprop persist.sys.language`.chomp
+        language = `#{::DroidAdbs.shell} getprop persist.sys.language`.strip
         return language unless language.empty?
 
-        `#{::DroidAdbs.shell} getprop ro.product.locale.language`.chomp
+        `#{::DroidAdbs.shell} getprop ro.product.locale.language`.strip
       end
 
       # @return [String] message from adb command
       # @example result of message
       #     "ja-JP"
       def current_locale
-        locale = `#{::DroidAdbs.shell} getprop persist.sys.locale`.chomp
+        locale = `#{::DroidAdbs.shell} getprop persist.sys.locale`.strip
         return locale unless locale.empty?
 
-        `#{::DroidAdbs.shell} getprop ro.product.locale`.chomp
+        `#{::DroidAdbs.shell} getprop ro.product.locale`.strip
       end
     end
   end

data/lib/droid_adbs/commons/grant.rb

@@ -5,7 +5,7 @@ module DroidAdbs
       # @param [Object] permission Permission you would like to allow
       # @return [String] message from adb command
       def grant(package:, permission:)
-        result = `#{::DroidAdbs.shell} pm grant #{package} #{permission}`.chomp
+        result = `#{::DroidAdbs.shell} pm grant #{package} #{permission}`.strip
 
         unless result.empty?
           exception = "java.lang.IllegalArgumentException:"

data/lib/droid_adbs/commons/ime.rb

@@ -3,7 +3,7 @@ module DroidAdbs
     class << self
       # @return [String] message from adb command as pure string.
       def get_ime_with_string
-        `#{::DroidAdbs.shell} ime list`.chomp
+        `#{::DroidAdbs.shell} ime list`.strip
       end
 
       # @return [Array] Array of IME ID list
@@ -22,7 +22,7 @@ module DroidAdbs
       #     If it succeeded to set IME, then it returns "Input method com.google.android.inputmethod.japanese/.MozcService selected"
       #     If it failed to set IME because of no ID, then it returns "Error: Unknown id: ime_id"
       def set_ime(ime_id)
-        `#{::DroidAdbs.shell} ime set #{ime_id}`.chomp
+        `#{::DroidAdbs.shell} ime set #{ime_id}`.strip
       end
 
       # @param [String] ime_lists

data/lib/droid_adbs/commons/settings.rb

@@ -3,63 +3,67 @@ module DroidAdbs
     class << self
       # @return [String] message from adb command
       def disable_always_finish_activities
-        `#{::DroidAdbs.shell} settings put global always_finish_activities 0`
+        `#{::DroidAdbs.shell} settings put global always_finish_activities 0`.strip
       end
 
       # @return [String] message from adb command
       def enable_always_finish_activities
-        `#{::DroidAdbs.shell} settings put global always_finish_activities 1`
+        `#{::DroidAdbs.shell} settings put global always_finish_activities 1`.strip
       end
 
       ### Network mode
       # @return [String] message from adb command
       def turn_airplain_mode_on
-        `#{::DroidAdbs.shell} settings put global airplane_mode_on 1`
-        `#{::DroidAdbs.shell} am broadcast -a android.intent.action.AIRPLANE_MODE --ez state true`
+        result1 = `#{::DroidAdbs.shell} settings put global airplane_mode_on 1`
+        result2 = `#{::DroidAdbs.shell} am broadcast -a android.intent.action.AIRPLANE_MODE --ez state true`.strip
+        result1.concat result2
       end
 
       # @return [String] message from adb command
       def turn_airplain_mode_off
-        `#{::DroidAdbs.shell} settings put global airplane_mode_on 0`
-        `#{::DroidAdbs.shell} am broadcast -a android.intent.action.AIRPLANE_MODE --ez state false`
+        result1 = `#{::DroidAdbs.shell} settings put global airplane_mode_on 0`
+        result2 = `#{::DroidAdbs.shell} am broadcast -a android.intent.action.AIRPLANE_MODE --ez state false`.strip
+        result1.concat result2
       end
 
       # @return [String] message from adb command
       def turn_wifi_on
-        `#{::DroidAdbs.shell} settings put global wifi_on 1`
-        `#{::DroidAdbs.shell} am broadcast -a android.intent.action.WIFI_ON --ez state false`
+        result1 = `#{::DroidAdbs.shell} settings put global wifi_on 1`
+        result2 = `#{::DroidAdbs.shell} am broadcast -a android.intent.action.WIFI_ON --ez state false`.strip
+        result1.concat result2
       end
 
       # @return [String] message from adb command
       def turn_wifi_off
-        `#{::DroidAdbs.shell} settings put global wifi_on 0`
-        `#{::DroidAdbs.shell} am broadcast -a android.intent.action.WIFI_ON --ez state false`
+        result1 = `#{::DroidAdbs.shell} settings put global wifi_on 0`
+        result2 = `#{::DroidAdbs.shell} am broadcast -a android.intent.action.WIFI_ON --ez state false`.strip
+        result1.concat result2
       end
 
       # @return [String] message from adb command
       def turn_cpu_monitoring_on
-        `#{::DroidAdbs.shell} settings put global show_processes 1`
+        `#{::DroidAdbs.shell} settings put global show_processes 1`.strip
       end
 
       # @return [String] message from adb command
       def turn_cpu_monitoring_off
-        `#{::DroidAdbs.shell} settings put global show_processes 0`
+        `#{::DroidAdbs.shell} settings put global show_processes 0`.strip
       end
 
       # @return [String] message from adb command
       def turn_auto_time_on
-        `#{::DroidAdbs.shell} settings put global auto_time 1`
+        `#{::DroidAdbs.shell} settings put global auto_time 1`.strip
       end
 
       # @return [String] message from adb command
       def turn_auto_time_off
-        `#{::DroidAdbs.shell} settings put global auto_time 0`
+        `#{::DroidAdbs.shell} settings put global auto_time 0`.strip
       end
 
       # @return [String] message from adb command
       def set_date_to(yyyymmdd, hhmmss)
         turn_auto_time_off
-        `#{::DroidAdbs.shell} date -s #{yyyymmdd}.#{hhmmss}`
+        `#{::DroidAdbs.shell} date -s #{yyyymmdd}.#{hhmmss}`.strip
       end
 
       # animation settings

data/lib/droid_adbs/commons/wm.rb

@@ -3,14 +3,14 @@ module DroidAdbs
     class << self
       # @return [Integer] density. If this method fail to get density, then return 0.
       def get_density
-        result = `#{::DroidAdbs.shell} wm density`.chomp
+        result = `#{::DroidAdbs.shell} wm density`.strip
         return 0 unless result.match(/\APhysical density:.*/)
         result.split(/\s/).last.to_i
       end
 
       # @return [String] message from adb commands
       def reset_density
-        `#{::DroidAdbs.shell} wm density reset`.chomp
+        `#{::DroidAdbs.shell} wm density reset`.strip
       end
 
       # Don't forget to call `reset_density` after change density via adb
@@ -28,7 +28,7 @@ module DroidAdbs
                     else # include :normal
                       base_density
                   end
-        `#{::DroidAdbs.shell} wm density #{density}`.chomp
+        `#{::DroidAdbs.shell} wm density #{density}`.strip
       end
 
     end

data/lib/droid_adbs/version.rb

@@ -1,3 +1,3 @@
 module DroidAdbs
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droid_adbs
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,4 +102,3 @@ signing_key:
 specification_version: 4
 summary: adb command wrapper
 test_files: []
-has_rdoc: