calabash-cucumber 0.9.154 → 0.9.155

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8d4190812e9ee519cd240f3a022f14e5ff4aec1
-  data.tar.gz: 681b90198c5794c0a663143f1b86d5d27b420d42
+  metadata.gz: 476d8e33d00c1b137a2dda6aaee55b59dea7cf8e
+  data.tar.gz: b9a84573f62e8bf7d6a38ba18ead4f93c3ff9d6b
 SHA512:
-  metadata.gz: 01a12bf0c3718f03541bc32a1046e217bb51767cb00a6fc23146ae3fcdbbb719e3f5bc8022384fd23cd3311c8b86e8c87e0abf7ba651d27f5ba28e598159d571
-  data.tar.gz: 4cdae234964c454a05c590198af2049e733ef89b4ce868571e15de1cee9c03461505a5389ec5363b09bccd08f1f823ef0f059a3e0831c992968a4a01492e8880
+  metadata.gz: d2d4bb51ffcedc670c91e41dd8c3859d2b7df20b8b23ed774b2599755c65cd892672f2032896a9307aa70f7213e5d070ca7374419ad3bec4b647efc76478076b
+  data.tar.gz: 88d85b46a59cab625f53fd02a110ee303ee3e23a8099bfb90bb61dd13d32dcbf3603f3cb256fc2f4475c9e30031c8d1e600cd9555a8088996d38cb595ca92e68

data/bin/calabash-ios-setup.rb

@@ -25,32 +25,28 @@ end
 def calabash_setup(args)
   puts "Checking if Xcode is running..."
   res = `ps x -o pid,command | grep -v grep | grep Contents/MacOS/Xcode`
-  if res==""
-    puts "Xcode not running."
-    project_name, project_path, xpath = find_project_files(args)
-    setup_project(project_name, project_path, xpath)
-
-    detect_accessibility_support
-
-    msg("Setup done") do
-
-      puts "Please validate by running the -cal target"
-      puts "from Xcode."
-      puts "When starting the iOS Simulator using the"
-      puts "new -cal target, you should see:\n\n"
-      puts '  "Started LPHTTP server on port 37265"'
-      puts "\nin the application log in Xcode."
-      puts "\n\n"
-      puts "After validating, you can generate a features folder:"
-      puts "Go to your project (the dir containing the .xcodeproj file)."
-      puts "Then run calabash-ios gen"
-      puts "(if you don't already have a features folder)."
-    end
+  unless res==""
+    puts "Detected running Xcode. You may need to restart Xcode after setup."
+  end
 
-  else
-    puts "Xcode is running. We'll be changing the project file so we'd better stop it."
-    puts "Please stop XCode and run setup again"
-    exit(0)
+  project_name, project_path, xpath = find_project_files(args)
+  setup_project(project_name, project_path, xpath)
+
+  detect_accessibility_support
+
+  msg("Setup done") do
+
+    puts "Please validate by running the -cal target"
+    puts "from Xcode."
+    puts "When starting the iOS Simulator using the"
+    puts "new -cal target, you should see:\n\n"
+    puts '  "Started LPHTTP server on port 37265"'
+    puts "\nin the application log in Xcode."
+    puts "\n\n"
+    puts "After validating, you can generate a features folder:"
+    puts "Go to your project (the dir containing the .xcodeproj file)."
+    puts "Then run calabash-ios gen"
+    puts "(if you don't already have a features folder)."
   end
 end
 
@@ -136,19 +132,6 @@ def setup_project(project_name, project_path, path)
     exit 1
   end
 
-  FileUtils.cd project_path do
-    ##Backup
-    if File.exists? "#{proj_file}.bak"
-      msg("Error") do
-        puts "Backup file already exists. #{proj_file}.bak"
-        puts "For safety, I won't overwrite this file."
-        puts "You must manually move this file, if you want to"
-        puts "Run calabash-ios setup again."
-      end
-      exit 1
-    end
-  end
-
   download_calabash(project_path)
 
   msg("Info") do

data/lib/calabash-cucumber/launcher.rb

@@ -122,6 +122,15 @@ class Calabash::Cucumber::Launcher
 
     args[:app] = args[:app] || args[:bundle_id] || app_path || detect_app_bundle_from_args(args)
 
+    unless args[:app]
+      if args[:device_target]=='simulator'
+        device_xamarin_build_dir = 'iPhoneSimulator'
+      else
+        device_xamarin_build_dir = 'iPhone'
+      end
+      args[:app] = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path, device_xamarin_build_dir)
+    end
+
     if File.directory?(args[:app])
       args[:app] = File.expand_path(args[:app])
     end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.154'
-    FRAMEWORK_VERSION = '0.9.153'
+    VERSION = '0.9.155'
+    FRAMEWORK_VERSION = '0.9.155'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.154
+  version: 0.9.155
 platform: ruby
 authors:
 - Karl Krukow