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

data/spaceship/lib/spaceship/commands_generator.rb

@@ -1,8 +1,10 @@
+require 'highline'
+
 HighLine.track_eof = false
 
 require 'fastlane/version'
-require 'spaceship/playground'
-require 'spaceship/spaceauth_runner'
+require_relative 'playground'
+require_relative 'spaceauth_runner'
 
 module Spaceship
   class CommandsGenerator

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

@@ -1,3 +1,6 @@
+require_relative '../client'
+require_relative 'utilities'
+
 module Spaceship
   # This class is used to upload Digital files (Images, Videos, JSON files) onto the du-itc service.
   # Its implementation is tied to the tunes module (in particular using +AppVersion+ instances)

data/spaceship/lib/spaceship/du/upload_file.rb

@@ -1,5 +1,7 @@
 require 'fileutils'
 
+require_relative 'utilities'
+
 module Spaceship
   # a wrapper around the concept of file required to make uploads to DU
   class UploadFile

data/spaceship/lib/spaceship/errors.rb

@@ -0,0 +1,67 @@
+module Spaceship
+  # 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
+end

data/spaceship/lib/spaceship/globals.rb

@@ -4,7 +4,7 @@ module Spaceship
     # otherwise fallback to $verbose
     def self.verbose?
       if Object.const_defined?("FastlaneCore")
-        return FastlaneCore::Globals.verbose?
+        return FastlaneCore::Globals.verbose? # rubocop:disable Lint/MissingRequireStatement
       end
       return $verbose
     end

data/spaceship/lib/spaceship/helper/plist_middleware.rb

@@ -3,7 +3,7 @@ require 'faraday_middleware/response_middleware'
 module FaradayMiddleware
   class PlistMiddleware < ResponseMiddleware
     dependency do
-      require 'plist' unless defined?(::Plist)
+      require 'plist' unless Object.const_defined?("Plist")
     end
 
     define_parser do |body|

data/spaceship/lib/spaceship/helper/rels_middleware.rb

@@ -4,6 +4,8 @@ module Faraday
   end
 end
 
+require 'faraday'
+
 module FaradayMiddleware
   class RelsMiddleware < Faraday::Middleware
     def initialize(app, options = {})

data/spaceship/lib/spaceship/launcher.rb

@@ -1,3 +1,5 @@
+require_relative 'portal/portal_client'
+
 module Spaceship
   class Launcher
     attr_accessor :client
@@ -68,27 +70,27 @@ module Spaceship
 
     # @return (Class) Access the apps for this spaceship
     def app
-      Spaceship::App.set_client(@client)
+      Spaceship::Portal::App.set_client(@client)
     end
 
     # @return (Class) Access the app groups for this spaceship
     def app_group
-      Spaceship::AppGroup.set_client(@client)
+      Spaceship::Portal::AppGroup.set_client(@client)
     end
 
     # @return (Class) Access the devices for this spaceship
     def device
-      Spaceship::Device.set_client(@client)
+      Spaceship::Portal::Device.set_client(@client)
     end
 
     # @return (Class) Access the certificates for this spaceship
     def certificate
-      Spaceship::Certificate.set_client(@client)
+      Spaceship::Portal::Certificate.set_client(@client)
     end
 
     # @return (Class) Access the provisioning profiles for this spaceship
     def provisioning_profile
-      Spaceship::ProvisioningProfile.set_client(@client)
+      Spaceship::Portal::ProvisioningProfile.set_client(@client)
     end
   end
 end

data/spaceship/lib/spaceship/module.rb

@@ -0,0 +1,4 @@
+module Spaceship
+  ROOT = Pathname.new(File.expand_path('../../..', __FILE__))
+  DESCRIPTION = "Ruby library to access the Apple Dev Center and iTunes Connect".freeze
+end

data/spaceship/lib/spaceship/playground.rb

@@ -1,6 +1,9 @@
 require "colored"
 require "credentials_manager"
 
+require_relative 'tunes/tunes'
+require_relative 'portal/portal'
+
 module Spaceship
   class Playground
     def initialize(username: nil)

data/spaceship/lib/spaceship/portal/app.rb

