calabash-cucumber 0.9.163.pre11 → 0.9.163

data/lib/calabash-cucumber/launch/simulator_helper.rb

@@ -78,6 +78,9 @@ module Calabash
             end
           end
 
+          # todo analyze `self.derived_data_dir_for_project` to see if it contains dead code
+          # todo assuming this is not dead code, the documentation around derived data for project needs to be updated
+
           if (build_dirs.count == 0)
             msg = ["Unable to find your built app."]
             msg << "This means that Calabash can't automatically launch iOS simulator."
@@ -154,7 +157,7 @@ module Calabash
           sim_dirs = Dir.glob(File.join(dd_dir, "Build", "Products", "*-iphonesimulator", "*.app"))
           if sim_dirs.empty?
             msg = ["Unable to auto detect APP_BUNDLE_PATH."]
-            msg << "Have you built your app for simulator?."
+            msg << "Have you built your app for simulator?"
             msg << "Searched dir: #{dd_dir}/Build/Products"
             msg << "Please build your app from Xcode"
             msg << "You should build the -cal target."

data/lib/calabash-cucumber/launcher.rb

@@ -46,6 +46,11 @@ class Calabash::Cucumber::Launcher
   end
 
   def attach(max_retry=1, timeout=10)
+    if calabash_no_launch?
+      self.actions= Calabash::Cucumber::PlaybackActions.new
+      return
+    end
+
     pids_str = `ps x -o pid,command | grep -v grep | grep "instruments" | awk '{printf "%s,", $1}'`
     pids = pids_str.split(',').map { |pid| pid.to_i }
     pid = pids.first
@@ -93,8 +98,6 @@ class Calabash::Cucumber::Launcher
     @@launcher = self
   end
 
-
-
   def ios_major_version
     return nil if device.nil? or device.ios_version.nil?
     device.ios_major_version
@@ -129,7 +132,7 @@ class Calabash::Cucumber::Launcher
     Dir["#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}*"]
   end
 
-  # Call as update_privacy_settings('com.my.app', {:photo => {:allow => true}})
+  # Call as update_privacy_settings('com.my.app', {:photos => {:allow => true}})
   def update_privacy_settings(bundle_id, opts={})
     if ENV['DEBUG']=='1'
       puts "Update privacy settings #{bundle_id}, #{opts}"

data/lib/calabash-cucumber/operations.rb

@@ -66,10 +66,13 @@ module Calabash
       end
 
       def set_text(uiquery, txt)
-        unless ENV['CALABASH_NO_DEPRECATION'] == '1'
-          warn "WARNING: set_text will be deprecated.\n  * to enter text using the native keyboard use 'keyboard_enter_text'\n  * to clear a text field or text view use 'clear_text'"
-          warn 'https://github.com/calabash/calabash-ios/wiki/03.5-Calabash-iOS-Ruby-API'
-        end
+        msgs = ["'set_text' will be deprecated.",
+                "* to enter text using the native keyboard use 'keyboard_enter_text'",
+                "* to clear a text field or text view use 'clear_text'",
+                'https://github.com/calabash/calabash-ios/wiki/03.5-Calabash-iOS-Ruby-API']
+        msg = msgs.join("\n")
+        _deprecated('0.9.145', msg, :warn)
+
         text_fields_modified = map(uiquery, :setText, txt)
         screenshot_and_raise "could not find text field #{uiquery}" if text_fields_modified.empty?
         text_fields_modified

data/lib/calabash-cucumber/playback_helpers.rb

@@ -1,3 +1,4 @@
+
 module Calabash
   module Cucumber
     module PlaybackHelpers
@@ -5,7 +6,8 @@ module Calabash
       DATA_PATH = File.expand_path(File.dirname(__FILE__))
 
       def recording_name_for(recording_name, os, device)
-        if !recording_name.end_with? ".base64"
+        #noinspection RubyControlFlowConversionInspection
+        if !recording_name.end_with? '.base64'
           "#{recording_name}_#{os}_#{device}.base64"
         else
           recording_name
@@ -38,8 +40,8 @@ module Calabash
       end
 
       def load_playback_data(recording_name, options={})
-        os = options["OS"] || ENV["OS"]
-        device = options["DEVICE"] || ENV["DEVICE"] || "iphone"
+        os = options['OS'] || ENV['OS']
+        device = options['DEVICE'] || ENV['DEVICE'] || 'iphone'
 
         unless os
           if @calabash_launcher && @calabash_launcher.active?
@@ -98,6 +100,7 @@ EOF
             recording = recording_name_for(recording_name, loop_os, device)
             candidates << recording
             data = load_recording(recording, rec_dir)
+            #noinspection RubyControlFlowConversionInspection
             break if !data.nil?
           end
         end
@@ -113,7 +116,7 @@ EOF
         post_data<< %Q|,"reverse":#{options[:reverse]}| if options[:reverse]
         post_data<< %Q|,"uia_gesture":"#{options[:uia_gesture]}"| if options[:uia_gesture]
         post_data<< %Q|,"prototype":"#{options[:prototype]}"| if options[:prototype]
-        post_data << "}"
+        post_data << '}'
 
         res = http({:method => :post, :raw => true, :path => 'play'}, post_data)
 
@@ -132,7 +135,7 @@ EOF
         post_data<< %Q|,"end":"#{escape_quotes(options[:end])}"| if options[:end]
         post_data<< %Q|,"offset_start":#{options[:offset_start].to_json}| if options[:offset_start]
         post_data<< %Q|,"offset_end":#{options[:offset_end].to_json}| if options[:offset_end]
