frank-cucumber 0.9.8 → 1.0.0.pre2

data/frank-cucumber.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency( "cucumber" )
   s.add_dependency( "rspec", [">=2.0"] )
-  s.add_dependency( "sim_launcher", [">=0.4.5"] )
+  s.add_dependency( "sim_launcher", [">=0.4.6"] )
   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

data/lib/frank-cucumber/cli.rb

@@ -73,8 +73,6 @@ module Frank
 
       FileUtils.mv( Dir.glob( "#{build_output_dir}/*.app" ).first, frankified_app_dir )
 
-      fix_frankified_apps_bundle_identifier
-
       in_root do
         FileUtils.cp_r( 
           File.join( 'Frank',static_bundle),
@@ -165,20 +163,6 @@ module Frank
       File.join( build_output_dir, app_bundle_name )
     end
 
-    def fix_frankified_apps_bundle_identifier
-      # as of iOS 6 the iOS Simulator locks up with a black screen if you try and launch an app which has the same
-      # bundle identifier as a previously installed app but which is in fact a different app. This impacts us because our 
-      # Frankified app is different but has the same bundle identifier as the standard non-Frankified app which most users
-      # will want to have installed in the simulator as well. 
-      #
-      # We work around this by modifying the Frankified app's bundle identifier inside its Info.plist.
-      inside frankified_app_dir do
-        existing_bundle_identifier = `/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' Info.plist`.chomp
-        new_bundle_identifier = existing_bundle_identifier + '.frankified'
-        run %Q|/usr/libexec/PlistBuddy -c 'Set :CFBundleIdentifier #{new_bundle_identifier}' Info.plist|
-      end
-    end
-
   end
 end
 

data/lib/frank-cucumber/core_frank_steps.rb

@@ -132,32 +132,8 @@ When /^I enter the text "([^\\"]*)" from keyboard to the textfield "([^\\"]*)"$/
 end
 
 # -- Rotate -- #
-Given /^the device is in (a )?landscape orientation$/ do |ignored|
-  # for some reason the simulator sometimes starts of reporting its orientation as 'flat'. Workaround for this is to rotate the device then wait a bit
-  if 'flat' == frankly_current_orientation
-    rotate_simulator_right
-    sleep 1
-  end 
-  
-  unless frankly_oriented_landscape?
-    rotate_simulator_left
-    sleep 1
-    raise "expected orientation to be landscape after rotating left, but it is #{frankly_current_orientation}" unless frankly_oriented_landscape?
-  end
-end
-
-Given /^the device is in (a )?portrait orientation$/ do |ignored|
-  # for some reason the simulator sometimes starts of reporting its orientation as 'flat'. Workaround for this is to rotate the device then wait a bit
-  if 'flat' == frankly_current_orientation
-    rotate_simulator_right
-    sleep 1
-  end 
-
-  unless frankly_oriented_portrait?
-    rotate_simulator_left
-    sleep 1
-    raise "Expected orientation to be portrait after rotating left, but it is #{frankly_current_orientation}" unless frankly_oriented_portrait?
-  end
+Given /^the device is in (a )?(landscape|portrait) orientation$/ do |_,orientation|
+  frankly_set_orientation orientation
 end
 
 When /^I simulate a memory warning$/ do

data/lib/frank-cucumber/frank_helper.rb

@@ -3,7 +3,6 @@ require 'frank-cucumber/gateway'
 require 'frank-cucumber/host_scripting'
 require 'frank-cucumber/wait_helper'
 require 'frank-cucumber/keyboard_helper'
-require 'frank-cucumber/scroll_helper'
 require 'frank-cucumber/bonjour'
 
 module Frank module Cucumber
@@ -25,7 +24,6 @@ module Frank module Cucumber
 module FrankHelper 
   include WaitHelper
   include KeyboardHelper
-  include ScrollHelper
   include HostScripting
 
   # @!attribute [rw] selector_engine
@@ -275,6 +273,16 @@ module FrankHelper
     orientation
   end
 
+
+  # set the device orientation
+  # @param orientation can be 'landscape','landscape_left','landscape_right','portrait', or 'portrait_upside_down'
+  def frankly_set_orientation(orientation)
+    orientation = orientation.to_s
+    orientation = 'landscape_left' if orientation == 'landscape' 
+    res = frank_server.send_post( 'orientation',  orientation )
+    return Gateway.evaluate_frankly_response( res, "set_orientation #{orientation}" )
+  end
+
   # @return [Boolean] Does the device running the application have accessibility enabled.
   # If accessibility is not enabled then a lot of Frank functionality will not work.
   def frankly_is_accessibility_enabled

data/lib/frank-cucumber/frank_localize.rb

@@ -16,8 +16,6 @@ module Frank
           :zh
         when /^ja_/
           :ja
-        when /^es_/
-          :es
         else
           :en
         end

data/lib/frank-cucumber/frankifier.rb

@@ -19,15 +19,10 @@ class Frankifier
     decide_on_project
     decide_on_target
     report_project_and_target
-
-    check_target_build_configuration_is_valid!
-
     say ''
     add_linker_flag
-
     say ''
     add_library_search_path
-
     save_changes
   end
 
@@ -83,11 +78,11 @@ class Frankifier
     setting_array = Array( build_settings_to_edit[build_setting] )
 
     if setting_array.find{ |flag| flag.start_with? "$(FRANK_" }
-      say "It appears that your '#{@target_build_configuration}' configuration's #{build_setting} build setting already include some FRANK setup. Namely: #{setting_array.inspect}. I won't change anything here."
+      say "It appears that your Debug configuration's #{build_setting} build setting already include some FRANK setup. Namely: #{setting_array.inspect}. I won't change anything here."
       return
     end
 
-    say "Adding $(inherited) and $(#{entry_to_add}) to your '#{@target_build_configuration}' configuration's #{build_setting} build setting ..."
+    say "Adding $(inherited) and $(#{entry_to_add}) to your Debug configuration's #{build_setting} build setting ..."
     setting_array.unshift "$(inherited)"
     setting_array << "$(#{entry_to_add})"
     setting_array.uniq! # mainly to avoid duplicate $(inherited) entries
@@ -96,19 +91,6 @@ class Frankifier
     build_settings_to_edit[build_setting] = setting_array
   end
 
-  def check_target_build_configuration_is_valid!
-    unless @target.build_configuration_list.build_configurations.object_named @target_build_configuration 
-      say %Q|I'm trying to Frankify the '#{@target_build_configuration}' build configuration, but I don't see it that build configuration in your XCode target. Here's a list of the build configurations I see:|
-      @target.build_configuration_list.build_configurations.each do |bc| 
-        say "  '#{bc.name}'"
-      end
-      say ''
-      say %Q|Please specify one of those build configurations using the --build_configuration flag|
-      exit
-    end
-    
-  end
-
   def build_settings_to_edit
     @_build_settings_to_edit ||= @target.build_configuration_list.build_settings(@target_build_configuration)
   end

data/lib/frank-cucumber/gateway.rb

@@ -54,10 +54,12 @@ class Gateway
   end
 
   #taken from Ian Dee's Encumber
-  def send_post( verb, command_hash )
+  def send_post( verb, command )
+    command = command.to_json unless command.is_a? String
+
     url = frank_url_for( verb )
     req = Net::HTTP::Post.new url.path
-    req.body = command_hash.to_json
+    req.body = command
 
     make_http_request( url, req )
   end

data/lib/frank-cucumber/launcher.rb

@@ -24,6 +24,10 @@ module Launcher
       end
       raise "\n\n"+("="*80)+"\n"+message+"\n"+("="*80)+"\n\n"
     end
+
+    if app_path_problem = SimLauncher.check_app_path(app_path)
+      raise "\n\n"+("="*80)+"\n"+app_path_problem+"\n"+("="*80)+"\n\n"
+    end
   end
 
   def launch_app(app_path, sdk = nil, version = 'iphone')

data/lib/frank-cucumber/localize.yml

@@ -63,14 +63,3 @@ ja:
   simulate_memory_warning: メモリ警告をシミュレート
   toggle_in_call_status_bar: 着信ステータスバーを切り替える
   simulate_hardware_keyboard: ハードウェアキーボードをシミュレート
-
-es:
-  iphone_simulator: Simulador iOS
-  hardware: Hardware
-  home: Inicio
-  rotate_left: Girar a la izquierda
-  rotate_right: Girar a la derecha
-  shake_gesture: Agitar
-  simulate_memory_warning: Simular aviso de memoria
-  toggle_in_call_status_bar: Activar/Desactivar barra de estado durante llamada
-  simulate_hardware_keyboard: Simular teclado físico

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "0.9.8"
+    VERSION = "1.0.0.pre2"
   end
 end

data/test/launcher_test.rb

@@ -9,6 +9,11 @@ def wait_for_frank_to_come_up
 end
 
 describe "frank cucumber launcher" do
+  DUMMY_APP_PATH = '/tmp/dummy_app_path'
+
+  before do
+    `mkdir -p #{DUMMY_APP_PATH}`
+  end
 
   describe "when the path is wrong" do
   
@@ -27,6 +32,12 @@ describe "frank cucumber launcher" do
           e.message.must_match "suggestion_1"
         end
     end
+
+    it "throws exception when app path doesn't exist" do
+      assert_raises(RuntimeError) do
+        enforce('/foo/bar/baz/not/a/real/path')
+      end
+    end
   end
 
   describe "when starting the simulator with the specified params" do
@@ -37,7 +48,7 @@ describe "frank cucumber launcher" do
     end
     
     it 'selects iphone mode by default' do
-      launch_app('test_path', 'X.Y')
+      launch_app(DUMMY_APP_PATH, 'X.Y')
       @version.must_equal 'iphone'
     end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.8
-  prerelease: 
+  version: 1.0.0.pre2
+  prerelease: 6
 platform: ruby
 authors:
 - Pete Hodgson
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70297839769240 !ruby/object:Gem::Requirement
+  requirement: &70209931333500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297839769240
+  version_requirements: *70209931333500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70297839768160 !ruby/object:Gem::Requirement
+  requirement: &70209931332480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +33,21 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297839768160
+  version_requirements: *70209931332480
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70297839767340 !ruby/object:Gem::Requirement
+  requirement: &70209931331180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70297839767340
+  version_requirements: *70209931331180
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70297839765760 !ruby/object:Gem::Requirement
+  requirement: &70209931329940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297839765760
+  version_requirements: *70209931329940
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70297839764880 !ruby/object:Gem::Requirement
+  requirement: &70209931328260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297839764880
+  version_requirements: *70209931328260
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70297839763920 !ruby/object:Gem::Requirement
+  requirement: &70209931326220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297839763920
+  version_requirements: *70209931326220
 - !ruby/object:Gem::Dependency
   name: dnssd
-  requirement: &70297839762620 !ruby/object:Gem::Requirement
+  requirement: &70209931324360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297839762620
+  version_requirements: *70209931324360
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70297839747840 !ruby/object:Gem::Requirement
+  requirement: &70209931323000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297839747840
+  version_requirements: *70209931323000
 - !ruby/object:Gem::Dependency
   name: xcodeproj
-  requirement: &70297839746960 !ruby/object:Gem::Requirement
+  requirement: &70209931321020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297839746960
+  version_requirements: *70209931321020
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70297839746040 !ruby/object:Gem::Requirement
+  requirement: &70209931318860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297839746040
+  version_requirements: *70209931318860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70297839745340 !ruby/object:Gem::Requirement
+  requirement: &70209931316340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297839745340
+  version_requirements: *70209931316340
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70297839744420 !ruby/object:Gem::Requirement
+  requirement: &70209935385440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297839744420
+  version_requirements: *70209935385440
 - !ruby/object:Gem::Dependency
   name: pry-debugger
-  requirement: &70297839743580 !ruby/object:Gem::Requirement
+  requirement: &70209935381600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297839743580
+  version_requirements: *70209935381600
 description: Use cucumber to test native iOS apps via Frank
 email:
 - gems@thepete.net
@@ -192,7 +192,6 @@ files:
 - lib/frank-cucumber/keyboard_helper.rb
 - lib/frank-cucumber/launcher.rb
 - lib/frank-cucumber/localize.yml
-- lib/frank-cucumber/scroll_helper.rb
 - lib/frank-cucumber/version.rb
 - lib/frank-cucumber/wait_helper.rb
 - test/keyboard_helper_test.rb
@@ -286,9 +285,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/lib/frank-cucumber/scroll_helper.rb

@@ -1,24 +0,0 @@
-module Frank
-module Cucumber
-
-module ScrollHelper
-
-  def scroll_view_to_top( selector )
-    frankly_map( selector, "FEX_scrollToTop" )
-  end
-
-  def scroll_view_to_bottom( selector )
-    frankly_map( selector, "FEX_scrollToBottom" )
-  end
-
-  def scroll_view_to_position( selector, x, y )
-    frankly_map( selector, "FEX_setContentOffsetX:y:", x.to_i, y.to_i)
-  end
-
-  def scroll_table_view( selector, row, section = 0)
-    frankly_map(selector, "FEX_scrollToRow:inSection:", row.to_i, section.to_i)
-  end
-
-end
-
-end end