calabash 2.0.0.pre4 → 2.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46648485266c6c561e26a5b25214c4b75efc0f18
-  data.tar.gz: e128516fcd291fe34c8e4322041b170966c53493
+  metadata.gz: 9c07d9cc780b34c917801a8f92680033ee3459ee
+  data.tar.gz: 9dde7d9f2be6e5c25a3d96eb7b1aa78b33e7b2cd
 SHA512:
-  metadata.gz: 39c208b6932d9ed0940a25e9bf6fe8fe7688c49cda6b12ee0f97e1063fd038f8ca540d1fbc73609185cfc6cd52b3f20cc4e444570774e7182dfcf5a3bb4c1792
-  data.tar.gz: 57d8c44ed1996097fec90970f6757a4e423f1cc0f41646a866715e0f1edeabfd53e266f5c06ed278f00bf64b26d17936b4acf413ed10f85f321cd5fcaa18aec2
+  metadata.gz: 811d0f912a1e87a5da924b8c3c472eb18cf1fdf43613bfb4bc18431c70322edca3ea7e3b120827d18f040a4730614c7ceeba8024732049705b1ff7e0d55731ef
+  data.tar.gz: 4b3c37994d0f5cf4627e1ddaa1d04dc052fdb37d962edb8016e934c6088efc5e2233f4a1826debecd5ac14bac67e5f3e118467a304ecd1847d39c3c444089edd

data/lib/calabash/ios/device/device_implementation.rb

@@ -371,7 +371,7 @@ module Calabash
 
         expect_app_installed_on_simulator(bridge)
 
-        installed_app = Calabash::IOS::Application.new(bridge.fetch_app_dir)
+        installed_app = Calabash::IOS::Application.new(bridge.send(:installed_app_bundle_dir))
         expect_matching_sha1s(installed_app, application)
       end
 
@@ -472,7 +472,7 @@ module Calabash
           bridge = run_loop_bridge(@run_loop_device, application)
 
           if bridge.app_is_installed?
-            installed_app = Calabash::IOS::Application.new(bridge.fetch_app_dir)
+            installed_app = Calabash::IOS::Application.new(bridge.send(:installed_app_bundle_dir))
 
             if installed_app.same_sha1_as?(application)
               true
@@ -575,9 +575,9 @@ module Calabash
       # @!visibility private
       def uninstall_app_on_simulator(application, run_loop_device, bridge)
         begin
-          bridge.uninstall
+          bridge.uninstall_app_and_sandbox
           true
-        rescue e
+        rescue => e
           raise "Could not uninstall #{application.identifier} on #{run_loop_device}: #{e}"
         end
       end
@@ -603,10 +603,11 @@ module Calabash
       end
 
       # @!visibility private
-      # Do not memoize this.  The Bridge initializer does a bunch of work to
+      # Do not memoize this.  The CoreSimulator initializer does a bunch of work to
       # prepare the environment for simctl actions.
       def run_loop_bridge(run_loop_simulator_device, application)
-        RunLoop::Simctl::Bridge.new(run_loop_simulator_device, application.path)
+        run_loop_app = RunLoop::App.new(application.path)
+        RunLoop::CoreSimulator.new(run_loop_simulator_device, run_loop_app)
       end
 
       # @!visibility private
@@ -619,7 +620,7 @@ module Calabash
             bridge = run_loop_bridge
           end
 
-          bridge.uninstall
+          bridge.uninstall_app_and_sandbox
           bridge.install
         rescue StandardError => e
           raise "Could not install #{application} on #{run_loop_device}: #{e}"

data/lib/calabash/version.rb

@@ -1,5 +1,5 @@
 module Calabash
 
   # @!visibility private
-  VERSION = '2.0.0.pre4'
+  VERSION = "2.0.0.pre5"
 end

data/lib/calabash.rb

@@ -112,7 +112,6 @@ module Calabash
       raise ArgumentError, "Expected a 'Class', got '#{page_class.class}'"
     end
 
-
     page_name = page_class.name
     full_page_name = "#{platform_module}::#{page_name}"
 
@@ -120,6 +119,17 @@ module Calabash
       page_class = platform_module.const_get(page_name, false)
 
       if page_class.is_a?(Class)
+        modules = page_class.included_modules.map(&:to_s)
+
+        unless modules.include?("Calabash::#{platform_module}")
+          raise "Page '#{page_class}' does not include Calabash::#{platform_module}"
+        end
+
+        if modules.include?('Calabash::Android') &&
+            modules.include?('Calabash::IOS')
+          raise "Page '#{page_class}' includes both Calabash::Android and Calabash::IOS"
+        end
+
         page = page_class.send(:new, self)
 
         if page.is_a?(Calabash::Page)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre4
+  version: 2.0.0.pre5
 platform: ruby
 authors:
 - Jonas Maturana Larsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -93,20 +93,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement