dryrun.rb in dryrun-0.8.0

- old
+ new

@@ -1,43 +1,42 @@
-require 'optparse'
-require 'colorize'
+﻿require 'colorize'
 require 'tmpdir'
 require 'fileutils'
 require 'dryrun/github'
 require 'dryrun/version'
 require 'dryrun/android_project'
-require "highline/import"
+require 'highline/import'
 require 'openssl'
 require 'open3'
 require_relative 'dryrun/device'
+require 'optparse'
 
 module Dryrun
   class MainApp
     def initialize(arguments)
-
       outdated_verification
 
-      @url = ['-h', '--help', '-v', '--version'].include?(arguments.first) ? nil : arguments.shift
+      @url = %w(-h --help -v --version -w --wipe).include?(arguments.first) ? nil : arguments.shift
 
       # defaults
       @app_path = nil
       @custom_module = nil
       @flavour = ''
       @tag = nil
-      @branch = "master"
-      @devices = Array.new
+      @branch = 'master'
+      @devices = []
+      @cleanup = false
 
       # Parse Options
-      arguments.push "-h" unless @url
       create_options_parser(arguments)
     end
 
     def create_options_parser(args)
       args.options do |opts|
-        opts.banner = "Usage: dryrun GIT_URL [OPTIONS]"
+        opts.banner = 'Usage: dryrun GIT_URL [OPTIONS]'
         opts.separator  ''
-        opts.separator  "Options"
+        opts.separator  'Options'
 
         opts.on('-m MODULE_NAME', '--module MODULE_NAME', 'Custom module to run') do |custom_module|
           @custom_module = custom_module
         end
 
@@ -55,10 +54,18 @@
 
         opts.on('-t TAG', '--tag TAG', 'Checkout tag/commit hash to clone (e.g. "v0.4.5", "6f7dd4b")') do |tag|
           @tag = tag
         end
 
+        opts.on('-c', '--cleanup', 'Clean the temporary folder before cloning the project') do
+          @cleanup = true
+        end
+
+        opts.on('-w', '--wipe', 'Wipe the temporary dryrun folder') do
+          wipe_temporary_folder
+        end
+
         opts.on('-h', '--help', 'Displays help') do
           puts opts.help
           exit
         end
 
@@ -66,146 +73,128 @@
           puts Dryrun::VERSION
           exit
         end
 
         opts.parse!
-
       end
     end
 
     def outdated_verification
-      is_up_to_date = DryrunUtils.is_up_to_date
+      return if DryrunUtils.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)
+      end until %w(y n s).include?(input.downcase)
 
-      if input.downcase.eql? 'y'
-        DryrunUtils.execute('gem update dryrun')
-
-      end
-
+      DryrunUtils.execute('gem update dryrun') if input.casecmp 'y'
     end
 
-    def pick_device()
+    def pick_device
+      @device = nil
+
       if !Gem.win_platform?
-        @@sdk = `echo $ANDROID_HOME`.gsub("\n",'')
-        @@sdk = @@sdk + "/platform-tools/adb";
+        @sdk = `echo $ANDROID_HOME`.delete("\n")
+        @sdk += '/platform-tools/adb'
       else
-        @@sdk = `echo %ANDROID_HOME%`.gsub("\n",'')
-        @@sdk = @@sdk + "/platform-tools/adb.exe"
+        @sdk = `echo %ANDROID_HOME%`.delete("\n")
+        @sdk += '/platform-tools/adb.exe'
       end
 
-      puts "Searching for devices...".yellow
+      $sdk = @sdk
 
-      run_adb("devices")
+      puts 'Searching for devices...'.yellow
 
-      if @devices.empty?
-        puts "No devices attached, but I'll run anyway"
+      @devices = DryrunUtils.run_adb('devices')
+
+      if @devices.nil? || @devices.empty?
+        puts 'Killing adb, there might be an issue with it...'
+        DryrunUtils.run_adb('kill-server')
+        @devices = DryrunUtils.run_adb('devices')
       end
 
-      @@device = nil
+      puts 'No devices attached, but I\'ll run anyway' if @devices.empty?
 
       if @devices.size >= 2
-        puts "Pick your device (1,2,3...):"
+        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" }
 
-        a = gets.chomp
+        input = gets.chomp
 
-        if a.match(/^\d+$/) && a.to_i <= (@devices.length - 1) && a.to_i >= 0
-          @@device = @devices[(a.to_i)]
-        else
-          @@device = @devices.first
-        end
+        @device = if input.match(/^\d+$/) && input.to_i <= (@devices.length - 1) && input.to_i >= 0
+                    @devices[input.to_i]
+                  else
+                    @devices.first
+                  end
       else
-        @@device = @devices.first
+        @device = @devices.first
       end
 
-      puts "Picked #{@@device.name.to_s.green}" if @@device != nil
+      $device = @device
+      puts "Picked #{@device.name.to_s.green}" unless @device.nil?
     end
 
-    def run_adb(args, adb_opts = {}, &block) # :yields: stdout
-      path = "#{@@sdk} #{args}"
-      last_command = path
-      run(path, &block)
+    def android_home_is_defined
+      @sdk = if !Gem.win_platform?
+               `echo $ANDROID_HOME`.delete('\n')
+             else
+               `echo %ANDROID_HOME%`.delete('\n')
+             end
+      !@sdk.empty?
     end
 
-    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
-    end
-  end
-
-  def self.getSDK # :yields: stdout
-      @@sdk
-  end
-
-  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
-
-  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"
+    def wipe_temporary_folder
+      tmpdir = Dir.tmpdir + '/dryrun/'
+      puts 'Wiping ' + tmpdir.red
+      FileUtils.rm_rf tmpdir
+      puts 'Folder totally removed!'.green
       exit 1
     end
 
-    @url = @url.split("?").first
-    @url.chop! if @url.end_with? '/'
+    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
 
+      if @url.nil?
+        puts 'You need to insert a valid GIT URL'
+        exit 1
+      end
 
-    pick_device()
+      @url = @url.split('?').first
+      @url.chop! if @url.end_with? '/'
 
-    github = Github.new(@url)
+      pick_device
 
-    unless github.is_valid
-      puts "#{@url.red} is not a valid git @url"
-      exit 1
-    end
+      github = Github.new(@url)
 
+      unless github.valid?
+        puts "#{@url.red} is not a valid git @url"
+        exit 1
+      end
+
       # clone the repository
-      repository_path = github.clone(@branch, @tag)
+      repository_path = github.clone(@branch, @tag, @cleanup)
 
-      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
+      unless android_project.valid?
         puts "#{@url.red} is not a valid android project"
         exit 1
       end
 
       puts "Using custom app folder: #{@app_path.green}" if @app_path
       puts "Using custom module: #{@custom_module.green}" if @custom_module
 
       # 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.yellow}\n\n"
+      puts "\n> If you want to remove the app you just installed, execute:\n#{android_project.uninstall_command.yellow}\n\n"
     end
   end
 end