acouchi 0.0.9 → 0.0.10

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p0
+1.9.3-p194

data/README.md

@@ -1,11 +1,6 @@
 Acouchi
 =======
 
-WARNING
--------
-
-This gem was initially a spike, and has since then become rather useful. It is very much not unit tested. For this I apologise, and offer up this picture of an [Acouchi](http://en.wikipedia.org/wiki/Acouchi):
-
 ![acouchi](https://github.com/AndrewVos/acouchi/raw/master/acouchi.jpg)
 
 Requirements
@@ -43,6 +38,9 @@ Cucumber
     require "acouchi/rspec/matchers"
 
     configuration = Acouchi::Configuration.from_json(File.read("acouchi_configuration.json"))
+    configuration.device =ENV["ACOUCHI_DEVICE"] if ENV["ACOUCHI_DEVICE"]
+    configuration.port =ENV["ACOUCHI_PORT"] if ENV["ACOUCHI_PORT"]
+
     Acouchi::Cucumber.prepare(configuration)
 
     def page

data/examples/AcouchiSample/AndroidManifest.xml

@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
 
-      <uses-sdk android:targetSdkVersion="16" />
+    <uses-sdk android:targetSdkVersion="17" />
 
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity android:name="StartupActivity"

data/examples/AcouchiSample/Rakefile

@@ -6,6 +6,8 @@ require "acouchi/rspec/matchers"
 desc "build project with Acouchi code included"
 task :build do
   configuration = Acouchi::Configuration.from_json(File.read("acouchi_configuration.json"))
+  configuration.device =ENV["ACOUCHI_DEVICE"] if ENV["ACOUCHI_DEVICE"]
+  configuration.port =ENV["ACOUCHI_PORT"] if ENV["ACOUCHI_PORT"]
   Acouchi::ProjectBuilder.new(configuration).build
 end
 
@@ -16,10 +18,12 @@ end
 desc "open up an acouchi console"
 task :console do
   configuration = Acouchi::Configuration.from_json(File.read("acouchi_configuration.json"))
+  configuration.device =ENV["ACOUCHI_DEVICE"] if ENV["ACOUCHI_DEVICE"]
+  configuration.port =ENV["ACOUCHI_PORT"] if ENV["ACOUCHI_PORT"]
   test_runner = Acouchi::TestRunner.new(configuration)
   test_runner.start
-  page = Acouchi::Solo.new
+  page = Acouchi::Solo.new(configuration)
   require "pry"
   binding.pry
   test_runner.stop
-end
+end

data/examples/AcouchiSample/features/support/env.rb

@@ -3,8 +3,11 @@ require "acouchi/cucumber"
 require "acouchi/rspec/matchers"
 
 configuration = Acouchi::Configuration.from_json(File.read("acouchi_configuration.json"))
+configuration.device =ENV["ACOUCHI_DEVICE"] if ENV["ACOUCHI_DEVICE"]
+configuration.port =ENV["ACOUCHI_PORT"] if ENV["ACOUCHI_PORT"]
+
 Acouchi::Cucumber.prepare(configuration)
 
 def page
   Acouchi::Cucumber.page
-end
+end

data/lib/acouchi/apk_installer.rb

@@ -6,19 +6,19 @@ module Acouchi
     end
 
     def install_apk
-      ProcessLauncher.new(
-        Executables.adb,
-        "install",
-        @apk_path
-      ).start_and_crash_if_process_fails
+      if @configuration.device
+        ProcessLauncher.new(Executables.adb,"-s",@configuration.device,"install",@apk_path).start_and_crash_if_process_fails
+      else
+        ProcessLauncher.new(Executables.adb,"install",@apk_path).start_and_crash_if_process_fails
+      end
     end
 
     def uninstall_apk
-      ProcessLauncher.new(
-        Executables.adb,
-        "uninstall",
-        @configuration.target_package
-      ).start
+      if @configuration.device
+        ProcessLauncher.new(Executables.adb,"-s",@configuration.device,"uninstall",@configuration.target_package).start
+      else 
+        ProcessLauncher.new(Executables.adb,"uninstall",@configuration.target_package).start
+      end
     end
   end
 end

data/lib/acouchi/configuration.rb

@@ -1,6 +1,6 @@
 module Acouchi
   class Configuration
-    attr_accessor :target_package, :activity, :project_path, :apk
+    attr_accessor :target_package, :activity, :project_path, :apk,:device,:port
 
     def self.from_json json
       require "json"
@@ -10,6 +10,8 @@ module Acouchi
       configuration.activity       = json["activity"]
       configuration.project_path   = json["project_path"]
       configuration.apk            = json["apk"]
+      configuration.device         = json["device"]
+      configuration.port           = json["port"] || 7103
       configuration
     end
   end

data/lib/acouchi/cucumber.rb

@@ -15,7 +15,7 @@ module Acouchi
     def self.before
       @test_runner = TestRunner.new(@configuration)
       @test_runner.start
-      @page = Solo.new
+      @page = Solo.new(@configuration)
     end
 
     def self.after

data/lib/acouchi/solo.rb

@@ -7,6 +7,10 @@ module Acouchi
     LEFT = 21
     RIGHT = 22
 
+    def initialize(configuration)
+      @configuration = configuration
+    end
+
     def send_key key
       call_method("sendKey", [key])
     end
@@ -131,7 +135,7 @@ module Acouchi
       def call_method name, arguments = []
         arguments = arguments.map {|a| a.to_s}
         options = { :body => {:parameters => arguments.to_json} }
-        response = HTTParty.post("http://127.0.0.1:7103/execute_method/#{name}", options)
+        response = HTTParty.post("http://127.0.0.1:#{@configuration.port}/execute_method/#{name}", options)
         json = JSON.parse(response.body, :max_nesting => 100)
         if json.empty?
           nil

data/lib/acouchi/test_runner.rb

@@ -5,24 +5,32 @@ module Acouchi
     end
 
     def start
+
       apk_installer = ApkInstaller.new(@configuration)
       apk_installer.uninstall_apk
-      apk_installer.install_apk
+      apk_installer.install_apk 
+
+
+      if @configuration.device
+        ProcessLauncher.new(Executables.adb,"-s",@configuration.device, "forward", "tcp:#{@configuration.port}", "tcp:7103").start_and_crash_if_process_fails
+        @test_runner_process = ProcessLauncher.new(Executables.adb, "-s" ,@configuration.device, "shell", "am", "instrument", "-w", "#{@configuration.target_package}/android.test.InstrumentationTestRunner")
+      else
+        ProcessLauncher.new(Executables.adb, "forward", "tcp:#{@configuration.port}", "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")
+      end
 
-      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
 
       sleep 0.1 until ready?
     end
 
     def stop
-      HTTParty.get("http://127.0.0.1:7103/finish") rescue nil
+      HTTParty.get("http://127.0.0.1:#{@configuration.port}/finish") rescue nil
     end
 
     private
       def ready?
-        HTTParty.get("http://127.0.0.1:7103/").body == "Acouchi" rescue false
+        HTTParty.get("http://127.0.0.1:#{@configuration.port}/").body == "Acouchi" rescue false
       end
   end
 end

data/lib/acouchi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acouchi
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -150,8 +150,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ''
 test_files: []
+has_rdoc: