spaceship 0.26.3 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecda13a0ac45078ad0e08f7abc3518a8a4f5bb44
-  data.tar.gz: e305bdacb1c19d9c7840c36ae98ae16743697359
+  metadata.gz: 429cc67c199e32d7f2e55aa822a6b4de8270df3f
+  data.tar.gz: b045bde4d81c758d7382ffabc8c46ccd2377fe17
 SHA512:
-  metadata.gz: c1f86d60293a4bda95488ca705ada246f48f51eaa771b7812d07db932922b653d42b46dbdda6b37301e483f10cb632de178e681b160721d90f47a5d0d9909752
-  data.tar.gz: 49123b5c67df77ad583984e36464093a508ea95e83a0552297c34f90500717d790154c6e34ab63e0861aef18d6fe47911e08e54e99c4af69dddfc37df3a8edc1
+  metadata.gz: f8714341e6951b1eacfc03c9cea0df512f4b5da3d39d671bbf34b8a3be4ef785f7e98bf36c2ff1987fe30ce367e988b37575c7a8d8a8488c183eedcad5466221
+  data.tar.gz: 42f76298463d24677037dcd29d8514e6cdf0c6465006190ff5de131572e868af92668380371dea0e64b9f150a3fb379da7dc7dc750dc297cc6535f2ebbc83cf4

data/lib/spaceship/base.rb

@@ -3,7 +3,7 @@ module Spaceship
   # Spaceship::Base is the superclass for models in Apple Developer Portal.
   # It's mainly responsible for mapping responses to objects.
   #
-  # A class-level attribute `client` is used to maintain the which spaceship we
+  # A class-level attribute `client` is used to maintain the spaceship which we
   # are using to talk to ADP.
   #
   # Example of creating a new ADP model:

data/lib/spaceship/tunes/application.rb

@@ -218,45 +218,24 @@ module Spaceship
         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.
-      def pre_processing_builds
-        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[:build_train] = self
-          Tunes::ProcessingBuild.factory(attrs)
-        end
-
-        builds.delete_if { |a| a.state.include?("invalidBinary") }
-
-        builds
-      end
-
-      # @return [Array]A list of binaries which are in the invalid state
-      def invalid_builds
-        data = client.build_trains(apple_id, 'internal') # we need to fetch all trains here to get the builds
+      # @return [Array] A list of all builds in an invalid state
+      def all_invalid_builds
+        builds = []
 
-        builds = data.fetch('processingBuilds', []).collect do |attrs|
-          attrs[:build_train] = self
-          Tunes::ProcessingBuild.factory(attrs)
+        self.build_trains.values.each do |train|
+          builds.concat(train.invalid_builds)
         end
 
-        builds.delete_if { |a| !a.state.include?("invalidBinary") }
-
-        builds
+        return builds
       end
 
       # @return [Array] This will return an array of *all* processing builds
       #   this include pre-processing or standard processing
       def all_processing_builds
-        builds = self.pre_processing_builds
+        builds = []
 
-        self.build_trains.each do |version_number, train|
-          train.processing_builds.each do |build|
-            builds << build
-          end
+        self.build_trains.values.each do |train|
+          builds.concat(train.processing_builds)
         end
 
         return builds

data/lib/spaceship/tunes/build.rb

@@ -29,6 +29,11 @@ module Spaceship
       # @return (Boolean) Is this build currently processing?
       attr_accessor :processing
 
+      # @return (String) The build processing state, may be nil
+      # @example "invalidBinary"
+      # @example "processingFailed"
+      attr_accessor :processing_state
+
       # @return (Integer) The number of ticks since 1970 (e.g. 1413966436000)
       attr_accessor :upload_date
 
@@ -91,6 +96,7 @@ module Spaceship
         'id' => :id,
         'valid' => :valid,
         'processing' => :processing,
+        'processingState' => :processing_state,
 
         'installCount' => :install_count,
         'internalInstallCount' => :internal_install_count,
@@ -230,6 +236,7 @@ end
 #  "exceededFileSizeLimit"=>false,
 #  "wentLiveWithVersion"=>false,
 #  "processing"=>false,
+#  "processingState": nil,
 #  "id"=>5298023,
 #  "valid"=>true,
 #  "missingExportCompliance"=>false,

data/lib/spaceship/tunes/build_train.rb

@@ -3,8 +3,7 @@ module Spaceship
     # Represents a build train of builds from iTunes Connect
     # A build train is all builds for a given version number with different build numbers
     class BuildTrain < TunesBase
-      # @return (Spaceship::Tunes::Application) A reference to the application
-      #   this train is for
+      # @return (Spaceship::Tunes::Application) A reference to the application this train is for
       attr_accessor :application
 
       # @return (Array) An array of all builds that are inside this train (Spaceship::Tunes::Build)
