fastlane 2.108.0 → 2.109.0

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -23,7 +23,7 @@ module Spaceship
         puts("Please check your credentials and try again.".yellow)
         puts("This could be an issue with App Store Connect,".yellow)
         puts("Please try unsetting the FASTLANE_SESSION environment variable".yellow)
-        puts("and re-run `fastlane spaceauth`".yellow)
+        puts("(if it is set) and re-run `fastlane spaceauth`".yellow)
         raise "Problem connecting to App Store Connect"
       end
 

data/spaceship/lib/spaceship/tunes/app_submission.rb

@@ -136,7 +136,8 @@ module Spaceship
         if self.content_rights_has_rights.nil? || self.content_rights_contains_third_party_content.nil?
           raw_data_clone.set(["contentRights"], nil)
         end
-        raw_data_clone.delete("version")
+        raw_data_clone.delete(:version)
+        raw_data_clone.delete(:application)
 
         # Check whether the application makes use of IDFA or not
         # and automatically set the mandatory limitsTracking value in the request JSON accordingly.

data/spaceship/lib/spaceship/tunes/device_type.rb

@@ -1,7 +1,7 @@
 module Spaceship
   module Tunes
     class DeviceType
-      @types = ['iphone4', 'iphone35', 'iphone6', 'iphone6Plus', 'iphone58', 'iphone65', 'ipad', 'ipadPro', 'ipad105', 'watch', 'watchSeries4', 'appleTV', 'desktop']
+      @types = ['iphone35', 'iphone4', 'iphone6', 'iphone6Plus', 'iphone58', 'iphone65', 'ipad', 'ipad105', 'ipadPro', 'ipadPro11', 'ipadPro129', 'watch', 'watchSeries4', 'appleTV', 'desktop']
       class << self
         attr_accessor :types
 

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

@@ -34,9 +34,12 @@ module Spaceship
             'iphone6' => [1334, 750],
             'iphone6Plus' => [2208, 1242],
             'iphone58' => [2436, 1125],
+            'iphone65' => [2688, 1242],
             'ipad' => [1024, 768],
             'ipad105' => [2224, 1668],
-            'ipadPro' => [2732, 2048]
+            'ipadPro' => [2732, 2048],
+            'iPadPro11' => [2388, 1668],
+            'iPadPro129' => [2732, 2048]
         }
 
         r = resolutions[device]
@@ -222,7 +225,7 @@ module Spaceship
         elsif errors.count == 1 && errors.first.include?("try again later")
           raise ITunesConnectTemporaryError.new, errors.first
         elsif errors.count == 1 && errors.first.include?("Forbidden")
-          raise_insuffient_permission_error!
+          raise_insufficient_permission_error!
         elsif flaky_api_call
           raise ITunesConnectPotentialServerError.new, errors.join(' ')
         else

data/spaceship/lib/spaceship/{two_step_client.rb → two_step_or_factor_client.rb}

@@ -1,125 +1,60 @@
-require 'tempfile'
-
 require_relative 'globals'
 require_relative 'tunes/tunes_client'
 require_relative 'tunes/recovery_device'
 
 module Spaceship
   class Client
-    def handle_two_step(response)
+    def handle_two_step_or_factor(response)
       @x_apple_id_session_id = response["x-apple-id-session-id"]
       @scnt = response["scnt"]
 
+      puts("")
+      puts("Two-step Verification (4 digits code) or Two-factor Authentication (6 digits code) is enabled for account '#{self.user}'")
+      puts("More information about Two-step Verification (4 digits code): https://support.apple.com/en-us/HT204152")
+      puts("More information about Two-factor Authentication (6 digits code): https://support.apple.com/en-us/HT204915")
+      puts("")
+
       r = request(:get) do |req|
         req.url("https://idmsa.apple.com/appleauth/auth")
         update_request_headers(req)
       end
 
       if r.body.kind_of?(Hash) && r.body["trustedDevices"].kind_of?(Array)
