cs-bdd 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 083aada0c6d56dc360cb8d8edc5e4b22051ce66d
-  data.tar.gz: e1dae588adee75ca80bbe0561dfb97cf5c9996ef
+  metadata.gz: 77788c60608eb5143e09cdb2e2adc8b4285f5334
+  data.tar.gz: 13607e4f59453700a6d4f5757a52edeb98fe45ee
 SHA512:
-  metadata.gz: 00cd5a0d3823e74a8e608bf0640d54bfc318a23113e6b2e182984800d1e54afe1c63921c010bb0cee1e6ecc46c10c15cc7ddc18e07597b29ad3ad7fa1d0abf8e
-  data.tar.gz: 3a9c49162395cd0cc3519022aa07cdfa6f56e549e778e908010df6bbc66230d0434f5e0997c25c8c1fe996e71af58ad9b38d79e25a0b1b3a08635942e27ab226
+  metadata.gz: c131b1b0fb8f9cb93a838048eef113bf74667222709def1128e074ac592015bbb234d48dca788a9843f0cb363d303c2ed2e61a60bef4f9fbf4fdaa23a929d7b5
+  data.tar.gz: cd77ac0ddf4d13a3685dcbe6e6745479eeffea5ded9518ef20f89107c2ba634220bbff7342c7ea0f5e19b40615d6a5a0af7fe7e260bc106cb9caca9c0ef42072

data/README.md

@@ -3,6 +3,8 @@
 
 A simple gem to generate all files needed in a project that will support calabash for both Android and iOS.
 
