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

data/snapshot/lib/snapshot/options.rb

@@ -1,5 +1,7 @@
-require 'fastlane_core'
-require 'credentials_manager'
+require 'fastlane_core/configuration/config_item'
+require 'fastlane_core/device_manager'
+require 'credentials_manager/appfile_config'
+require_relative 'module'
 
 module Snapshot
   class Options
@@ -137,6 +139,13 @@ module Snapshot
                                      description: "Should the project be cleaned before building it?",
                                      is_string: false,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :test_without_building,
+                                     short_option: "-T",
+                                     env_name: "SNAPSHOT_TEST_WITHOUT_BUILDING",
+                                     description: "Test without building, requires a derived data path",
+                                     is_string: false,
+                                     type: Boolean,
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :configuration,
                                      short_option: "-q",
                                      env_name: "SNAPSHOT_CONFIGURATION",

data/snapshot/lib/snapshot/reports_generator.rb

@@ -1,8 +1,10 @@
-require 'erb'
-require 'fastimage'
+require_relative 'module'
 
 module Snapshot
   class ReportsGenerator
+    require 'erb'
+    require 'fastimage'
+
     def generate
       UI.message "Generating HTML Report"
 

data/snapshot/lib/snapshot/reset_simulators.rb

@@ -1,3 +1,6 @@
+require 'fastlane_core/device_manager'
+require_relative 'module'
+
 module Snapshot
   class ResetSimulators
     def self.clear_everything!(ios_versions, force = false)

data/snapshot/lib/snapshot/runner.rb

@@ -2,6 +2,16 @@ require 'shellwords'
 require 'plist'
 require 'os'
 require 'thread'
+require 'terminal-table'
+
+require 'fastlane_core/print_table'
+require_relative 'module'
+require_relative 'update'
+require_relative 'test_command_generator'
+require_relative 'reports_generator'
+require_relative 'simulator_launchers/simulator_launcher'
+require_relative 'simulator_launchers/simulator_launcher_xcode_8'
+require_relative 'simulator_launchers/launcher_configuration'
 
 module Snapshot
   class Runner

data/snapshot/lib/snapshot/screenshot_flatten.rb

@@ -1,3 +1,5 @@
+require_relative 'module'
+
 module Snapshot
   # This class takes care of removing the alpha channel of the generated screenshots
   class ScreenshotFlatten

data/snapshot/lib/snapshot/screenshot_rotate.rb

@@ -1,8 +1,11 @@
-require 'shellwords'
+require_relative 'module'
 
 module Snapshot
   # This class takes care of rotating images
   class ScreenshotRotate
+    require 'shellwords'
+    require 'pty'
+
     # @param (String) The path in which the screenshots are located in
     def run(path)
       UI.verbose "Rotating the screenshots (if necessary)"

data/snapshot/lib/snapshot/setup.rb

@@ -1,3 +1,5 @@
+require_relative 'module'
+
 module Snapshot
   class Setup
     # This method will take care of creating a Snapfile and other necessary files

data/snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb

@@ -1,4 +1,3 @@
-
 module Snapshot
   class SimulatorLauncherConfiguration
     # both

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb

@@ -1,6 +1,32 @@
-require 'snapshot/simulator_launchers/simulator_launcher_base'
+require 'fastlane_core/test_parser'
+require_relative 'simulator_launcher_base'
 
 module Snapshot
+  class CPUInspector
+    def self.hwprefs_available?
+      `which hwprefs` != ''
+    end
+
+    def self.cpu_count
+      @cpu_count ||=
+        case RUBY_PLATFORM
+        when /darwin9/
+          `hwprefs cpu_count`.to_i
+        when /darwin10/
+          (hwprefs_available? ? `hwprefs thread_count` : `sysctl -n hw.physicalcpu_max`).to_i
+        when /linux/
+          UI.user_error!("We detected that you are running snapshot on Linux, but snapshot is only supported on macOS")
+        when /freebsd/
+          UI.user_error!("We detected that you are running snapshot on FreeBSD, but snapshot is only supported on macOS")
+        else
+          if RbConfig::CONFIG['host_os'] =~ /darwin/
+            (hwprefs_available? ? `hwprefs thread_count` : `sysctl -n hw.physicalcpu_max`).to_i
+          else
+            UI.crash!("Cannot find the machine's processor count.")
+          end
+        end
+    end
+  end
   class SimulatorLauncher < SimulatorLauncherBase
     # With Xcode 9's ability to run tests on multiple concurrent simulators,
     # this method sets the maximum number of simulators to run simultaneously
