fastlane 2.86.0.beta.20180316050051 → 2.86.0.beta.20180317050040

data/fastlane_core/lib/fastlane_core/tool_collector.rb

@@ -59,7 +59,7 @@ module FastlaneCore
     def did_finish
       return false if FastlaneCore::Env.truthy?("FASTLANE_OPT_OUT_USAGE")
 
-      if !did_show_message? and !Helper.ci?
+      if !did_show_message? && !Helper.ci?
         show_message
       end
 

data/frameit/lib/frameit/editor.rb

@@ -86,7 +86,7 @@ module Frameit
 
       @offset_information = fetch_config['offset'] || Offsets.image_offset(screenshot).dup
 
-      if @offset_information and (@offset_information['offset'] or @offset_information['offset'])
+      if @offset_information && (@offset_information['offset'] || @offset_information['offset'])
         return @offset_information
       end
       UI.user_error!("Could not find offset_information for '#{screenshot}'")
@@ -450,7 +450,7 @@ module Frameit
       # No string files, fallback to Framefile config
       text = fetch_config[type.to_s]['text'] if fetch_config[type.to_s] && fetch_config[type.to_s]['text'] && fetch_config[type.to_s]['text'].length > 0 # Ignore empty string
 
-      if type == :title and !text
+      if type == :title && !text
         # title is mandatory
         UI.user_error!("Could not get title for screenshot #{screenshot.path}. Please provide one in your Framefile.json or title.strings")
       end

data/gym/lib/gym/generators/build_command_generator.rb

@@ -37,7 +37,6 @@ module Gym
         options << "-sdk '#{config[:sdk]}'" if config[:sdk]
         options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]
         options << "-destination '#{config[:destination]}'" if config[:destination]
-        options << "-xcconfig '#{config[:xcconfig]}'" if config[:xcconfig]
         options << "-archivePath #{archive_path.shellescape}" unless config[:skip_archive]
         options << "-derivedDataPath '#{config[:derived_data_path]}'" if config[:derived_data_path]
         options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]

data/match/lib/match/git_helper.rb

@@ -59,7 +59,7 @@ module Match
 
       checkout_branch(branch) unless branch == "master"
 
