screengrab 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77fc72be9bccdbde7ac47f9caf489dfd4a695bc
-  data.tar.gz: c64689b75eac8687ca4d786c6833103e4415bc56
+  metadata.gz: 3f74d14d0f19ab1ec79fec8b498b124e51dc53bd
+  data.tar.gz: 42119a6f3a72053d12e207ade40280b11e2e6b5f
 SHA512:
-  metadata.gz: e4fe5f5217b5746cf4ebb7f86fef5b235a03a24a249f6341cf4d304b9ea90a40482070abd780784685bea4250da8d6fe68a46472e85a1f0fe1664bd01a926623
-  data.tar.gz: 40645833920cd54544a71c46058d34af5503f79baadfd4760edb154303cfe5a7291384b15228c7a45934ee2b6673455434a1f54857e011e86c88a33c116da1a8
+  metadata.gz: 17abb01dd66da35880b93d7a315b5cb7a01a626d240cb8bd0939840b5fae5caf741c9b4c67291b74b82a308c776bc83341103a49427478a20359c96d398f1190
+  data.tar.gz: 9414051edff7d5b45c9cf10168d4e74efcd75ced86bc85a22ac99362435f3845c3417785c25348d7d0ac3160db0db006ed66db6292a9e7f4bfccb35edf22d4f3

data/README.md

@@ -55,7 +55,7 @@ sudo gem install screengrab
 
 ##### Gradle dependency
 ```java
-androidTestCompile 'tools.fastlane:screengrab:0.3.2'
+androidTestCompile 'tools.fastlane:screengrab:0.5.1'
 ```
 
 ##### Configuring your Manifest Permissions

data/lib/screengrab/runner.rb

@@ -77,11 +77,15 @@ module Screengrab
     end
 
     def select_device
-      devices = @executor.execute(command: "adb devices -l", print_all: true, print_command: true).split("\n")
+      devices = run_adb_command("adb devices -l", print_all: true, print_command: true).split("\n")
       # the first output by adb devices is "List of devices attached" so remove that and any adb startup output
-      # devices.reject! { |d| d.include?("List of devices attached") || d.include?("* daemon") || d.include?("unauthorized") || d.include?("offline") }
       devices.reject! do |device|
-        ['unauthorized', 'offline', '* daemon', 'List of devices attached'].any? { |status| device.include? status }
+        [
+          'unauthorized',            # The device has not yet accepted ADB control
+          'offline',                 # The device is offline, skip it
+          '* daemon',                # Messages printed when the daemon is starting up
+          'List of devices attached' # Header of table for data we want
+        ].any? { |status| device.include? status }
       end
 
       UI.user_error! 'There are no connected and authorized devices or emulators' if devices.empty?
@@ -130,9 +134,9 @@ module Screengrab
     end
 
     def determine_external_screenshots_path(device_serial)
-      device_ext_storage = @executor.execute(command: "adb -s #{device_serial} shell echo \\$EXTERNAL_STORAGE",
-                                             print_all: true,
-                                             print_command: true)
+      device_ext_storage = run_adb_command("adb -s #{device_serial} shell echo \\$EXTERNAL_STORAGE",
+                                           print_all: true,
+                                           print_command: true)
       File.join(device_ext_storage, @config[:app_package_name], 'screengrab')
     end
 
@@ -145,9 +149,9 @@ module Screengrab
 
       device_screenshots_paths.each do |device_path|
         if_device_path_exists(device_serial, device_path) do |path|
-          @executor.execute(command: "adb -s #{device_serial} shell rm -rf #{path}",
-                            print_all: true,
-                            print_command: true)
+          run_adb_command("adb -s #{device_serial} shell rm -rf #{path}",
+                          print_all: true,
+                          print_command: true)
         end
       end
     end
@@ -172,36 +176,36 @@ module Screengrab
 
     def install_apks(device_serial, app_apk_path, tests_apk_path)
       UI.message 'Installing app APK'
-      apk_install_output = @executor.execute(command: "adb -s #{device_serial} install -r #{app_apk_path}",
-                        print_all: true,
-                        print_command: true)
+      apk_install_output = run_adb_command("adb -s #{device_serial} install -r #{app_apk_path}",
+                                           print_all: true,
+                                           print_command: true)
       UI.user_error! "App APK could not be installed" if apk_install_output.include?("Failure [")
 
       UI.message 'Installing tests APK'
-      apk_install_output = @executor.execute(command: "adb -s #{device_serial} install -r #{tests_apk_path}",
-                        print_all: true,
-                        print_command: true)
+      apk_install_output = run_adb_command("adb -s #{device_serial} install -r #{tests_apk_path}",
+                                           print_all: true,
+                                           print_command: true)
       UI.user_error! "Tests APK could not be installed" if apk_install_output.include?("Failure [")
     end
 
     def grant_permissions(device_serial)
       UI.message 'Granting the permission necessary to change locales on the device'