@@ -1,3 +1,6 @@
+require_relative 'portal_base'
+require_relative 'app_group'
+
 module Spaceship
   module Portal
     # Represents an App ID from the Developer Portal

data/spaceship/lib/spaceship/portal/app_group.rb

@@ -1,3 +1,5 @@
+require_relative 'portal_base'
+
 module Spaceship
   module Portal
     # Represents an app group of the Apple Dev Portal

data/spaceship/lib/spaceship/portal/app_service.rb

@@ -30,85 +30,44 @@ module Spaceship
         end
       end
 
-      class << self
-        def app_group
-          self::AppGroup
-        end
-
-        def apple_pay
-          self::ApplePay
-        end
-
-        def associated_domains
-          self::AssociatedDomains
-        end
-
-        def data_protection
-          self::DataProtection
-        end
-
-        def game_center
-          self::GameCenter
-        end
-
-        def health_kit
-          self::HealthKit
-        end
-
-        def home_kit
-          self::HomeKit
-        end
-
-        def wireless_accessory
-          self::WirelessAccessory
-        end
-
-        def icloud
-          self::Cloud
-        end
-
-        def cloud_kit
-          self::CloudKit
-        end
-
-        def in_app_purchase
-          self::InAppPurchase
-        end
-
-        def inter_app_audio
-          self::InterAppAudio
-        end
-
-        def passbook
-          self::Passbook
-        end
-
-        def push_notification
-          self::PushNotification
-        end
-
-        def siri_kit
-          self::SiriKit
-        end
-
-        def vpn_configuration
-          self::VPNConfiguration
-        end
-
-        def network_extension
-          self::NetworkExtension
-        end
-
-        def hotspot
-          self::Hotspot
-        end
-
-        def multipath
-          self::Multipath
-        end
-
-        def nfc_tag_reading
-          self::NFCTagReading
+      def self.new_service(id, values: { on: true, off: false })
+        m = Module.new
+        values.each do |k, v|
+          m.define_singleton_method(k) do
+            AppService.new(id, v)
+          end
+        end
+        return m
+      end
+
+      AppGroup = AppService.new_service("APG3427HIY")
+      ApplePay = AppService.new_service("OM633U5T5G")
+      AssociatedDomains = AppService.new_service("SKC3T5S89Y")
+      DataProtection = AppService.new_service("dataProtection", values: { off: "", complete: "complete", unless_open: "unlessopen", until_first_auth: "untilfirstauth" })
+      GameCenter = AppService.new_service("gameCenter")
+      HealthKit = AppService.new_service("HK421J6T7P")
+      HomeKit = AppService.new_service("homeKit")
+      WirelessAccessory = AppService.new_service("WC421J6T7P")
+      Cloud = AppService.new_service("iCloud")
+      CloudKit = AppService.new_service("cloudKitVersion", values: { xcode5_compatible: 1, cloud_kit: 2 })
+      InAppPurchase = AppService.new_service("inAppPurchase")
+      InterAppAudio = AppService.new_service("IAD53UNK2F")
+      Passbook = AppService.new_service("pass")
+      PushNotification = AppService.new_service("push")
+      SiriKit = AppService.new_service("SI015DKUHP")
+      VPNConfiguration = AppService.new_service("V66P55NK2I")
+      NetworkExtension = AppService.new_service("NWEXT04537")
+      Hotspot = AppService.new_service("HSC639VEI8")
+      Multipath = AppService.new_service("MP49FN762P")
+      NFCTagReading = AppService.new_service("NFCTRMAY17")
+
+      constants.each do |c|
+        name = c.to_s
+                .gsub(/([A-Z0-9]+)([A-Z][a-z])/, '\1_\2') # ABBRVString -> ABBRV_String
+                .gsub(/([a-z0-9])([A-Z])/, '\1_\2')       # CamelCase -> Camel_Case
+                .downcase
+        self.class.send(:define_method, name) do
+          AppService.const_get(c)
         end
       end
 
@@ -118,217 +77,6 @@ module Spaceship
           self.value == other.value &&
           self.service_uri == other.service_uri
       end
