honeydew 0.15.0 → 0.16.0

data/.gitignore

@@ -19,3 +19,4 @@ bin
 output
 .idea
 log
+.DS_Store

data/examples/cucumber/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'honeydew'
+
+gem 'cucumber'
 gem 'rspec'
 gem 'rake'

data/examples/cucumber/features/example.feature

@@ -1,10 +1,6 @@
-@honeydew
 Feature: Example demonstrating honeydew
+
   Scenario: Perform addition using calculator
-    When I launch app "Calculator"
-    Then I long press the element with description "square root"
-    Then I press the "6" button
-    Then I press the "2" button
-    Then I press the "5" button
-    And I press the "=" button
-    Then I wait up to 2 seconds for "25" to appear in edit text
+    When I launch app Calculator
+    Then I square root 625
+    Then I should see 25 as the result

data/examples/cucumber/features/step_definitions/calculator_steps.rb

@@ -0,0 +1,19 @@
+require 'honeydew'
+
+When(/^I launch app (.+)$/) do |app|
+  Honeydew.current_device.launch_application app
+end
+
+Then(/^I square root (\d+)/) do |number|
+  Honeydew.current_device.long_click_element 'square root'
+  number.to_s.each_char {|n| Honeydew.current_device.click_button n }
+  Honeydew.current_device.click_button '='
+end
+
+When(/^I press the (.+) button$/) do |text|
+  Honeydew.current_device.click_button text
+end
+
+Then(/^I should see (\d+) as the result$/) do |result|
+  Honeydew.current_device.should have_edit_text(result)
+end

data/examples/rspec/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'honeydew'
+
+gem 'rspec'
+gem 'rake'

data/examples/rspec/Rakefile

@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/honeydew/device.rb

@@ -2,11 +2,13 @@ require 'net/http'
 
 require 'honeydew/device_matchers'
 require 'honeydew/device_actions'
+require 'honeydew/device_log_formatter'
 
 module Honeydew
   class Device
     include Honeydew::DeviceActions
     include Honeydew::DeviceMatchers
+    include Honeydew::DeviceLogFormatter
 
     ServerTimeoutError = Class.new(Timeout::Error)
     ActionFailedError = Class.new(Timeout::Error)
@@ -40,7 +42,7 @@ module Honeydew
 
       arguments[:timeout] = Honeydew.config.timeout.to_s
 
-      log "performing assertion #{action} with arguments #{arguments}"
+      debug "performing assertion #{action} with arguments #{arguments}"
       Timeout.timeout Honeydew.config.timeout.to_i, FinderTimeout do
         begin
           send_command action, arguments
@@ -56,7 +58,7 @@ module Honeydew
     def perform_action action, arguments = {}, options = {}
       ensure_device_ready
       arguments[:timeout] = Honeydew.config.timeout.to_s
-      log "performing action #{action} with arguments #{arguments}"
+      debug "performing action #{action} with arguments #{arguments}"
       send_command action, arguments
     end
 
@@ -81,11 +83,6 @@ module Honeydew
       end
     end
 
-    def log message
-      return unless Honeydew.config.debug
-      STDERR.puts "Device #{serial}: #{message}"
-    end
-
     def ensure_device_ready
       @device_ready ||= begin
         wait_for_honeydew_server
@@ -98,11 +95,11 @@ module Honeydew
     end
 
     def wait_for_honeydew_server
-      log 'waiting for honeydew-server to respond'
+      info 'waiting for honeydew-server to respond'
       timeout_server_operation do
         sleep 0.1 until honeydew_server_alive?
       end
-      log 'honeydew-server is alive and awaiting commands'
+      info 'honeydew-server is alive and awaiting commands'
 
     rescue ServerTimeoutError
       raise 'timed out waiting for honeydew-server to respond'

data/lib/honeydew/device_actions.rb

@@ -60,6 +60,10 @@ module Honeydew
       perform_action :long_click, :description => element_description
     end
 
+    def long_click_text element_text
+      perform_action :long_click, :text =>element_text, :type => 'TextView'
+    end
+
     def launch_settings_item item_name
       perform_action :select_menu_in_settings, :menuName => item_name
     end

data/lib/honeydew/device_commands.rb

@@ -35,7 +35,7 @@ module Honeydew
     end
 
     def terminate_honeydew_server
-      log "terminating honeydew-server"
+      info "terminating honeydew-server"
       Net::HTTP.post_form device_endpoint('/terminate'), {}
     rescue Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError
       # Swallow
@@ -50,9 +50,9 @@ module Honeydew
     end
 
     def start_automation_server
-      log "starting honeydew-server on the device"
+      info "starting honeydew-server on the device"
+      adb "push #{honeydew_server_file} /data/local/tmp"
       Thread.new do
-        adb "push #{honeydew_server_file} /data/local/tmp"
         adb "shell uiautomator runtest #{honeydew_server_package} -c com.amplify.honeydew_server.TestRunner"
       end
       at_exit do
@@ -86,10 +86,12 @@ module Honeydew
 
     def adb(command)
       adb_command = "adb -s #{serial} #{command}"
-      log "executing '#{adb_command}'"
+      info "executing '#{adb_command}'"
       `#{adb_command} 2>/dev/null`.tap do
         if $?.exitstatus != 0
-          raise "ADB command '#{command}' failed"
+          message = "ADB command '#{command}' failed"
+          error message
+          raise message
         end
       end
     end

data/lib/honeydew/device_log_formatter.rb

@@ -0,0 +1,10 @@
+module Honeydew
+  module DeviceLogFormatter
+    Logger::Severity.constants.each do |severity|
+      severity_sym = severity.to_s.downcase.to_sym
+      define_method severity_sym do |message|
+        Honeydew.config.logger.send(severity_sym, "Device #{serial}: #{message}")
+      end
+    end
+  end
+end

data/lib/honeydew/honeydew.rb

@@ -5,16 +5,18 @@ require 'honeydew/device'
 
 module Honeydew
   class Configuration
-    attr_accessor :debug,
+    attr_accessor :logger,
+      :port,
       :server_timeout,
-      :timeout,
-      :port
+      :timeout
 
     def initialize
       @port = 7120
-      @debug = true
       @timeout = 5.seconds
-      @server_timeout = 30.seconds
+      @server_timeout = 60.seconds
+
+      @logger = Logger.new(STDERR)
+      @logger.level = Logger::INFO
     end
 
     def obtain_new_port

data/lib/honeydew/version.rb

@@ -1,3 +1,3 @@
 module Honeydew
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/server/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>amplify</groupId>
     <artifactId>honeydew-server</artifactId>
-    <version>0.15.0</version>
+    <version>0.16.0</version>
     <packaging>jar</packaging>
     <name>Honeydew Android Server</name>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeydew
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,7 +132,9 @@ files:
 - examples/cucumber/Gemfile
 - examples/cucumber/Rakefile
 - examples/cucumber/features/example.feature
-- examples/cucumber/features/step_definitions/honeydew_steps.rb
+- examples/cucumber/features/step_definitions/calculator_steps.rb
+- examples/rspec/Gemfile
+- examples/rspec/Rakefile
 - examples/rspec/spec/browse_spec.rb
 - examples/rspec/spec/spec_helper.rb
 - honeydew.gemspec
@@ -142,6 +144,7 @@ files:
 - lib/honeydew/device.rb
 - lib/honeydew/device_actions.rb
 - lib/honeydew/device_commands.rb
+- lib/honeydew/device_log_formatter.rb
 - lib/honeydew/device_matchers.rb
 - lib/honeydew/dsl.rb
 - lib/honeydew/honeydew.rb
@@ -198,7 +201,7 @@ files:
 - spec/honeydew/device_matchers_spec.rb
 - spec/honeydew/device_spec.rb
 - spec/spec_helper.rb
-- server/target/honeydew-server-0.15.0.jar
+- server/target/honeydew-server-0.16.0.jar
 homepage: 
 licenses: []
 post_install_message: 
@@ -219,12 +222,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby DSL for controlling Android devices
 test_files:
 - .rspec
+- examples/rspec/Gemfile
+- examples/rspec/Rakefile
 - examples/rspec/spec/browse_spec.rb
 - examples/rspec/spec/spec_helper.rb
 - honeydew.gemspec

data/examples/cucumber/features/step_definitions/honeydew_steps.rb

@@ -1 +0,0 @@
-require 'honeydew/step_definitions'