dryrun 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a8b8b33d462e6e7dc193f307ea700166bcc90c0
-  data.tar.gz: ef5926a7a47f020ebeb7753de7483f1e6c3ad676
+  metadata.gz: 12d9fa58a5064dd85da72920ac21be5fcaa0906c
+  data.tar.gz: cc3f02008e17b792b1e637bf16377e47d4da7e22
 SHA512:
-  metadata.gz: 42886f6dae79ad2810173c8bb1407a3f19b1918fab1b74a45ae12a79e9b88bf6d8039cba9d639346bd67c2c9aea7b190d2b061bde875c14767f21c222053a47f
-  data.tar.gz: 7e443523c64f26248d19236038813510ad6c8af0b9cdddfa0028f4e9136ad200d6f9f2dab47ba1cc01bbc579c569953cd21c9b90a0741714ec56f867651bd2da
+  metadata.gz: 889183fa40425402bed0665325d5abc4aa7ee8c3741864c87e4c46637a82d5881f90c7868874fe5b0727b3f47c6860f35bd696518658e12d98f33026901fd397
+  data.tar.gz: 18739688e6362dc37467995c029eee686d7e43632f885526d24227d7663ec4e4c14d49924e48aba1a0f894ada9a4408b54ccc45f84bcc72441881936fe018b6a

data/README.md

@@ -49,6 +49,7 @@ Options
     -w, --wipe                       Wipe the temporary dryrun folder
     -h, --help                       Displays help
     -v, --version                    Displays the version