-        post_data << "}"
+        post_data << '}'
 
         res = http({:method => :post, :raw => true, :path => 'interpolate'}, post_data)
 
@@ -149,7 +152,7 @@ EOF
 
       def record_end(file_name)
         res = http({:method => :post, :path => 'record'}, {:action => :stop})
-        File.open("_recording.plist", 'wb') do |f|
+        File.open('_recording.plist', 'wb') do |f|
           f.write res
         end
 
@@ -178,9 +181,9 @@ EOF
         end
 
         file_name = "#{file_name}_#{os}_#{device}.base64"
-        system("/usr/bin/plutil -convert binary1 -o _recording_binary.plist _recording.plist")
+        system('/usr/bin/plutil -convert binary1 -o _recording_binary.plist _recording.plist')
         system("openssl base64 -in _recording_binary.plist -out '#{file_name}'")
-        system("rm _recording.plist _recording_binary.plist")
+        system('rm _recording.plist _recording_binary.plist')
 
         rec_dir = ENV['PLAYBACK_DIR'] || "#{Dir.pwd}/features/playback"
         unless File.directory?(rec_dir)

data/lib/calabash-cucumber/rotation_helpers.rb

@@ -78,23 +78,23 @@ module Calabash
         case dir
           when :left then
             if current_orientation == :down
-              rotate_cmd = "left_home_down"
+              rotate_cmd = 'left_home_down'
             elsif current_orientation == :right
-              rotate_cmd = "left_home_right"
+              rotate_cmd = 'left_home_right'
             elsif current_orientation == :left
-              rotate_cmd = "left_home_left"
+              rotate_cmd = 'left_home_left'
             elsif current_orientation == :up
-              rotate_cmd = "left_home_up"
+              rotate_cmd = 'left_home_up'
             end
           when :right then
             if current_orientation == :down
-              rotate_cmd = "right_home_down"
+              rotate_cmd = 'right_home_down'
             elsif current_orientation == :left
-              rotate_cmd = "right_home_left"
+              rotate_cmd = 'right_home_left'
             elsif current_orientation == :right
-              rotate_cmd = "right_home_right"
+              rotate_cmd = 'right_home_right'
             elsif current_orientation == :up
-              rotate_cmd = "right_home_up"
+              rotate_cmd = 'right_home_up'
             end
         end
 

data/lib/calabash-cucumber/status_bar_helpers.rb

@@ -12,12 +12,12 @@ module Calabash
             end
           end
 
-          return res if !force_down
+          return res unless force_down
           return rotate_home_button_to :down
         end
 
-        return res if !res.eql?('unknown')
-        return res if !force_down
+        return res unless res.eql?('unknown')
+        return res unless force_down
         rotate_home_button_to(:down)
       end
 
@@ -25,6 +25,18 @@ module Calabash
         map(nil, :orientation, :status_bar).first
       end
 
+      # returns +true+ if orientation is portrait
+      def portrait?
+        o = status_bar_orientation
+        o.eql?('up') or o.eql?('down')
+      end
+
+      # returns +true+ if orientation is landscape
+      def landscape?
+        o = status_bar_orientation
+        o.eql?('right') or o.eql?('left')
+      end
+
     end
   end
 end

data/lib/calabash-cucumber/uia.rb

@@ -182,7 +182,7 @@ module Calabash
         end
         command = "#{js_cmd}.#{js_args.join('.')}"
         if ENV['DEBUG'] == '1'
-          puts "Sending UIA command"
+          puts 'Sending UIA command'
           puts command
         end
 
@@ -193,7 +193,7 @@ module Calabash
       def uia_handle_command(cmd, *query_args)
         command = uia_serialize_command(cmd, *query_args)
         if ENV['DEBUG'] == '1'
-          puts "Sending UIA command"
+          puts 'Sending UIA command'
           puts command
         end
         s = uia(command)
@@ -224,13 +224,20 @@ module Calabash
         escape_quotes string
       end
 
+      # <b>DEPRECATED:</b> Use <tt>uia("...javascript..", options)</tt> instead.
+      # deprecated because the method signature is poor
       def send_uia_command(opts ={})
-        #deprecated, poor method signature
-        #use uia("uia-js...",options)
+
+        # TODO formally deprecate send_uia_command with _deprecated function
+        #cmd = opts[:command]
+        #new_opts = cmd.select{|x| x != :command}
+        #_deprecated('0.9.163',
+        #            "use 'uia(#{cmd}, #{new_opts})' instead",
+        #            :warn)
+
         uia(opts[:command], opts)
       end
 
-
       private
       def validate_hash_is_location!(options)
         return if options[:latitude] and options[:longitude]
@@ -244,7 +251,7 @@ module Calabash
 
       def uia_result(s)
         if ENV['DEBUG'] == '1'
-          puts "Result"
+          puts 'Result'
           p s
         end
         if s['status'] == 'success'

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.163.pre11'
-    FRAMEWORK_VERSION = '0.9.163.pre10'
+    VERSION = '0.9.163'
+    FRAMEWORK_VERSION = '0.9.163'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.163.pre11
+  version: 0.9.163
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre8
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre8
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.25
+        version: 0.9.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.25
+        version: 0.9.27
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
@@ -235,6 +235,7 @@ files:
 - lib/calabash-cucumber/cucumber.rb
 - lib/calabash-cucumber/date_picker.rb
 - lib/calabash-cucumber/device.rb
+- lib/calabash-cucumber/environment_helpers.rb
 - lib/calabash-cucumber/failure_helpers.rb
 - lib/calabash-cucumber/http_helpers.rb
 - lib/calabash-cucumber/ibase.rb
@@ -380,9 +381,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3