spaceship 0.19.4 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4693da7e9b3b4cee2808c01b9aca5756699271ac
-  data.tar.gz: e0cf96db5506284940c11e489da1a43f1a1a6607
+  metadata.gz: 13327e628a59af20edccc21b45b712a7369ba849
+  data.tar.gz: 899347df5eed63a08ab77a14f5bce260857260df
 SHA512:
-  metadata.gz: dd750685e85559d693d15373cb2f7944353c42a793b8be318ef9b5714ce04e9a8e1e2f95904978baccde06e29e22faf681e848f16cd0ac69ded0a17002676230
-  data.tar.gz: 8a53dbea6ef84b06fba11c3b6caaa0b6fa0ab5dadec16768b76713902a9705a060af3e7639121ef1a30dd2641ab6f236350c616b6d8eeb637f52462dadb8b4af
+  metadata.gz: 66ca044745dff1f1e44d41e67fa149c407b95a1796391aa24bf07864d682815d35273813076d50895e196b5ac45ef7a3a624d02aea71e46fb3bf3bfcfa6f961b
+  data.tar.gz: c463fc2b1d2a5bf1adb4079d36815ebdd31e476429ab00774ec86f96517e22c2dee498e5142528ed2bc91ff0a196ef6f14fbd9c8183d0a9a92da00cbf18e9532

data/README.md