-        if r.body.fetch("securityCode", {})["tooManyCodesLock"].to_s.length > 0
-          raise Tunes::Error.new, "Too many verification codes have been sent. Enter the last code you received, use one of your devices, or try again later."
-        end
-
-        old_client = (begin
-                        Tunes::RecoveryDevice.client
-                      rescue
-                        nil # since client might be nil, which raises an exception
-                      end)
-        Tunes::RecoveryDevice.client = self # temporary set it as it's required by the factory method
-        devices = r.body["trustedDevices"].collect do |current|
-          Tunes::RecoveryDevice.factory(current)
-        end
-        Tunes::RecoveryDevice.client = old_client
-
-        puts("Two Step Verification for account '#{self.user}' is enabled")
-        puts("Please select a device to verify your identity")
-        available = devices.collect do |c|
-          "#{c.name}\t#{c.model_name || 'SMS'}\t(#{c.device_id})"
-        end
-        result = choose(*available)
-        device_id = result.match(/.*\t.*\t\((.*)\)/)[1]
-        select_device(r, device_id)
+        handle_two_step(r)
       elsif r.body.kind_of?(Hash) && r.body["trustedPhoneNumbers"].kind_of?(Array) && r.body["trustedPhoneNumbers"].first.kind_of?(Hash)
         handle_two_factor(r)
       else
-        raise "Invalid 2 step response #{r.body}"
+        raise "Although response from Apple indicated activated Two-step Verification or Two-factor Authentication, spaceship didn't know how to handle this response: #{r.body}"
       end
     end
 
-    def handle_two_factor(response)
-      two_factor_url = "https://github.com/fastlane/fastlane/tree/master/spaceship#2-step-verification"
-      puts("Two Factor Authentication for account '#{self.user}' is enabled")
-
-      if !File.exist?(persistent_cookie_path) && self.class.spaceship_session_env.to_s.length.zero?
-        puts("If you're running this in a non-interactive session (e.g. server or CI)")
-        puts("check out #{two_factor_url}")
-      else
-        # If the cookie is set but still required, the cookie is expired
-        puts("Your session cookie has been expired.")
-      end
-
-      security_code = response.body["securityCode"]
-      # {"length"=>6,
-      #  "tooManyCodesSent"=>false,
-      #  "tooManyCodesValidated"=>false,
-      #  "securityCodeLocked"=>false}
-      code_length = security_code["length"]
-      code = ask("Please enter the #{code_length} digit code: ")
-      puts("Requesting session...")
-
-      # Send securityCode back to server to get a valid session
-      r = request(:post) do |req|
-        req.url("https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode")
-        req.headers['Content-Type'] = 'application/json'
-        req.body = { "securityCode" => { "code" => code.to_s } }.to_json
-
-        update_request_headers(req)
+    def handle_two_step(r)
+      if r.body.fetch("securityCode", {})["tooManyCodesLock"].to_s.length > 0
+        raise Tunes::Error.new, "Too many verification codes have been sent. Enter the last code you received, use one of your devices, or try again later."
       end
 
-      # we use `Spaceship::TunesClient.new.handle_itc_response`
-      # since this might be from the Dev Portal, but for 2 step
-      Spaceship::TunesClient.new.handle_itc_response(r.body)
-
-      store_session
-
-      return true
-    end
-
-    # Only needed for 2 step
-    def load_session_from_file
-      if File.exist?(persistent_cookie_path)
-        puts("Loading session from '#{persistent_cookie_path}'") if Spaceship::Globals.verbose?
-        @cookie.load(persistent_cookie_path)
-        return true
+      old_client = (begin
+                      Tunes::RecoveryDevice.client
+                    rescue
+                      nil # since client might be nil, which raises an exception
+                    end)
+      Tunes::RecoveryDevice.client = self # temporary set it as it's required by the factory method
+      devices = r.body["trustedDevices"].collect do |current|
+        Tunes::RecoveryDevice.factory(current)
       end
-      return false
-    end
-
-    def load_session_from_env
-      return if self.class.spaceship_session_env.to_s.length == 0
-      puts("Loading session from environment variable") if Spaceship::Globals.verbose?
+      Tunes::RecoveryDevice.client = old_client
 
-      file = Tempfile.new('cookie.yml')
-      file.write(self.class.spaceship_session_env.gsub("\\n", "\n"))
-      file.close
-
-      begin
-        @cookie.load(file.path)
-      rescue => ex
-        puts("Error loading session from environment")
-        puts("Make sure to pass the session in a valid format")
-        raise ex
-      ensure
-        file.unlink
+      puts("Two-step Verification (4 digits code) is enabled for account '#{self.user}'")
+      puts("Please select a device to verify your identity")
+      available = devices.collect do |c|
+        "#{c.name}\t#{c.model_name || 'SMS'}\t(#{c.device_id})"
       end
+      result = choose(*available)
+      device_id = result.match(/.*\t.*\t\((.*)\)/)[1]
+      select_device(r, device_id)
     end
 