@@ -177,30 +203,4 @@ module Snapshot
       return File.join(containing, file_name)
     end
   end
-
-  class CPUInspector
-    def self.hwprefs_available?
-      `which hwprefs` != ''
-    end
-
-    def self.cpu_count
-      @cpu_count ||=
-        case RUBY_PLATFORM
-        when /darwin9/
-          `hwprefs cpu_count`.to_i
-        when /darwin10/
-          (hwprefs_available? ? `hwprefs thread_count` : `sysctl -n hw.physicalcpu_max`).to_i
-        when /linux/
-          UI.user_error!("We detected that you are running snapshot on Linux, but snapshot is only supported on macOS")
-        when /freebsd/
-          UI.user_error!("We detected that you are running snapshot on FreeBSD, but snapshot is only supported on macOS")
-        else
-          if RbConfig::CONFIG['host_os'] =~ /darwin/
-            (hwprefs_available? ? `hwprefs thread_count` : `sysctl -n hw.physicalcpu_max`).to_i
-          else
-            UI.crash!("Cannot find the machine's processor count.")
-          end
-        end
-    end
-  end
 end

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -1,3 +1,11 @@
+require 'plist'
+
+require_relative '../module'
+require_relative '../test_command_generator'
+require_relative '../collector'
+require_relative '../fixes/hardware_keyboard_fix'
+require_relative '../fixes/simulator_zoom_fix'
+
 module Snapshot
   class SimulatorLauncherBase
     attr_accessor :collected_errors

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_xcode_8.rb

@@ -1,4 +1,7 @@
-require 'snapshot/simulator_launchers/simulator_launcher_base'
+require_relative 'simulator_launcher_base'
+require_relative '../error_handler'
+require_relative '../collector'
+require_relative '../test_command_generator_xcode_8'
 
 module Snapshot
   class SimulatorLauncherXcode8 < SimulatorLauncherBase

data/snapshot/lib/snapshot/test_command_generator.rb

@@ -1,4 +1,5 @@
-require 'snapshot/test_command_generator_base'
+require_relative 'test_command_generator_base'
+require_relative 'latest_os_version'
 
 module Snapshot
   # Responsible for building the fully working xcodebuild command

data/snapshot/lib/snapshot/test_command_generator_base.rb

@@ -1,3 +1,6 @@
+require 'fastlane_core/device_manager'
+require_relative 'module'
+
 module Snapshot
   class TestCommandGeneratorBase
     class << self
@@ -36,10 +39,13 @@ module Snapshot
 
       def actions
         actions = []
-        actions << :clean if Snapshot.config[:clean]
-        actions << :build # https://github.com/fastlane/snapshot/issues/246
-        actions << :test
-
+        if Snapshot.config[:test_without_building]
+          actions << "test-without-building"
+        else
+          actions << :clean if Snapshot.config[:clean]
+          actions << :build # https://github.com/fastlane/snapshot/issues/246
+          actions << :test
+        end
         return actions
       end
 

data/snapshot/lib/snapshot/test_command_generator_xcode_8.rb

@@ -1,4 +1,6 @@
-require 'snapshot/test_command_generator_base'
+require_relative 'test_command_generator_base'
+require_relative 'module'
+require_relative 'latest_os_version'
 
 module Snapshot
   # Responsible for building the fully working xcodebuild command

data/snapshot/lib/snapshot/update.rb

@@ -1,3 +1,6 @@
+require_relative 'module'
+require_relative 'runner'
+
 module Snapshot
   # Migrate helper files
   class Update