-
-      #
-      # Modules for "constants"
-      #
-      module AppGroup
-        def self.off
-          AppService.new("APG3427HIY", false)
-        end
-
-        def self.on
-          AppService.new("APG3427HIY", true)
-        end
-      end
-
-      module ApplePay
-        def self.off
-          AppService.new("OM633U5T5G", false)
-        end
-
-        def self.on
-          AppService.new("OM633U5T5G", true)
-        end
-      end
-
-      module AssociatedDomains
-        def self.off
-          AppService.new("SKC3T5S89Y", false)
-        end
-
-        def self.on
-          AppService.new("SKC3T5S89Y", true)
-        end
-      end
-
-      module DataProtection
-        def self.off
-          AppService.new("dataProtection", "")
-        end
-
-        def self.complete
-          AppService.new("dataProtection", "complete")
-        end
-
-        def self.unless_open
-          AppService.new("dataProtection", "unlessopen")
-        end
-
-        def self.until_first_auth
-          AppService.new("dataProtection", "untilfirstauth")
-        end
-      end
-
-      module GameCenter
-        def self.off
-          AppService.new("gameCenter", false)
-        end
-
-        def self.on
-          AppService.new("gameCenter", true)
-        end
-      end
-
-      module HealthKit
-        def self.off
-          AppService.new("HK421J6T7P", false)
-        end
-
-        def self.on
-          AppService.new("HK421J6T7P", true)
-        end
-      end
-
-      module HomeKit
-        def self.off
-          AppService.new("homeKit", false)
-        end
-
-        def self.on
-          AppService.new("homeKit", true)
-        end
-      end
-
-      module WirelessAccessory
-        def self.off
-          AppService.new("WC421J6T7P", false)
-        end
-
-        def self.on
-          AppService.new("WC421J6T7P", true)
-        end
-      end
-
-      module Cloud
-        def self.off
-          AppService.new("iCloud", false)
-        end
-
-        def self.on
-          AppService.new("iCloud", true)
-        end
-      end
-
-      module CloudKit
-        def self.xcode5_compatible
-          AppService.new("cloudKitVersion", 1)
-        end
-
-        def self.cloud_kit
-          AppService.new("cloudKitVersion", 2)
-        end
-      end
-
-      module InAppPurchase
-        def self.off
-          AppService.new("inAppPurchase", false)
-        end
-
-        def self.on
-          AppService.new("inAppPurchase", true)
-        end
-      end
-
-      module InterAppAudio
-        def self.off
-          AppService.new("IAD53UNK2F", false)
-        end
-
-        def self.on
-          AppService.new("IAD53UNK2F", true)
-        end
-      end
-
-      module Passbook
-        def self.off
-          AppService.new("pass", false)
-        end
-
-        def self.on
-          AppService.new("pass", true)
-        end
-      end
-
-      module PushNotification
-        def self.off
-          AppService.new("push", false)
-        end
-
-        def self.on
-          AppService.new("push", true)
-        end
-      end
-
-      module SiriKit
-        def self.off
-          AppService.new("SI015DKUHP", false)
-        end
-
-        def self.on
-          AppService.new("SI015DKUHP", true)
-        end
-      end
-
-      module VPNConfiguration
-        def self.off
-          AppService.new("V66P55NK2I", false)
-        end
-
-        def self.on
-          AppService.new("V66P55NK2I", true)
-        end
-      end
-
-      module NetworkExtension
-        def self.off
-          AppService.new("NWEXT04537", false)
-        end
-
-        def self.on
-          AppService.new("NWEXT04537", true)
-        end
-      end
-
-      module Hotspot
-        def self.off
-          AppService.new("HSC639VEI8", false)
-        end
-
-        def self.on
-          AppService.new("HSC639VEI8", true)
-        end
-      end
-
-      module Multipath
-        def self.off
-          AppService.new("MP49FN762P", false)
-        end
-
-        def self.on
-          AppService.new("MP49FN762P", true)
-        end
-      end
-
-      module NFCTagReading
-        def self.off
-          AppService.new("NFCTRMAY17", false)
-        end
-
-        def self.on
-          AppService.new("NFCTRMAY17", true)
-        end
-      end
     end
   end
 end