fastlane 2.74.0.beta.20180106010004 → 2.74.0.beta.20180107010004

data/fastlane_core/lib/fastlane_core.rb

@@ -1,85 +1,50 @@
-require 'json'
-require 'fastlane/version'
-require 'fastlane/boolean'
-
-require 'fastlane_core/globals'
+require_relative 'fastlane_core/globals'
 # Ruby monkey-patches - should be before almost all else
-require 'fastlane_core/core_ext/string'
-
-require 'fastlane_core/env'
-require 'fastlane_core/feature/feature'
-require 'fastlane_core/features'
-require 'fastlane_core/helper'
-require 'fastlane_core/xcodebuild_list_output_parser'
-require 'fastlane_core/configuration/configuration'
-require 'fastlane_core/update_checker/update_checker'
-require 'fastlane_core/languages'
-require 'fastlane_core/itunes_search_api'
-require 'fastlane_core/cert_checker'
-require 'fastlane_core/ipa_file_analyser'
-require 'fastlane_core/itunes_transporter'
-require 'fastlane_core/provisioning_profile'
-require 'fastlane_core/pkg_file_analyser'
-require 'fastlane_core/pkg_upload_package_builder'
-require 'fastlane_core/command_executor'
-require 'fastlane_core/ipa_upload_package_builder'
-require 'fastlane_core/print_table'
-require 'fastlane_core/project'
-require 'fastlane_core/device_manager'
-require 'fastlane_core/ui/ui'
-require 'fastlane_core/tool_collector'
-require 'fastlane_core/fastlane_folder'
-require 'fastlane_core/keychain_importer'
-require 'fastlane_core/swag'
-require 'fastlane_core/build_watcher'
-require 'fastlane_core/crash_reporter/crash_reporter'
-require 'fastlane_core/crash_reporter/crash_report_generator'
-require 'fastlane_core/crash_reporter/crash_report_sanitizer'
-require 'fastlane_core/ui/errors/fastlane_exception'
-require 'fastlane_core/ui/errors/fastlane_error'
-require 'fastlane_core/ui/errors/fastlane_crash'
-require 'fastlane_core/ui/errors/fastlane_shell_error'
-require 'fastlane_core/ui/errors/fastlane_common_error'
-require 'fastlane_core/test_parser'
-require 'fastlane_core/analytics/action_completion_context'
-require 'fastlane_core/analytics/action_launch_context'
-require 'fastlane_core/analytics/analytics_event_builder'
-require 'fastlane_core/analytics/analytics_ingester_client'
-require 'fastlane_core/analytics/analytics_session'
-require 'fastlane_core/tag_version'
+require_relative 'fastlane_core/core_ext/string'
+
+require_relative 'fastlane_core/env'
+require_relative 'fastlane_core/feature/feature'
+require_relative 'fastlane_core/features'
+require_relative 'fastlane_core/helper'
+require_relative 'fastlane_core/xcodebuild_list_output_parser'
+require_relative 'fastlane_core/configuration/configuration'
+require_relative 'fastlane_core/update_checker/update_checker'
+require_relative 'fastlane_core/languages'
+require_relative 'fastlane_core/itunes_search_api'
+require_relative 'fastlane_core/cert_checker'
+require_relative 'fastlane_core/ipa_file_analyser'
+require_relative 'fastlane_core/itunes_transporter'
+require_relative 'fastlane_core/provisioning_profile'
+require_relative 'fastlane_core/pkg_file_analyser'
+require_relative 'fastlane_core/pkg_upload_package_builder'
+require_relative 'fastlane_core/command_executor'
+require_relative 'fastlane_core/ipa_upload_package_builder'
+require_relative 'fastlane_core/print_table'
+require_relative 'fastlane_core/project'
+require_relative 'fastlane_core/device_manager'
+require_relative 'fastlane_core/ui/ui'
+require_relative 'fastlane_core/tool_collector'
+require_relative 'fastlane_core/fastlane_folder'
+require_relative 'fastlane_core/keychain_importer'
+require_relative 'fastlane_core/swag'
+require_relative 'fastlane_core/build_watcher'
+require_relative 'fastlane_core/crash_reporter/crash_reporter'
+require_relative 'fastlane_core/crash_reporter/crash_report_generator'
+require_relative 'fastlane_core/crash_reporter/crash_report_sanitizer'
+require_relative 'fastlane_core/ui/errors'
+require_relative 'fastlane_core/test_parser'
+require_relative 'fastlane_core/analytics/action_completion_context'
+require_relative 'fastlane_core/analytics/action_launch_context'
+require_relative 'fastlane_core/analytics/analytics_event_builder'
+require_relative 'fastlane_core/analytics/analytics_ingester_client'
+require_relative 'fastlane_core/analytics/analytics_session'
+require_relative 'fastlane_core/tag_version'
 
 # Third Party code
 require 'colored'
 require 'commander'
 
 # after commander import
-require 'fastlane_core/ui/fastlane_runner' # monkey patch
-
-Boolean = Fastlane::Boolean
-
-module FastlaneCore
-  ROOT = Pathname.new(File.expand_path('../..', __FILE__))
-
-  # Session is used to report usage metrics.
-  # If you opt out, we will not send anything.
-  # You can confirm this by observing how we use the environment variable: FASTLANE_OPT_OUT_USAGE
-  # Specifically, in AnalyticsSession.finalize_session
-  # Learn more at https://docs.fastlane.tools/#metrics
-  def self.session
-    @session ||= AnalyticsSession.new
-  end
-
-  def self.reset_session
-    @session = nil
-  end
+require_relative 'fastlane_core/ui/fastlane_runner' # monkey patch
 
-  # A directory that's being used to user-wide fastlane configs
-  # This directory is also used for the bundled fastlane
-  # Since we don't want to access FastlaneCore from spaceship
-  # this method is duplicated in spaceship/client.rb
-  def self.fastlane_user_dir
-    path = File.expand_path(File.join(Dir.home, ".fastlane"))
-    FileUtils.mkdir_p(path) unless File.directory?(path)
-    return path
-  end
-end
+require_relative 'fastlane_core/module'

data/fastlane_core/lib/fastlane_core/analytics/action_completion_context.rb

@@ -1,3 +1,5 @@
+require_relative 'app_identifier_guesser'
+
 module FastlaneCore
   class ActionCompletionStatus
     SUCCESS = 'success'

data/fastlane_core/lib/fastlane_core/analytics/action_launch_context.rb

@@ -1,4 +1,5 @@
-require 'fastlane_core/helper'
+require_relative '../helper'
+require_relative 'app_identifier_guesser'
 
 module FastlaneCore
   class ActionLaunchContext

data/fastlane_core/lib/fastlane_core/analytics/analytics_ingester_client.rb

@@ -1,3 +1,7 @@
+require 'openssl'
+
+require_relative '../helper'
+
 module FastlaneCore
   class AnalyticsIngesterClient
     def post_events(events)

data/fastlane_core/lib/fastlane_core/analytics/analytics_session.rb

@@ -1,4 +1,6 @@
-require 'fastlane_core/analytics/analytics_ingester_client'
+require_relative 'analytics_ingester_client'
+require_relative 'action_launch_context'
+require_relative 'analytics_event_builder'
 
 module FastlaneCore
   class AnalyticsSession

data/fastlane_core/lib/fastlane_core/analytics/app_identifier_guesser.rb

@@ -1,5 +1,6 @@
-require 'fastlane_core/android_package_name_guesser'
-require 'fastlane_core/ios_app_identifier_guesser'
+require_relative '../android_package_name_guesser'
+require_relative '../ios_app_identifier_guesser'
+require_relative '../env'
 
 module FastlaneCore
   class AppIdentifierGuesser
@@ -34,7 +35,6 @@ module FastlaneCore
         return nil
       end
 
-      require 'credentials_manager'
       return Digest::SHA256.hexdigest("p#{app_id}fastlan3_SAlt") # hashed + salted the bundle identifier
     rescue
       return nil # we don't want this method to cause a crash

data/fastlane_core/lib/fastlane_core/android_package_name_guesser.rb

@@ -1,3 +1,8 @@
+require 'credentials_manager/appfile_config'
+
+require_relative 'configuration/configuration'
+require_relative 'env'
+
 module FastlaneCore
   class AndroidPackageNameGuesser
     class << self

data/fastlane_core/lib/fastlane_core/build_watcher.rb

@@ -1,3 +1,7 @@
+require 'spaceship/test_flight/build'
+
+require_relative 'ui/ui'
+
 module FastlaneCore
   class BuildWatcher
     class << self

data/fastlane_core/lib/fastlane_core/cert_checker.rb

@@ -1,5 +1,7 @@
 require 'tempfile'
 
+require_relative 'helper'
+
 module FastlaneCore
   # This class checks if a specific certificate is installed on the current mac
   class CertChecker

data/fastlane_core/lib/fastlane_core/command_executor.rb

