acouchi 0.0.8 → 0.0.9

data/acouchi.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "httparty"
   gem.add_runtime_dependency "childprocess"
   gem.add_runtime_dependency "nokogiri"
+  gem.add_runtime_dependency "ptools"
 end

data/lib/acouchi/apk_modifier.rb

@@ -6,11 +6,6 @@ module Acouchi
     def initialize apk
       @apk = apk
       @output_path = "#{Dir.tmpdir}/#{SecureRandom.uuid}/"
-
-      unless apktool
-        puts "Couldn't find a valid apktool. Please install apktool from http://code.google.com/p/android-apktool/"
-        exit
-      end
     end
 
     def modify_manifest
@@ -28,21 +23,17 @@ module Acouchi
     end
 
     private
-      def apktool
-        @apktool ||= Which.find_executable("apktool.bat", "apktool")
-      end
-
       def decompile_apk
-        ProcessLauncher.new(apktool, "d", @apk, @output_path).with_inherited_io.start_and_crash_if_process_fails
+        ProcessLauncher.new(Executables.apktool, "d", @apk, @output_path).with_inherited_io.start_and_crash_if_process_fails
       end
 
       def compile_apk
-        ProcessLauncher.new(apktool, "b", @output_path).with_inherited_io.start_and_crash_if_process_fails
+        ProcessLauncher.new(Executables.apktool, "b", @output_path).with_inherited_io.start_and_crash_if_process_fails
       end
 
       def sign_apk_in_debug_mode
         @new_apk = File.join(@output_path, "dist", File.basename(@apk))
-        jarsigner = Which.which?("jarsigner.exe") || Which.which?("jarsigner")
+        jarsigner = Executables.jarsigner
         debug_keystore = File.join(ENV["HOME"], ".android", "debug.keystore")
         ProcessLauncher.new(
           jarsigner,

data/lib/acouchi/executables.rb

@@ -1,7 +1,19 @@
 module Acouchi
   class Executables
     def self.adb
-      @adb ||= Which.find_executable("adb.exe", "adb")
+      @adb ||= Which.find_executable("adb")
+    end
+
+    def self.jarsigner
+      @jarsigner ||= Which.find_executable("jarsigner")
+    end
+
+    def self.apktool
+      @apktool ||= Which.find_executable("apktool")
+    end
+
+    def self.ant
+      @ant ||= Which.find_executable("ant")
     end
   end
 end

data/lib/acouchi/project_builder.rb

@@ -75,13 +75,9 @@ module Acouchi
       end
     end
 
-    def ant
-      Which.find_executable("ant.bat", "ant")
-    end
-
     def build_apk
       Dir.chdir configuration.project_path do
-        ProcessLauncher.new(ant, "clean", "debug").with_inherited_io.start_and_crash_if_process_fails
+        ProcessLauncher.new(Executables.ant, "clean", "debug").with_inherited_io.start_and_crash_if_process_fails
       end
     end
   end

data/lib/acouchi/test_runner.rb

@@ -13,9 +13,7 @@ module Acouchi
       @test_runner_process = ProcessLauncher.new(Executables.adb, "shell", "am", "instrument", "-w", "#{@configuration.target_package}/android.test.InstrumentationTestRunner")
       @test_runner_process.start_in_background
 
-      while ready? == false
-        sleep 0.1
-      end
+      sleep 0.1 until ready?
     end
 
     def stop

data/lib/acouchi/version.rb

@@ -1,3 +1,3 @@
 module Acouchi
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/acouchi/which.rb

@@ -1,29 +1,12 @@
 module Acouchi
   class Which
-    def self.find_executable *aliases
-      if executable = aliases.find {|a| which? a}
+    def self.find_executable name
+      require "ptools"
+      if executable = File.which(name)
         executable
       else
         raise %{Couldn't find any matches for the aliases "#{aliases.join(", ")}"}
       end
     end
-
-    private
-      def self.which? command
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          exe = File.join(path, "#{command}")
-          return exe if executable? exe
-        end
-        return nil
-      end
-
-      def self.executable? file
-        return true if File.executable?(file)
-        extensions = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : []
-        File.exist?(file) &&
-          File.file?(file) &&
-          extensions.any? &&
-          extensions.any? {|e| file.downcase.end_with?(e.downcase)}
-      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acouchi
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ptools
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - andrew.vos@gmail.com