dryrun 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff3c2fe1c435df6056a21d91b2fb81b4119a05c
-  data.tar.gz: 05e3055bec7c209db52797450c2001fd7166c054
+  metadata.gz: bc56acb0b83a79cdaf4d2598da0ebf3dc811f0b4
+  data.tar.gz: 4a2b2a5015b0481e000f7f0b69cc3118d8afe979
 SHA512:
-  metadata.gz: 7f1de2e292dd0ff8c0eaa9f91ad884bb8e871d41309141db289b9635ebbc999514d72bb9a1035457a6fdddc4a4808a72be848196ee0fa238285abe07782dedb5
-  data.tar.gz: 6851dfe5e5eb1e51788b3c1ce966439437890edcf56131c4535b5976c351cc1741b783646920eab6f129c29b38281b01e0ba97731b99a802933218ce3b3d78d3
+  metadata.gz: fa2148852009d390dedca1ce5d17f835ed288c9441a39abf99cea0f6318b55bffa2a40868b56055d31189d31574640daa3bece41cca92cd63afb1e71f4eb63b9
+  data.tar.gz: f4d4a20fd672de76f584b7dd7a08847e5594f4cb55569cc95bb11d1a5d42ae08c67eb50a627ba3faa1711d808e9aaf430519671021069f6233ae6f5192544621

data/lib/dryrun.rb

@@ -1,4 +1,3 @@
-require 'adb-sdklib'
 require 'optparse'
 require 'colorize'
 require 'tmpdir'
@@ -8,13 +7,15 @@ require 'dryrun/version'
 require 'dryrun/android_project'
 require "highline/import"
 require 'openssl'
+require 'open3'
+require_relative 'dryrun/device'
 
 module Dryrun
   class MainApp
     def initialize(arguments)
-      
+
       outdated_verification
-      
+
       @url = ['-h', '--help', '-v', '--version'].include?(arguments.first) ? nil : arguments.shift
 
       # defaults
@@ -23,6 +24,7 @@ module Dryrun
       @flavour = ''
       @tag = nil
       @branch = "master"
+      @devices = Array.new
 
       # Parse Options
       arguments.push "-h" unless @url
@@ -92,77 +94,104 @@ module Dryrun
 
     def pick_device()
       if !Gem.win_platform?
-        sdk = `echo $ANDROID_HOME`.gsub("\n",'')
-        sdk = sdk + "/platform-tools/adb";
+        @@sdk = `echo $ANDROID_HOME`.gsub("\n",'')
+        @@sdk = @@sdk + "/platform-tools/adb";
       else
-        sdk = `echo %ANDROID_HOME%`.gsub("\n",'')
-        sdk = sdk + "/platform-tools/adb.exe"
+        @@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?
+      run_adb("devices")
+
+      if @devices.empty?
         puts "No devices attached, but I'll run anyway"
       end
 
-      @device = nil
+      @@device = nil
 
-      if devices.size >= 2
+      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"}
+        @devices.each_with_index.map {|key, index| puts "#{index.to_s.green} -  #{key.name} \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]
+        if a.match(/^\d+$/) && a.to_i <= (@devices.length - 1) && a.to_i >= 0
+          @@device = @devices[(a.to_i)]
         else
-          @device = devices.first
+          @@device = @devices.first
         end
       else
-        @device = devices.first
+        @@device = @devices.first
       end
 
-      puts "Picked #{@device.to_s.green}" if @device
+      puts "Picked #{@@device.name.to_s.green}" if @@device != nil
     end
 
+    def run_adb(args, adb_opts = {}, &block) # :yields: stdout
+      path = "#{@@sdk} #{args}"
+      last_command = path
+      run(path, &block)
+    end
 
-    def android_home_is_defined
-      if !Gem.win_platform?
-        sdk = `echo $ANDROID_HOME`.gsub("\n",'')
-      else
-        sdk = `echo %ANDROID_HOME%`.gsub("\n",'')
+    def run(path, &block)
+      @last_command = path
+      Open3.popen3(path) do |stdin, stdout, stderr, wait_thr|
+       stdout.each do |line|
+        line = line.strip
+        if (!line.empty? && line !~ /^List of devices/)
+          parts = line.split
+          device = AdbDevice::Device.new(parts[0], parts[1])
+          @devices << device
+        end
       end
-      !sdk.empty?
     end
+  end
 
-    def call
-      unless android_home_is_defined
-        puts "\nWARNING: your #{'$ANDROID_HOME'.yellow} is not defined\n"
-        puts "\nhint: in your #{'~/.bashrc'.yellow} or #{'~/.bash_profile'.yellow}  add:\n  #{"export ANDROID_HOME=\"/Users/cesarferreira/Library/Android/sdk/\"".yellow}"
-        puts "\nNow type #{'source ~/.bashrc'.yellow}\n\n"
-        exit 1
-      end
+  def self.getSDK # :yields: stdout
+      @@sdk
+  end
 
-      @url = @url.split("?").first
-      @url.chop! if @url.end_with? '/'
+  def self.getDevice # :yields: stdout
+      @@device
+  end
 
+  def android_home_is_defined
+    if !Gem.win_platform?
+      sdk = `echo $ANDROID_HOME`.gsub("\n",'')
+    else
+      sdk = `echo %ANDROID_HOME%`.gsub("\n",'')
+    end
+    !sdk.empty?
+  end
 
