spaceship 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9452203d446ab2eb76810e8ee4a50d7b838ad91
-  data.tar.gz: f90ffe947881c20f13fc1186dede47bbeb26d2f2
+  metadata.gz: 8a0aa9495ff354e1c5b95d9e37c3d4bbe3fdd78a
+  data.tar.gz: 4cb03238dd2e3c63d807b8b15e989b818845f6b0
 SHA512:
-  metadata.gz: 27ee1ad437139635ca1b28356482cd7127c9f4ef314c2822c5554518d1cc18dfba3ccf171eaaf9085609b13d6038a300b104628b13d53d2a857588132d9e4c63
-  data.tar.gz: 849de99bac3737816bf33ca79854786bfc5a21d7e57793f6f0f5d4ea69d2a52c520cca5dbd4f7901b53757e388f9700becbf758f2d12646401665216364f7cd9
+  metadata.gz: 178f2df3b4200629861bccb40f34ad30c6abb5510caa70eb7d55b4a5a670b2b60fa3d7edc1d1a104b884f30fc735e7ec22c09d564887be0c5d77a033ad5ed0e4
+  data.tar.gz: e3a7a94c04cdb8c41a1545b6e477306befe94d8007c1f567a9a9391ad9422af66f649b87719afa46244ee8a3adfe4e739ead4b8c20f99f8c4307609404083b0d

data/lib/spaceship/client.rb

@@ -28,19 +28,47 @@ module Spaceship
     # /tmp/spaceship[time]_[pid].log by default
     attr_accessor :logger
 
+    # 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 < StandardError; end
+    class InvalidUserCredentialsError < BasicPreferredInfoError; end
 
     # Raised when no user credentials were passed at all
-    class NoUserCredentialsError < StandardError; end
+    class NoUserCredentialsError < BasicPreferredInfoError; end
 
-    class UnexpectedResponse < StandardError; 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 < StandardError; end
+    class AppleTimeoutError < BasicPreferredInfoError; end
 
     # Raised when 401 is received from portal request
-    class UnauthorizedAccessError < StandardError; end
+    class UnauthorizedAccessError < BasicPreferredInfoError; end
 
     # 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
@@ -238,7 +266,7 @@ module Spaceship
 
     def request(method, url_or_path = nil, params = nil, headers = {}, &block)
       headers.merge!(csrf_tokens)
-      headers.merge!({ 'User-Agent' => USER_AGENT })
+      headers['User-Agent'] = USER_AGENT
 
       # Before encoding the parameters, log them
       log_request(method, url_or_path, params)
@@ -297,7 +325,7 @@ module Spaceship
       end
 
       if content.nil?
-        raise UnexpectedResponse.new, response.body
+        raise UnexpectedResponse.new(response.body)
       else
         store_csrf_tokens(response)
         content

data/lib/spaceship/du/du_client.rb

@@ -62,7 +62,7 @@ module Spaceship
         req.headers['X-Apple-Upload-ContentProviderId'] = content_provider_id
         req.headers['X-Original-Filename'] = upload_file.file_name
         req.headers['X-Apple-Upload-Validation-RuleSets'] = du_validation_rule_set if du_validation_rule_set
-        req.headers['Content-Length'] = "#{upload_file.file_size}"
+        req.headers['Content-Length'] = upload_file.file_size.to_s
         req.headers['Connection'] = "keep-alive"
       end
 

data/lib/spaceship/du/upload_file.rb

@@ -12,7 +12,7 @@ module Spaceship
     class << self
       def from_path(path)
         raise "Image must exists at path: #{path}" unless File.exist?(path)
-        path = remove_alpha_channel(path) if File.extname(path).downcase == '.png'
+        path = remove_alpha_channel(path) if File.extname(path).casecmp('.png').zero?
 
         content_type = Utilities.content_type(path)
         self.new(

data/lib/spaceship/portal/certificate.rb

@@ -193,8 +193,8 @@ module Spaceship
           csr = OpenSSL::X509::Request.new
           csr.version = 0
           csr.subject = OpenSSL::X509::Name.new([
-            ['CN', 'PEM', OpenSSL::ASN1::UTF8STRING]
-          ])
+                                                  ['CN', 'PEM', OpenSSL::ASN1::UTF8STRING]
+                                                ])
           csr.public_key = key.public_key
           csr.sign(key, OpenSSL::Digest::SHA1.new)
           return [csr, key]

data/lib/spaceship/tunes/app_submission.rb

@@ -98,14 +98,14 @@ module Spaceship
         def factory(attrs)
           # fill content rights section if iTC returns nil
           if attrs["contentRights"].nil?
-            attrs.merge!("contentRights" => {
+            attrs["contentRights"] = {
               "containsThirdPartyContent" => {
                 "value" => nil
               },
               "hasRights" => {
                 "value" => nil
               }
-            })
+            }
           end
 
           obj = self.new(attrs)
@@ -115,8 +115,8 @@ module Spaceship
         # @param application (Spaceship::Tunes::Application) The app this submission is for
         def create(application, version)
           attrs = client.prepare_app_submissions(application.apple_id, application.edit_version.version_id)
-          attrs.merge!(application: application)
-          attrs.merge!(version: version)
+          attrs[:application] = application
+          attrs[:version] = version
 
           return self.factory(attrs)
         end

data/lib/spaceship/tunes/app_trailer.rb

@@ -40,8 +40,7 @@ module Spaceship
       end
 
       def reset!(attrs = {})
-        update_raw_data!
-        ({
+        update_raw_data!({
           video_asset_token: nil,
           picture_asset_token: nil,
           descriptionXML: nil,
@@ -54,8 +53,7 @@ module Spaceship
           video_status: nil,
           device_type: nil,
           language: nil
-         }.merge(attrs)
-        )
+         }.merge(attrs))
       end
 
       private

data/lib/spaceship/tunes/app_version.rb

@@ -168,8 +168,8 @@ module Spaceship
           attrs = client.app_version(app_id, is_live)
           return nil unless attrs
 
-          attrs.merge!(application: application)
-          attrs.merge!(is_live: is_live)
+          attrs[:application] = application
+          attrs[:is_live] = is_live
 
           return self.factory(attrs)
         end
@@ -429,7 +429,7 @@ module Spaceship
 
           trailer.merge!({
             "pictureAssetToken" => video_preview_data["token"],
-            "previewFrameTimeCode" => "#{ts}",
+            "previewFrameTimeCode" => ts.to_s,
             "isPortrait" => Utilities.portrait?(video_preview_path)
           })
         else # removing trailer

data/lib/spaceship/tunes/application.rb

@@ -130,7 +130,7 @@ module Spaceship
 
       def details
         attrs = client.app_details(apple_id)
-        attrs.merge!(application: self)
+        attrs[:application] = self
         Tunes::AppDetails.factory(attrs)
       end
 
@@ -138,7 +138,7 @@ module Spaceship
         ensure_not_a_bundle
         versions = client.versions_history(apple_id, platform)
         versions.map do |attrs|
-          attrs.merge!(application: self)
+          attrs[:application] = self
           Tunes::AppVersionHistory.factory(attrs)
         end
       end
@@ -193,12 +193,31 @@ module Spaceship
       # @!group Builds
       #####################################################
 
-      # A reference to all the build trains
+      # TestFlight: A reference to all the build trains
       # @return [Hash] a hash, the version number being the key
       def build_trains
         Tunes::BuildTrain.all(self, self.apple_id)
       end
 
+      # The numbers of all build trains that were uploaded
+      # @return [Array] An array of train version numbers
+      def all_build_train_numbers
+        client.all_build_trains(app_id: self.apple_id).fetch("trains").collect do |current|
+          current["versionString"]
+        end
+      end
+
+      # Receive the build details for a specific build
+      # useful if the app is not listed in the TestFlight build list
+      # which might happen if you don't use TestFlight
+      # This is used to receive dSYM files from Apple
+      def all_builds_for_train(train: nil)
+        client.all_builds_for_train(app_id: self.apple_id, train: train).fetch("items", []).collect do |attrs|
+          attrs[:apple_id] = self.apple_id
+          Tunes::Build.factory(attrs)
+        end
+      end
+
       # @return [Array]A list of binaries which are not even yet processing based on the version
       #   These are all build that have no information except the upload date
       #   Those builds can also be the builds that are stuck on iTC.
@@ -206,7 +225,7 @@ module Spaceship
         data = client.build_trains(apple_id, 'internal') # we need to fetch all trains here to get the builds
 
         builds = data.fetch('processingBuilds', []).collect do |attrs|
-          attrs.merge!(build_train: self)
+          attrs[:build_train] = self
           Tunes::ProcessingBuild.factory(attrs)
         end
 
@@ -220,7 +239,7 @@ module Spaceship
         data = client.build_trains(apple_id, 'internal') # we need to fetch all trains here to get the builds
 
         builds = data.fetch('processingBuilds', []).collect do |attrs|
-          attrs.merge!(build_train: self)
+          attrs[:build_train] = self
           Tunes::ProcessingBuild.factory(attrs)
         end
 

data/lib/spaceship/tunes/build.rb

@@ -6,6 +6,11 @@ module Spaceship
       # @!group General metadata
       #####################################################
 
+      # @return (String) The App identifier of this app, provided by iTunes Connect
+      # @example
+      #   "1013943394"
+      attr_accessor :apple_id
+
       # @return (Spaceship::Tunes::BuildTrain) A reference to the build train this build is contained in
       attr_accessor :build_train
 
@@ -112,12 +117,25 @@ module Spaceship
         self.internal_expiry_date ||= 0
       end
 
+      def details
+        response = client.build_details(app_id: self.apple_id,
+                                         train: self.train_version,
+                                  build_number: self.build_version)
+        response['apple_id'] = self.apple_id
+        BuildDetails.factory(response)
+      end
+
+      def apple_id
+        return @apple_id if @apple_id
+        return self.build_train.application.apple_id
+      end
+
       def update_build_information!(whats_new: nil,
                                     description: nil,
                                     feedback_email: nil)
         parameters = {
-          app_id: self.build_train.application.apple_id,
-          train: self.build_train.version_string,
+          app_id: self.apple_id,
+          train: self.train_version,
           build_number: self.build_version,
           platform: self.platform
         }.merge({
@@ -150,8 +168,8 @@ module Spaceship
       #  }
       def submit_for_beta_review!(metadata)
         parameters = {
-          app_id: self.build_train.application.apple_id,
-          train: self.build_train.version_string,
+          app_id: self.apple_id,
+          train: self.train_version,
           build_number: self.build_version,
           platform: self.platform,
 
@@ -199,8 +217,8 @@ module Spaceship
 
       # This will cancel the review process for this TestFlight build
       def cancel_beta_review!
-        client.remove_testflight_build_from_review!(app_id: self.build_train.application.apple_id,
-                                                     train: self.build_train.version_string,
+        client.remove_testflight_build_from_review!(app_id: self.apple_id,
+                                                     train: self.train_version,
                                               build_number: self.build_version,
                                                   platform: self.platform)
       end

data/lib/spaceship/tunes/build_details.rb

@@ -0,0 +1,48 @@
+module Spaceship
+  module Tunes
+    # Represents the details of a build
+    class BuildDetails < TunesBase
+      # @return (String) The App identifier of this app, provided by iTunes Connect
+      # @example
+      #   "1013943394"
+      attr_accessor :apple_id
+
+      # @return (String) Link to the dSYM file (not always available)
+      #     lol, it's unencrypted http
+      attr_accessor :dsym_url
+
+      # @return [Bool]
+      attr_accessor :include_symbols
+
+      # @return [Integer]
+      attr_accessor :number_of_asset_packs
+
+      # @return [Bool]
+      attr_accessor :contains_odr
+
+      # e.g. "13A340"
+      attr_accessor :build_sdk
+
+      # @return [String] e.g. "MyApp.ipa"
+      attr_accessor :file_name
+
+      attr_mapping(
+        'apple_id' => :apple_id,
+        'dsymurl' => :dsym_url,
+        'includesSymbols' => :include_symbols,
+        'numberOfAssetPacks' => :number_of_asset_packs,
+        'containsODR' => :contains_odr,
+        'buildSdk' => :build_sdk,
+        'fileName' => :file_name
+      )
+
+      class << self
+        # Create a new object based on a hash.
+        # This is used to create a new object based on the server response.
+        def factory(attrs)
+          self.new(attrs)
+        end
+      end
+    end
+  end
+end

data/lib/spaceship/tunes/build_train.rb

@@ -49,7 +49,7 @@ module Spaceship
 
           result = {}
           trains.each do |attrs|
-            attrs.merge!(application: application)
+            attrs[:application] = application
             current = self.factory(attrs)
             result[current.version_string] = current
           end
@@ -62,12 +62,12 @@ module Spaceship
         super
 
         @builds = (self.raw_data['builds'] || []).collect do |attrs|
-          attrs.merge!(build_train: self)
+          attrs[:build_train] = self
           Tunes::Build.factory(attrs)
         end
 
         @processing_builds = (self.raw_data['buildsInProcessing'] || []).collect do |attrs|
-          attrs.merge!(build_train: self)
+          attrs[:build_train] = self
           Tunes::Build.factory(attrs)
         end
 

data/lib/spaceship/tunes/language_item.rb

@@ -26,7 +26,7 @@ module Spaceship
         end
         return result if result
 
-        raise "Language '#{lang}' is not activated for this app version."
+        raise "Language '#{lang}' is not activated / available for this app version."
       end
 
       # @return (Array) An array containing all languages that are already available

data/lib/spaceship/tunes/tunes.rb

@@ -15,6 +15,7 @@ require 'spaceship/tunes/user_detail'
 require 'spaceship/tunes/app_screenshot'
 require 'spaceship/tunes/language_converter'
 require 'spaceship/tunes/build'
+require 'spaceship/tunes/build_details'
 require 'spaceship/tunes/processing_build'
 require 'spaceship/tunes/build_train'
 require 'spaceship/tunes/device_type'

data/lib/spaceship/tunes/tunes_client.rb

@@ -2,7 +2,7 @@ module Spaceship
   # rubocop:disable Metrics/ClassLength
   class TunesClient < Spaceship::Client
     # ITunesConnectError is only thrown when iTunes Connect raises an exception
-    class ITunesConnectError < StandardError
+    class ITunesConnectError < BasicPreferredInfoError
     end
 
     # raised if the server failed to save temporarily
@@ -80,7 +80,7 @@ module Spaceship
 
       if t_name.length > 0
         teams.each do |t|
-          t_id = t['contentProvider']['contentProviderId'].to_s if t['contentProvider']['name'].downcase == t_name.downcase
+          t_id = t['contentProvider']['contentProviderId'].to_s if t['contentProvider']['name'].casecmp(t_name.downcase).zero?
         end
       end
 
@@ -574,6 +574,22 @@ module Spaceship
       handle_itc_response(r.body)
     end
 
+    # All build trains, even if there is no TestFlight
+    def all_build_trains(app_id: nil)
+      r = request(:get, "ra/apps/#{app_id}/buildHistory?platform=ios")
+      handle_itc_response(r.body)
+    end
+
+    def all_builds_for_train(app_id: nil, train: nil)
+      r = request(:get, "ra/apps/#{app_id}/trains/#{train}/buildHistory?platform=ios")
+      handle_itc_response(r.body)
+    end
+
+    def build_details(app_id: nil, train: nil, build_number: nil)
+      r = request(:get, "ra/apps/#{app_id}/platforms/ios/trains/#{train}/builds/#{build_number}/details")
+      handle_itc_response(r.body)
+    end
+
     def update_build_information!(app_id: nil,
                                   train: nil,
                                   build_number: nil,

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.23.0"
+  VERSION = "0.24.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager
@@ -241,14 +241,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.38.0
 description: Because you would rather spend your time building stuff than fighting
   provisioning
 email:
@@ -297,6 +297,7 @@ files:
 - lib/spaceship/tunes/app_version_states_history.rb
 - lib/spaceship/tunes/application.rb
 - lib/spaceship/tunes/build.rb
+- lib/spaceship/tunes/build_details.rb
 - lib/spaceship/tunes/build_train.rb
 - lib/spaceship/tunes/device_type.rb
 - lib/spaceship/tunes/language_converter.rb
@@ -332,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Because you would rather spend your time building stuff than fighting provisioning