-    # Fetch the session cookie from the environment
-    # (if exists)
-    def self.spaceship_session_env
-      ENV["FASTLANE_SESSION"] || ENV["SPACESHIP_SESSION"]
-    end
-
+    # this is extracted into its own method so it can be called multiple times (see end)
     def select_device(r, device_id)
       # Request Token
       r = request(:put) do |req|
@@ -138,9 +73,8 @@ module Spaceship
       # Send token back to server to get a valid session
       r = request(:post) do |req|
         req.url("https://idmsa.apple.com/appleauth/auth/verify/device/#{device_id}/securitycode")
-        req.body = { "code" => code.to_s }.to_json
         req.headers['Content-Type'] = 'application/json'
-
+        req.body = { "code" => code.to_s }.to_json
         update_request_headers(req)
       end
 
@@ -178,6 +112,41 @@ module Spaceship
       return true
     end
 
+    def handle_two_factor(response)
+      two_factor_url = "https://github.com/fastlane/fastlane/tree/master/spaceship#2-step-verification"
+      puts("Two-factor Authentication (6 digits code) is enabled for account '#{self.user}'")
+
+      puts("If you're running this in a non-interactive session (e.g. server or CI)")
+      puts("check out #{two_factor_url}")
+
+      security_code = response.body["securityCode"]
+      # securityCode =
+      # {"length"=>6,
+      #  "tooManyCodesSent"=>false,
+      #  "tooManyCodesValidated"=>false,
+      #  "securityCodeLocked"=>false}
+      code_length = security_code["length"]
+      code = ask("Please enter the #{code_length} digit code: ")
+      puts("Requesting session...")
+
+      # Send securityCode back to server to get a valid session
+      r = request(:post) do |req|
+        req.url("https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode")
+        req.headers['Content-Type'] = 'application/json'
+        req.body = { "securityCode" => { "code" => code.to_s } }.to_json
+
+        update_request_headers(req)
+      end
+
+      # we use `Spaceship::TunesClient.new.handle_itc_response`
+      # since this might be from the Dev Portal, but for 2 step
+      Spaceship::TunesClient.new.handle_itc_response(r.body)
+
+      store_session
+
+      return true
+    end
+
     def store_session
       # If the request was successful, r.body is actually nil
       # The previous request will fail if the user isn't on a team

data/supply/lib/supply/options.rb

@@ -92,7 +92,7 @@ module Supply
                                      env_name: "SUPPLY_APK",
                                      description: "Path to the APK file to upload",
                                      short_option: "-b",
-                                     conflicting_options: [:apk_paths, :aab],
+                                     conflicting_options: [:apk_paths, :aab, :aab_paths],
                                      code_gen_sensitive: true,
                                      default_value: Dir["*.apk"].last || Dir[File.join("app", "build", "outputs", "apk", "app-Release.apk")].last,
                                      default_value_dynamic: true,
@@ -103,7 +103,7 @@ module Supply
                                      end),
         FastlaneCore::ConfigItem.new(key: :apk_paths,
                                      env_name: "SUPPLY_APK_PATHS",
-                                     conflicting_options: [:apk, :aab],
+                                     conflicting_options: [:apk, :aab, :aab_paths],
                                      optional: true,
                                      type: Array,
                                      description: "An array of paths to APK files to upload",
@@ -119,7 +119,7 @@ module Supply
                                      env_name: "SUPPLY_AAB",
                                      description: "Path to the AAB file to upload",
                                      short_option: "-f",
-                                     conflicting_options: [:apk_path, :apk_paths],
+                                     conflicting_options: [:apk, :apk_paths, :aab_paths],
                                      code_gen_sensitive: true,
                                      default_value: Dir["*.aab"].last || Dir[File.join("app", "build", "outputs", "bundle", "release", "bundle.aab")].last,
                                      default_value_dynamic: true,
@@ -128,6 +128,20 @@ module Supply
                                        UI.user_error!("Could not find aab file at path '#{value}'") unless File.exist?(value)
                                        UI.user_error!("aab file is not an aab") unless value.end_with?('.aab')
                                      end),
+        FastlaneCore::ConfigItem.new(key: :aab_paths,
+                                     env_name: "SUPPLY_AAB_PATHS",
+                                     conflicting_options: [:apk, :apk_paths, :aab],
+                                     optional: true,
+                                     type: Array,
+                                     description: "An array of paths to AAB files to upload",
+                                     short_option: "-z",
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Could not evaluate array from '#{value}'") unless value.kind_of?(Array)
+                                       value.each do |path|
+                                         UI.user_error!("Could not find aab file at path '#{path}'") unless File.exist?(path)
+                                         UI.user_error!("file at path '#{path}' is not an aab") unless path.end_with?('.aab')
+                                       end
+                                     end),
         FastlaneCore::ConfigItem.new(key: :skip_upload_apk,
                                      env_name: "SUPPLY_SKIP_UPLOAD_APK",
                                      optional: true,

data/supply/lib/supply/uploader.rb

@@ -46,7 +46,7 @@ module Supply
     end
 
     def verify_config!
-      unless metadata_path || Supply.config[:apk] || Supply.config[:apk_paths] || Supply.config[:aab] || (Supply.config[:track] && Supply.config[:track_promote_to])
+      unless metadata_path || Supply.config[:apk] || Supply.config[:apk_paths] || Supply.config[:aab] || Supply.config[:aab_paths] || (Supply.config[:track] && Supply.config[:track_promote_to])
         UI.user_error!("No local metadata, apks, aab, or track to promote were found, make sure to run `fastlane supply init` to setup supply")
       end
 
@@ -152,11 +152,18 @@ module Supply
     end
 
     def upload_bundles
-      aab_path = Supply.config[:aab]
-      return [] unless aab_path
+      aab_paths = [Supply.config[:aab]] unless (aab_paths = Supply.config[:aab_paths])
+      return [] unless aab_paths
+      aab_paths.compact!
 
-      UI.message("Preparing aab at path '#{aab_path}' for upload...")
-      return [client.upload_bundle(aab_path)]
+      aab_version_codes = []
+
+      aab_paths.each do |aab_path|
+        UI.message("Preparing aab at path '#{aab_path}' for upload...")
+        aab_version_codes.push(client.upload_bundle(aab_path))
+      end
+
+      return aab_version_codes
     end
 
     private

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.108.0
+  version: 2.109.0
 platform: ruby
 authors:
-- Stefan Natchev
-- Luka Mirosevic
+- Matthew Ellis
+- Helmut Januschka
+- Jimmy Dee
 - Danielle Tomlinson
-- Fumiya Nakamura
+- Kohki Miki
+- Manu Wallner
+- Andrew McBurney
+- Josh Holtz
+- Joshua Liebowitz
+- Jorge Revuelta H
 - Aaron Brager
+- Felix Krause
 - Jan Piotrowski
 - Jérôme Lacoste
-- Olivier Halligon
-- Felix Krause
-- Manu Wallner
+- Luka Mirosevic
 - Iulian Onofrei
-- Matthew Ellis
-- Jorge Revuelta H
-- Kohki Miki
-- Jimmy Dee
+- Olivier Halligon
+- Stefan Natchev
 - Maksym Grebenets
-- Andrew McBurney
-- Joshua Liebowitz
-- Helmut Januschka
-- Josh Holtz
+- Fumiya Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -903,7 +903,6 @@ files:
 - deliver/lib/assets/ScreenshotsHelp
 - deliver/lib/assets/summary.html.erb
 - deliver/lib/deliver.rb
-- deliver/lib/deliver/.app_screenshot.rb.swp
 - deliver/lib/deliver/app_screenshot.rb
 - deliver/lib/deliver/commands_generator.rb
 - deliver/lib/deliver/detect_values.rb
@@ -1329,7 +1328,6 @@ files:
 - fastlane_core/lib/fastlane_core/swag.rb
 - fastlane_core/lib/fastlane_core/tag_version.rb
 - fastlane_core/lib/fastlane_core/test_parser.rb
-- fastlane_core/lib/fastlane_core/tool_collector.rb
 - fastlane_core/lib/fastlane_core/ui/disable_colors.rb
 - fastlane_core/lib/fastlane_core/ui/errors.rb
 - fastlane_core/lib/fastlane_core/ui/errors/fastlane_common_error.rb
@@ -1640,7 +1638,7 @@ files:
 - spaceship/lib/spaceship/tunes/tunes_client.rb
 - spaceship/lib/spaceship/tunes/user_detail.rb
 - spaceship/lib/spaceship/tunes/version_set.rb
-- spaceship/lib/spaceship/two_step_client.rb
+- spaceship/lib/spaceship/two_step_or_factor_client.rb
 - spaceship/lib/spaceship/ui.rb
 - supply/README.md
 - supply/lib/supply.rb

data/fastlane_core/lib/fastlane_core/tool_collector.rb

@@ -1,304 +0,0 @@
-require_relative 'helper'
-
-module FastlaneCore
-  class ToolCollector
-    # Learn more at https://docs.fastlane.tools/#metrics
-
-    # This is the original error reporting mechanism, which has always represented
-    # either controlled (UI.user_error!), or uncontrolled (UI.crash!, anything else)
-    # exceptions.
-    #
-    # Thus, if you call `did_crash`, it will record the failure both here, and in the
-    # newer, more specific `crash` field.
-    #
-    # This value is a String, which is the name of the tool that caused the error
-    attr_reader :error
-
-    # This is the newer field for tracking only uncontrolled exceptions.
-    #
-    # This is written to only when `did_crash` is called, and therefore excludes
-    # controlled exceptions.
-    #
-    # This value is a boolean, which is true if the error was an uncontrolled exception
-    attr_reader :crash
-
-    def initialize
-      @crash = false
-    end
-
-    def did_launch_action(name)
-      name = name_to_track(name.to_sym)
-      return unless name
-
-      launches[name] += 1
-      versions[name] ||= determine_version(name)
-    end
-
-    # Call when the problem is a caught/controlled exception (e.g. via UI.user_error!)
-    def did_raise_error(name)
-      name = name_to_track(name.to_sym)
-      return unless name
-
-      @error = name
-      # Don't write to the @crash field so that we can distinguish this exception later
-      # as being controlled
-    end
-
-    # Call when the problem is an uncaught/uncontrolled exception (e.g. via UI.crash!)
-    def did_crash(name)
-      name = name_to_track(name.to_sym)
-      return unless name
-
-      # Write to the @error field to maintain the historical behavior of the field, so
-      # that the server gets the same data in that field from old and new clients
-      @error = name
-      # Also specifically note that this exception was uncontrolled in the @crash field
-      @crash = true
-    end
-
-    def did_finish
-      return false if FastlaneCore::Env.truthy?("FASTLANE_OPT_OUT_USAGE")
-
-      if !did_show_message? && !Helper.ci?
-        show_message
-      end
-
-      require 'excon'
-      url = ENV["FASTLANE_METRICS_URL"] || "https://fastlane-metrics.fabric.io/public"
-
-      analytic_event_body = create_analytic_event_body
-
-      # Never generate web requests during tests
-      unless Helper.test?
-        Thread.new do
-          begin
-            Excon.post(url,
-                       body: analytic_event_body,
-                       headers: { "Content-Type" => 'application/json' })
-          rescue
-            # we don't want to show a stack trace if something goes wrong
-          end
-        end
-      end
-
-      return true
-    rescue
-      # We don't care about connection errors
-    end
-
-    def create_analytic_event_body
-      analytics = []
-      timestamp_seconds = Time.now.to_i
-
-      # `fastfile_id` helps us track success/failure metrics for Fastfiles we
-      # generate as part of an automated process.
-      fastfile_id = ENV["GENERATED_FASTFILE_ID"]
-
-      if fastfile_id && launches.size == 1 && launches['fastlane']
-        if crash
-          completion_status = 'crash'
-        elsif error
-          completion_status = 'error'
-        else
-          completion_status = 'success'
-        end
-        analytics << event_for_web_onboarding(fastfile_id, completion_status, timestamp_seconds)
-      end
-
-      launches.each do |action, count|
-        action_version = versions[action] || 'unknown'
-        if crash && error == action
-          action_completion_status = 'crash'
-        elsif action == error
-          action_completion_status = 'error'
-        else
-          action_completion_status = 'success'
-        end
-        analytics << event_for_completion(action, action_completion_status, action_version, timestamp_seconds)
-        analytics << event_for_count(action, count, action_version, timestamp_seconds)
-      end
-      { analytics: analytics }.to_json
-    end
-
-    def show_message
-      UI.message("Sending Crash/Success information")
-      UI.message("Learn more at https://docs.fastlane.tools/#metrics")
-      UI.message("No personal/sensitive data is sent. Only sharing the following:")
-      UI.message(launches)
-      UI.message(@error) if @error
-      UI.message("This information is used to fix failing tools and improve those that are most often used.")
-      UI.message("You can disable this by adding `opt_out_usage` at the top of your Fastfile")
-    end
-
-    def launches
-      @launches ||= Hash.new(0)
-    end
-
-    # Maintains a hash of tool names to their detected versions.
-    #
-    # This data is sent in the same manner as launches, as an inline form-encoded JSON value in the POST.
-    # For example:
-    #
-    # {
-    #   match: '0.5.0',
-    #   fastlane: '1.86.1'
-    # }
-    def versions
-      @versions ||= {}
-    end
-
-    # Override this in subclasses
-    def is_official?(name)
-      return true
-    end
-
-    # Returns nil if we shouldn't track this action
-    # Returns a (maybe modified) name that should be sent to the analytic ingester
-    # Modificiation is used to prefix the action name with the name of the plugin
-    def name_to_track(name)
-      return nil unless is_official?(name)
-      name
-    end
-
-    def did_show_message?
-      file_name = ".did_show_opt_info"
-
-      legacy_path = File.join(File.expand_path('~'), file_name)
-      new_path = File.join(FastlaneCore.fastlane_user_dir, file_name)
-      did_show = File.exist?(new_path) || File.exist?(legacy_path)
-
-      return did_show if did_show
-
-      File.write(new_path, '1')
-      false
-    end
-
-    def determine_version(name)
-      self.class.determine_version(name)
-    end
-
-    def self.determine_version(name)
-      unless name.to_s.start_with?("fastlane-plugin")
-        # In the early days before the mono gem this was more complicated
-        # Now we have a mono version number, which makes this method easy
-        # for all built-in actions and tools
-        require 'fastlane/version'
-        return Fastlane::VERSION
-      end
-
-      # For plugins we still need to load the specific version
-      begin
-        name = name.to_s.downcase
-
-        # We need to pre-load the version file because tools that are invoked through their actions
-        # will not yet have run their action, and thus will not yet have loaded the file which defines
-        # the module and constant we need.
-        require File.join(name, "version")
-
-        # Go from :foo_bar to 'FooBar'
-        module_name = name.fastlane_module
-
-        # Look up the VERSION constant defined for the given tool name,
-        # or return 'unknown' if we can't find it where we'd expect
-        if Kernel.const_defined?(module_name)
-          tool_module = Kernel.const_get(module_name)
-
-          if tool_module.const_defined?('VERSION')
-            return tool_module.const_get('VERSION')
-          end
-        end
-      rescue LoadError
-        # If there is no version file to load, this is not a tool for which
-        # we can report a particular version
-      end
-
-      return nil
-    end
-
-    def event_for_web_onboarding(fastfile_id, completion_status, timestamp_seconds)
-      {
-        event_source: {
-          oauth_app_name: oauth_app_name,
-          product: 'fastlane_web_onboarding'
-        },
-        actor: {
-          name: 'customer',
-          detail: fastfile_id
-        },
-        action: {
-          name: 'fastfile_executed'
-        },
-        primary_target: {
-          name: 'fastlane_completion_status',
-          detail: completion_status
-        },
-        secondary_target: {
-          name: 'executed',
-          detail: secondary_target_string('')
-        },
-        millis_since_epoch: timestamp_seconds * 1000,
-        version: 1
-      }
-    end
-
-    def event_for_completion(action, completion_status, version, timestamp_seconds)
-      {
-        event_source: {
-          oauth_app_name: oauth_app_name,
-          product: 'fastlane'
-        },
-        actor: {
-          name: 'action',
-          detail: action
-        },
-        action: {
-          name: 'execution_completed'
-        },
-        primary_target: {
-          name: 'completion_status',
-          detail: completion_status
-        },
-        secondary_target: {
-          name: 'version',
-          detail: secondary_target_string(version)
-        },
-        millis_since_epoch: timestamp_seconds * 1000,
-        version: 1
-      }
-    end
-
-    def event_for_count(action, count, version, timestamp_seconds)
-      {
-        event_source: {
-          oauth_app_name: oauth_app_name,
-          product: 'fastlane'
-        },
-        actor: {
-          name: 'action',
-          detail: action
-        },
-        action: {
-          name: 'execution_counted'
-        },
-        primary_target: {
-          name: 'count',
-          detail: count.to_s || "1"
-        },
-        secondary_target: {
-          name: 'version',
-          detail: secondary_target_string(version)
-        },
-        millis_since_epoch: timestamp_seconds * 1000,
-        version: 1
-      }
-    end
-
-    def oauth_app_name
-      return 'fastlane-enhancer'
-    end
-
-    def secondary_target_string(string)
-      return string
-    end
-  end
-end