@@ -22,10 +21,14 @@ module Spaceship
       # @return (Bool) Is internal beta testing enabled for this train? Only one train can have enabled testing.
       attr_reader :internal_testing_enabled
 
-      # @return (Array) An array of all builds that are inside this train (Spaceship::Tunes::Build)
+      # @return (Array) An array of all processing builds that are inside this train (Spaceship::Tunes::Build)
+      # Does not include invalid builds.
       #  I never got this to work to properly try and debug this
       attr_reader :processing_builds
 
+      # @return (Array) An array of all invalid builds that are inside this train
+      attr_reader :invalid_builds
+
       attr_mapping(
         'versionString' => :version_string,
         'platform' => :platform,
@@ -66,6 +69,12 @@ module Spaceship
           Tunes::Build.factory(attrs)
         end
 
+        @invalid_builds = @builds.select do |build|
+          build.processing_state == 'processingFailed' || build.processing_state == 'invalidBinary'
+        end
+
+        # This step may not be necessary anymore - it seems as if every processing build will be caught by the
+        # @builds.each below, but not every processing build makes it to buildsInProcessing, so this is redundant
         @processing_builds = (self.raw_data['buildsInProcessing'] || []).collect do |attrs|
           attrs[:build_train] = self
           Tunes::Build.factory(attrs)
@@ -73,7 +82,24 @@ module Spaceship
 
         # since buildsInProcessing appears empty, fallback to also including processing state from @builds
         @builds.each do |build|
-          @processing_builds << build if build.processing == true && build.valid == true
+          # What combination of attributes constitutes which state is pretty complicated. The table below summarizes
+          # what I've observed, but there's no reason to believe there aren't more states I just haven't seen yet.
+          # The column headers are qualitative states of a given build, and the first column is the observed attributes
+          # of that build.
+          # NOTE: Some of the builds in the build_trains.json fixture do not follow these rules. I don't know if that is
+          # because those examples are older, and the iTC API has changed, or if their format is still a possibility.
+          # The second part of the OR clause in the line below exists so that those suspicious examples continue to be
+          # accepted for unit tests.
+          # +---------------------+-------------------+-------------------+-----------------+--------------------+---------+
+          # |                     | just after upload | normal processing | invalid binary  | processing failed  | success |
+          # +---------------------+-------------------+-------------------+-----------------+--------------------+---------+
+          # |  build.processing = | true              | true              | true            | true               | false   |
+          # |       build.valid = | false             | true              | false           | true               | true    |
+          # | .processing_state = | "processing"      | "processing"      | "invalidBinary" | "processingFailed" | nil     |
+          # +---------------------+-------------------+-------------------+-----------------+--------------------+---------+
+          if build.processing_state == 'processing' || (build.processing && build.processing_state != 'invalidBinary' && build.processing_state != 'processingFailed')
+            @processing_builds << build
+          end
         end
       end
 
@@ -98,9 +124,9 @@ module Spaceship
 
             # also update the builds
             train['builds'].delete_if do |b|
-              return true if b[testing_key].nil?
-
-              if build && b["buildVersion"] == build.build_version
+              if b[testing_key].nil?
+                true
+              elsif build && b["buildVersion"] == build.build_version
                 b[testing_key]['value'] = new_value
                 false
               elsif b[testing_key]['value'] == true

data/lib/spaceship/tunes/tunes.rb

@@ -16,7 +16,6 @@ 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'
 require 'spaceship/tunes/app_trailer'

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.26.3".freeze
+  VERSION = "0.27.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.27.0
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager
@@ -361,7 +361,6 @@ files:
 - lib/spaceship/tunes/language_converter.rb
 - lib/spaceship/tunes/language_item.rb
 - lib/spaceship/tunes/pricing_tier.rb
-- lib/spaceship/tunes/processing_build.rb
 - lib/spaceship/tunes/recovery_device.rb
 - lib/spaceship/tunes/spaceship.rb
 - lib/spaceship/tunes/tester.rb
@@ -393,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Because you would rather spend your time building stuff than fighting provisioning

data/lib/spaceship/tunes/processing_build.rb

@@ -1,29 +0,0 @@
-module Spaceship
-  module Tunes
-    # Represents a build which doesn't have a version number yet and is either processing or is stuck
-    class ProcessingBuild < Build
-      # @return [String] The state of this build
-      # @example
-      #   ITC.apps.betaProcessingStatus.InvalidBinary
-      # @example
-      #   ITC.apps.betaProcessingStatus.Created
-      # @example
-      #   ITC.apps.betaProcessingStatus.Uploaded
-      attr_accessor :state
-
-      # @return (Integer) The number of ticks since 1970 (e.g. 1413966436000)
-      attr_accessor :upload_date
-
-      attr_mapping(
-        'processingState' => :state,
-        'uploadDate' => :upload_date
-      )
-
-      class << self
-        def factory(attrs)
-          self.new(attrs)
-        end
-      end
-    end
-  end
-end