spaceship 0.3.4 → 0.4.0

data/lib/spaceship/portal/provisioning_profile.rb

@@ -16,12 +16,12 @@ module Spaceship
       attr_accessor :uuid
 
       # @return (DateTime) The date and time of when the profile
-      #   expires. 
+      #   expires.
       # @example
       #   #<DateTime: 2015-11-25T22:45:50+00:00 ((2457352j,81950s,0n),+0s,2299161j)>
       attr_accessor :expires
 
-      # @return (String) The profile distribution type. You probably want to 
+      # @return (String) The profile distribution type. You probably want to
       #   use the class type to detect the profile type instead of this string.
       # @example AppStore Profile
       #     "store"
@@ -45,7 +45,7 @@ module Spaceship
       #   "Invalid"
       attr_accessor :status
 
-      # @return (String) The type of the profile (development or distribution). 
+      # @return (String) The type of the profile (development or distribution).
       #   You'll probably not need this value
       # @example Distribution
       #   "iOS Distribution"
@@ -69,7 +69,7 @@ module Spaceship
       # A reference to the app this profile is for.
       # You can then easily access the value directly
       # @return (App) The app this profile is for
-      # 
+      #
       # @example Example Value
       #   <Spaceship::App
       #     @app_id="2UMR2S6PAA"
@@ -80,7 +80,7 @@ module Spaceship
       #     @is_wildcard=false
       #     @dev_push_enabled=false
       #     @prod_push_enabled=false>
-      # 
+      #
       # @example Usage
       #   profile.app.name
       attr_accessor :app
@@ -99,14 +99,14 @@ module Spaceship
       #     @owner_id=nil
       #     @type_display_id="R58UK2EWAA">]
       #  ]
-      # 
+      #
       # @example Usage
       #   profile.certificates.first.id
       attr_accessor :certificates
 
       # @return (Array) A list of devices this profile is enabled for.
       #   This will always be [] for AppStore profiles
-      # 
+      #
       # @example Example Value
       #  <Spaceship::Device
       #    @id="WXQ7V239BE"
@@ -114,7 +114,7 @@ module Spaceship
       #    @udid="ba0ac7d70f7a14c6fa02ef0e02f4fe9c5178e2f7"
       #    @platform="ios"
       #    @status="c">]
-      # 
+      #
       # @example Usage
       #  profile.devices.first.name
       attr_accessor :devices
@@ -204,7 +204,7 @@ module Spaceship
 
           devices = [] if (self == AppStore or self == InHouse) # App Store Profiles MUST NOT have devices
 
-          certificate_parameter = certificate.collect { |c| c.id } if certificate.kind_of?Array
+          certificate_parameter = certificate.collect { |c| c.id } if certificate.kind_of? Array
           certificate_parameter ||= [certificate.id]
 
           # Fix https://github.com/KrauseFx/fastlane/issues/349
@@ -217,29 +217,19 @@ module Spaceship
             end
           end
 
-          def send_create_request(name, type, app_id, certificate_parameter, devices)
-            tries ||= 5
-            client.create_provisioning_profile!(name, type, app_id, certificate_parameter, devices)
-          rescue => ex 
-            unless (tries -= 1).zero?
-              sleep 3
-              retry
-            end
-
-            raise ex # re-raise the exception
+          profile = client.with_retry do
+            client.create_provisioning_profile!(name,
+                                                self.type,
+                                                app.app_id,
+                                                certificate_parameter,
+                                                devices.map {|d| d.id} )
           end
 
-          profile = send_create_request(name,
-                                        self.type,
-                                        app.app_id,
-                                        certificate_parameter,
-                                        devices.map {|d| d.id} )
-          
           self.new(profile)
         end
 
         # @return (Array) Returns all profiles registered for this account
-        #  If you're calling this from a subclass (like AdHoc), this will 
+        #  If you're calling this from a subclass (like AdHoc), this will
         #  only return the profiles that are of this type
         def all
           profiles = client.provisioning_profiles.map do |profile|
@@ -317,7 +307,7 @@ module Spaceship
 
       # Repair an existing provisioning profile
       # alias to update!
-      # @return (ProvisioningProfile) A new provisioning profile, as 
+      # @return (ProvisioningProfile) A new provisioning profile, as
       #  the repair method will generate a profile with a new ID
       def repair!
         update!
@@ -326,56 +316,40 @@ module Spaceship
       # Updates the provisioning profile from the local data
       # e.g. after you added new devices to the profile
       # This will also update the code signing identity if necessary
-      # @return (ProvisioningProfile) A new provisioning profile, as 
+      # @return (ProvisioningProfile) A new provisioning profile, as
       #  the repair method will generate a profile with a new ID
       def update!
         unless certificate_valid?
-          if self.kind_of?Development
+          if self.kind_of? Development
             self.certificates = [Spaceship::Certificate::Development.all.first]
-          elsif self.kind_of?InHouse
+          elsif self.kind_of? InHouse
             self.certificates = [Spaceship::Certificate::InHouse.all.first]
           else
-            self.certificates = [Spaceship::Certificate::Production.all.first]  
+            self.certificates = [Spaceship::Certificate::Production.all.first]
           end
         end
 
-        def send_update_request(id, name, distribution_method, app_id, certificates, devices)
-          tries ||= 5
+        client.with_retry do
           client.repair_provisioning_profile!(
             id,
             name,
             distribution_method,
-            app_id,
-            certificates,
-            devices
+            app.app_id,
+            certificates.map { |c| c.id },
+            devices.map { |d| d.id }
           )
-        rescue => ex 
-          unless (tries -= 1).zero?
-            sleep 3
-            retry
-          end
-          raise ex # re-raise the exception
         end
 
-        send_update_request(
-          self.id,
-          self.name,
-          self.distribution_method,
-          self.app.app_id,
-          self.certificates.map { |c| c.id },
-          self.devices.map { |d| d.id }
-        )
-
         # We need to fetch the provisioning profile again, as the ID changes
-        profile = Spaceship::ProvisioningProfile.all.find do |profile|
-          profile.name == self.name # we can use the name as it's valid
+        profile = Spaceship::ProvisioningProfile.all.find do |p|
+          p.name == self.name # we can use the name as it's valid
         end
 
         return profile
       end
 
       # Is the certificate of this profile available?
-      # @return (Bool) is the certificate valid? 
+      # @return (Bool) is the certificate valid?
       def certificate_valid?
         return false if (certificates || []).count == 0
         certificates.each do |c|

data/lib/spaceship/portal/spaceship.rb

@@ -8,30 +8,30 @@ module Spaceship
       # 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
       # on.
-      # 
+      #
       # This method will automatically use the username from the Appfile (if available)
       # and fetch the password from the Keychain (if available)
-      # 
+      #
       # @param user (String) (optional): The username (usually the email address)
       # @param password (String) (optional): The password
-      # 
+      #
       # @raise InvalidUserCredentialsError: raised if authentication failed
-      # 
+      #
       # @return (Spaceship::Client) The client the login method was called for
       def login(user = nil, password = nil)
         @client = PortalClient.login(user, password)
       end
 
       # Open up the team selection for the user (if necessary).
-      # 
+      #
       # If the user is in multiple teams, a team selection is shown.
       # The user can then select a team by entering the number
-      # 
+      #
       # Additionally, the team ID is shown next to each team name
       # so that the user can use the environment variable `FASTLANE_TEAM_ID`
       # for future user.
-      # 
-      # @return (String) The ID of the select team. You also get the value if 
+      #
+      # @return (String) The ID of the select team. You also get the value if
       #   the user is only in one team.
       def select_team
         @client.select_team
@@ -44,6 +44,16 @@ module Spaceship
         Spaceship::App.set_client(@client)
       end
 