@@ -1,3 +1,6 @@
+require_relative 'ui/ui'
+require_relative 'globals'
+
 module FastlaneCore
   # Executes commands and takes care of error handling and more
   class CommandExecutor
@@ -43,6 +46,7 @@ module FastlaneCore
         end
 
         begin
+          require 'pty'
           PTY.spawn(command) do |stdin, stdout, pid|
             begin
               stdin.each do |l|

data/fastlane_core/lib/fastlane_core/configuration/commander_generator.rb

@@ -1,5 +1,7 @@
 require 'commander'
-require 'fastlane/version'
+
+require_relative '../module'
+require_relative '../ui/ui'
 
 module FastlaneCore
   class CommanderGenerator
@@ -30,7 +32,7 @@ module FastlaneCore
 
         # Boolean is a fastlane thing, it's either TrueClass, or FalseClass, but we won't know
         # that until runtime, so nil is the best we get
-        if type == Boolean
+        if type == Fastlane::Boolean
           type = nil
         end
 

data/fastlane_core/lib/fastlane_core/configuration/config_item.rb

@@ -1,3 +1,8 @@
+require_relative '../ui/ui'
+require_relative '../ui/errors/fastlane_error'
+require_relative '../helper'
+require_relative '../module'
+
 module FastlaneCore
   class ConfigItem
     # [Symbol] the key which is used as command parameters or key in the fastlane tools
@@ -195,7 +200,7 @@ module FastlaneCore
       if value
         # Verify that value is the type that we're expecting, if we are expecting a type
 
-        if data_type == Boolean
+        if data_type == Fastlane::Boolean
           ensure_boolean_type_passes_validation(value)
         else
           ensure_generic_type_passes_validation(value)

data/fastlane_core/lib/fastlane_core/configuration/configuration.rb

@@ -1,6 +1,8 @@
-require 'fastlane_core/configuration/config_item'
-require 'fastlane_core/configuration/commander_generator'
-require 'fastlane_core/configuration/configuration_file'
+require_relative '../helper'
+require_relative '../globals'
+require_relative 'config_item'
+require_relative 'commander_generator'
+require_relative 'configuration_file'
 
 module FastlaneCore
   class Configuration

data/fastlane_core/lib/fastlane_core/configuration/configuration_file.rb

@@ -1,3 +1,6 @@
+require_relative '../print_table'
+require_relative '../ui/ui'
+
 module FastlaneCore
   # Responsible for loading configuration files
   class ConfigurationFile

data/fastlane_core/lib/fastlane_core/crash_reporter/crash_report_generator.rb

@@ -1,3 +1,5 @@
+require_relative 'crash_report_sanitizer'
+
 module FastlaneCore
   class CrashReportGenerator
     class << self

data/fastlane_core/lib/fastlane_core/crash_reporter/crash_reporter.rb

@@ -1,6 +1,11 @@
-require 'faraday'
 require 'json'
 
+require_relative '../env'
+require_relative '../helper'
+require_relative '../globals'
+require_relative '../ui/ui'
+require_relative 'crash_report_generator'
+
 module FastlaneCore
   class CrashReporter
     class << self
@@ -87,6 +92,7 @@ module FastlaneCore
       end
 
       def send_report(payload: "{}")
+        require 'faraday'
         connection = Faraday.new(url: "https://clouderrorreporting.googleapis.com/v1beta1/projects/fastlane-166414/events:report?key=AIzaSyAMACPfuI-wi4grJWEZjcPvhfV2Rhmddwo")
         connection.post do |request|
           request.headers['Content-Type'] = 'application/json'

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -1,6 +1,9 @@
 require 'open3'
 require 'plist'
 
+require_relative 'command_executor'
+require_relative 'helper'
+
 module FastlaneCore
   class DeviceManager
     class << self
@@ -52,7 +55,10 @@ module FastlaneCore
             name = matches.join(' ')
 
             if matches.count && (os_type == requested_os_type || requested_os_type == "")
+              # This is disabled here because the Device is defined later in the file, and that's a problem for the cop
+              # rubocop:disable Lint/MissingRequireStatement
               @devices << Device.new(name: name, os_type: os_type, os_version: (exact_versions[os_type][os_version] || os_version), udid: udid, state: state, is_simulator: true)
+              # rubocop:enable Lint/MissingRequireStatement
             end
           end
         end

data/fastlane_core/lib/fastlane_core/fastlane_folder.rb

@@ -1,3 +1,5 @@
+require_relative 'ui/ui'
+
 module FastlaneCore
   class FastlaneFolder
     FOLDER_NAME = 'fastlane'

data/fastlane_core/lib/fastlane_core/feature/feature.rb

