acouchi 0.0.4 → 0.0.5

data/lib/acouchi.rb

@@ -4,5 +4,7 @@ require "acouchi/solo"
 require "acouchi/test_runner"
 require "acouchi/configuration"
 require "acouchi/apk_modifier"
+require "acouchi/apk_installer"
 require "acouchi/process_launcher"
 require "acouchi/which"
+require "acouchi/executables"

data/lib/acouchi/apk_installer.rb

@@ -0,0 +1,24 @@
+module Acouchi
+  class ApkInstaller
+    def initialize configuration
+      @configuration = configuration
+      @apk_path = File.join(configuration.project_path, "bin", configuration.apk)
+    end
+
+    def install_apk
+      ProcessLauncher.new(
+        Executables.adb,
+        "install",
+        @apk_path
+      ).start_and_crash_if_process_fails
+    end
+
+    def uninstall_apk
+      ProcessLauncher.new(
+        Executables.adb,
+        "uninstall",
+        @configuration.target_package
+      ).start
+    end
+  end
+end

data/lib/acouchi/apk_modifier.rb

@@ -32,16 +32,12 @@ module Acouchi
         @apktool ||= Which.find_executable("apktool.bat", "apktool")
       end
 
-      def execute_apktool command
-        ProcessLauncher.new(apktool, command)
-      end
-
       def decompile_apk
-        ProcessLauncher.new(apktool, "d", @apk, @output_path).start_and_crash_if_process_fails
+        ProcessLauncher.new(apktool, "d", @apk, @output_path).with_inherited_io.start_and_crash_if_process_fails
       end
 
       def compile_apk
-        ProcessLauncher.new(apktool, "b", @output_path).start_and_crash_if_process_fails
+        ProcessLauncher.new(apktool, "b", @output_path).with_inherited_io.start_and_crash_if_process_fails
       end
 
       def sign_apk_in_debug_mode
@@ -58,11 +54,11 @@ module Acouchi
           "android",
           @new_apk,
           "androiddebugkey"
-        ).start_and_crash_if_process_fails
+        ).with_inherited_io.start_and_crash_if_process_fails
       end
 
       def overwrite_original_apk
-       FileUtils.mv(@new_apk, @apk)
+        FileUtils.mv(@new_apk, @apk)
       end
   end
 end

data/lib/acouchi/executables.rb

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

data/lib/acouchi/process_launcher.rb

@@ -1,37 +1,41 @@
+require "childprocess"
+
 module Acouchi
   class ProcessLauncher
+    DEFAULT_START_OPTIONS = {:inherit_io => true}
+
     def initialize(*arguments)
       @arguments = arguments
       @process = ChildProcess.build(*@arguments)
+      self
+    end
+
+    def with_inherited_io
       @process.io.inherit!
+      self
     end
 
     def start
-      write_out_arguments
       @process.start
+      self
+    end
+
+    def wait
       @process.wait
+      self
     end
 
     def start_in_background
-      write_out_arguments
       @process.start
-    end
-
-    def stop
-      @process.stop
+      self
     end
 
     def start_and_crash_if_process_fails
-      start
-
+      start.wait
       if @process.crashed?
         raise "A process exited with a non-zero exit code.\nThe command executed was \"#{@arguments.join(" ")}\""
       end
+      self
     end
-
-    private
-      def write_out_arguments
-        p @arguments
-      end
   end
 end

data/lib/acouchi/project_builder.rb

@@ -21,7 +21,6 @@ module Acouchi
 
       apk_path = File.join(configuration.project_path, "bin", configuration.apk)
       modify_manifest(apk_path)
-      install_apk(apk_path)
     end
 
     def temporarily_copy_over_source_files
@@ -76,23 +75,14 @@ module Acouchi
       end
     end
 
-    def adb
-      Which.which?("adb.exe") ||  Which.which?("adb")
-    end
-
     def ant
-      Which.which?("ant.exe") || Which.which?("ant")
+      Which.find_executable("ant.exe", "ant")
     end
 
     def build_apk
       Dir.chdir configuration.project_path do
-        ProcessLauncher.new(ant, "clean", "debug").start_and_crash_if_process_fails
+        ProcessLauncher.new(ant, "clean", "debug").with_inherited_io.start_and_crash_if_process_fails
       end
     end
-
-    def install_apk apk_path
-      ProcessLauncher.new(adb, "uninstall", configuration.target_package).start
-      ProcessLauncher.new(adb, "install", apk_path).start_and_crash_if_process_fails
-    end
   end
 end

data/lib/acouchi/test_runner.rb

@@ -1,19 +1,16 @@
-require "childprocess"
-
 module Acouchi
   class TestRunner
     def initialize configuration
       @configuration = configuration
     end
 
-    def adb
-      @adb ||= Which.find_executable("adb")
-    end
-
     def start
-      force_stop
-      ProcessLauncher.new(adb, "forward", "tcp:7103", "tcp:7103").start_and_crash_if_process_fails
-      @test_runner_process = ProcessLauncher.new(adb, "shell", "am", "instrument", "-w", "#{@configuration.target_package}/android.test.InstrumentationTestRunner")
+      apk_installer = ApkInstaller.new(@configuration)
+      apk_installer.uninstall_apk
+      apk_installer.install_apk
+
+      ProcessLauncher.new(Executables.adb, "forward", "tcp:7103", "tcp:7103").start_and_crash_if_process_fails
+      @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
@@ -23,16 +20,11 @@ module Acouchi
 
     def stop
       HTTParty.get("http://127.0.0.1:7103/finish") rescue nil
-      @test_runner_process.stop
     end
 
     private
       def ready?
         HTTParty.get("http://127.0.0.1:7103/").body == "Acouchi" rescue false
       end
-
-      def force_stop
-        ChildProcess.build(adb, "shell", "am", "force-stop", @configuration.target_package).start.wait
-      end
   end
 end

data/lib/acouchi/version.rb

@@ -1,3 +1,3 @@
 module Acouchi
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/acouchi/which.rb

@@ -1,16 +1,5 @@
 module Acouchi
   class Which
-    def self.which? command
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each { |ext|
-          exe = "#{path}/#{command}#{ext}"
-          return exe if File.executable? exe
-        }
-      end
-      return nil
-    end
-
     def self.find_executable *aliases
       if executable = aliases.find {|a| which? a}
         executable
@@ -18,5 +7,17 @@ module Acouchi
         raise %{Couldn't find any matches for the aliases "#{aliases.join(", ")}"}
       end
     end
+
+    private
+      def self.which? command
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each { |ext|
+            exe = "#{path}/#{command}#{ext}"
+            return exe if File.executable? exe
+          }
+        end
+        return nil
+      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acouchi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -92,9 +92,11 @@ files:
 - jars/gson-2.2.2.jar
 - jars/robotium-solo-3.4.1.jar
 - lib/acouchi.rb
+- lib/acouchi/apk_installer.rb
 - lib/acouchi/apk_modifier.rb
 - lib/acouchi/configuration.rb
 - lib/acouchi/cucumber.rb
+- lib/acouchi/executables.rb
 - lib/acouchi/process_launcher.rb
 - lib/acouchi/project_builder.rb
 - lib/acouchi/rspec/matchers.rb