+      # @return (Class) Access the app groups for the spaceship
+      def app_group
+        Spaceship::AppGroup.set_client(@client)
+      end
+
+      # @return (Class) Access app services for the spaceship
+      def app_service
+        Spaceship::AppService
+      end
+
       # @return (Class) Access the devices for the spaceship
       def device
         Spaceship::Device.set_client(@client)
@@ -75,6 +85,14 @@ module Spaceship
       Spaceship::Portal.app
     end
 
+    def app_group
+      Spaceship::Portal.app_group
+    end
+
+    def app_service
+      Spaceship::Portal.app_service
+    end
+
     def device
       Spaceship::Portal.device
     end
@@ -91,4 +109,4 @@ module Spaceship
       Spaceship::Portal.client
     end
   end
-end
+end

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

@@ -8,11 +8,11 @@ module Spaceship
       #   "type"=>"Company/Organization",
       #   "extendedTeamAttributes"=>{},
       #   "teamAgent"=>{
-      #       "personId"=>15534241111, 
-      #       "firstName"=>"Felix", 
-      #       "lastName"=>"Krause", 
-      #       "email"=>"spaceship@krausefx.com", 
-      #       "developerStatus"=>"active", 
+      #       "personId"=>15534241111,
+      #       "firstName"=>"Felix",
+      #       "lastName"=>"Krause",
+      #       "email"=>"spaceship@krausefx.com",
+      #       "developerStatus"=>"active",
       #       "teamMemberId"=>"5Y354CXAAA"},
       #   "memberships"=>
       #    [{"membershipId"=>"HJ5WHYC5CE",
@@ -57,10 +57,8 @@ module Spaceship
           puts "Couldn't find team with Name '#{team_name}'"
         end
 
-
         return teams[0]['teamId'] if teams.count == 1 # user is just in one team
 
-
         # User Selection
         loop do
           # Multiple teams, user has to select
@@ -77,4 +75,4 @@ module Spaceship
       end
     end
   end
-end
+end

data/lib/spaceship/tunes/app_screenshot.rb

@@ -25,4 +25,4 @@ module Spaceship
       end
     end
   end
-end
+end

data/lib/spaceship/tunes/app_status.rb

@@ -1,7 +1,7 @@
 module Spaceship
   module Tunes
     # Defines the different states of the app
-    # 
+    #
     # As specified by Apple: https://developer.apple.com/library/ios/documentation/LanguagesUtilities/Conceptual/iTunesConnect_Guide/Chapters/ChangingAppStatus.html
     module AppStatus
       # You can edit this version, upload new binaries and more
@@ -23,7 +23,7 @@ module Spaceship
       DEVELOPER_REMOVED_FROM_SALE = "Developer Removed From Sale"
 
       # Developer rejected this version/binary
-      DEVELOPER_REJECTED = "Developer Rejected" 
+      DEVELOPER_REJECTED = "Developer Rejected"
 
       # You have to renew your Apple account to keep using iTunes Connect
       PENDING_CONTRACT = "Pending Contract"
@@ -34,13 +34,12 @@ module Spaceship
 
       # Unused app states
       # PENDING_APPLE_RELASE = "Pending Apple Release"
-      
+
       # WAITING_FOR_EXPORT_COMPLIANCE = "Waiting For Export Compliance"
       # METADATA_REJECTED = "Metadata Rejected"
       # REMOVED_FROM_SALE = "Removed From Sale"
       # INVALID_BINARY = "Invalid Binary"
 
-
       # Get the app status matching based on a string (given by iTunes Connect)
       def self.get_from_string(text)
         mapping = {
@@ -52,7 +51,7 @@ module Spaceship
           'waitingForReview' => WAITING_FOR_REVIEW
         }
 
-        mapping.each do |k, v| 
+        mapping.each do |k, v|
           return v if k == text
         end
 
@@ -60,4 +59,4 @@ module Spaceship
       end
     end
   end
-end
+end

data/lib/spaceship/tunes/app_submission.rb

@@ -1,3 +1,4 @@
+
 module Spaceship
   module Tunes
     # Represents a submission for review of an iTunes Connect Application
@@ -9,61 +10,61 @@ module Spaceship
 
       # @return (AppVersion) The version to use for this submission
       attr_accessor :version
-      
+
       # @return (String) The stage of this submission (start, complete)
       attr_accessor :stage
-      
+
       # @return (Boolean) Submitted for Review
       attr_accessor :submitted_for_review
 
       # @return (Boolean) Ad ID Info - Limits ads tracking
       attr_accessor :add_id_info_limits_tracking
-      
+
       # @return (Boolean) Ad ID Info - Serves ads
       attr_accessor :add_id_info_serves_ads
-      
+
       # @return (Boolean) Ad ID Info - Tracks actions
       attr_accessor :add_id_info_tracks_action
-      
+
       # @return (Boolean) Ad ID Info - Tracks installs
       attr_accessor :add_id_info_tracks_install
-      
+
       # @return (Boolean) Ad ID Info - Uses idfa
       attr_accessor :add_id_info_uses_idfa
-      
+
       # @return (Boolean) Content Rights - Contains third party content
       attr_accessor :content_rights_contains_third_party_content
-      
+
       # @return (Boolean) Content Rights - Has rights of content
       attr_accessor :content_rights_has_rights
-            
+
       # @return (Boolean) Export Compliance - Available on French Store
       attr_accessor :export_compliance_available_on_french_store
-      
+
       # @return (Not Yet Implemented) Export Compliance - CCAT File
       attr_accessor :export_compliance_ccat_file
-      
+
       # @return (Boolean) Export Compliance - Contains proprietary cryptography
       attr_accessor :export_compliance_contains_proprietary_cryptography
-      
+
       # @return (Boolean) Export Compliance - Contains third-party cryptography
       attr_accessor :export_compliance_contains_third_party_cryptography
-      
+
       # @return (Boolean) Export Compliance - Is exempt
       attr_accessor :export_compliance_is_exempt
-      
+
       # @return (Boolean) Export Compliance - Uses encryption
       attr_accessor :export_compliance_uses_encryption
 
       # @return (String) Export Compliance - App type
       attr_accessor :export_compliance_app_type
-      
+
       # @return (Boolean) Export Compliance - Encryption Updated
       attr_accessor :export_compliance_encryption_updated
-      
+
       # @return (Boolean) Export Compliance - Compliance Required
       attr_accessor :export_compliance_compliance_required
-      
+
       # @return (String) Export Compliance - Platform
       attr_accessor :export_compliance_platform
 
@@ -75,11 +76,11 @@ module Spaceship
         'adIdInfo.tracksAction.value' => :add_id_info_tracks_action,
         'adIdInfo.tracksInstall.value' => :add_id_info_tracks_install,
         'adIdInfo.usesIdfa.value' => :add_id_info_uses_idfa,
-        
+
         # Content Rights Section
         'contentRights.containsThirdPartyContent.value' => :content_rights_contains_third_party_content,
         'contentRights.hasRights.value' => :content_rights_has_rights,
-        
+
         # Export Compliance Section
         'exportCompliance.availableOnFrenchStore.value' => :export_compliance_available_on_french_store,
         'exportCompliance.ccatFile.value' => :export_compliance_ccat_file,
@@ -98,7 +99,7 @@ module Spaceship
         # This is used to create a new object based on the server response.
         def factory(attrs)
           orig = attrs.dup
-          
+
           # fill content rights section if iTC returns nil
           if attrs["contentRights"].nil?
             attrs.merge!("contentRights" => {
@@ -110,11 +111,11 @@ module Spaceship
               }
             })
           end
-          
+
           obj = self.new(attrs)
           return obj
         end
-        
+
         # @param application (Spaceship::Tunes::Application) The app this submission is for
         # @param app_id (String) The unique Apple ID of this app
         def create(application, app_id, version)
@@ -127,7 +128,7 @@ module Spaceship
           return self.factory(attrs)
         end
       end
-      
+
       # Save and complete the app submission
       def complete!
         @stage = "complete"