+iOS Build script works only with iOS SDK 9.2 or newer
+
 [Calabash](http://calaba.sh/) uses cucumber to support functional tests in Android and iOS and has one gem for each Platform:
 
   > calabash-android (for Android) [(link)](https://github.com/calabash/calabash-android)

data/cs-bdd.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'bundler', '~> 1.7'
-  spec.add_runtime_dependency 'rake', '~> 10.0'
-  spec.add_runtime_dependency 'thor', '~> 0.19.1'
-  spec.add_runtime_dependency 'i18n', '~> 0.6.11'
-  spec.add_runtime_dependency 'gherkin', '~> 2.12.2'
+  spec.add_runtime_dependency 'bundler', '>=1.7'
+  spec.add_runtime_dependency 'rake', '>=10.0'
+  spec.add_runtime_dependency 'thor', '>=0.19.1'
+  spec.add_runtime_dependency 'i18n', '>=0.6.11'
+  spec.add_runtime_dependency 'gherkin', '>=2.12.2'
 end

data/lib/cs/bdd/version.rb

@@ -1,5 +1,5 @@
 module CS
   module BDD
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

data/lib/skeleton/Gemfile

@@ -1,14 +1,6 @@
 # Gemfile to help setting up the initial development environment
 source 'https://rubygems.org'
 
-gem 'calabash-common', '~> 0.0.1'
-gem 'calabash-android', '~> 0.5.14'
-
-# Gems that will only be used with the computer is a Mac
-group :mac_os do
-  # Remenber to fix the calabash-cucumber version. The update of this gem is
-  # a proccess that you need to update the Calabash Server on your iOS
-  # application code. So I suggest doing the update manually
-  gem 'calabash-cucumber', '~> 0.16.4'
-  gem 'cocoapods', '~> 0.35.0'
-end
+gem 'calabash-common', '~> 0.0.2'
+gem 'calabash-android', '~> 0.5.15'
+gem 'calabash-cucumber', '~> 0.17.1'

data/lib/skeleton/config/scripts/ios/build_app.rb

@@ -3,13 +3,13 @@
 # ----------------------------------------------------------------------------
 #
 # $1 -> configuration environment (dev or jenkins)
-# $2 -> device type. Builds for 'simulator' or 'device'
 #
 #
 # REMEMBER to fill the configuration file build_app.yml
 
 require 'fileutils'
 require 'yaml'
+require 'pathname'
 
 # When running on CI
 # It is a good pratice to run pod install when executing this script
@@ -19,11 +19,10 @@ require 'yaml'
 # Parsing the yaml configuration file
 config = YAML.load_file(File.join(File.dirname(__FILE__), 'build_app.yml'))
 
-if ARGV.length < 2
+if ARGV.length != 1
   puts 'Error: Wrong number of arguments!'
-  puts 'Usage: build_app.rb environment device_type'
+  puts 'Usage: build_app.rb environment'
   puts "Available Environments: #{config.keys.join(', ')}"
-  puts "Device type: 'simulator' or 'device'"
   exit 1
 end
 
@@ -37,29 +36,36 @@ else
   config = config[ARGV[0]]
 end
 
-export_path = File.join(config['export_path'], ARGV[1])
+# Creating a folder name from the destination configuration parameter
+folder_name = config['destination'].gsub('platform=', '').gsub('name=', '')
+              .tr(' ', '_').tr(',', '_')
+export_path = File.join(config['export_path'], folder_name)
+
+# Removing the folder where the .app will be stored if it already exists
+FileUtils.rm_r export_path if Dir.exist?(export_path)
 
 # Creating the folder where the .app will be stored
 FileUtils.mkdir_p export_path
 
-# Choosing the SDK for device or simulator
-sdk = ''
-if ARGV[1] == 'device'
-  sdk = 'iphoneos'
-else
-  sdk = 'iphonesimulator'
-end
-
 puts 'Building project'
 
 system <<eos
   xcodebuild -workspace "#{config['xcworkspace']}" \
-  -scheme "#{config['scheme']}" -sdk "#{sdk}" \
+  -scheme "#{config['scheme']}" -destination "#{config['destination']}" \
   -configuration "#{config['configuration']}" clean build \
   CONFIGURATION_BUILD_DIR="#{export_path}"
 eos
 
-puts "APP_BUNDLE_PATH=#{File.join(export_path, config['scheme'])}.app"
+# Getting the app folder that was created
+# Listing all folders on the export path folder
+folders = Pathname.new(export_path).children.select { |c| c.directory? }
+# Getting the folder which ends with .app
+app_pathname = folders.select { |f| f.to_s.match('.app$') }
+# Getting the app folder path
+app_path = app_pathname.first.to_s
+
+# Printing the APP_BUNDLE_PATH in the terminal
+puts "APP_BUNDLE_PATH=#{app_path}"
 
 puts "End: #{Time.now.strftime('%H:%M:%S')}"
 puts 'Bye!'

data/lib/skeleton/config/scripts/ios/build_app.yml

@@ -2,10 +2,12 @@ dev:
   xcworkspace: "Path_to_the_xcworkspace_folder"
   scheme: TargetName
   configuration: Debug
+  destination: "platform=iOS Simulator,name=iPhone 6"
   export_path: "Path_to_export_app_folder"
 
 jenkins:
   xcworkspace: <%= ENV['WORKSPACE']%>/Project.xcworkspace
   scheme: TargetName
   configuration: Debug
+  destination: "Any_platform_or_device_that_you_want"
   export_path: <%= ENV['WORKSPACE']%>/releases/normal

data/lib/skeleton/features/android/support/app_installation_hooks.rb

@@ -1,7 +1,7 @@
 require 'calabash-android/management/app_installation'
 
 AfterConfiguration do
-  FeatureNameMemory.feature_name = nil
+  FeatureMemory.feature = nil
 end
 
 Before('@reinstall') do
@@ -11,13 +11,11 @@ Before('@reinstall') do
 end
 
 Before do |scenario|
-  @scenario_is_outline =
-    (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow)
-  scenario = scenario.scenario_outline if @scenario_is_outline
+  scenario = scenario.scenario_outline if
+    scenario.respond_to?(:scenario_outline)
 
-  feature_name = scenario.feature.title
-  if FeatureNameMemory.feature_name != feature_name ||
-     ENV['RESET_BETWEEN_SCENARIOS'] == '1'
+  feature = scenario.feature
+  if FeatureMemory.feature != feature || ENV['RESET_BETWEEN_SCENARIOS'] == '1'
     if ENV['RESET_BETWEEN_SCENARIOS'] == '1'
       log 'New scenario - reinstalling apps'
     else
@@ -28,15 +26,11 @@ Before do |scenario|
     install_app(ENV['TEST_APP_PATH'])
     install_app(ENV['APP_PATH'])
 
-    FeatureNameMemory.feature_name = feature_name
-    FeatureNameMemory.invocation = 1
+    FeatureMemory.feature = feature
+    FeatureMemory.invocation = 1
   else
-    FeatureNameMemory.invocation += 1
+    FeatureMemory.invocation += 1
   end
 end
 
-FeatureNameMemory = Class.new
-class << FeatureNameMemory
-  @feature_name = nil
-  attr_accessor :feature_name, :invocation
-end
+FeatureMemory = Struct.new(:feature, :invocation).new

data/lib/skeleton/features/ios/support/01_launch.rb

@@ -5,7 +5,7 @@
 #   When running calabash-ios tests at #
 #   www.xamarin.com/test-cloud         #
 #   the  methods invoked by            #
-#   CalabashLauncher are overriden.    #
+#   CalabashLauncher are overridden.   #
 #   It will automatically ensure       #
 #   running on device, installing apps #
 #   etc.                               #
@@ -14,35 +14,54 @@
 
 require 'calabash-cucumber/launcher'
 
+module Calabash::Launcher
+  @@launcher = nil
+  def self.launcher
+    @@launcher ||= Calabash::Cucumber::Launcher.new
+  end
+
+  def self.launcher=(launcher)
+    @@launcher = launcher
+  end
+end
+
+AfterConfiguration do
+  FeatureMemory.feature = nil
+end
+
 Before do |scenario|
-  @calabash_launcher = Calabash::Cucumber::Launcher.new
+  launcher = Calabash::Launcher.launcher
+  # Relaunch options
+  options = { timeout: 3000 }
 
-  @scenario_is_outline =
-    (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow)
-  scenario = scenario.scenario_outline if @scenario_is_outline
+  scenario = scenario.scenario_outline if
+    scenario.respond_to?(:scenario_outline)
+  feature = scenario.feature
 
   scenario_tags = scenario.source_tag_names
-  # Resetting the app between scenarios
-  # ENV['FEATURE_NAME'] is just an aux created to store the feature name
-  if ENV['FEATURE_NAME'] != scenario.feature.title ||
+  if FeatureMemory.feature != feature ||
      ENV['RESET_BETWEEN_SCENARIOS'] == '1' ||
      scenario_tags.include?('@reinstall')
+    reinstall_app
+    # Reset app if it is a new feature
+    options[:reset] = true
 
-    @calabash_launcher.reset_app_jail
-    ENV['FEATURE_NAME'] = scenario.feature.title
+    FeatureMemory.feature = feature
+    FeatureMemory.invocation = 1
+  else
+    FeatureMemory.invocation += 1
   end
 
-  unless @calabash_launcher.calabash_no_launch?
-    @calabash_launcher.relaunch
-    @calabash_launcher.calabash_notify(self)
+  FeatureMemory.feature = feature
+  FeatureMemory.invocation = 1
+  unless launcher.calabash_no_launch?
+    launcher.relaunch(options)
+    launcher.calabash_notify(self)
   end
 end
 
 After do
-  unless @calabash_launcher.calabash_no_stop?
-    calabash_exit
-    @calabash_launcher.stop if @calabash_launcher.active?
-  end
+  calabash_exit unless launcher.calabash_no_stop?
 end
 
 at_exit do
@@ -51,3 +70,32 @@ at_exit do
     launcher.simulator_launcher.stop unless launcher.calabash_no_stop?
   end
 end
+
+def device?
+  # Check if UUID (ENV['DEVICE_TARGET']) is from a device or a simulator
+  # Getting all the simulator's UUID
+  uuids = `xcrun simctl list`
+  return false if uuids.include? ENV['DEVICE_TARGET']
+  return true
+end
+
+def reinstall_app
+  if device?
+    system "echo 'Installing the app...'"
+    # Trying to reinstall the app
+    success = system "ios-deploy -r -b #{ENV['APP_BUNDLE_PATH']} -i #{ENV['DEVICE_TARGET']} -t 5 > /dev/null"
+
+    # If the app is not installed the above command will throw an error
+    # So we just install the app
+    unless success
+      success = system "ios-deploy -b #{ENV['APP_BUNDLE_PATH']} -i #{ENV['DEVICE_TARGET']} -t 5 > /dev/null"
+      fail 'Error. Could not install the app.' unless
+        success # If there is any error raises an exception
+    end
+
+    system "echo 'Installed.'"
+    sleep(3) # Gives a time to finish the installation of the app in the device
+  end
+end
+
+FeatureMemory = Struct.new(:feature, :invocation).new

data/lib/templates/screen.tt

@@ -3,11 +3,11 @@ class <%= config[:name] %>Screen < <%= config[:platform] %>ScreenBase
   # trait(:trait)                 { "* <%= (config[:platform] == 'Android') ? 'id' : 'marked' %>:'#{layout_name}'" }
 
   # <%= I18n.translate 'comments.elements' %>
-  # element(:layout_name)         { 'insert_layout_identificator' }
-  # element(:button)              { 'insert_button_identificator' }
+  # element(:layout_name)         { pending 'Insert layout identificator' }
+  # element(:button)              { pending 'Insert button identificator' }
 
   # <%= I18n.translate 'comments.actions' %>
-  # action(:touch_button) {
+  # action(:touch_button) do
   #   touch("* <%= (config[:platform] == 'Android') ? 'id' : 'marked' %>:'#{button}'")
-  # }
+  # end
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: cs-bdd
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Oscar Tanner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: gherkin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.2
 description: A simple gem to generate all files needed in a project that will support
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generates an android and iOS calabash project.