-      @executor.execute(command: "adb -s #{device_serial} shell pm grant #{@config[:app_package_name]} android.permission.CHANGE_CONFIGURATION",
-                        print_all: true,
-                        print_command: true)
+      run_adb_command("adb -s #{device_serial} shell pm grant #{@config[:app_package_name]} android.permission.CHANGE_CONFIGURATION",
+                      print_all: true,
+                      print_command: true)
 
-      device_api_version = @executor.execute(command: "adb -s #{device_serial} shell getprop ro.build.version.sdk",
-                                             print_all: true,
-                                             print_command: true).to_i
+      device_api_version = run_adb_command("adb -s #{device_serial} shell getprop ro.build.version.sdk",
+                                           print_all: true,
+                                           print_command: true).to_i
 
       if device_api_version >= 23
         UI.message 'Granting the permissions necessary to access device external storage'
-        @executor.execute(command: "adb -s #{device_serial} shell pm grant #{@config[:app_package_name]} android.permission.WRITE_EXTERNAL_STORAGE",
-                          print_all: true,
-                          print_command: true)
-        @executor.execute(command: "adb -s #{device_serial} shell pm grant #{@config[:app_package_name]} android.permission.READ_EXTERNAL_STORAGE",
-                          print_all: true,
-                          print_command: true)
+        run_adb_command("adb -s #{device_serial} shell pm grant #{@config[:app_package_name]} android.permission.WRITE_EXTERNAL_STORAGE",
+                        print_all: true,
+                        print_command: true)
+        run_adb_command("adb -s #{device_serial} shell pm grant #{@config[:app_package_name]} android.permission.READ_EXTERNAL_STORAGE",
+                        print_all: true,
+                        print_command: true)
       end
     end
 
@@ -216,9 +220,9 @@ module Screengrab
         instrument_command << "-e package #{test_packages_to_use.join(',')}" if test_packages_to_use
         instrument_command << "#{@config[:tests_package_name]}/#{@config[:test_instrumentation_runner]}"
 
-        test_output = @executor.execute(command: instrument_command.join(" \\\n"),
-                                        print_all: true,
-                                        print_command: true)
+        test_output = run_adb_command(instrument_command.join(" \\\n"),
+                                      print_all: true,
+                                      print_command: true)
 
         UI.user_error!("Tests failed", show_github_issues: false) if test_output.include?("FAILURES!!!")
       end
@@ -235,9 +239,9 @@ module Screengrab
       Dir.mktmpdir do |tempdir|
         device_screenshots_paths.each do |device_path|
           if_device_path_exists(device_serial, device_path) do |path|
-            @executor.execute(command: "adb -s #{device_serial} pull #{path} #{tempdir}",
-                              print_all: false,
-                              print_command: true)
+            run_adb_command("adb -s #{device_serial} pull #{path} #{tempdir}",
+                            print_all: false,
+                            print_command: true)
           end
         end
 
@@ -298,9 +302,9 @@ module Screengrab
     # Some device commands fail if executed against a device path that does not exist, so this helper method
     # provides a way to conditionally execute a block only if the provided path exists on the device.
     def if_device_path_exists(device_serial, device_path)
-      return if @executor.execute(command: "adb -s #{device_serial} shell ls #{device_path}",
-                                  print_all: false,
-                                  print_command: false).include?('No such file')
+      return if run_adb_command("adb -s #{device_serial} shell ls #{device_path}",
+                                print_all: false,
+                                print_command: false).include?('No such file')
 
       yield device_path
     rescue
@@ -312,10 +316,20 @@ module Screengrab
       unless @config[:skip_open_summary]
         UI.message "Opening screenshots summary"
         # MCF: this isn't OK on any platform except Mac
-        @executor.execute(command: "open #{@config[:output_directory]}/*/images/#{device_type_dir_name}/*.png",
-                          print_all: false,
-                          print_command: true)
+        run_adb_command("open #{@config[:output_directory]}/*/images/#{device_type_dir_name}/*.png",
+                        print_all: false,
+                        print_command: true)
       end
     end
+
+    def run_adb_command(command, print_all: false, print_command: false)
+      output = @executor.execute(command: command,
+                                 print_all: print_all,
+                                 print_command: print_command) || ''
+      output.lines.reject do |line|
+        # Debug/Warning output from ADB}
+        line.start_with?('adb: ')
+      end.join('') # Lines retain their newline chars
+    end
   end
 end

data/version.properties

@@ -1,3 +1,3 @@
 major=0
 minor=5
-patch=1
+patch=2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: screengrab
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrea Falcone
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core