dryrun 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ec56b375eacf6ee115b8d7f6659d4d7165e920
-  data.tar.gz: 3a2807a1fc8cc5e54fc25dd6b80df8e87640f993
+  metadata.gz: 31a7a350f5f35e5214aad6a9cff0b5ca61cf0331
+  data.tar.gz: 9415dd1e35bbbc086a14439b0fc9eabf7a18ba51
 SHA512:
-  metadata.gz: 7ae9e2139b40fd0e7d6ec3de75d09552d5b0f3ffbcdf307728da4989c220b818610d3d5b3df0c6a975bade1814a9aa00b35b5ced27a0e8f73f8e4f1028ec6594
-  data.tar.gz: 9dac1dff1bf37f1704d6450ac97abc16ac07db10b2c8ef34d0d23d10c1d25d7f49890fc72dd893378b7ff1460f6c10ca60a830dd698c391e4e7bf02868c48ea0
+  metadata.gz: 936abaf3c71d7c2097065fcb0bef60a3e6b7eedcf70bc8d23662e8f30f6e602a93d6885f3ecdc6020e1cb952a7226a2efbce4b86c6ef1386f9529c59f70010ff
+  data.tar.gz: 6ca7768fbfa671b5e3b90c434f4787d767854784c2b5b74a041e2e379c038b35bc8f6837833c8c84c86ef436b14f1706c5e36912d7343be2042af387e50d205a

data/lib/dryrun.rb

@@ -11,7 +11,7 @@ module DryRun
     def initialize(arguments)
 
       @url = ['-h', '--help', '-v', '--version'].include?(arguments.first) ? nil : arguments.shift
-      
+
       # defaults
       @app_path = nil
       @custom_module = nil
@@ -102,7 +102,7 @@ module DryRun
       # clean and install the apk
       android_project.install
 
-      puts "\n> If you want to remove the app you just installed, execute:\n#{android_project.get_uninstall_command.red}\n\n"
+      puts "\n> If you want to remove the app you just installed, execute:\n#{android_project.get_uninstall_command.yellow}\n\n"
     end
   end
 end

data/lib/dryrun/android_project.rb

@@ -1,6 +1,7 @@
 require 'oga'
 require 'fileutils'
 require 'tempfile'
+require 'find'
 require_relative 'dryrun_utils'
 
 module DryRun
@@ -152,15 +153,13 @@ module DryRun
     end
 
     def get_execution_line_command(path_to_sample)
-      path_to_manifest = File.join(path_to_sample, 'src/main/AndroidManifest.xml')
+      manifest_file = get_manifest(path_to_sample) 
 
-      if !File.exist?(path_to_manifest)
+      if manifest_file.nil?
         return false
       end
 
-      f = File.open(path_to_manifest)
-
-      doc = Oga.parse_xml(f)
+      doc = Oga.parse_xml(manifest_file)
 
       @package = get_package(doc)
       @launcher_activity = get_launcher_activity(doc)
@@ -169,11 +168,22 @@ module DryRun
         return false
       end
 
-      f.close
+      manifest_file.close
 
       "adb shell am start -n \"#{get_launchable_activity}\" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER"
     end
 
+    def get_manifest(path_to_sample)
+      default_path = File.join(path_to_sample, 'src/main/AndroidManifest.xml')
+      if File.exist?(default_path)
+        return File.open(default_path)
+      else
+        Find.find(path_to_sample) do |path|
+          return File.open(path) if path =~ /.*AndroidManifest.xml$/
+        end
+      end
+    end
+
     def get_launchable_activity
       full_path_to_launcher = "#{@package}#{@launcher_activity.gsub(@package,'')}"
       "#{@package}/#{full_path_to_launcher}"
@@ -189,7 +199,7 @@ module DryRun
         intent_filter = child.css('intent-filter')
 
         if intent_filter != nil and intent_filter.length != 0
-          return child.xpath("//activity").attr("android:name").last.value
+          return child.attr("android:name").value
         end
       end
       false

data/lib/dryrun/version.rb

@@ -1,3 +1,3 @@
 module DryRun
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryrun
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - cesar ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake