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

data/spaceship/lib/spaceship/portal/provisioning_profile_template.rb

@@ -1,3 +1,5 @@
+require_relative 'portal_base'
+
 module Spaceship
   module Portal
     class ProvisioningProfileTemplate < PortalBase

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

@@ -1,3 +1,6 @@
+require_relative 'portal_client'
+require_relative 'app_service'
+
 module Spaceship
   module Portal
     class << self
@@ -17,7 +20,7 @@ module Spaceship
       #
       # @raise InvalidUserCredentialsError: raised if authentication failed
       #
-      # @return (Spaceship::Client) The client the login method was called for
+      # @return (Spaceship::Portal::Client) The client the login method was called for
       def login(user = nil, password = nil)
         @client = PortalClient.login(user, password)
       end
@@ -41,47 +44,47 @@ module Spaceship
 
       # @return (Class) Access the apps for the spaceship
       def app
-        Spaceship::App.set_client(@client)
+        Spaceship::Portal::App.set_client(@client)
       end
 
       # @return (Class) Access the pass types for the spaceship
       def passbook
-        Spaceship::Passbook.set_client(@client)
+        Spaceship::Portal::Passbook.set_client(@client)
       end
 
       # @return (Class) Access the website pushes for the spaceship
       def website_push
-        Spaceship::WebsitePush.set_client(@client)
+        Spaceship::Portal::WebsitePush.set_client(@client)
       end
 
       # @return (Class) Access the app groups for the spaceship
       def app_group
-        Spaceship::AppGroup.set_client(@client)
+        Spaceship::Portal::AppGroup.set_client(@client)
       end
 
       # @return (Class) Access app services for the spaceship
       def app_service
-        Spaceship::AppService
+        Spaceship::Portal::AppService
       end
 
       # @return (Class) Access the devices for the spaceship
       def device
-        Spaceship::Device.set_client(@client)
+        Spaceship::Portal::Device.set_client(@client)
       end
 
       # @return (Class) Access the certificates for the spaceship
       def certificate
-        Spaceship::Certificate.set_client(@client)
+        Spaceship::Portal::Certificate.set_client(@client)
       end
 
       # @return (Class) Access the provisioning profiles for the spaceship
       def provisioning_profile
-        Spaceship::ProvisioningProfile.set_client(@client)
+        Spaceship::Portal::ProvisioningProfile.set_client(@client)
       end
 
       # @return (Class) Access the merchants for the spaceship
       def merchant
-        Spaceship::Merchant.set_client(@client)
+        Spaceship::Portal::Merchant.set_client(@client)
       end
     end
   end

data/spaceship/lib/spaceship/portal/ui/select_team.rb

@@ -31,6 +31,7 @@ module Spaceship
       #     {...}
       #   ]
 
+      # rubocop:disable Lint/MissingRequireStatement
       def self.ci?
         if Object.const_defined?("FastlaneCore") && FastlaneCore.const_defined?("Helper")
           return FastlaneCore::Helper.ci?
@@ -44,6 +45,7 @@ module Spaceship
         end
         return true
       end
+      # rubocop:enable Lint/MissingRequireStatement
 
       def select_team
         teams = client.teams

data/spaceship/lib/spaceship/portal/website_push.rb

@@ -1,3 +1,5 @@
+require_relative 'portal_base'
+
 module Spaceship
   module Portal
     # Represents an Website Push ID from the Developer Portal

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -1,7 +1,9 @@
-require "colored"
-require "credentials_manager"
+require 'colored'
+require 'credentials_manager/appfile_config'
 require 'yaml'
 
+require_relative 'tunes/tunes_client'
+
 module Spaceship
   class SpaceauthRunner
     def initialize(username: nil)

data/spaceship/lib/spaceship/test_flight.rb

@@ -1,4 +1,3 @@
-
 require 'spaceship/test_flight/client'
 require 'spaceship/test_flight/base'
 require 'spaceship/test_flight/app_test_info'

data/spaceship/lib/spaceship/test_flight/app_test_info.rb

@@ -1,3 +1,7 @@
+require_relative 'base'
+require_relative 'test_info'
+require_relative 'beta_review_info'
+
 module Spaceship::TestFlight
   class AppTestInfo < Base
     # AppTestInfo wraps a test_info and beta_review_info in the format required to manage test_info

data/spaceship/lib/spaceship/test_flight/base.rb

@@ -1,23 +1,28 @@
-module Spaceship::TestFlight
-  class Base < Spaceship::Base
-    def self.client
-      @client ||= Client.client_with_authorization_from(Spaceship::Tunes.client)
-    end
+require_relative '../base'
+require_relative '../tunes/tunes_client'
 
-    ##
-    # Have subclasses inherit the client from their superclass
-    #
-    # Essentially, we are making a class-inheritable-accessor as described here:
-    # https://apidock.com/rails/v4.2.7/Class/class_attribute
-    def self.inherited(subclass)
-      this_class = self
-      subclass.define_singleton_method(:client) do
-        this_class.client
+module Spaceship
+  module TestFlight
+    class Base < Spaceship::Base
+      def self.client
+        @client ||= Client.client_with_authorization_from(Spaceship::Tunes.client)
       end
-    end
 
-    def to_json
-      raw_data.to_json
+      ##
+      # Have subclasses inherit the client from their superclass
+      #
+      # Essentially, we are making a class-inheritable-accessor as described here:
+      # https://apidock.com/rails/v4.2.7/Class/class_attribute
+      def self.inherited(subclass)
+        this_class = self
+        subclass.define_singleton_method(:client) do
+          this_class.client
+        end
+      end
+
+      def to_json
+        raw_data.to_json
+      end
     end
   end
 end

data/spaceship/lib/spaceship/test_flight/beta_review_info.rb

@@ -1,3 +1,5 @@
+require_relative 'base'
+
 module Spaceship::TestFlight
   class BetaReviewInfo < Base
     attr_accessor :contact_first_name, :contact_last_name, :contact_phone, :contact_email

data/spaceship/lib/spaceship/test_flight/build.rb

@@ -1,208 +1,216 @@
 require 'time'
 
-module Spaceship::TestFlight
-  class Build < Base
-    # @example
-    #   "com.sample.app"
-    attr_accessor :bundle_id
-
-    # @example
-    #   "testflight.build.state.testing.active"
-    # @example
-    #   "testflight.build.state.processing"
-    attr_accessor :internal_state
-
-    # @example
-    #   "testflight.build.state.submit.ready"
-    # @example
-    #   "testflight.build.state.processing"
-    attr_accessor :external_state
-
-    # Internal build ID (int)
-    # @example
-    #   19285309
-    attr_accessor :id
-
-    # @example
-    #   "1.0"
-    attr_accessor :train_version
-
-    # @example
-    #   "152"
-    attr_accessor :build_version
-
-    attr_accessor :beta_review_info
-
-    attr_accessor :export_compliance
-
-    attr_accessor :test_info
-
-    attr_accessor :install_count
-    attr_accessor :invite_count
-    attr_accessor :crash_count
-
-    attr_accessor :did_notify
-
-    attr_accessor :upload_date
-
-    attr_accessor :dsym_url
-    attr_accessor :build_sdk
-    attr_accessor :include_symbols
-    attr_accessor :number_of_asset_packs
-    attr_accessor :contains_odr
-    attr_accessor :file_name
-
-    attr_mapping({
-      'appAdamId' => :app_id,
-      'providerId' => :provider_id,
-      'bundleId' => :bundle_id,
-      'trainVersion' => :train_version,
-      'buildVersion' => :build_version,
-      'betaReviewInfo' => :beta_review_info,
-      'exportCompliance' => :export_compliance,
-      'internalState' => :internal_state,
-      'externalState' => :external_state,
-      'testInfo' => :test_info,
-      'installCount' => :install_count,
-      'inviteCount' => :invite_count,
-      'crashCount' => :crash_count,
-      'didNotify' => :did_notify,
-      'uploadDate' => :upload_date,
-      'id' => :id,
-      'dSYMUrl' => :dsym_url,
-      'buildSdk' => :build_sdk,
-      'includesSymbols' => :include_symbols,
-      'numberOfAssetPacks' => :number_of_asset_packs,
-      'containsODR' => :contains_odr,
-      'fileName' => :file_name
-    })
-
-    BUILD_STATES = {
-      processing: 'testflight.build.state.processing',
-      active: 'testflight.build.state.testing.active',
-      ready_to_submit: 'testflight.build.state.submit.ready',
-      ready_to_test: 'testflight.build.state.testing.ready',
-      export_compliance_missing: 'testflight.build.state.export.compliance.missing',
-      review_rejected: 'testflight.build.state.review.rejected'
-    }
-
-    # Find a Build by `build_id`.
-    #
-    # @return (Spaceship::TestFlight::Build)
-    def self.find(app_id: nil, build_id: nil)
-      attrs = client.get_build(app_id: app_id, build_id: build_id)
-      self.new(attrs)
-    end
-
-    def self.all(app_id: nil, platform: nil, retry_count: 0)
-      trains = BuildTrains.all(app_id: app_id, platform: platform, retry_count: retry_count)
-      trains.values.flatten
-    end
-
-    def self.builds_for_train(app_id: nil, platform: nil, train_version: nil, retry_count: 3)
-      builds_data = client.get_builds_for_train(app_id: app_id, platform: platform, train_version: train_version, retry_count: retry_count)
-      builds_data.map { |data| self.new(data) }
-    end
-
-    # Just the builds, as a flat array, that are still processing
-    def self.all_processing_builds(app_id: nil, platform: nil, retry_count: 0)
-      all(app_id: app_id, platform: platform, retry_count: retry_count).find_all(&:processing?)
-    end
-
-    def self.latest(app_id: nil, platform: nil)
-      all(app_id: app_id, platform: platform).sort_by(&:upload_date).last
-    end
-
-    # reload the raw_data resource for this build.
-    # This is useful when we start with a partial build response as returned by the BuildTrains,
-    # but then need to look up some attributes on the full build representation.
-    #
-    # Note: this will overwrite any non-saved changes to the object
-    #
-    # @return (Spaceship::Base::DataHash) the raw_data of the build.
-    def reload
-      self.raw_data = self.class.find(app_id: app_id, build_id: id).raw_data
-    end
-
-    def ready_to_submit?
-      external_state == BUILD_STATES[:ready_to_submit]
-    end
-
-    def ready_to_test?
-      external_state == BUILD_STATES[:ready_to_test]
-    end
-
-    def active?
-      external_state == BUILD_STATES[:active]
-    end
-
-    def processing?
-      external_state == BUILD_STATES[:processing]
-    end
-
-    def export_compliance_missing?
-      external_state == BUILD_STATES[:export_compliance_missing]
-    end
-
-    def review_rejected?
-      external_state == BUILD_STATES[:review_rejected]
-    end
-
-    def processed?
-      active? || ready_to_submit? || export_compliance_missing? || review_rejected?
-    end
-
-    # Getting builds from BuildTrains only gets a partial Build object
-    # We are then requesting the full build from iTC when we need to access
-    # any of the variables below, because they are not included in the partial Build objects
-    #
-    # `super` here calls `beta_review_info` as defined by the `attr_mapping` above.
-    # @return (Spaceship::TestFlight::BetaReviewInfo)
-    def beta_review_info
-      super || reload
-      BetaReviewInfo.new(super)
-    end
-
-    # @return (Spaceship::TestFlight::ExportCompliance)
-    def export_compliance
-      super || reload
-      ExportCompliance.new(super)
-    end
-
-    # @return (Spaceship::TestFlight::TestInfo)
-    def test_info
-      super || reload
-      TestInfo.new(super)
-    end
-
-    # @return (Time) an parsed Time value for the upload_date
-    def upload_date
-      Time.parse(super)
-    end
-
-    # saves the changes to the Build object to TestFlight
-    def save!
-      client.put_build(app_id: app_id, build_id: id, build: self)
-    end
-
-    def update_build_information!(description: nil, feedback_email: nil, whats_new: nil)
-      test_info.description = description if description
-      test_info.feedback_email = feedback_email if feedback_email
-      test_info.whats_new = whats_new if whats_new
-      save!
-    end
-
-    def submit_for_testflight_review!
-      return if ready_to_test?
-      client.post_for_testflight_review(app_id: app_id, build_id: id, build: self)
-    end
-
-    def expire!
-      client.expire_build(app_id: app_id, build_id: id, build: self)
-    end
-
-    def add_group!(group)
-      client.add_group_to_build(app_id: app_id, group_id: group.id, build_id: id)
+require_relative 'base'
+require_relative 'test_info'
+require_relative 'export_compliance'
+require_relative 'beta_review_info'
+require_relative 'build_trains'
+
+module Spaceship
+  module TestFlight
+    class Build < Base
+      # @example
+      #   "com.sample.app"
+      attr_accessor :bundle_id
+
+      # @example
+      #   "testflight.build.state.testing.active"
+      # @example
+      #   "testflight.build.state.processing"
+      attr_accessor :internal_state
+
+      # @example
+      #   "testflight.build.state.submit.ready"
+      # @example
+      #   "testflight.build.state.processing"
+      attr_accessor :external_state
+
+      # Internal build ID (int)
+      # @example
+      #   19285309
+      attr_accessor :id
+
+      # @example
+      #   "1.0"
+      attr_accessor :train_version
+
+      # @example
+      #   "152"
+      attr_accessor :build_version
+
+      attr_accessor :beta_review_info
+
+      attr_accessor :export_compliance
+
+      attr_accessor :test_info
+
+      attr_accessor :install_count
+      attr_accessor :invite_count
+      attr_accessor :crash_count
+
+      attr_accessor :did_notify
+
+      attr_accessor :upload_date
+
+      attr_accessor :dsym_url
+      attr_accessor :build_sdk
+      attr_accessor :include_symbols
+      attr_accessor :number_of_asset_packs
+      attr_accessor :contains_odr
+      attr_accessor :file_name
+
+      attr_mapping({
+        'appAdamId' => :app_id,
+        'providerId' => :provider_id,
+        'bundleId' => :bundle_id,
+        'trainVersion' => :train_version,
+        'buildVersion' => :build_version,
+        'betaReviewInfo' => :beta_review_info,
+        'exportCompliance' => :export_compliance,
+        'internalState' => :internal_state,
+        'externalState' => :external_state,
+        'testInfo' => :test_info,
+        'installCount' => :install_count,
+        'inviteCount' => :invite_count,
+        'crashCount' => :crash_count,
+        'didNotify' => :did_notify,
+        'uploadDate' => :upload_date,
+        'id' => :id,
+        'dSYMUrl' => :dsym_url,
+        'buildSdk' => :build_sdk,
+        'includesSymbols' => :include_symbols,
+        'numberOfAssetPacks' => :number_of_asset_packs,
+        'containsODR' => :contains_odr,
+        'fileName' => :file_name
+      })
+
+      BUILD_STATES = {
+        processing: 'testflight.build.state.processing',
+        active: 'testflight.build.state.testing.active',
+        ready_to_submit: 'testflight.build.state.submit.ready',
+        ready_to_test: 'testflight.build.state.testing.ready',
+        export_compliance_missing: 'testflight.build.state.export.compliance.missing',
+        review_rejected: 'testflight.build.state.review.rejected'
+      }
+
+      # Find a Build by `build_id`.
+      #
+      # @return (Spaceship::TestFlight::Build)
+      def self.find(app_id: nil, build_id: nil)
+        attrs = client.get_build(app_id: app_id, build_id: build_id)
+        self.new(attrs)
+      end
+
+      def self.all(app_id: nil, platform: nil, retry_count: 0)
+        trains = BuildTrains.all(app_id: app_id, platform: platform, retry_count: retry_count)
+        trains.values.flatten
+      end
+
+      def self.builds_for_train(app_id: nil, platform: nil, train_version: nil, retry_count: 3)
+        builds_data = client.get_builds_for_train(app_id: app_id, platform: platform, train_version: train_version, retry_count: retry_count)
+        builds_data.map { |data| self.new(data) }
+      end
+
+      # Just the builds, as a flat array, that are still processing
+      def self.all_processing_builds(app_id: nil, platform: nil, retry_count: 0)
+        all(app_id: app_id, platform: platform, retry_count: retry_count).find_all(&:processing?)
+      end
+
+      def self.latest(app_id: nil, platform: nil)
+        all(app_id: app_id, platform: platform).sort_by(&:upload_date).last
+      end
+
+      # reload the raw_data resource for this build.
+      # This is useful when we start with a partial build response as returned by the BuildTrains,
+      # but then need to look up some attributes on the full build representation.
+      #
+      # Note: this will overwrite any non-saved changes to the object
+      #
+      # @return (Spaceship::Base::DataHash) the raw_data of the build.
+      def reload
+        self.raw_data = self.class.find(app_id: app_id, build_id: id).raw_data
+      end
+
+      def ready_to_submit?
+        external_state == BUILD_STATES[:ready_to_submit]
+      end
+
+      def ready_to_test?
+        external_state == BUILD_STATES[:ready_to_test]
+      end
+
+      def active?
+        external_state == BUILD_STATES[:active]
+      end
+
+      def processing?
+        external_state == BUILD_STATES[:processing]
+      end
+
+      def export_compliance_missing?
+        external_state == BUILD_STATES[:export_compliance_missing]
+      end
+
+      def review_rejected?
+        external_state == BUILD_STATES[:review_rejected]
+      end
+
+      def processed?
+        active? || ready_to_submit? || export_compliance_missing? || review_rejected?
+      end
+
+      # Getting builds from BuildTrains only gets a partial Build object
+      # We are then requesting the full build from iTC when we need to access
+      # any of the variables below, because they are not included in the partial Build objects
+      #
+      # `super` here calls `beta_review_info` as defined by the `attr_mapping` above.
+      # @return (Spaceship::TestFlight::BetaReviewInfo)
+      def beta_review_info
+        super || reload
+        BetaReviewInfo.new(super)
+      end
+
+      # @return (Spaceship::TestFlight::ExportCompliance)
+      def export_compliance
+        super || reload
+        ExportCompliance.new(super)
+      end
+
+      # @return (Spaceship::TestFlight::TestInfo)
+      def test_info
+        super || reload
+        TestInfo.new(super)
+      end
+
+      # @return (Time) an parsed Time value for the upload_date
+      def upload_date
+        Time.parse(super)
+      end
+
+      # saves the changes to the Build object to TestFlight
+      def save!
+        client.put_build(app_id: app_id, build_id: id, build: self)
+      end
+
+      def update_build_information!(description: nil, feedback_email: nil, whats_new: nil)
+        test_info.description = description if description
+        test_info.feedback_email = feedback_email if feedback_email
+        test_info.whats_new = whats_new if whats_new
+        save!
+      end
+
+      def submit_for_testflight_review!
+        return if ready_to_test?
+        client.post_for_testflight_review(app_id: app_id, build_id: id, build: self)
+      end
+
+      def expire!
+        client.expire_build(app_id: app_id, build_id: id, build: self)
+      end
+
+      def add_group!(group)
+        client.add_group_to_build(app_id: app_id, group_id: group.id, build_id: id)
+      end
     end
   end
 end