@@ -1,3 +1,5 @@
+require_relative '../env'
+
 module FastlaneCore
   class Feature
     class << self

data/fastlane_core/lib/fastlane_core/features.rb

@@ -1,2 +1,4 @@
+require_relative 'feature/feature'
+
 FastlaneCore::Feature.register(env_var: 'FASTLANE_ITUNES_TRANSPORTER_USE_SHELL_SCRIPT',
                            description: 'Use iTunes Transporter shell script')

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -2,6 +2,10 @@ require 'logger'
 require 'colored'
 require 'tty-spinner'
 
+require_relative 'fastlane_folder'
+require_relative 'ui/ui'
+require_relative 'env'
+
 module FastlaneCore
   module Helper
     # This method is deprecated, use the `UI` class
@@ -22,7 +26,7 @@ module FastlaneCore
 
     # @return true if the currently running program is a unit test
     def self.test?
-      defined? SpecHelper
+      Object.const_defined?("SpecHelper")
     end
 
     # @return true if it is enabled to execute external commands

data/fastlane_core/lib/fastlane_core/ios_app_identifier_guesser.rb

@@ -1,3 +1,8 @@
+require 'credentials_manager/appfile_config'
+
+require_relative 'env'
+require_relative 'configuration/configuration'
+
 module FastlaneCore
   class IOSAppIdentifierGuesser
     APP_ID_REGEX = /var\s*appIdentifier:\s*String\?{0,1}\s*\[?\]?\s*{\s*return\s*\[?\s*"(\s*[a-zA-Z.-]+\s*)"\s*\]?\s*}/

data/fastlane_core/lib/fastlane_core/ipa_file_analyser.rb

@@ -1,5 +1,7 @@
 require 'zip'
-require "fastlane_core/core_ext/cfpropertylist"
+
+require_relative 'core_ext/cfpropertylist'
+require_relative 'ui/ui'
 
 module FastlaneCore
   class IpaFileAnalyser

data/fastlane_core/lib/fastlane_core/ipa_upload_package_builder.rb

@@ -1,5 +1,9 @@
 require "digest/md5"
 
+require_relative 'globals'
+require_relative 'ui/ui'
+require_relative 'module'
+
 module FastlaneCore
   # Builds a package for the binary ready to be uploaded with the iTunes Transporter
   class IpaUploadPackageBuilder

data/fastlane_core/lib/fastlane_core/itunes_search_api.rb

@@ -1,5 +1,7 @@
 require 'open-uri'
 
+require_relative 'ui/ui'
+
 module FastlaneCore
   # A wrapper around the Apple iTunes Search API to access app information like
   # the app identifier of an app.

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -3,6 +3,9 @@ require 'shellwords'
 require 'fileutils'
 require 'credentials_manager/account_manager'
 
+require_relative 'features'
+require_relative 'helper'
+
 module FastlaneCore
   # The TransporterInputError occurs when you passed wrong inputs to the {Deliver::ItunesTransporter}
   class TransporterInputError < StandardError

data/fastlane_core/lib/fastlane_core/keychain_importer.rb

@@ -1,3 +1,5 @@
+require_relative 'helper'
+
 module FastlaneCore
   class KeychainImporter
     def self.import_file(path, keychain_path, keychain_password: "", certificate_password: "", output: FastlaneCore::Globals.verbose?)

data/fastlane_core/lib/fastlane_core/module.rb

@@ -0,0 +1,31 @@
+require 'fastlane/boolean'
+
+require_relative 'analytics/analytics_session'
+
+module FastlaneCore
+  ROOT = Pathname.new(File.expand_path('../../..', __FILE__))
+  Boolean = Fastlane::Boolean
+
+  # Session is used to report usage metrics.
+  # If you opt out, we will not send anything.
+  # You can confirm this by observing how we use the environment variable: FASTLANE_OPT_OUT_USAGE
+  # Specifically, in AnalyticsSession.finalize_session
+  # Learn more at https://github.com/fastlane/fastlane#metrics
+  def self.session
+    @session ||= AnalyticsSession.new
+  end
+
+  def self.reset_session
+    @session = nil
+  end
+
+  # A directory that's being used to user-wide fastlane configs
+  # This directory is also used for the bundled fastlane
+  # Since we don't want to access FastlaneCore from spaceship
+  # this method is duplicated in spaceship/client.rb
+  def self.fastlane_user_dir
+    path = File.expand_path(File.join("~", ".fastlane"))
+    FileUtils.mkdir_p(path) unless File.directory?(path)
+    return path
+  end
+end