frank-cucumber 0.8.14 → 0.8.15

data/frank-cucumber.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "i18n" )
   s.add_dependency( "plist" )
   s.add_dependency( "json" ) # TODO: figure out how to be more permissive as to which JSON gems we allow
+  s.add_dependency( "dnssd" )
 
   s.add_development_dependency( "rr" )
 end

data/lib/frank-cucumber/bonjour.rb

@@ -0,0 +1,73 @@
+require 'timeout'
+require 'uri'
+
+module Frank module Cucumber
+class Bonjour
+
+  FRANK_SERVICE_NAME = 'Frank UISpec server'
+  FRANK_PORT = 37265
+  LOOKUP_TIMEOUT = 10
+
+  def debug string
+    puts string if $DEBUG
+  end
+
+  def found_a_frank( reply )
+    debug reply.inspect
+    unless reply.flags.add?
+      debug 'got a non-add reply'
+      debug "flags: #{reply.flags.to_a.inspect}"
+      return nil
+    end
+
+    resolve_service = DNSSD::Service.new
+    addr_service = DNSSD::Service.new
+    resolve_service.resolve reply do |r|
+      debug "#{r.name} on #{r.target}:#{r.port}"
+
+      address = nil
+      addr_service.getaddrinfo r.target do |addrinfo|
+        address = addrinfo.address
+        break
+      end
+
+      debug "first address for #{r.target} is #{address}"
+      return address
+    end
+  end
+
+  def browse_for_franks_address
+    require 'dnssd'
+
+    DNSSD.browse! '_http._tcp.' do |reply|
+      debug 'got a reply'
+      if reply.name == FRANK_SERVICE_NAME 
+        address = found_a_frank(reply)
+        if address
+          debug "OK WE HAVE AN ADDRESS: #{address}"
+          return address
+        end
+      end
+    end
+  end
+
+  def lookup_frank_base_uri
+    puts "finding Frank server via Bonjour..."
+    address = begin
+      Timeout::timeout(LOOKUP_TIMEOUT){ address = browse_for_franks_address }
+    rescue Timeout::Error
+      puts "could not find Frank within #{LOOKUP_TIMEOUT} seconds"
+    end
+
+    if address
+      puts "...found Frank via Bonjour: #{address}"
+      return URI::HTTP.new( 'http', nil, address, FRANK_PORT, nil, nil, nil, nil, nil )
+    else
+      puts '...failed to find Frank server via Bonjour'
+      return nil
+    end
+  end
+
+end
+
+end end

data/lib/frank-cucumber/frank_helper.rb

@@ -3,6 +3,7 @@ require 'frank-cucumber/gateway'
 require 'frank-cucumber/host_scripting'
 require 'frank-cucumber/wait_helper'
 require 'frank-cucumber/keyboard_helper'
+require 'frank-cucumber/bonjour'
 
 module Frank module Cucumber
 
@@ -13,16 +14,28 @@ module FrankHelper
 
   class << self
     # TODO: adding an ivar to the module itself is a big ugyl hack. We need a FrankDriver class, or similar
-    attr_accessor :selector_engine
+    attr_accessor :selector_engine, :server_base_url
+
     def use_shelley_from_now_on
       @selector_engine = 'shelley_compat'
     end
+
+    def test_on_physical_device_via_bonjour
+      @server_base_url = Bonjour.new.lookup_frank_base_uri
+      raise 'could not detect running Frank server' unless @server_base_url
+    end
   end
 
   def selector_engine
     Frank::Cucumber::FrankHelper.selector_engine || 'uiquery' # default to UIQuery for backwards compatibility
   end
+
+  def base_server_url
+    Frank::Cucumber::FrankHelper.server_base_url
+  end
   
+
+
   def touch( uiquery )
     touch_successes = frankly_map( uiquery, 'touch' )
     raise "could not find anything matching [#{uiquery}] to touch" if touch_successes.empty?
@@ -203,7 +216,7 @@ module FrankHelper
   end
 
   def frank_server
-    @_frank_server ||= Frank::Cucumber::Gateway.new
+    @_frank_server ||= Frank::Cucumber::Gateway.new( base_server_url )
   end
  
 end

data/lib/frank-cucumber/gateway.rb

@@ -4,11 +4,10 @@ require 'uri'
 module Frank module Cucumber
 
 class Gateway
-  DEFAULT_HOST = "localhost"
-  DEFAULT_PORT = 37265
+  DEFAULT_BASE_URL = "http://localhost:37265/"
 
-  def initialize( host=DEFAULT_HOST, port=DEFAULT_PORT )
-    @base_uri = URI.parse "http://#{host}:#{port}/"
+  def initialize( base_url = nil )
+    @base_url = URI.parse (base_url || DEFAULT_BASE_URL).to_s
   end
 
   def ping
@@ -72,7 +71,7 @@ class Gateway
   private
 
   def frank_url_for( verb )
-    url = @base_uri.clone
+    url = @base_url.clone
     url.path = '/'+verb
     url
   end

data/lib/frank-cucumber/keyboard_helper.rb

@@ -6,7 +6,7 @@ module KeyboardHelper
     text_to_type = text_to_type+"\n" unless text_to_type.end_with?("\n")
     res = frank_server.send_post( 
       'type_into_keyboard',
-      :text_to_type => text_to_type,
+      :text_to_type => text_to_type
     )
     Frank::Cucumber::Gateway.evaluate_frankly_response( res, "typing the following into the keyboard '#{text_to_type}'" )
   end

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "0.8.14"
+    VERSION = "0.8.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.8.15
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000Z
+date: 2012-06-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70144982662120 !ruby/object:Gem::Requirement
+  requirement: &70354211328540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144982662120
+  version_requirements: *70354211328540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144982661540 !ruby/object:Gem::Requirement
+  requirement: &70354211327880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144982661540
+  version_requirements: *70354211327880
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70144982661020 !ruby/object:Gem::Requirement
+  requirement: &70354211327300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144982661020
+  version_requirements: *70354211327300
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70144982660500 !ruby/object:Gem::Requirement
+  requirement: &70354211326740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144982660500
+  version_requirements: *70354211326740
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70144982660000 !ruby/object:Gem::Requirement
+  requirement: &70354211326180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144982660000
+  version_requirements: *70354211326180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70144982659180 !ruby/object:Gem::Requirement
+  requirement: &70354211325680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144982659180
+  version_requirements: *70354211325680
+- !ruby/object:Gem::Dependency
+  name: dnssd
+  requirement: &70354211325200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70354211325200
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70144982658640 !ruby/object:Gem::Requirement
+  requirement: &70354211324620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144982658640
+  version_requirements: *70354211324620
 description: Use cucumber to test native iOS apps via Frank
 email:
 - gems@thepete.net
@@ -138,6 +149,7 @@ files:
 - frank-skeleton/libShelley.a
 - lib/frank-cucumber.rb
 - lib/frank-cucumber/app_bundle_locator.rb
+- lib/frank-cucumber/bonjour.rb
 - lib/frank-cucumber/color_helper.rb
 - lib/frank-cucumber/core_frank_steps.rb
 - lib/frank-cucumber/frank_helper.rb