data/spaceship/lib/spaceship.rb

@@ -1,42 +1,20 @@
-require 'spaceship/globals'
-require 'spaceship/base'
-require 'spaceship/client'
-require 'spaceship/provider'
-require 'spaceship/launcher'
-
-# For basic user inputs
-require 'highline/import'
+require_relative 'spaceship/globals'
+require_relative 'spaceship/base'
+require_relative 'spaceship/client'
+require_relative 'spaceship/provider'
+require_relative 'spaceship/launcher'
 
 # Dev Portal
-require 'spaceship/portal/portal'
-require 'spaceship/portal/spaceship'
+require_relative 'spaceship/portal/portal'
+require_relative 'spaceship/portal/spaceship'
 
 # iTunes Connect
-require 'spaceship/tunes/tunes'
-require 'spaceship/tunes/spaceship'
-require 'spaceship/test_flight'
-
-# To support legacy code
-module Spaceship
-  ROOT = Pathname.new(File.expand_path('../..', __FILE__))
-
-  # Dev Portal
-  Certificate = Spaceship::Portal::Certificate
-  ProvisioningProfile = Spaceship::Portal::ProvisioningProfile
-  Device = Spaceship::Portal::Device
-  App = Spaceship::Portal::App
-  AppGroup = Spaceship::Portal::AppGroup
-  Passbook = Spaceship::Portal::Passbook
-  WebsitePush = Spaceship::Portal::WebsitePush
-  AppService = Spaceship::Portal::AppService
-  Merchant = Spaceship::Portal::Merchant
+require_relative 'spaceship/tunes/tunes'
+require_relative 'spaceship/tunes/spaceship'
+require_relative 'spaceship/test_flight'
 
-  # iTunes Connect
-  AppVersion = Spaceship::Tunes::AppVersion
-  AppSubmission = Spaceship::Tunes::AppSubmission
-  Application = Spaceship::Tunes::Application
-  Members = Spaceship::Tunes::Members
-  Persons = Spaceship::Portal::Persons
+require_relative 'spaceship/module'
 
-  DESCRIPTION = "Ruby library to access the Apple Dev Center and iTunes Connect".freeze
-end
+# Support for legacy wrappers
+require_relative 'spaceship/portal/legacy_wrapper'
+require_relative 'spaceship/tunes/legacy_wrapper'

data/spaceship/lib/spaceship/client.rb

@@ -1,16 +1,21 @@
 require 'faraday' # HTTP Client
 require 'faraday-cookie_jar'
 require 'faraday_middleware'
-require 'fastlane/version'
 require 'logger'
-require 'spaceship/babosa_fix'
-require 'spaceship/helper/net_http_generic_request'
-require 'spaceship/helper/plist_middleware'
-require 'spaceship/helper/rels_middleware'
-require 'spaceship/ui'
 require 'tmpdir'
 require 'cgi'
 
+require 'fastlane/version'
+require_relative 'babosa_fix'
+require_relative 'helper/net_http_generic_request'
+require_relative 'helper/plist_middleware'
+require_relative 'helper/rels_middleware'
+require_relative 'ui'
+require_relative 'errors'
+require_relative 'tunes/errors'
+require_relative 'globals'
+require_relative 'provider'
+
 Faraday::Utils.default_params_encoder = Faraday::FlatParamsEncoder
 
 module Spaceship
@@ -37,71 +42,16 @@ module Spaceship
 
     attr_accessor :available_providers
 