+    -a, --android-test               Execute android tests
 ```
 
 ## Alternative scenario (if you don't use `dryrun`)
@@ -80,7 +81,7 @@ Be aware that ANDROID_HOME needs to be set with the adb path:
  - MAC -> ```ANDROID_HOME=/usr/local/opt/android-sdk```
  - Linux -> ```ANDROID_HOME=/usr/local/opt/android-sdk```
  - Windows -> ```ANDROID_HOME="...sdk"```
-In windows this ANDROID_HOME is not automatically created, see more in [here](https://facebook.github.io/react-native/releases/0.21/docs/android-setup.html#define-the-android-home-environment-variable)
+In windows this ANDROID_HOME is not automatically created, see more in [here](https://github.com/facebook/react-native/blob/0.24-stable/docs/DevelopmentSetupAndroid.md#define-the-android_home-environment-variable)
 
 Additionally, on windows in order to use git commands, the following path should be on the environment variable
   - ```...\Git\cmd ```

data/lib/dryrun.rb

@@ -4,6 +4,8 @@ require 'fileutils'
 require 'dryrun/github'
 require 'dryrun/version'
 require 'dryrun/android_project'
+require 'dryrun/install_application_command'
+require 'dryrun/test_application_command'
 require 'dryrun/device'
 require 'highline/import'
 require 'openssl'
@@ -25,6 +27,7 @@ module Dryrun
       @branch = 'master'
       @devices = []
       @cleanup = false
+      @command = InstallApplicationCommand.new
 
       # Parse Options
       create_options_parser(arguments)
@@ -74,6 +77,10 @@ module Dryrun
           exit
         end
 
+        opts.on('-a', '--android-test', 'Execute android tests') do
+          @command = TestApplicationCommand.new
+        end
+
         opts.parse!
       end
     end
@@ -118,7 +125,7 @@ module Dryrun
       if @devices.size >= 2
         puts 'Pick your device (1,2,3...):'
 
-        @devices.each_with_index.map { |key, index| puts "#{index.to_s.green} -  #{key.name} \n" }
+        @devices.each_with_index.map {|key, index| puts "#{index.to_s.green} -  #{key.name} \n"}
 
         input = gets.chomp
 
@@ -198,7 +205,7 @@ module Dryrun
       puts "Using custom module: #{@custom_module.green}" if @custom_module
 
       # clean and install the apk
-      android_project.install
+      android_project.execute_command(@command)
 
       puts "\n> If you want to remove the app you just installed, execute:\n#{android_project.uninstall_command.yellow}\n\n"
     end

data/lib/dryrun/android_project.rb

@@ -3,6 +3,8 @@ require 'fileutils'
 require 'tempfile'
 require 'find'
 require_relative 'dryrun_utils'
+require_relative 'manifest_parser'
+require_relative 'gradle_adapter'
 
 module Dryrun
   class AndroidProject
@@ -52,7 +54,8 @@ module Dryrun
 
       # Write good lines to temporary file
       File.open(file, 'r') do |f|
-        f.each do |l| tmp << l unless l.include? 'applicationId'
+        f.each do |l|
+          tmp << l unless l.include? 'applicationId'
         end
       end
       tmp.close
@@ -71,7 +74,7 @@ module Dryrun
 
     def valid?(main_gradle_file = @main_gradle_file)
       File.exist?(main_gradle_file) &&
-      File.exist?(@settings_gradle_path)
+          File.exist?(@settings_gradle_path)
     end
 
     def find_modules
@@ -79,111 +82,69 @@ module Dryrun
 
       content = File.open(@settings_gradle_path, 'rb').read
       modules = content.scan(/'([^']*)'/)
-      modules.each { |replacement| replacement.first.tr!(':', '/') }
+      modules.each {|replacement| replacement.first.tr!(':', '/')}
     end
 
-    def install
+    def execute_command(command)
       Dir.chdir @base_path
 
-      path, execute_line = sample_project
+      path = sample_project
+      manifest_parsed = parse_manifest(path)
 
-      if path == false && execute_line == false
+      if path == false && manifest_parsed == false
         puts "Couldn't open the sample project, sorry!".red
         exit 1
       end
 
-      builder = 'gradle'
-
-      if File.exist?('gradlew')
-        if !Gem.win_platform?
-          DryrunUtils.execute('chmod +x gradlew')
-        else
-          DryrunUtils.execute('icacls gradlew /T')
-        end
-        builder = './gradlew'
-      end
-
-      # Generate the gradle/ folder
-      DryrunUtils.execute('gradle wrap') if File.exist?('gradlew') && !gradle_wrapped?
+      builder = create_builder
 
       remove_application_id
       remove_local_properties
 
-      if @custom_module
-        DryrunUtils.execute("#{builder} clean")
-        DryrunUtils.execute("#{builder} :#{@custom_module}:install#{@flavour}Debug")
-      else
-        DryrunUtils.execute("#{builder} clean")
-
-        if @device.nil?
-          puts 'No devices picked/available, proceeding with assemble instead'.green
-          puts "#{builder} assemble#{@flavour}Debug"
-          DryrunUtils.execute("#{builder} assemble#{@flavour}Debug")
-        else
-          puts "#{builder} install#{@flavour}Debug"
-          DryrunUtils.execute("#{builder} install#{@flavour}Debug")
-        end
-      end
-
-      unless @device.nil?
-        clear_app_data
-        puts "Installing #{@package.green}...\n"
-        puts "executing: #{execute_line.green}\n"
-
-        DryrunUtils.run_adb("shell #{execute_line}")
-      end
+      command.run(builder, @package, @launcher_activity, @custom_module, @flavour, @device)
     end
 
     def gradle_wrapped?
       return false unless File.directory?('gradle/')
 
       File.exist?('gradle/wrapper/gradle-wrapper.properties') &&
-        File.exist?('gradle/wrapper/gradle-wrapper.jar')
+          File.exist?('gradle/wrapper/gradle-wrapper.jar')
     end
 
     def sample_project
-      if @custom_module && @modules.any? { |m| m.first == "/#{@custom_module}" }
+      if @custom_module && @modules.any? {|m| m.first == "/#{@custom_module}"}
         @path_to_sample = File.join(@base_path, "/#{@custom_module}")
-        return @path_to_sample, get_execution_line_command(@path_to_sample)
+        return @path_to_sample
       else
         @modules.each do |child|
           full_path = File.join(@base_path, child.first)
           @path_to_sample = full_path
-
-          execution_line_command = get_execution_line_command(full_path)
-          return full_path, execution_line_command if execution_line_command
+          return full_path
         end
       end
-      [false, false]
+      false
     end
 
     def uninstall_command
       "adb uninstall \"#{@package}\""
     end
 
-    def clear_app_data
-      DryrunUtils.run_adb("shell pm clear #{@package}")
-    end
-
     def uninstall_application
       DryrunUtils.run_adb("shell pm uninstall #{@package}")
     end
 
-    def get_execution_line_command(path_to_sample)
+    def parse_manifest(path_to_sample)
       manifest_file = get_manifest(path_to_sample)
 
       return false if manifest_file.nil?
 
-      doc = Oga.parse_xml(manifest_file)
-
-      @package = get_package(doc)
-      @launcher_activity = get_launcher_activity(doc)
+      manifest_parser = ManifestParser.new(manifest_file)
+      @package = manifest_parser.package
+      @launcher_activity = manifest_parser.launcher_activity
 
       return false unless @launcher_activity
 
       manifest_file.close
-
-      "am start -n \"#{launcheable_activity}\" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER"
     end
 
     def get_manifest(path_to_sample)
@@ -199,25 +160,21 @@ module Dryrun
       end
     end
 
-    def launcheable_activity
-      full_path_to_launcher = "#{@package}#{@launcher_activity.gsub(@package, '')}"
-      "#{@package}/#{full_path_to_launcher}"
-    end
-
-    def get_package(doc)
-      doc.xpath('//manifest').attr('package').first.value
-    end
-
-    def get_launcher_activity(doc)
-      activities = doc.css('activity')
-      activities.each do |child|
-        intent_filter = child.css('intent-filter')
+    def create_builder
+      builder = 'gradle'
 
-        if !intent_filter.nil? && !intent_filter.empty?
-          return child.attr('android:name').value
+      if File.exist?('gradlew')
+        if !Gem.win_platform?
+          DryrunUtils.execute('chmod +x gradlew')
+        else
+          DryrunUtils.execute('icacls gradlew /T')
         end
+        builder = './gradlew'
       end
-      false
+
+      # Generate the gradle/ folder
+      DryrunUtils.execute('gradle wrap') if File.exist?('gradlew') && !gradle_wrapped?
+      GradleAdapter.new(builder)
     end
   end
 end

data/lib/dryrun/android_utils.rb

@@ -0,0 +1,17 @@
+require_relative 'dryrun_utils'
+
+module Dryrun
+  class AndroidUtils
+
+    def self.pretty_run(execute_line, package)
+      puts "Installing #{package.green}...\n"
+      puts "executing: #{execute_line.green}\n"
+
+      DryrunUtils.run_adb("shell #{execute_line}")
+    end
+
+    def self.clear_app_data(package)
+      DryrunUtils.run_adb("shell pm clear #{package}")
+    end
+  end
+end

data/lib/dryrun/gradle_adapter.rb

@@ -0,0 +1,55 @@
+require_relative 'dryrun_utils'
+
+module Dryrun
+  class GradleAdapter
+
+    def initialize(builder)
+      @builder = builder
+    end
+
+    def clean
+      DryrunUtils.execute("#{@builder} clean")
+    end
+
+    def run_android_tests(custom_module, flavour)
+      if custom_module
+        puts "#{@builder} :#{custom_module}:connected#{flavour}DebugAndroidTest"
+        DryrunUtils.execute("#{@builder} :#{custom_module}:connected#{flavour}DebugAndroidTest")
+      else
+        puts "#{@builder} connected#{flavour}DebugAndroidTest"
+        DryrunUtils.execute("#{@builder} connected#{flavour}DebugAndroidTest")
+      end
+    end
+
+    def run_unit_tests(custom_module, flavour)
+      if custom_module
+        puts "#{@builder} :#{custom_module}:test#{flavour}DebugUnitTest"
+        DryrunUtils.execute("#{@builder} :#{custom_module}:test#{flavour}DebugUnitTest")
+      else
+        puts "#{@builder} test#{flavour}DebugUnitTest"
+        DryrunUtils.execute("#{@builder} test#{flavour}DebugUnitTest")
+      end
+    end
+
+    def install(custom_module, flavour)
+      if custom_module
+        puts "#{@builder} :#{custom_module}:install#{flavour}Debug"
+        DryrunUtils.execute("#{@builder} :#{custom_module}:install#{flavour}Debug")
+      else
+        puts "#{@builder} install#{flavour}Debug"
+        DryrunUtils.execute("#{@builder} install#{flavour}Debug")
+      end
+    end
+
+
+    def assemble(custom_module, flavour)
+      if custom_module
+        puts "#{@builder} :#{custom_module}:assemble#{flavour}Debug"
+        DryrunUtils.execute("#{@builder} :#{custom_module}:assemble#{flavour}Debug")
+      else
+        puts "#{@builder} assemble#{flavour}Debug"
+        DryrunUtils.execute("#{@builder} assemble#{flavour}Debug")
+      end
+    end
+  end
+end

data/lib/dryrun/install_application_command.rb

@@ -0,0 +1,33 @@
+require_relative 'dryrun_utils'
+require_relative 'android_utils'
+
+module Dryrun
+  class InstallApplicationCommand
+
+    def run(builder, package, launcher_activity, custom_module, flavour, device)
+      execute_line = get_execution_command_line(package, launcher_activity)
+      builder.clean
+
+      if device.nil?
+        puts 'No devices picked/available, proceeding with assemble instead'.green
+        builder.assemble(custom_module, flavour)
+      else
+        builder.install(custom_module, flavour)
+      end
+
+      unless device.nil?
+        AndroidUtils.clear_app_data(package)
+        AndroidUtils.pretty_run(execute_line, package)
+      end
+    end
+
+    def get_execution_command_line(package, launcher_activity)
+      "am start -n \"#{launcheable_activity(package, launcher_activity)}\" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER"
+    end
+
+    def launcheable_activity(package, launcher_activity)
+      full_path_to_launcher = "#{package}#{launcher_activity.gsub(package, '')}"
+      "#{package}/#{full_path_to_launcher}"
+    end
+  end
+end

data/lib/dryrun/manifest_parser.rb

@@ -0,0 +1,33 @@
+require 'oga'
+
+module Dryrun
+
+  class ManifestParser
+
+    attr_accessor :package, :launcher_activity
+
+    def initialize(manifest_file)
+      doc = Oga.parse_xml(manifest_file)
+
+      @package = get_package(doc)
+      @launcher_activity = get_launcher_activity(doc)
+    end
+
+    def get_package(doc)
+      doc.xpath('//manifest').attr('package').first.value
+    end
+
+    def get_launcher_activity(doc)
+      activities = doc.css('activity')
+      activities.each do |child|
+        intent_filter = child.css('intent-filter')
+
+        if !intent_filter.nil? && !intent_filter.empty?
+          return child.attr('android:name').value
+        end
+      end
+      false
+    end
+
+  end
+end

data/lib/dryrun/test_application_command.rb

@@ -0,0 +1,28 @@
+require_relative 'dryrun_utils'
+require_relative 'android_utils'
+
+module Dryrun
+  class TestApplicationCommand
+
+    def run(builder, package, launcher_activity, custom_module, flavour, device)
+      execute_line = get_execution_command_line(package)
+      builder.clean
+
+      if device.nil?
+        puts 'No devices picked/available, proceeding with unit tests instead'.green
+        builder.run_unit_tests(custom_module, flavour)
+      else
+        builder.run_android_tests(custom_module, flavour)
+      end
+
+      unless device.nil?
+        AndroidUtils.clear_app_data(package)
+        AndroidUtils.pretty_run(execute_line, package)
+      end
+    end
+
+    def get_execution_command_line(package)
+      "adb shell am instrument -w #{package}"
+    end
+  end
+end

data/lib/dryrun/version.rb

@@ -1,3 +1,3 @@
 module Dryrun
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryrun
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - cesar ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -149,9 +149,14 @@ files:
 - extras/usage_v4.gif
 - lib/dryrun.rb
 - lib/dryrun/android_project.rb
+- lib/dryrun/android_utils.rb
 - lib/dryrun/device.rb
 - lib/dryrun/dryrun_utils.rb
 - lib/dryrun/github.rb
+- lib/dryrun/gradle_adapter.rb
+- lib/dryrun/install_application_command.rb
+- lib/dryrun/manifest_parser.rb
+- lib/dryrun/test_application_command.rb
 - lib/dryrun/version.rb
 - spec/dryrun_spec.rb
 - spec/github_spec.rb
@@ -177,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Tool to try any android library hosted online directly from the command line