calabash-cucumber 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634d208866c3c80558eea3cf6e002d436a38ca70
-  data.tar.gz: d2800a32dec27bbbbb2fef975ca0c0714cfe4dcb
+  metadata.gz: 7beda75c6242b6bc7f82b44c1a61d3ed14a57a33
+  data.tar.gz: 0753bd7f7c8bb00bf02f769300cd2308568f405d
 SHA512:
-  metadata.gz: c3d0e8203c996a79d956d3c1862a48a760a716f622ff070a053682816e0a06bd2e77daeaeb232a299592cef3a8bb060222a64d96bdc39250d484638becea859a
-  data.tar.gz: ecf56d4a6ed42028125511566d7b5a8078c43bdc2925619e7f3ee56b9ce5a715d63057355c91800480bc61b3fdc7427ff4677a515ae6e1d786175374aad9b7a8
+  metadata.gz: b9bbeb8638dc56f4cbba5d1a14ff8904265e049011245f083aa1746edd5d7440aa3b5921ecbcb407eb5987e4c291fe306e7c795aa54edf40b2269fe65e046aa8
+  data.tar.gz: 91fd05fae2b029a11d7df9ce4645c2b9018cd5237a400bc692322d33ac350f7ddc56bfb53d9963330c68054e87785005387cd46dcfc32303b67b2459bee6eb8a

data/bin/calabash-ios-sim.rb

@@ -1,5 +1,6 @@
 require 'calabash-cucumber/utils/simulator_accessibility'
 require 'calabash-cucumber/utils/logging'
+require "calabash-cucumber/environment"
 require 'run_loop'
 
 include Calabash::Cucumber::Logging
@@ -62,46 +63,99 @@ end
 
 def calabash_sim_locale(args)
 
-  prefs_path = File.expand_path("#{@script_dir}/data/.GlobalPreferences.plist")
-  plist = CFPropertyList::List.new(:file => prefs_path)
-  hash = CFPropertyList.native_types(plist.value)
+  if args.length != 2
+   puts %Q{
+Usage:
 
+$ calabash-ios sim locale < language code > < locale code >
 
-  if args.length == 0
-    print_usage
-    puts "Options: \n"
-    puts hash['AppleLanguages'].join("\n")
-    exit 0
-  end
-  lang = args.shift
-  reg = nil
-  if args.length == 1
-    reg = args.shift
-  end
+Examples:
 
-  langs = hash['AppleLanguages']
-  lang_index = langs.find_index { |l| l == lang }
+# French language and locale
+$ calabash-ios sim locale fr fr
 
-  if lang_index.nil?
-    puts "Unable to find #{lang}..."
-    puts "Options:\n#{langs.join("\n")}"
-    exit 0
+# Swiss French with Swiss German locale
+$ calabash-ios sim locale fr-CH de_CH
+
+By default, this method will change the default simulator for the active
+Xcode version.  If you want to target an alternative simulator, set the
+DEVICE_TARGET environment variable.
+
+$ DEVICE_TARGET="iPhone 6 (9.2)" calabash-ios sim locale en-US en_US
+$ DEVICE_TARGET=B9BCAD64-1624-4277-9361-40EFFBD7C67F calabash-ios sim locale de de
+
+This operation will quit and reset the simulator.
+}
+   return false
   end
 
-  langs[0], langs[lang_index] = langs[lang_index], langs[0]
+  language = args[0]
+  locale = args[1]
+
+  device_target = Calabash::Cucumber::Environment.device_target
+  default_target = RunLoop::Core.default_simulator
+
+  target = device_target || default_target
+
+  device = RunLoop::Device.device_with_identifier(target)
+
+  if device.nil?
+    if target == device_target
+      puts %Q{
+Could not find simulator matching:
 
+DEVICE_TARGET=#{device_target}
 
-  if reg
-    hash['AppleLocale'] = reg
+Check the output of:
+
+$ xcrun instruments -s devices
+
+for a list of available simulators.
+}
+    else
+      puts %Q{
+Could not find the default simulator.  Make sure that you have
+the right version of run_loop installed for your Xcode version.
+}
+    end
+
+    return false
   end
-  res_plist = CFPropertyList::List.new
-  res_plist.value = CFPropertyList.guess(hash)
-  dirs = Dir.glob(File.join(File.expand_path("~/Library"), "Application Support", "iPhone Simulator", "*.*", "Library", "Preferences"))
-  dirs.each do |sim_pref_dir|
-    res_plist.save("#{sim_pref_dir}/.GlobalPreferences.plist", CFPropertyList::List::FORMAT_BINARY)
+
+  if device.physical_device?
+    puts %Q{
+This tool is for simulators only.
+
+#{target} is a physical device.
+}
+    return false
   end
 
+  RunLoop::CoreSimulator.set_language(device, language)
+  RunLoop::CoreSimulator.set_locale(device, locale)
+
+  puts %Q{
+Set langauge to: '#{language}' and locale to: '#{locale}'.
+
+Don't forget to launch your app with these options:
+
+options = {
+  args = [
+           "-AppleLanguages", "(#{language})",
+           "-AppleLocale", "#{locale}"
+         ]
+}
+
+to ensure that your app launches with the correct primary langauge.
+
+Examples:
+
+* https://github.com/calabash/calabash-ios/wiki/Changing-Locale-and-Language
+* https://github.com/calabash/Permissions/blob/master/features/0x/support/01_launch.rb
 
+SUCCESS!
+}
+  true
 end
 
 

data/features-skeleton/support/env.rb

@@ -1,9 +1,15 @@
-# Requiring this file will import Calabash and the Calabash predefined Steps.
-require 'calabash-cucumber/cucumber'
+# Requiring this file will import:
+# * the Calabash Cucumber API,
+# * the Calabash Cucumber predefined Steps,
+# * and the Calabash::Formatters::Html cucumber formatter.
+require "calabash-cucumber/cucumber"
 
 # To use Calabash without the predefined Calabash Steps, uncomment these
 # three lines and delete the require above.
-# require 'calabash-cucumber/wait_helpers'
-# require 'calabash-cucumber/operations'
+# require "calabash-cucumber/wait_helpers"
+# require "calabash-cucumber/operations"
 # World(Calabash::Cucumber::Operations)
 
+# Uncomment this line if you want the Calabash::Formatters::Html formatter.
+# require "calabash-cucumber/formatters/html"
+

data/lib/calabash-cucumber/cucumber.rb

@@ -1,5 +1,6 @@
 require 'calabash-cucumber/wait_helpers'
 require 'calabash-cucumber/operations'
+require "calabash-cucumber/formatters/html"
 
 World(Calabash::Cucumber::Operations)
 

data/lib/calabash-cucumber/formatters/html.rb

@@ -0,0 +1,35 @@
+require "cucumber/formatter/html"
+require "uri"
+require "pathname"
+
+module Calabash
+  module Formatters
+    class Html < ::Cucumber::Formatter::Html
+      def embed_image(src, label)
+        if _output_relative? && _relative_uri?(src)
+          output_dir = Pathname.new(File.dirname(@io.path))
+          src_path = Pathname.new(src)
+          embed_relative_path = src_path.relative_path_from(output_dir)
+          super(embed_relative_path.to_s, label)
+        else
+          super(src, label)
+        end
+      end
+
+      def _relative_uri?(src)
+        uri = URI.parse(src)
+        return false if uri.scheme
+        not Pathname.new(src).absolute?
+      end
+
+
+      def _output_relative?
+        if @io.is_a?(File)
+          path = @io.path
+          _relative_uri?(path)
+        end
+      end
+    end
+  end
+end
+

data/lib/calabash-cucumber/version.rb

@@ -3,10 +3,10 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = "0.17.1"
+    VERSION = "0.18.0"
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.
-    MIN_SERVER_VERSION = "0.17.1"
+    MIN_SERVER_VERSION = "0.18.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: calabash-common
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: edn
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +132,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -156,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -416,6 +402,7 @@ files:
 - lib/calabash-cucumber/environment.rb
 - lib/calabash-cucumber/environment_helpers.rb
 - lib/calabash-cucumber/failure_helpers.rb
+- lib/calabash-cucumber/formatters/html.rb
 - lib/calabash-cucumber/http_helpers.rb
 - lib/calabash-cucumber/ibase.rb
 - lib/calabash-cucumber/ipad_1x_2x.rb
@@ -570,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS