calabash-cucumber 0.9.80.pre.5 → 0.9.80

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.80.pre.4)
+    calabash-cucumber (0.9.80)
       CFPropertyList
       cucumber
       json
@@ -23,7 +23,7 @@ GEM
     geocoder (1.1.2)
     gherkin (2.11.1)
       json (>= 1.4.6)
-    json (1.7.3)
+    json (1.7.4)
     location-one (0.0.5)
       geocoder (~> 1.1)
       json

data/lib/calabash-cucumber/core.rb

@@ -100,6 +100,11 @@ module Calabash
         playback(file, options)
       end
 
+      #Current position of home button
+      def current_rotation
+        @current_rotation
+      end
+
       def rotate(dir)
         @current_rotation = @current_rotation || :down
         rotate_cmd = nil
@@ -141,9 +146,51 @@ module Calabash
       end
 
       def background(secs)
-        http({:method => :post, :path => 'background'}, {:duration => secs})
+        set_user_pref("__calabash_action", {:action => :background, :duration => secs})
+      end
+
+      def prepare_dialog_action(opts={:dialog => nil, :answer => "Ok"})
+        if opts[:dialog].nil? || opts[:dialog].length < 1
+          raise ":dialog must be specified as a non-empty string (used as regexp to match dialog text)"
+        end
+        txt = opts[:answer] || 'Ok'
+        set_user_pref("__calabash_action", {:action => :dialog,
+                                            :text => opts[:dialog],
+                                            :answer => txt})
       end
 
+      def picker(opts={:query => "pickerView", :action => :texts})
+        raise "Not implemented" unless opts[:action] == :texts
+
+        q = opts[:query]
+
+        check_element_exists(q)
+
+        comps = query(q,:numberOfComponents).first
+        row_counts = []
+        texts = []
+        comps.times do |i|
+          row_counts[i] = query(q,:numberOfRowsInComponent=>i).first
+          texts[i] = []
+        end
+
+        row_counts.each_with_index do |row_count, comp|
+          row_count.times do |i|
+            #view = query(q,[{:viewForRow => 0}, {:forComponent => 0}],:accessibilityLabel).first
+            spec = [{:viewForRow => i}, {:forComponent => comp}]
+            view = query(q,spec).first
+            if view
+              txt = query(q,spec,:accessibilityLabel).first
+            else
+              txt = query(q, :delegate, [{:pickerView=>:view},
+                                         {:titleForRow=>i},
+                                         {:forComponent=>comp}]).first
+            end
+            texts[comp] << txt
+          end
+        end
+        texts
+      end
 
       def load_playback_data(recording, options={})
         os = options["OS"] || ENV["OS"] || "ios5"
@@ -267,16 +314,16 @@ module Calabash
         else
           req = Net::HTTP::Get.new url.path
           if data
-            if URI.respond_to?:encode_www_form
+            if URI.respond_to? :encode_www_form
               url.query = URI.encode_www_form(data)
             else
               ##suport only "safe" ascii params for now
-              url.query = enum.map do |k,v|
+              url.query = enum.map do |k, v|
                 "#{k.to_s}=#{v.to_s}"
               end.join('&')
             end
             resp = Net::HTTP.get_response(url)
-            if resp.is_a?Net::HTTPSuccess
+            if resp.is_a? Net::HTTPSuccess
               return resp.body
             else
               raise "HTTP-level Error #{resp}"

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

@@ -29,13 +29,16 @@ module Calabash
 
       def self.derived_data_dir_for_project
         dir = project_dir
-
+        xcode_workspace_name = ''
         info_plist = Dir.glob(DEFAULT_DERIVED_DATA_INFO).find { |plist_file|
           begin
             plist = CFPropertyList::List.new(:file => plist_file)
             hash = CFPropertyList.native_types(plist.value)
             ws_dir = File.dirname(hash['WorkspacePath']).downcase
             p_dir = dir.downcase
+            if (p_dir.include? ws_dir)
+              xcode_workspace_name = ws_dir.split('/').last
+            end
             ws_dir == p_dir
           rescue
             false
@@ -60,6 +63,13 @@ module Calabash
             File.basename(xc_proj).start_with?(xcode_proj_name)
           end
 
+          if (build_dirs.count == 0 && !xcode_workspace_name.empty?)
+            # check for directory named "workspace-{deriveddirectoryrandomcharacters}"
+            build_dirs = Dir.glob("#{DERIVED_DATA}/*").find_all do |xc_proj|
+              File.basename(xc_proj).downcase.start_with?(xcode_workspace_name)
+            end
+          end
+          
           if (build_dirs.count == 0)
             msg = ["Unable to find your built app."]
             msg << "This means that Calabash can't automatically launch iOS simulator."

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.80.pre.5"
-    FRAMEWORK_VERSION = "0.9.80.pre.5"
+    VERSION = "0.9.80"
+    FRAMEWORK_VERSION = "0.9.80"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.80.pre.5
-  prerelease: 7
+  version: 0.9.80
+  prerelease: 
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -238,9 +238,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23