acouchi 0.0.11 → 0.0.12

data/README.md

@@ -33,49 +33,51 @@ Cucumber
 
 ### PROJECT_ROOT/features/support/env.rb
 
-    require "acouchi"
-    require "acouchi/cucumber"
-    require "acouchi/rspec/matchers"
+```ruby
+require "acouchi"
+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"]
+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)
+Acouchi::Cucumber.prepare(configuration)
 
-    def page
-      Acouchi::Cucumber.page
-    end
+def page
+  Acouchi::Cucumber.page
+end
+```
 
 ### PROJECT_ROOT/acouchi_configuration.json
 
+```ruby
     {
       "target_package": "com.acouchi.sample",
       "activity"      : "com.acouchi.sample.StartupActivity",
       "project_path"  : ".",
       "apk"           : "AcouchiSample-debug.apk"
     }
+```
 
 ### PROJECT_ROOT/Rakefile
 
-    require "cucumber"
-    require "cucumber/rake/task"
-    require "acouchi"
+```ruby
+    require "acouchi/rake/tasks
+```
 
-    desc "build project with Acouchi code included"
-    task :build do
-      configuration = Acouchi::Configuration.from_json(File.read("acouchi_configuration.json"))
-      Acouchi::ProjectBuilder.new(configuration).build
-    end
+Running the tests
+-----------------
 
-    Cucumber::Rake::Task.new(:features) do |t|
-      t.cucumber_opts = "features --format pretty"
-    end
+```
+rake build #only if you modify the application code
+cucumber
+```
 
 Pressing Keys
 -------------
 
-```
+```ruby
 page.send_key Acouchi::Solo::MENU
 page.send_key Acouchi::Solo::LEFT
 page.send_key Acouchi::Solo::RIGHT
@@ -84,7 +86,7 @@ page.send_key Acouchi::Solo::RIGHT
 Modifying Text
 --------------
 
-```
+```ruby
 # Enter text into the only text area on the page
 page.enter_text "Hello"
 
@@ -101,7 +103,7 @@ page.clear_text 4
 Searching Text
 --------------
 
-```
+```ruby
 # Check if page has_text
 page.has_text? "Bla"
 
@@ -123,7 +125,7 @@ page.all_content
 Clicking Things
 ---------------
 
-```
+```ruby
 # Check if button with text exists
 page.has_button? "Clicky"
 
@@ -146,7 +148,7 @@ page.click_image 5
 Finding Views
 -------------
 
-```
+```ruby
 # List the buttons currently on the page
 page.buttons
 
@@ -157,7 +159,7 @@ page.text_views
 Scrolling
 ---------
 
-```
+```ruby
 page.scroll_up
 page.scroll_down
 
@@ -177,7 +179,7 @@ page.scroll_to_right
 Navigating
 ----------
 
-```
+```ruby
 # Press the back button
 page.go_back
 ```
@@ -187,7 +189,7 @@ Waiting
 
 Most methods in acouchi will wait for a while until an element is available.
 
-```
+```ruby
 # Wait for the text "Bla Bla" to appear. Returns true if the text appears.
 page.wait_for_text "Bla Bla"
 
@@ -207,7 +209,7 @@ page.wait_for_text "Bla Bla", {
 RSpec
 -----
 
-```
+```ruby
 require "acouchi/rspec/matchers"
 
 # The have_text matcher will now output all page content
@@ -222,7 +224,7 @@ Troubleshooting
 
 If it seems that buttons/text aren't being clicked properly, you need to add the following xml to your AndroidManifest.xml:
 
-```
+```xml
 <uses-sdk android:targetSdkVersion="SDK_VERSION" />
 ```
 

data/examples/AcouchiSample/AndroidManifest.xml

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

data/examples/AcouchiSample/Rakefile

@@ -1,29 +1 @@
-require "cucumber"
-require "cucumber/rake/task"
-require "acouchi"
-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
-
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format pretty"
-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(configuration)
-  require "pry"
-  binding.pry
-  test_runner.stop
-end
+require "acouchi/rake/tasks"

data/lib/acouchi/rake/tasks.rb

@@ -0,0 +1,37 @@
+require "cucumber"
+require "cucumber/rake/task"
+require "acouchi"
+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
+
+desc "farm"
+task :farm do
+  port_range = (7004...10000).to_a
+  %x(adb devices).scan(/.*\tdevice/).map{|device|device.gsub! "	device",""}.each do |device|
+    system "ACOUCHI_DEVICE=#{device} ACOUCHI_PORT=#{port_range.sample} rake features &"
+  end
+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(configuration)
+  require "pry"
+  binding.pry
+  test_runner.stop
+end
+
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format progress --format html --out=#{ENV["ACOUCHI_DEVICE"]}.html"
+end

data/lib/acouchi/solo.rb

@@ -137,6 +137,9 @@ module Acouchi
         options = { :body => {:parameters => arguments.to_json} }
         response = HTTParty.post("http://127.0.0.1:#{@configuration.port}/execute_method/#{name}", options)
         json = JSON.parse(response.body, :max_nesting => 100)
+
+        puts json 
+        
         if json.empty?
           nil
         else

data/lib/acouchi/version.rb

@@ -1,3 +1,3 @@
 module Acouchi
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/src/com/acouchi/Acouchi.java

@@ -10,6 +10,7 @@ import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import android.util.Log;
 import com.google.gson.Gson;
 
 import java.io.PrintWriter;
@@ -63,6 +64,7 @@ public class Acouchi extends NanoHTTPD
         String methodName = uri.replace("/execute_method/", "");
         String[] parameters = new Gson().fromJson(params.getProperty("parameters"), String[].class);
         String jsonResult = new MethodExecutor(solo, methodName, parameters).Execute();
+
         return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, jsonResult);
       } catch (Throwable throwable) {
         return showException(throwable);

data/src/com/acouchi/MethodExecutor.java

@@ -3,6 +3,7 @@ package com.acouchi;
 import com.jayway.android.robotium.solo.Solo;
 
 import java.util.ArrayList;
+import android.util.Log;
 
 import com.google.gson.Gson;
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acouchi
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -115,6 +115,7 @@ files:
 - lib/acouchi/executables.rb
 - lib/acouchi/process_launcher.rb
 - lib/acouchi/project_builder.rb
+- lib/acouchi/rake/tasks.rb
 - lib/acouchi/rspec/matchers.rb
 - lib/acouchi/solo.rb
 - lib/acouchi/test_runner.rb