calabash-android 0.8.0.pre1 → 0.8.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3c04184513136f46a2e22bdee2267e6a0197d2
-  data.tar.gz: 308434d9e8d514059c51e8c3af29d9da6d0f2ab2
+  metadata.gz: cc0a5ca87b41a3b21f898f7d27a156e6a12c2679
+  data.tar.gz: 3a3efb9ed3632879c1fc8476d77e11207c3e19bd
 SHA512:
-  metadata.gz: c4d55875019e0c5e5906d05648b3e6f96ee2dd22a85f30a7827a244992b841b633561433a0b54aa52a6d4b49a540c976a3e5dce049edff292a135451fe1a0266
-  data.tar.gz: 98082ec475eec0c11a73c085c4112a7ef92a77c67d3e343c9e62768682ed090ad799c623ad894dac03218189cef6e41e6edd14f8b6f76e45639e1f5559143808
+  metadata.gz: df6bda16ea2e67aa9904badbb85d81ac36bf4cbb57222df20fae15c6069c0e7d7753fa8c735fa30417f74b781c94fdfaf5b313245a445d1c2eba989bc97b8d1f
+  data.tar.gz: 8c727c35e57d94f9f7be437f7eea008357401724df69015415a265d70769870b5e4bd795e5afb2c91067c44ba5bd0d885c2686e0eeeecfd8a469e19d914a976c

data/bin/calabash-android-console.rb

@@ -15,11 +15,6 @@ def calabash_console(app_path = nil)
 
   ENV['IRBRC'] = path
 
-
-  unless ENV['MAIN_ACTIVITY']
-    ENV['MAIN_ACTIVITY'] = main_activity(app_path)
-  end
-
   unless ENV['APP_PATH']
     ENV['APP_PATH'] = app_path
   end

data/bin/calabash-android-run.rb

@@ -17,11 +17,11 @@ def calabash_run(app_path = nil)
 
     test_server_path = test_server_path(app_path)
 
-    main_activity = ENV['MAIN_ACTIVITY'] || main_activity(app_path)
+    env = "APP_PATH=\"#{app_path}\" TEST_APP_PATH=\"#{test_server_path}\""
 
-    env = "MAIN_ACTIVITY=#{main_activity} "\
-          "APP_PATH=\"#{app_path}\" "\
-          "TEST_APP_PATH=\"#{test_server_path}\""
+    if ENV['MAIN_ACTIVITY']
+      env = "#{env} MAIN_ACTIVITY=#{ENV['MAIN_ACTIVITY']}"
+    end
   else
     env = ""
   end

data/lib/calabash-android/operations.rb

@@ -18,10 +18,10 @@ require 'calabash-android/env'
 require 'calabash-android/environment'
 require 'calabash-android/dot_dir'
 require 'calabash-android/logging'
+require 'calabash-android/retry'
 require 'calabash-android/store/preferences'
 require 'calabash-android/usage_tracker'
 require 'calabash-android/dependencies'
-require 'retriable'
 require 'cucumber'
 require 'date'
 require 'time'
@@ -188,6 +188,24 @@ module Calabash module Android
       default_device.clear_preferences(name)
     end
 
+    def set_activity_orientation(orientation)
+      unless orientation.is_a?(Symbol)
+        raise ArgumentError, "Orientation is not a symbol"
+      end
+
+      unless orientation == :landscape || orientation == :portrait ||
+          orientation == :reverse_landscape || orientation == :reverse_portrait
+        raise ArgumentError, "Invalid orientation given. Use :landscape, :portrait, :reverse_landscape, or :reverse_portrait"
+      end
+
+      perform_action("set_activity_orientation", orientation.to_s)
+    end
+
+    # Note: Android 2.2 will always return either portrait or landscape, not reverse_portrait or reverse_landscape
+    def get_activity_orientation
+      perform_action("get_activity_orientation")
+    end
+
     def query(uiquery, *args)
       converted_args = []
       args.each do |arg|
@@ -618,7 +636,7 @@ module Calabash module Android
         log wake_up_cmd
         raise "Could not wake up the device" unless system(wake_up_cmd)
 
-        Retriable.retriable :tries => 10, :interval => 1 do
+        Calabash::Android::Retry.retry :tries => 10, :interval => 1 do
           raise "Could not remove the keyguard" if keyguard_enabled?
         end
       end
@@ -648,7 +666,7 @@ module Calabash module Android
         env_options = options.clone
         env_options.delete(:intent)
 
-        env_options[:main_activity] ||= main_activity(@app_path)
+        env_options[:main_activity] ||= ENV['MAIN_ACTIVITY'] || 'null'
         env_options[:test_server_port] ||= @test_server_port
         env_options[:class] ||= "sh.calaba.instrumentationbackend.InstrumentationBackend"
 
@@ -668,12 +686,12 @@ module Calabash module Android
         log cmd
         raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
 
-        Retriable.retriable :tries => 100, :interval => 0.1 do
+        Calabash::Android::Retry.retry :tries => 100, :interval => 0.1 do
           raise "App did not start" unless app_running?
         end
 
         begin
-          Retriable.retriable :tries => 300, :interval => 0.1 do
+          Calabash::Android::Retry.retry :tries => 300, :interval => 0.1 do
             log "Checking if instrumentation backend is ready"
 
             log "Is app running? #{app_running?}"

data/lib/calabash-android/retry.rb

@@ -0,0 +1,24 @@
+module Calabash
+  module Android
+    module Retry
+      def self.retry(opts, &blk)
+        tries = opts[:tries]
+        interval = opts[:interval]
+
+        tries.times do |try|
+          begin
+            blk.call
+            return
+
+          rescue => e
+            if (try + 1) >= tries
+              raise
+            else
+              sleep interval
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/calabash-android/steps/navigation_steps.rb

@@ -7,7 +7,8 @@ Then /^I press the menu key$/ do
 end
 
 Then /^I press the enter button$/ do
-  perform_action('send_key_enter')
+  press_user_action_button
+  # Or, possibly, press_enter_button
 end
 
 

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.8.0.pre1"
+    VERSION = "0.8.0.pre2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre1
+  version: 0.8.0.pre2
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -38,26 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: retriable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.3.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.3.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
   requirement: !ruby/object:Gem::Requirement
@@ -367,6 +347,7 @@ files:
 - lib/calabash-android/monkey_helpers.rb
 - lib/calabash-android/operations.rb
 - lib/calabash-android/removed_actions.txt
+- lib/calabash-android/retry.rb
 - lib/calabash-android/steps/assert_steps.rb
 - lib/calabash-android/steps/check_box_steps.rb
 - lib/calabash-android/steps/context_menu_steps.rb