-      if !Helper.test? and GitHelper.match_version(@dir).nil? and manual_password.nil? and File.exist?(File.join(@dir, "README.md"))
+      if !Helper.test? && GitHelper.match_version(@dir).nil? && manual_password.nil? && File.exist?(File.join(@dir, "README.md"))
         UI.important("Migrating to new match...")
         ChangePassword.update(params: { git_url: git_url,
                                     git_branch: branch,

data/match/lib/match/options.rb

@@ -125,7 +125,7 @@ module Match
                                      description: nil,
                                      verify_block: proc do |value|
                                        unless Helper.test?
-                                         if value.start_with?("/var/folders") or value.include?("tmp/") or value.include?("temp/")
+                                         if value.start_with?("/var/folders") || value.include?("tmp/") || value.include?("temp/")
                                            # that's fine
                                          else
                                            UI.user_error!("Specify the `git_url` instead of the `path`")

data/match/lib/match/runner.rb

@@ -67,7 +67,7 @@ module Match
       end
 
       # Done
-      if self.files_to_commmit.count > 0 and !params[:readonly]
+      if self.files_to_commmit.count > 0 && !params[:readonly]
         message = GitHelper.generate_commit_message(params)
         GitHelper.commit_changes(params[:workspace], message, params[:git_url], params[:git_branch], self.files_to_commmit)
       end
@@ -94,7 +94,7 @@ module Match
       certs = Dir[File.join(params[:workspace], "certs", cert_type.to_s, "*.cer")]
       keys = Dir[File.join(params[:workspace], "certs", cert_type.to_s, "*.p12")]
 
-      if certs.count == 0 or keys.count == 0
+      if certs.count == 0 || keys.count == 0
         UI.important("Couldn't find a valid code signing identity in the git repo for #{cert_type}... creating one for you now")
         UI.crash!("No code signing identity found and can not create a new one because you enabled `readonly`") if params[:readonly]
         cert_path = Generator.generate_certificate(params, cert_type)
@@ -151,7 +151,7 @@ module Match
         end
       end
 
-      if profile.nil? or params[:force]
+      if profile.nil? || params[:force]
         if params[:readonly]
           all_profiles = Dir.entries(base_dir).reject { |f| f.start_with?(".") }
           UI.error("No matching provisioning profiles found for '#{profile_name}'")

data/pilot/lib/pilot/build_manager.rb

@@ -15,7 +15,7 @@ module Pilot
 
       UI.user_error!("No ipa file given") unless config[:ipa]
 
-      if options[:changelog].nil? and options[:distribute_external] == true
+      if options[:changelog].nil? && options[:distribute_external] == true
         if UI.interactive?
           options[:changelog] = UI.input("No changelog provided for new build. Please provide a changelog. You can also provide a changelog using the `changelog` option")
         else
@@ -62,7 +62,7 @@ module Pilot
 
     def distribute(options, build: nil)
       start(options)
-      if config[:apple_id].to_s.length == 0 and config[:app_identifier].to_s.length == 0
+      if config[:apple_id].to_s.length == 0 && config[:app_identifier].to_s.length == 0
         config[:app_identifier] = UI.input("App Identifier: ")
       end
 
@@ -102,7 +102,7 @@ module Pilot
 
     def list(options)
       start(options)
-      if config[:apple_id].to_s.length == 0 and config[:app_identifier].to_s.length == 0
+      if config[:apple_id].to_s.length == 0 && config[:app_identifier].to_s.length == 0
         config[:app_identifier] = UI.input("App Identifier: ")
       end
 

data/scan/lib/scan/slack_poster.rb

@@ -41,7 +41,7 @@ module Scan
         }
       end
 
-      if results[:tests] and results[:failures]
+      if results[:tests] && results[:failures]
         attachments << {
           text: "Successful Tests: #{results[:tests] - results[:failures]}",
           color: "good",

data/scan/lib/scan/test_command_generator.rb

@@ -40,7 +40,6 @@ module Scan
       options << "-enableCodeCoverage #{config[:code_coverage] ? 'YES' : 'NO'}" unless config[:code_coverage].nil?
       options << "-enableAddressSanitizer #{config[:address_sanitizer] ? 'YES' : 'NO'}" unless config[:address_sanitizer].nil?
       options << "-enableThreadSanitizer #{config[:thread_sanitizer] ? 'YES' : 'NO'}" unless config[:thread_sanitizer].nil?
-      options << "-xcconfig '#{config[:xcconfig]}'" if config[:xcconfig]
       options << "-xctestrun '#{config[:xctestrun]}'" if config[:xctestrun]
       options << config[:xcargs] if config[:xcargs]
 

data/scan/lib/scan/test_result_parser.rb

@@ -6,7 +6,7 @@ module Scan
       # e.g. ...<testsuites tests='2' failures='1'>...
       matched = output.scan(/<testsuites\b(?=[^<>]*\s+tests='(\d+)')(?=[^<>]*\s+failures='(\d+)')[^<>]+>/)
 
-      if matched and matched.length == 1 and matched[0].length == 2
+      if matched && matched.length == 1 && matched[0].length == 2
         tests = matched[0][0].to_i
         failures = matched[0][1].to_i
 

data/sigh/lib/sigh/runner.rb

@@ -222,7 +222,7 @@ module Sigh
         end
       end
 
-      if certificates.count > 1 and !Sigh.config[:development]
+      if certificates.count > 1 && !Sigh.config[:development]
         UI.important("Found more than one code signing identity. Choosing the first one. Check out `fastlane sigh --help` to see all available options.")
         UI.important("Available Code Signing Identities for current filters:")
         certificates.each do |c|

data/snapshot/lib/snapshot/options.rb

@@ -37,6 +37,14 @@ module Snapshot
                                      description: "Pass additional arguments to xcodebuild for the test phase. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS=\"-ObjC -lstdc++\"",
                                      optional: true,
                                      type: :shell_string),
+        FastlaneCore::ConfigItem.new(key: :xcconfig,
+                                     short_option: "-y",
+                                     env_name: "SNAPSHOT_XCCONFIG",
+                                     description: "Use an extra XCCONFIG file to build your app",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("File not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
+                                     end),
         FastlaneCore::ConfigItem.new(key: :devices,
                                      description: "A list of devices you want to take the screenshots from",
                                      short_option: "-d",

data/snapshot/lib/snapshot/runner.rb

@@ -16,7 +16,7 @@ require_relative 'simulator_launchers/launcher_configuration'
 module Snapshot
   class Runner
     def work
-      if File.exist?("./fastlane/snapshot.js") or File.exist?("./snapshot.js")
+      if File.exist?("./fastlane/snapshot.js") || File.exist?("./snapshot.js")
         UI.error("Found old snapshot configuration file 'snapshot.js'")
         UI.error("You updated to snapshot 1.0 which now uses UI Automation")
         UI.error("Please follow the migration guide: https://github.com/fastlane/fastlane/blob/master/snapshot/MigrationGuide.md")

data/snapshot/lib/snapshot/test_command_generator.rb

@@ -52,7 +52,10 @@ module Snapshot
         return [destinations.join(' ')]
       end
 
-      def verify_devices_share_os(devices)
+      def verify_devices_share_os(device_names)
+        # Get device types based off of device name
+        devices = get_device_type_with_simctl(device_names)
+
         # Check each device to see if it is an iOS device
         all_ios = devices.map do |device|
           device = device.downcase
@@ -74,6 +77,30 @@ module Snapshot
         # as checked above, that would imply that this is a mixed bag
         return devices.count == 1
       end
+
+      private
+
+      # Creates an alias for require to prevent `rubocop/require_tools`
+      # from failing. This eventually change it when `simctl` doesn't
+      # execute shell commands at the top-level anymore
+      #
+      # Issue: https://github.com/fastlane/fastlane/issues/12071
+      alias silence_the_horrible_require_checker require
+
+      def get_device_type_with_simctl(device_names)
+        return device_names if Helper.test?
+
+        silence_the_horrible_require_checker("simctl")
+
+        # Gets actual simctl device type from device name
+        return device_names.map do |device_name|
+          # Disable checking due to alias-ed require above
+          device = SimCtl.device(name: device_name) # rubocop:disable Require/MissingRequireStatement
+          if device
+            device.devicetype.name
+          end
+        end.compact
+      end
     end
   end
 end

data/spaceship/lib/spaceship/client.rb

@@ -340,7 +340,7 @@ module Spaceship
     #
     # @return (Spaceship::Client) The client the login method was called for
     def login(user = nil, password = nil)
-      if user.to_s.empty? or password.to_s.empty?
+      if user.to_s.empty? || password.to_s.empty?
         require 'credentials_manager/account_manager'
 
         keychain_entry = CredentialsManager::AccountManager.new(user: user, password: password)
@@ -348,7 +348,7 @@ module Spaceship
         password = keychain_entry.password
       end
 
-      if user.to_s.strip.empty? or password.to_s.strip.empty?
+      if user.to_s.strip.empty? || password.to_s.strip.empty?
         raise NoUserCredentialsError.new, "No login data provided"
       end
 
@@ -657,9 +657,9 @@ module Spaceship
 
     # Is called from `parse_response` to store the latest csrf_token (if available)
     def store_csrf_tokens(response)
-      if response and response.headers
+      if response && response.headers
         tokens = response.headers.select { |k, v| %w(csrf csrf_ts).include?(k) }
-        if tokens and !tokens.empty?
+        if tokens && !tokens.empty?
           @csrf_tokens = tokens
         end
       end

data/spaceship/lib/spaceship/du/du_client.rb

@@ -89,7 +89,7 @@ module Spaceship
         req.headers['Connection'] = "keep-alive"
       end
 
-      if r.status == 500 and r.body.include?("Server Error")
+      if r.status == 500 && r.body.include?("Server Error")
         return upload_file(app_version: app_version, upload_file: upload_file, path: path, content_provider_id: content_provider_id, sso_token: sso_token, du_validation_rule_set: du_validation_rule_set, app_id: app_id)
       end
 

data/spaceship/lib/spaceship/launcher.rb

@@ -23,7 +23,7 @@ module Spaceship
     def initialize(user = nil, password = nil)
       @client = PortalClient.new
 
-      if user or password
+      if user || password
         @client.login(user, password)
       end
     end

data/spaceship/lib/spaceship/portal/provisioning_profile.rb

@@ -262,7 +262,7 @@ module Spaceship
           app = Spaceship::Portal::App.find(bundle_id, mac: mac)
           raise "Could not find app with bundle id '#{bundle_id}'" unless app
 
-          raise "Invalid sub_platform #{sub_platform}, valid values are tvOS" if !sub_platform.nil? and sub_platform != 'tvOS'
+          raise "Invalid sub_platform #{sub_platform}, valid values are tvOS" if !sub_platform.nil? && sub_platform != 'tvOS'
 
           # Fill in sensible default values
           name ||= [bundle_id, self.pretty_type].join(' ')
@@ -278,8 +278,8 @@ module Spaceship
           # Fix https://github.com/KrauseFx/fastlane/issues/349
           certificate_parameter = certificate_parameter.first if certificate_parameter.count == 1
 
-          if devices.nil? or devices.count == 0
-            if self == Development or self == AdHoc
+          if devices.nil? || devices.count == 0
+            if self == Development || self == AdHoc
               # For Development and AdHoc we usually want all compatible devices by default
               if mac
                 devices = Spaceship::Portal::Device.all_macs
@@ -364,7 +364,7 @@ module Spaceship
         #   This may also contain invalid or expired profiles
         def find_by_bundle_id(bundle_id: nil, mac: false, sub_platform: nil)
           raise "Missing required parameter 'bundle_id'" if bundle_id.to_s.empty?
-          raise "Invalid sub_platform #{sub_platform}, valid values are tvOS" if !sub_platform.nil? and sub_platform != 'tvOS'
+          raise "Invalid sub_platform #{sub_platform}, valid values are tvOS" if !sub_platform.nil? && sub_platform != 'tvOS'
           find_tvos_profiles = sub_platform == 'tvOS'
           all(mac: mac).find_all do |profile|
             profile.app.bundle_id == bundle_id && profile.tvos? == find_tvos_profiles

data/spaceship/lib/spaceship/tunes/application.rb

@@ -6,6 +6,7 @@ require_relative 'app_submission'
 require_relative 'app_version'
 require_relative 'app_version_generated_promocodes'
 require_relative 'app_version_history'
+require_relative 'build_train'
 require_relative 'iap'
 require_relative 'tunes_base'
 require_relative 'version_set'
@@ -236,6 +237,15 @@ module Spaceship
         end
       end
 
+      def reject_version_if_possible!
+        can_reject = edit_version.can_reject_version
+        if can_reject
+          client.reject!(apple_id, edit_version.version_id)
+        end
+
+        return can_reject
+      end
+
       # set the price tier. This method doesn't require `save` to be called
       def update_price_tier!(price_tier)
         client.update_price_tier!(self.apple_id, price_tier)
@@ -296,6 +306,30 @@ module Spaceship
         return TestFlight::Build.all_processing_builds(app_id: self.apple_id, platform: platform || self.platform)
       end
 
+      def tunes_all_build_trains(app_id: nil, platform: nil)
+        resp = client.all_build_trains(app_id: apple_id, platform: platform)
+        trains = resp["trains"] or []
+        trains.map do |attrs|
+          attrs['application'] = self
+          Tunes::BuildTrain.factory(attrs)
+        end
+      end
+
+      def tunes_all_builds_for_train(train: nil, platform: nil)
+        resp = client.all_builds_for_train(app_id: apple_id, train: train, platform: platform)
+        items = resp["items"] or []
+        items.map do |attrs|
+          attrs['apple_id'] = apple_id
+          Tunes::Build.factory(attrs)
+        end
+      end
+
+      def tunes_build_details(train: nil, build_number: nil, platform: nil)
+        resp = client.build_details(app_id: apple_id, train: train, build_number: build_number, platform: platform)
+        resp['apple_id'] = apple_id
+        Tunes::BuildDetails.factory(resp)
+      end
+
       # Get all builds that are already processed for all build trains
       # You can either use the return value (array) or pass a block
       def builds(platform: nil)

data/spaceship/lib/spaceship/tunes/build_train.rb

@@ -38,6 +38,7 @@ module Spaceship
       attr_reader :invalid_builds
 
       attr_mapping(
+        'application' => 'application',
         'versionString' => :version_string,
         'platform' => :platform,
         'externalTesting.value' => :external_testing_enabled,

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -182,7 +182,7 @@ module Spaceship
           hash.each do |key, value|
             errors += handle_response_hash.call(value, current_language)
 
-            next unless key == 'errorKeys' and value.kind_of?(Array) and value.count > 0
+            next unless key == 'errorKeys' && value.kind_of?(Array) && value.count > 0
             # Prepend the error with the language so it's easier to understand for the user
             errors += value.collect do |current_error_message|
               current_language ? "[#{current_language}]: #{current_error_message}" : current_error_message
@@ -215,11 +215,11 @@ module Spaceship
 
       if errors.count > 0 # they are separated by `.` by default
         # Sample `error` content: [["Forbidden"]]
-        if errors.count == 1 and errors.first == "You haven't made any changes."
+        if errors.count == 1 && errors.first == "You haven't made any changes."
           # This is a special error which we really don't care about
-        elsif errors.count == 1 and errors.first.include?("try again later")
+        elsif errors.count == 1 && errors.first.include?("try again later")
           raise ITunesConnectTemporaryError.new, errors.first
-        elsif errors.count == 1 and errors.first.include?("Forbidden")
+        elsif errors.count == 1 && errors.first.include?("Forbidden")
           raise_insuffient_permission_error!
         elsif flaky_api_call
           raise ITunesConnectPotentialServerError.new, errors.join(' ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.86.0.beta.20180316050051
+  version: 2.86.0.beta.20180317050040
 platform: ruby
 authors:
 - Maksym Grebenets
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -591,6 +591,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: simctl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -1607,22 +1621,22 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - supply/lib
-- sigh/lib
-- produce/lib
-- scan/lib
+- fastlane_core/lib
 - cert/lib
-- frameit/lib
-- screengrab/lib
-- precheck/lib
-- pilot/lib
 - gym/lib
-- snapshot/lib
-- fastlane_core/lib
+- produce/lib
+- pilot/lib
+- scan/lib
+- spaceship/lib
+- sigh/lib
 - deliver/lib
-- match/lib
+- screengrab/lib
 - pem/lib
+- frameit/lib
 - credentials_manager/lib
-- spaceship/lib
+- snapshot/lib
+- match/lib
+- precheck/lib
 - fastlane/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements: