dryrun 0.6.5 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a82bf4d7e5bf344587e52b51b8f51158ddd823f
-  data.tar.gz: a1b1e5e4ac6a8799729cc3cb571d4cff148bf009
+  metadata.gz: 036e595b962647744176802351d6e161da574fe9
+  data.tar.gz: 242399841f07ea231618a27f6b2c75ba7d83f5b6
 SHA512:
-  metadata.gz: cf77b30f4b44a504c84907254b89518771fa33437d56c25a89e08e05bb7a9065f7caeec293fd5adec950222ab1e294c157f2a3bfd27872f3d8bb3044f29d77ad
-  data.tar.gz: ef0ac730b9d866d48090bdc7388179557b1878710c954830ea4c4b519894c4da3f40ed809f6ad826de3c08238eb397df1c5715765d890b4255338dbba38fd068
+  metadata.gz: b397ce280f7d1584c3dd8111bf0ccfcf2a523624cde0ba16e14ded13d33857c7ff5f0671f090984d8aaa946292ec9e1428845f598f5f6d6f65c4c3f373bd155b
+  data.tar.gz: e4a92ddc5395763d8d6d12722f04d634b286480b26c57a32446530b9ab666b98a440039f7cea371ab7073eb4748ff44a372b461960094aa28cea0b555fa48e65

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.1
+  - 2.3.0

data/dryrun.gemspec

@@ -33,5 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bundler', '~> 1.7'
   spec.add_dependency 'colorize',  '~> 0.7'
   spec.add_dependency 'oga',  '~> 1.3.1'
+  spec.add_dependency 'highline', '~> 1.7'
+  spec.add_dependency 'adb-sdklib', '~> 0.0.3'
+  spec.add_dependency 'rjb', '>= 1.5.4'
 
 end

data/lib/dryrun.rb

@@ -1,3 +1,4 @@
+require 'adb-sdklib'
 require 'optparse'
 require 'colorize'
 require 'tmpdir'
@@ -5,11 +6,12 @@ require 'fileutils'
 require 'dryrun/github'
 require 'dryrun/version'
 require 'dryrun/android_project'
+require "highline/import"
 
 module DryRun
   class MainApp
     def initialize(arguments)
-
+      outdated_verification
       @url = ['-h', '--help', '-v', '--version'].include?(arguments.first) ? nil : arguments.shift
 
       # defaults
@@ -65,6 +67,64 @@ module DryRun
       end
     end
 
+    def outdated_verification
+      is_up_to_date = DryrunUtils.is_up_to_date
+
+      if is_up_to_date
+        return
+      end
+
+      input = nil
+
+      begin
+        input = ask "\n#{'Your Dryrun version is outdated, want to update?'.yellow} #{'[Y/n]:'.white}"
+      end while !['y', 'n', 's'].include?(input.downcase)
+
+      if input.downcase.eql? 'y'
+        DryrunUtils.execute('gem update dryrun')
+      end
+
+    end
+
+    def pick_device()
+      if !Gem.win_platform?
+        sdk = `echo $ANDROID_HOME`.gsub("\n",'')
+        sdk = sdk + "/platform-tools/adb";
+      else
+        sdk = `echo %ANDROID_HOME%`.gsub("\n",'')
+        sdk = sdk + "/platform-tools/adb.exe"
+      end
+
+      puts "Searching for devices...".yellow
+      adb = AdbSdkLib::Adb.new(sdk)
+      devices = adb.devices;
+
+      if devices.empty?
+        puts "No devices attached, but I'll run anyway"
+      end
+
+      @device = nil
+
+      if devices.size >= 2
+        puts "Pick your device (1,2,3...):"
+
+        devices.each_with_index.map {|key, index| puts "#{index.to_s.green} -  #{key} \n"}
+
+        a = gets.chomp
+
+        if a.match(/^\d+$/) && a.to_i <= (devices.length - 1) && a.to_i >= 0
+          @device = devices.to_a.at((a.to_i))[1]
+        else
+          @device = devices.first
+        end
+      else
+        @device = devices.first
+      end
+
+      puts "Picked #{@device.to_s.green}" if @device
+    end
+
+
     def android_home_is_defined
       if !Gem.win_platform?
         sdk = `echo $ANDROID_HOME`.gsub("\n",'')
@@ -82,6 +142,8 @@ module DryRun
         exit 1
       end
 
+      pick_device()
+
       github = Github.new(@url)
 
       unless github.is_valid
@@ -92,7 +154,7 @@ module DryRun
       # clone the repository
       repository_path = github.clone(@branch, @tag)
 
-      android_project = AndroidProject.new(repository_path, @app_path, @custom_module, @flavour)
+      android_project = AndroidProject.new(repository_path, @app_path, @custom_module, @flavour, @device)
 
       # is a valid android project?
       unless android_project.is_valid

data/lib/dryrun/android_project.rb

@@ -1,3 +1,4 @@
+require 'adb-sdklib'
 require 'oga'
 require 'fileutils'
 require 'tempfile'
@@ -6,12 +7,13 @@ require_relative 'dryrun_utils'
 
 module DryRun
   class AndroidProject
-    def initialize(path, custom_app_path, custom_module, flavour)
+    def initialize(path, custom_app_path, custom_module, flavour, device)
 
       @custom_app_path = custom_app_path
       @custom_module = custom_module
       @base_path = path
       @flavour = flavour
+      @device = device
 
       @settings_gradle_path = settings_gradle_file
 
@@ -113,10 +115,9 @@ module DryRun
       clear_app_data
 
       puts "Installing #{@package.green}...\n"
-      puts "executing: #{execute_line.green}\n\n"
-
-      DryrunUtils.execute(execute_line)
+      puts "executing: #{execute_line.green}\n"
 
+      @device.shell("#{execute_line}")
     end
 
     def is_gradle_wrapped
@@ -141,20 +142,16 @@ module DryRun
       [false, false]
     end
 
-    def get_clear_app_command
-      "adb shell pm clear #{@package}"
-    end
-
     def get_uninstall_command
-      "adb uninstall #{@package}"
+       "adb uninstall \"#{@package}\""
     end
 
     def clear_app_data
-      system(get_clear_app_command)
+       @device.shell("pm clear #{@package}")
     end
 
     def uninstall_application
-      DryrunUtils.execute(get_uninstall_command) # > /dev/null 2>&1")
+      @device.shell("pm uninstall #{@package}")
     end
 
     def get_execution_line_command(path_to_sample)
@@ -175,7 +172,7 @@ module DryRun
 
       manifest_file.close
 
-      "adb shell am start -n \"#{get_launchable_activity}\" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER"
+      return "am start -n \"#{get_launchable_activity}\" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER"
     end
 
     def get_manifest(path_to_sample)

data/lib/dryrun/dryrun_utils.rb

@@ -1,3 +1,6 @@
+require 'open-uri'
+require 'dryrun/version'
+
 module DryRun
 	class DryrunUtils
 
@@ -9,7 +12,23 @@ module DryRun
 		        puts "  $ #{command}\n".yellow
 		        puts "======================================================\n\n"
 		        exit 1
-		      end	
+		      end
+		end
+
+		def self.get_latest_version
+		  url = 'https://raw.githubusercontent.com/cesarferreira/dryrun/master/lib/dryrun/version.rb'
+		  page_string = nil
+
+		  open(url) do |f|
+		    page_string = f.read
+		  end
+
+		  page_string[/#{Regexp.escape('\'')}(.*?)#{Regexp.escape('\'')}/m, 1]
+		end
+
+		def self.is_up_to_date
+		  latest = get_latest_version
+		  latest.eql? DryRun::VERSION
 		end
-	end 
-end
+	end
+end

data/lib/dryrun/version.rb

@@ -1,3 +1,3 @@
 module DryRun
-  VERSION = '0.6.5'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryrun
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.2
 platform: ruby
 authors:
 - cesar ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: adb-sdklib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: rjb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.4
 description: Tool to try any android library hosted online directly from the command
   line
 email:
@@ -144,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tool to try any android library hosted online directly from the command line