-    # Base class for errors that want to present their message as
-    # preferred error info for fastlane error handling. See:
-    # fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb
-    class BasicPreferredInfoError < StandardError
-      TITLE = 'The request could not be completed because:'.freeze
-
-      def preferred_error_info
-        message ? [TITLE, message] : nil
-      end
-    end
-
-    # Invalid user credentials were provided
-    class InvalidUserCredentialsError < BasicPreferredInfoError; end
-
-    # Raised when no user credentials were passed at all
-    class NoUserCredentialsError < BasicPreferredInfoError; end
-
-    class ProgramLicenseAgreementUpdated < BasicPreferredInfoError
-      def show_github_issues
-        false
-      end
-    end
-
-    # User doesn't have enough permission for given action
-    class InsufficientPermissions < BasicPreferredInfoError
-      TITLE = 'Insufficient permissions for your Apple ID:'.freeze
-
-      def preferred_error_info
-        message ? [TITLE, message] : nil
-      end
-
-      # We don't want to show similar GitHub issues, as the error message
-      # should be pretty clear
-      def show_github_issues
-        false
-      end
-    end
-
-    class UnexpectedResponse < StandardError
-      attr_reader :error_info
-
-      def initialize(error_info = nil)
-        super(error_info)
-        @error_info = error_info
-      end
-
-      def preferred_error_info
-        return nil unless @error_info.kind_of?(Hash) && @error_info['resultString']
-
-        [
-          "Apple provided the following error info:",
-          @error_info['resultString'],
-          @error_info['userString']
-        ].compact.uniq # sometimes 'resultString' and 'userString' are the same value
-      end
-    end
-
-    # Raised when 302 is received from portal request
-    class AppleTimeoutError < BasicPreferredInfoError; end
-
-    # Raised when 401 is received from portal request
-    class UnauthorizedAccessError < BasicPreferredInfoError; end
-
-    # Raised when 500 is received from iTunes Connect
-    class InternalServerError < BasicPreferredInfoError; end
+    # legacy support
+    BasicPreferredInfoError = Spaceship::BasicPreferredInfoError
+    InvalidUserCredentialsError = Spaceship::InvalidUserCredentialsError
+    NoUserCredentialsError = Spaceship::NoUserCredentialsError
+    ProgramLicenseAgreementUpdated = Spaceship::ProgramLicenseAgreementUpdated
+    InsufficientPermissions = Spaceship::InsufficientPermissions
+    UnexpectedResponse = Spaceship::UnexpectedResponse
+    AppleTimeoutError = Spaceship::AppleTimeoutError
+    UnauthorizedAccessError = Spaceship::UnauthorizedAccessError
+    InternalServerError = Spaceship::InternalServerError
 
     # Authenticates with Apple's web services. This method has to be called once
     # to generate a valid session. The session will automatically be used from then
@@ -219,7 +169,7 @@ module Spaceship
 
       unless result
         error_string = "Could not set team ID to '#{team_id}', only found the following available teams:\n\n#{available_teams.map { |team| "- #{team[:team_id]} (#{team[:team_name]})" }.join("\n")}\n"
-        raise TunesClient::ITunesConnectError.new, error_string
+        raise Tunes::Error.new, error_string
       end
 
       response = request(:post) do |req|
@@ -388,7 +338,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?
-        require 'credentials_manager'
+        require 'credentials_manager/account_manager'
 
         keychain_entry = CredentialsManager::AccountManager.new(user: user, password: password)
         user ||= keychain_entry.user
@@ -513,7 +463,7 @@ module Spaceship
           raise "Looks like your Apple ID is not enabled for iTunes Connect, make sure to be able to login online"
         else
           info = [response.body, response['Set-Cookie']]
-          raise TunesClient::ITunesConnectError.new, info.join("\n")
+          raise Tunes::Error.new, info.join("\n")
         end
       end
     end
@@ -576,7 +526,7 @@ module Spaceship
       tries -= 1
       unless tries.zero?
         logger.warn("Timeout received: '#{ex.message}'. Retrying after 3 seconds (remaining: #{tries})...")
-        sleep 3 unless defined? SpecHelper
+        sleep 3 unless Object.const_defined?("SpecHelper")
         retry
       end
       raise ex # re-raise the exception
@@ -591,7 +541,7 @@ module Spaceship
         end
 
         do_login(self.user, @password)
-        sleep 3 unless defined? SpecHelper
+        sleep 3 unless Object.const_defined?("SpecHelper")
         retry
       end
       raise ex # re-raise the exception