-      pick_device()
+  def call
+    unless android_home_is_defined
+      puts "\nWARNING: your #{'$ANDROID_HOME'.yellow} is not defined\n"
+      puts "\nhint: in your #{'~/.bashrc'.yellow} or #{'~/.bash_profile'.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)
+    @url = @url.split("?").first
+    @url.chop! if @url.end_with? '/'
 
-      unless github.is_valid
-        puts "#{@url.red} is not a valid git @url"
-        exit 1
-      end
+
+    pick_device()
+
+    github = Github.new(@url)
+
+    unless github.is_valid
+      puts "#{@url.red} is not a valid git @url"
+      exit 1
+    end
 
       # clone the repository
       repository_path = github.clone(@branch, @tag)
 
-      android_project = AndroidProject.new(repository_path, @app_path, @custom_module, @flavour, @device)
+      android_project = AndroidProject.new(repository_path, @app_path, @custom_module, @flavour)
 
       # is a valid android project?
       unless android_project.is_valid

data/lib/dryrun/android_project.rb

@@ -7,13 +7,12 @@ require_relative 'dryrun_utils'
 
 module Dryrun
   class AndroidProject
-    def initialize(path, custom_app_path, custom_module, flavour, device)
+    def initialize(path, custom_app_path, custom_module, flavour)
 
       @custom_app_path = custom_app_path
       @custom_module = custom_module
       @base_path = @custom_app_path? File.join(path, @custom_app_path) : path
       @flavour = flavour
-      @device = device
 
       @settings_gradle_path = settings_gradle_file
       @main_gradle_file = main_gradle_file
@@ -125,7 +124,7 @@ module Dryrun
       puts "Installing #{@package.green}...\n"
       puts "executing: #{execute_line.green}\n"
 
-      @device.shell("#{execute_line}")
+      DryrunUtils.run_adb("shell #{execute_line}")
     end
 
     def is_gradle_wrapped
@@ -155,11 +154,11 @@ module Dryrun
     end
 
     def clear_app_data
-       @device.shell("pm clear #{@package}")
+       DryrunUtils.run_adb("shell pm clear #{@package}")
     end
 
     def uninstall_application
-      @device.shell("pm uninstall #{@package}")
+        DryrunUtils.run_adb("shell pm uninstall #{@package}")
     end
 
     def get_execution_line_command(path_to_sample)

data/lib/dryrun/device.rb

@@ -0,0 +1,11 @@
+module AdbDevice
+  class Device
+    attr_accessor :name, :id
+
+    def initialize(name, id)
+      @name = name
+      @id = id
+    end
+  end
+end
+

data/lib/dryrun/dryrun_utils.rb

@@ -1,40 +1,55 @@
 require 'open-uri'
 require 'dryrun/version'
+require 'open3'
 
 module Dryrun
 	class DryrunUtils
 
 		def self.execute(command)
 			is_success = system command
-		      unless is_success
-		        puts "\n\n======================================================\n\n"
-		        puts " Something went wrong while executing this:".red
-		        puts "  $ #{command}\n".yellow
-		        puts "======================================================\n\n"
-		        exit 1
-		      end
+			unless is_success
+				puts "\n\n======================================================\n\n"
+				puts " Something went wrong while executing this:".red
+				puts "  $ #{command}\n".yellow
+				puts "======================================================\n\n"
+				exit 1
+			end
 		end
 
 		def self.get_latest_version
-		  url = 'https://raw.githubusercontent.com/cesarferreira/dryrun/master/lib/dryrun/version.rb'
-		  page_string = nil
+			url = 'https://raw.githubusercontent.com/cesarferreira/dryrun/master/lib/dryrun/version.rb'
+			page_string = nil
 
-      if Gem.win_platform?
+			if Gem.win_platform?
 				open(url, {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}) do |f|
-			    page_string = f.read
-			  end
+					page_string = f.read
+				end
 			else
 				open(url) do |f|
-			    page_string = f.read
-			  end
-      end
+					page_string = f.read
+				end
+			end
 
-		  page_string[/#{Regexp.escape('\'')}(.*?)#{Regexp.escape('\'')}/m, 1]
+			page_string[/#{Regexp.escape('\'')}(.*?)#{Regexp.escape('\'')}/m, 1]
 		end
 
 		def self.is_up_to_date
-		  latest = get_latest_version
-		  latest.to_s <= Dryrun::VERSION.to_s
+			latest = get_latest_version
+			latest.to_s <= Dryrun::VERSION.to_s
+		end
+
+		def self.run_adb(args, adb_opts = {}, &block) # :yields: stdout
+	      adb_arg = ""
+	      adb_arg += " -s #{Dryrun::MainApp.getDevice.name}"
+	      path = "#{Dryrun::MainApp.getSDK} #{adb_arg} #{args} "
+	      last_command = path
+	      run(path, &block)
+	    end
+
+		def self.run(path, &block)
+			@last_command = path
+			Open3.popen3(path) do |stdin, stdout, stderr, wait_thr|
+			end
 		end
 	end
 end

data/lib/dryrun/version.rb

@@ -1,3 +1,3 @@
 module Dryrun
-  VERSION = '0.7.8'
+  VERSION = '0.7.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryrun
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - cesar ferreira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -162,6 +162,7 @@ files:
 - extras/usage_v4.gif
 - lib/dryrun.rb
 - lib/dryrun/android_project.rb
+- lib/dryrun/device.rb
 - lib/dryrun/dryrun_utils.rb
 - lib/dryrun/github.rb
 - lib/dryrun/version.rb