dryrun 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fd1ba9e6128d81ef1f63fbe9d3f390d110bc4b8
-  data.tar.gz: 35d3f500bb00c197d26275324ba3811a2bad673f
+  metadata.gz: 10d011b7a25d63325257ca136b7cc4ab0c0c91c9
+  data.tar.gz: e1748d67462043c41fc210b32332e04708bebdbf
 SHA512:
-  metadata.gz: 2d4ed1d9533676a7129663edd5a674bca2f6938e4ad4d41ee309d6f2b1d963905f6543b762a66295c773f45b46063eb6bb1913d4f594520d7acd63275635a64a
-  data.tar.gz: b08ce5d82b63c7835c4745e1785a7f151cd0412f8fa9b368b4865b5d3e7bf250941e32469870e6fb41d4c1f6e5618f6cd946352519bd5ba2bab474ca04ea6dc8
+  metadata.gz: b2f560b1066b631ecc531dd601b40b176b739e03329177b65d42818021ef629975cc5313c30d442afc6d8b4f4ed4dd2b2114cbe467babf29e207be3cdfce8c4e
+  data.tar.gz: e4f679f242bd348c6f9a19c2e4f7a02b9ac38bae414a06d33a4045b01443734cbb4d83682c42a360958e8780349a31861451316e8070bdb0962cb9db56eebec9

data/README.md

@@ -1,5 +1,5 @@
 # dryrun
-[![Build Status](https://travis-ci.org/cesarferreira/dryrun.svg?branch=master)](https://travis-ci.org/cesarferreira/dryrun) [![Gem Version](https://badge.fury.io/rb/dryrun.svg)](http://badge.fury.io/rb/dryrun)
+[![Build Status](https://travis-ci.org/cesarferreira/dryrun.svg?branch=master)](https://travis-ci.org/cesarferreira/dryrun) [![Gem Version](https://badge.fury.io/rb/dryrun.svg)](http://badge.fury.io/rb/dryrun) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-dryrun-green.svg?style=flat)](https://android-arsenal.com/details/1/2361)
 
 **Try** any **android library** on your **smartphone** **directly** from the **command line**
 
@@ -31,7 +31,7 @@ Wait a few seconds... and `voilà`! The app is opened on your phone :smiley:
 
 ## Alternative scenario (if you don't use `dryrun`)
 
-1. Find the github url (lets say `https://github.com/cesarferreira/android-helloworld`)
+1. Find the github's repository url
 2. Click the `download zip`
 3. Extract the `zip file`
 4. Open Android Studio

data/dryrun.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["cesar ferreira"]
   spec.email         = ["cesar.manuel.ferreira@gmail.com"]
 
-  spec.summary       = %q{Tool which allows to quickly try the demo project of an Android Library}
-  spec.description   = %q{Tool which allows to quickly try the demo project of an Android Library}
+  spec.summary       = %q{Tool which allows to quickly try the demo project of any Android Library}
+  spec.description   = %q{Tool which allows to quickly try the demo project of any Android Library}
   spec.homepage      = "https://github.com/cesarferreira/dryrun"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/lib/dryrun.rb

@@ -8,43 +8,43 @@ module DryRun
 
   class MainApp
 
-    def self.is_ANDROID_HOME_defined
-      return true
+    def self.ANDROID_HOME_is_defined
+      sdk = `echo $ANDROID_HOME`.gsub("\n",'')
+      !sdk.empty?
     end
 
 
     def self.initialize(url)
 
-      if !is_ANDROID_HOME_defined
-        # TODO missing warning
+      unless self.ANDROID_HOME_is_defined
+        puts "\nWARNING: your #{'$ANDROID_HOME'.yellow} is not defined\n"
+        puts "\nhint: in your #{'~/.bashrc'.yellow} add:\n  #{"export ANDROID_HOME=\"/Users/cesarferreira/Library/Android/sdk/\"".yellow}"
+        puts "\nNow type #{'source ~/.bashrc'.yellow}\n\n"
+        exit 1
       end
 
       github = Github.new(url)
 
-      if !github.is_valid
+      unless github.is_valid
         puts "#{url.red} is not a valid github url"
         exit 1
       end
 
       # clone the repository
-      clonable = github.clonable_url
-
-      repository = github.clone
-
-      Dir.chdir repository
+      repository_path = github.clone
 
-      project = AndroidProject.new(repository)
+      android_project = AndroidProject.new(repository_path)
 
       # is a valid android project?
-      if !project.is_valid
+      unless android_project.is_valid
         puts "#{url.red} is not a valid android project"
         exit 1
       end
 
       # clean and install the apk
-      project.clean_install
+      android_project.install
 
-      puts "\n> If you want to remove the app you just installed, execute:\n#{project.get_uninstall_command.yellow}\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

data/lib/dryrun/android_project.rb

@@ -1,4 +1,6 @@
 require 'nokogiri'
+require 'fileutils'
+require 'tempfile'
 
 module DryRun
 
@@ -10,6 +12,32 @@ module DryRun
       @modules = find_modules
     end
 
+    def remove_local_properties
+      Dir.chdir @base_path
+      file_name = 'local.properties'
+
+      if File.exist?(file_name)
+        File.remove(file_name)
+      end
+    end
+
+    def remove_application_id
+      # Open temporary file
+      tmp = Tempfile.new("extract")
+
+      file = "#{@path_to_sample}/build.gradle"
+
+      # Write good lines to temporary file
+      open(file, 'r').each { |l| tmp << l unless l.include? 'applicationId' }
+
+      # Close tmp, or troubles ahead
+      tmp.close
+
+      # Move temp file to origin
+      FileUtils.mv(tmp.path, file)
+
+    end
+
     def settings_gradle
       "#{@base_path}/settings.gradle"
     end
@@ -29,7 +57,7 @@ module DryRun
     end
 
     # ./gradlew clean installDebug
-    def clean_install
+    def install
 
       Dir.chdir @base_path
 
@@ -42,17 +70,26 @@ module DryRun
 
       builder = "gradle"
 
-      if File.exist?("gradlew")
-        system("chmod +x gradlew")
-        builder = "./gradlew"
+      if File.exist?('gradlew')
+        system('chmod +x gradlew')
+
+        builder = 'sh gradlew'
+      end
+
+
+      # Generate the gradle/ folder
+      if File.exist?('gradlew') and !File.directory?('gradle/')
+        system('gradle wrap')
       end
 
       self.uninstall
+      self.remove_application_id
+      self.remove_local_properties
 
       system("#{builder} clean assembleDebug installDebug")
 
       puts "Installing #{@package.green}...\n"
-      puts "executing: #{execute_line}"
+      puts "executing: #{execute_line.green}\n\n"
       system(execute_line)
 
     end
@@ -61,6 +98,7 @@ module DryRun
 
       @modules.each do |child|
         full_path = "#{@base_path}#{child.first}"
+        @path_to_sample = full_path
 
         execute_line = get_execute_line("#{full_path}/src/main/AndroidManifest.xml")
         return full_path, execute_line if execute_line
@@ -96,10 +134,14 @@ module DryRun
 
       f.close
 
-      "adb shell am start -n #{@package}/#{@launcher_activity}"
+      "adb shell am start -n \"#{get_launchable_activity}\" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER"
 
     end
 
+    def get_launchable_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').value

data/lib/dryrun/version.rb

@@ -1,3 +1,3 @@
 module DryRun
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryrun
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - cesar ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,7 +94,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.6.2
-description: Tool which allows to quickly try the demo project of an Android Library
+description: Tool which allows to quickly try the demo project of any Android Library
 email:
 - cesar.manuel.ferreira@gmail.com
 executables:
@@ -139,5 +139,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Tool which allows to quickly try the demo project of an Android Library
+summary: Tool which allows to quickly try the demo project of any Android Library
 test_files: []