@@ -118,7 +118,7 @@ Most [fastlane tools](https://fastlane.tools) already use `spaceship`, like `sig
 
 The detailed documentation of all available classes is available on [RubyDoc](http://www.rubydoc.info/github/fastlane/spaceship/frames).
 
-You can find the log file here `/tmp/spaceship[time].log`.
+You can find the log file here `/tmp/spaceship[time]_[pid].log`.
 
 # Technical Details
 

data/lib/spaceship/client.rb

@@ -25,7 +25,7 @@ module Spaceship
     attr_accessor :user
 
     # The logger in which all requests are logged
-    # /tmp/spaceship[time].log by default
+    # /tmp/spaceship[time]_[pid].log by default
     attr_accessor :logger
 
     # Invalid user credentials were provided
@@ -84,14 +84,14 @@ module Spaceship
     end
 
     # The logger in which all requests are logged
-    # /tmp/spaceship[time].log by default
+    # /tmp/spaceship[time]_[pid].log by default
     def logger
       unless @logger
         if ENV["VERBOSE"]
           @logger = Logger.new(STDOUT)
         else
           # Log to file by default
-          path = "/tmp/spaceship#{Time.now.to_i}.log"
+          path = "/tmp/spaceship#{Time.now.to_i}_#{Process.pid}.log"
           @logger = Logger.new(path)
         end
 

data/lib/spaceship/portal/portal_client.rb

@@ -10,7 +10,7 @@ module Spaceship
 
     # Fetches the latest API Key from the Apple Dev Portal
     def api_key
-      cache_path = "/tmp/spaceship_api_key.txt"
+      cache_path = File.expand_path("~/Library/Caches/spaceship_api_key.txt")
       begin
         cached = File.read(cache_path)
       rescue Errno::ENOENT
@@ -23,6 +23,7 @@ module Spaceship
       results = headers['location'].match(/.*appIdKey=(\h+)/)
       if (results || []).length > 1
         api_key = results[1]
+        FileUtils.mkdir_p(File.dirname(cache_path))
         File.write(cache_path, api_key) if api_key.length == 64
         return api_key
       else
@@ -177,11 +178,7 @@ module Spaceship
 
       params.merge!(ident_params)
 
-      if csrf_tokens.count == 0
-        # If we directly create a new app without querying anything before
-        # we don't have a valid csrf token, that's why we have to do at least one request
-        apps
-      end
+      ensure_csrf
 
       r = request(:post, "account/#{platform_slug(mac)}/identifiers/addAppId.action", params)
       parse_response(r, 'appId')
@@ -288,11 +285,7 @@ module Spaceship
     end
 
     def create_certificate!(type, csr, app_id = nil)
-      if csrf_tokens.count == 0
-        # If we directly create a new certificate without querying anything before
-        # we don't have a valid csrf token, that's why we have to do at least one request
-        certificates([Certificate::CERTIFICATE_TYPE_IDS.keys.first])
-      end
+      ensure_csrf
 
       r = request(:post, 'account/ios/certificate/submitCertificateRequest.action', {
         teamId: team_id,
@@ -346,11 +339,7 @@ module Spaceship
     end
 
     def create_provisioning_profile!(name, distribution_method, app_id, certificate_ids, device_ids, mac: false)
-      if csrf_tokens.count == 0
-        # If we directly create a new profile without querying anything before
-        # we don't have a valid csrf token, that's why we have to do at least one request
-        provisioning_profiles
-      end
+      ensure_csrf
 
       r = request(:post, "account/#{platform_slug(mac)}/profile/createProvisioningProfile.action", {
         teamId: team_id,
@@ -377,13 +366,7 @@ module Spaceship
     end
 
     def delete_provisioning_profile!(profile_id, mac: false)
-      if csrf_tokens.count == 0
-        r = request(:post, "account/#{platform_slug(mac)}/profile/getProvisioningProfile.action", {
-          teamId: team_id,
-          provisioningProfileId: profile_id
-        })
-        parse_response(r)
-      end
+      ensure_csrf
 
       r = request(:post, "account/#{platform_slug(mac)}/profile/deleteProvisioningProfile.action", {
         teamId: team_id,
@@ -405,5 +388,15 @@ module Spaceship
 
       parse_response(r, 'provisioningProfile')
     end
+
+    private
+
+    def ensure_csrf
+      if csrf_tokens.count == 0
+        # If we directly create a new resource (e.g. app) without querying anything before
+        # we don't have a valid csrf token, that's why we have to do at least one request
+        apps
+      end
+    end
   end
 end

data/lib/spaceship/tunes/build.rb

@@ -149,13 +149,11 @@ module Spaceship
       #     encryption: false
       #  }
       def submit_for_beta_review!(metadata)
-        # First, enable beta testing for this train (per iTC requirement)
-        self.build_train.update_testing_status!(true, 'external')
-
         parameters = {
           app_id: self.build_train.application.apple_id,
           train: self.build_train.version_string,
           build_number: self.build_version,
+          platform: self.platform,
 
           # Required Metadata:
           changelog: "No changelog provided",
@@ -177,6 +175,9 @@ module Spaceship
 
         client.submit_testflight_build_for_review!(parameters)
 
+        # Last, enable beta testing for this train (per iTC requirement). This will fail until the app has been approved for beta testing
+        self.build_train.update_testing_status!(true, 'external', self)
+
         return parameters
       end
 
@@ -200,7 +201,8 @@ module Spaceship
       def cancel_beta_review!
         client.remove_testflight_build_from_review!(app_id: self.build_train.application.apple_id,
                                                      train: self.build_train.version_string,
-                                              build_number: self.build_version)
+                                              build_number: self.build_version,
+                                                  platform: self.platform)
       end
     end
   end

data/lib/spaceship/tunes/build_train.rb

@@ -87,18 +87,31 @@ module Spaceship
         data = client.build_trains(self.application.apple_id, testing_type)
 
         build ||= latest_build if testing_type == 'external'
-
-        data['trains'].each do |train|
-          train["#{testing_type}Testing"]['value'] = false
-          train["#{testing_type}Testing"]['value'] = new_value if train['versionString'] == version_string
-
-          # find correct build
-          train['builds'].select! { |b| !b["#{testing_type}Testing"].nil? && !build.nil? && b['buildVersion'] == build.build_version }
-
-          # also update the build if it was found
-          train['builds'].each do |b|
-            b["#{testing_type}Testing"]['value'] = false
-            b["#{testing_type}Testing"]['value'] = new_value if b['trainVersion'] == version_string
+        testing_key = "#{testing_type}Testing"
+
+        # Delete the irrelevant trains and update the relevant one to enable testing
+        data['trains'].delete_if do |train|
+          if train['versionString'] != version_string
+            true
+          else
+            train[testing_key]['value'] = new_value
+
+            # also update the builds
+            train['builds'].delete_if do |b|
+              return true if b[testing_key].nil?
+
+              if build && b["buildVersion"] == build.build_version
+                b[testing_key]['value'] = new_value
+                false
+              elsif b[testing_key]['value'] == true
+                b[testing_key]['value'] = false
+                false
+              else
+                true
+              end
+            end
+
+            false
           end
         end
 

data/lib/spaceship/tunes/tunes_client.rb

@@ -281,9 +281,9 @@ module Spaceship
       handle_itc_response(data)
     end
 
-    def create_version!(app_id, version_number)
+    def create_version!(app_id, version_number, platform = 'ios')
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/platforms/ios/versions/create/"
+        req.url "ra/apps/#{app_id}/platforms/#{platform}/versions/create/"
         req.body = {
           version: {
             value: version_number.to_s
@@ -526,9 +526,9 @@ module Spaceship
       handle_itc_response(r.body)
     end
 
-    def remove_testflight_build_from_review!(app_id: nil, train: nil, build_number: nil)
+    def remove_testflight_build_from_review!(app_id: nil, train: nil, build_number: nil, platform: 'ios')
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/platforms/ios/trains/#{train}/builds/#{build_number}/reject"
+        req.url "ra/apps/#{app_id}/platforms/#{platform}/trains/#{train}/builds/#{build_number}/reject"
         req.body = {}.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -567,7 +567,7 @@ module Spaceship
       handle_itc_response(r.body)
     end
 
-    def submit_testflight_build_for_review!(app_id: nil, train: nil, build_number: nil,
+    def submit_testflight_build_for_review!(app_id: nil, train: nil, build_number: nil, platform: 'ios',
                                             # Required Metadata:
                                             changelog: nil,
                                             description: nil,
@@ -585,29 +585,29 @@ module Spaceship
                                             review_password: nil,
                                             encryption: false)
 
-      build_info = get_build_info_for_review(app_id: app_id, train: train, build_number: build_number)
+      build_info = get_build_info_for_review(app_id: app_id, train: train, build_number: build_number, platform: platform)
       # Now fill in the values provided by the user
 
       # First the localised values:
       build_info['testInfo']['details'].each do |current|
-        current['whatsNew']['value'] = changelog
-        current['description']['value'] = description
-        current['feedbackEmail']['value'] = feedback_email
-        current['marketingUrl']['value'] = marketing_url
-        current['privacyPolicyUrl']['value'] = privacy_policy_url
+        current['whatsNew']['value'] = changelog if changelog
+        current['description']['value'] = description if description
+        current['feedbackEmail']['value'] = feedback_email if feedback_email
+        current['marketingUrl']['value'] = marketing_url if marketing_url
+        current['privacyPolicyUrl']['value'] = privacy_policy_url if privacy_policy_url
         current['pageLanguageValue'] = current['language'] # There is no valid reason why we need this, only iTC being iTC
       end
       build_info['significantChange'] ||= {}
       build_info['significantChange']['value'] = significant_change
-      build_info['testInfo']['reviewFirstName']['value'] = first_name
-      build_info['testInfo']['reviewLastName']['value'] = last_name
-      build_info['testInfo']['reviewPhone']['value'] = phone_number
-      build_info['testInfo']['reviewEmail']['value'] = review_email
-      build_info['testInfo']['reviewUserName']['value'] = review_user_name
-      build_info['testInfo']['reviewPassword']['value'] = review_password
+      build_info['testInfo']['reviewFirstName']['value'] = first_name if first_name
+      build_info['testInfo']['reviewLastName']['value'] = last_name if last_name
+      build_info['testInfo']['reviewPhone']['value'] = phone_number if phone_number
+      build_info['testInfo']['reviewEmail']['value'] = review_email if review_email
+      build_info['testInfo']['reviewUserName']['value'] = review_user_name if review_user_name
+      build_info['testInfo']['reviewPassword']['value'] = review_password if review_password
 
       r = request(:post) do |req| # same URL, but a POST request
-        req.url "ra/apps/#{app_id}/platforms/ios/trains/#{train}/builds/#{build_number}/submit/start"
+        req.url "ra/apps/#{app_id}/platforms/#{platform}/trains/#{train}/builds/#{build_number}/submit/start"
 
         req.body = build_info.to_json
         req.headers['Content-Type'] = 'application/json'
@@ -618,13 +618,14 @@ module Spaceship
       update_encryption_compliance(app_id: app_id,
                                    train: train,
                                    build_number: build_number,
+                                   platform: platform,
                                    encryption_info: encryption_info,
                                    encryption: encryption)
     end
 
-    def get_build_info_for_review(app_id: nil, train: nil, build_number: nil)
+    def get_build_info_for_review(app_id: nil, train: nil, build_number: nil, platform: 'ios')
       r = request(:get) do |req|
-        req.url "ra/apps/#{app_id}/platforms/ios/trains/#{train}/builds/#{build_number}/submit/start"
+        req.url "ra/apps/#{app_id}/platforms/#{platform}/trains/#{train}/builds/#{build_number}/submit/start"
         req.headers['Content-Type'] = 'application/json'
       end
       handle_itc_response(r.body)
@@ -632,16 +633,19 @@ module Spaceship
       r.body['data']
     end
 
-    def update_encryption_compliance(app_id: nil, train: nil, build_number: nil, encryption_info: nil, encryption: nil)
+    def update_encryption_compliance(app_id: nil, train: nil, build_number: nil, platform: 'ios', encryption_info: nil, encryption: nil, is_exempt: true, proprietary: false, third_party: false)
       return unless encryption_info['exportComplianceRequired']
       # only sometimes this is required
 
       encryption_info['usesEncryption']['value'] = encryption
       encryption_info['encryptionUpdated'] ||= {}
       encryption_info['encryptionUpdated']['value'] = encryption
+      encryption_info['isExempt']['value'] = is_exempt
+      encryption_info['containsProprietaryCryptography']['value'] = proprietary
+      encryption_info['containsThirdPartyCryptography']['value'] = third_party
 
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/platforms/ios/trains/#{train}/builds/#{build_number}/submit/complete"
+        req.url "ra/apps/#{app_id}/platforms/#{platform}/trains/#{train}/builds/#{build_number}/submit/complete"
         req.body = encryption_info.to_json
         req.headers['Content-Type'] = 'application/json'
       end

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.19.4"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.20.0
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager