fastlane 2.74.1 → 2.75.0.beta.20180109010003

data/spaceship/lib/spaceship/tunes/application.rb

@@ -90,7 +90,7 @@ module Spaceship
         #  should it be an ios or an osx app
 
         def create!(name: nil, primary_language: nil, version: nil, sku: nil, bundle_id: nil, bundle_id_suffix: nil, company_name: nil, platform: nil, itunes_connect_users: nil)
-          puts "The `version` parameter is deprecated. Use `ensure_version!` method instead" if version
+          puts("The `version` parameter is deprecated. Use `ensure_version!` method instead") if version
           client.create_application!(name: name,
                          primary_language: primary_language,
                                       sku: sku,

data/spaceship/lib/spaceship/tunes/device_type.rb

@@ -1,12 +1,12 @@
 module Spaceship
   module Tunes
     class DeviceType
-      @types = ['iphone4', 'iphone35', 'iphone6', 'iphone6Plus', 'iphone58', 'ipad', 'ipadPro', 'watch', 'appleTV', 'desktop']
+      @types = ['iphone4', 'iphone35', 'iphone6', 'iphone6Plus', 'iphone58', 'ipad', 'ipadPro', 'ipad105', 'watch', 'appleTV', 'desktop']
       class << self
         attr_accessor :types
 
         def exists?(type)
-          types.include? type
+          types.include?(type)
         end
       end
     end

data/spaceship/lib/spaceship/tunes/iap_detail.rb

@@ -195,7 +195,7 @@ module Spaceship
 
         if @review_screenshot
           # Upload Screenshot
-          upload_file = UploadFile.from_path @review_screenshot
+          upload_file = UploadFile.from_path(@review_screenshot)
           screenshot_data = client.upload_purchase_review_screenshot(application.apple_id, upload_file)
           raw_data["versions"][0]["reviewScreenshot"] = screenshot_data
         end

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -61,19 +61,19 @@ module Spaceship
       t_name = (ENV['FASTLANE_ITC_TEAM_NAME'] || '').strip
 
       if t_name.length > 0 && t_id.length.zero? # we prefer IDs over names, they are unique
-        puts "Looking for iTunes Connect Team with name #{t_name}" if Spaceship::Globals.verbose?
+        puts("Looking for iTunes Connect Team with name #{t_name}") if Spaceship::Globals.verbose?
 
         teams.each do |t|
           t_id = t['contentProvider']['contentProviderId'].to_s if t['contentProvider']['name'].casecmp(t_name.downcase).zero?
         end
 
-        puts "Could not find team with name '#{t_name}', trying to fallback to default team" if t_id.length.zero?
+        puts("Could not find team with name '#{t_name}', trying to fallback to default team") if t_id.length.zero?
       end
 
       t_id = teams.first['contentProvider']['contentProviderId'].to_s if teams.count == 1
 
       if t_id.length > 0
-        puts "Looking for iTunes Connect Team with ID #{t_id}" if Spaceship::Globals.verbose?
+        puts("Looking for iTunes Connect Team with ID #{t_id}") if Spaceship::Globals.verbose?
 
         # actually set the team id here
         self.team_id = t_id
@@ -82,24 +82,24 @@ module Spaceship
 
       # user didn't specify a team... #thisiswhywecanthavenicethings
       loop do
-        puts "Multiple iTunes Connect teams found, please enter the number of the team you want to use: "
-        puts "Note: to automatically choose the team, provide either the iTunes Connect Team ID, or the Team Name in your fastlane/Appfile:"
-        puts "Alternatively you can pass the team name or team ID using the `FASTLANE_ITC_TEAM_ID` or `FASTLANE_ITC_TEAM_NAME` environment variable"
+        puts("Multiple iTunes Connect teams found, please enter the number of the team you want to use: ")
+        puts("Note: to automatically choose the team, provide either the iTunes Connect Team ID, or the Team Name in your fastlane/Appfile:")
+        puts("Alternatively you can pass the team name or team ID using the `FASTLANE_ITC_TEAM_ID` or `FASTLANE_ITC_TEAM_NAME` environment variable")
         first_team = teams.first["contentProvider"]
-        puts ""
-        puts "  itc_team_id \"#{first_team['contentProviderId']}\""
-        puts ""
-        puts "or"
-        puts ""
-        puts "  itc_team_name \"#{first_team['name']}\""
-        puts ""
+        puts("")
+        puts("  itc_team_id \"#{first_team['contentProviderId']}\"")
+        puts("")
+        puts("or")
+        puts("")
+        puts("  itc_team_name \"#{first_team['name']}\"")
+        puts("")
         teams.each_with_index do |team, i|
-          puts "#{i + 1}) \"#{team['contentProvider']['name']}\" (#{team['contentProvider']['contentProviderId']})"
+          puts("#{i + 1}) \"#{team['contentProvider']['name']}\" (#{team['contentProvider']['contentProviderId']})")
         end
 
         unless Spaceship::Client::UserInterface.interactive?
-          puts "Multiple teams found on iTunes Connect, Your Terminal is running in non-interactive mode! Cannot continue from here."
-          puts "Please check that you set FASTLANE_ITC_TEAM_ID or FASTLANE_ITC_TEAM_NAME to the right value."
+          puts("Multiple teams found on iTunes Connect, Your Terminal is running in non-interactive mode! Cannot continue from here.")
+          puts("Please check that you set FASTLANE_ITC_TEAM_ID or FASTLANE_ITC_TEAM_NAME to the right value.")
           raise "Multiple iTunes Connect Teams found; unable to choose, terminal not ineractive!"
         end
 
@@ -151,7 +151,7 @@ module Spaceship
     # Patience is a virtue.
     def handle_itc_response(raw, flaky_api_call: false)
       return unless raw
-      return unless raw.kind_of? Hash
+      return unless raw.kind_of?(Hash)
 
       data = raw['data'] || raw # sometimes it's with data, sometimes it isn't
       error_keys_to_check = [
@@ -184,7 +184,7 @@ module Spaceship
               current_language ? "[#{current_language}]: #{current_error_message}" : current_error_message
             end
           end
-        elsif hash.kind_of? Array
+        elsif hash.kind_of?(Array)
           hash.each do |value|
             errors += handle_response_hash.call(value)
           end
@@ -257,7 +257,7 @@ module Spaceship
 
     def update_app_details!(app_id, data)
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/details"
+        req.url("ra/apps/#{app_id}/details")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -276,7 +276,7 @@ module Spaceship
     # @param bundle_id (String): The bundle ID must match the one you used in Xcode. It
     #   can't be changed after you submit your first build.
     def create_application!(name: nil, primary_language: nil, version: nil, sku: nil, bundle_id: nil, bundle_id_suffix: nil, company_name: nil, platform: nil, itunes_connect_users: nil)
-      puts "The `version` parameter is deprecated. Use `Spaceship::Tunes::Application.ensure_version!` method instead" if version
+      puts("The `version` parameter is deprecated. Use `Spaceship::Tunes::Application.ensure_version!` method instead") if version
 
       # First, we need to fetch the data from Apple, which we then modify with the user's values
       primary_language ||= "English"
@@ -300,12 +300,12 @@ module Spaceship
 
       unless itunes_connect_users.nil?
         data['iTunesConnectUsers']['grantedAllUsers'] = false
-        data['iTunesConnectUsers']['grantedUsers'] = data['iTunesConnectUsers']['availableUsers'].select { |user| itunes_connect_users.include? user['username'] }
+        data['iTunesConnectUsers']['grantedUsers'] = data['iTunesConnectUsers']['availableUsers'].select { |user| itunes_connect_users.include?(user['username']) }
       end
 
       # Now send back the modified hash
       r = request(:post) do |req|
-        req.url 'ra/apps/create/v2'
+        req.url('ra/apps/create/v2')
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -316,7 +316,7 @@ module Spaceship
 
     def create_version!(app_id, version_number, platform = 'ios')
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/platforms/#{platform}/versions/create/"
+        req.url("ra/apps/#{app_id}/platforms/#{platform}/versions/create/")
         req.body = {
           version: {
             value: version_number.to_s
@@ -404,7 +404,7 @@ module Spaceship
 
       with_tunes_retry do
         r = request(:post) do |req|
-          req.url "ra/apps/#{app_id}/platforms/ios/versions/#{version_id}"
+          req.url("ra/apps/#{app_id}/platforms/ios/versions/#{version_id}")
           req.body = data.to_json
           req.headers['Content-Type'] = 'application/json'
         end
@@ -433,7 +433,7 @@ module Spaceship
         email: email
       }
       request(:post) do |req|
-        req.url "ra/users/itc/delete"
+        req.url("ra/users/itc/delete")
         req.body = payload.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -467,7 +467,7 @@ module Spaceship
 
       # send the changes back to Apple
       r = request(:post) do |req|
-        req.url "ra/users/itc/create"
+        req.url("ra/users/itc/create")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -498,7 +498,7 @@ module Spaceship
 
       # send the changes back to Apple
       r = request(:post) do |req|
-        req.url "ra/users/itc/#{member.user_id}/roles"
+        req.url("ra/users/itc/#{member.user_id}/roles")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -533,7 +533,7 @@ module Spaceship
 
       # send the changes back to Apple
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/pricing/intervals"
+        req.url("ra/apps/#{app_id}/pricing/intervals")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -600,7 +600,7 @@ module Spaceship
 
       # send the changes back to Apple
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/pricing/intervals"
+        req.url("ra/apps/#{app_id}/pricing/intervals")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -802,7 +802,7 @@ module Spaceship
         tries -= 1
         if tries > 0
           logger.warn("Received temporary server error from iTunes Connect. Retrying the request...")
-          sleep 3 unless Object.const_defined?("SpecHelper")
+          sleep(3) unless Object.const_defined?("SpecHelper")
           retry
         end
       end
@@ -818,7 +818,7 @@ module Spaceship
       data.delete("dailySubmissionCountByPlatform")
 
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/testingTypes/#{testing_type}/trains/"
+        req.url("ra/apps/#{app_id}/testingTypes/#{testing_type}/trains/")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -828,7 +828,7 @@ module Spaceship
 
     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/#{platform}/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
@@ -877,7 +877,7 @@ module Spaceship
 
       # Now send everything back to iTC
       r = request(:post) do |req| # same URL, but a POST request
-        req.url url
+        req.url(url)
         req.body = build_info.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -946,7 +946,7 @@ module Spaceship
       }
 
       r = request(:post) do |req| # same URL, but a POST request
-        req.url "ra/apps/#{app_id}/platforms/#{platform}/trains/#{train}/builds/#{build_number}/review/submit"
+        req.url("ra/apps/#{app_id}/platforms/#{platform}/trains/#{train}/builds/#{build_number}/review/submit")
 
         req.body = review_info.to_json
         req.headers['Content-Type'] = 'application/json'
@@ -958,7 +958,7 @@ module Spaceship
     def get_build_info_for_review(app_id: nil, train: nil, build_number: nil, platform: 'ios')
       url = "ra/apps/#{app_id}/platforms/#{platform}/trains/#{train}/builds/#{build_number}/testInformation"
       r = request(:get) do |req|
-        req.url url
+        req.url(url)
         req.headers['Content-Type'] = 'application/json'
       end
       handle_itc_response(r.body)
@@ -975,7 +975,7 @@ module Spaceship
       raise "version is required" unless version
 
       r = request(:get) do |req|
-        req.url "ra/apps/#{app_id}/versions/#{version}/submit/summary"
+        req.url("ra/apps/#{app_id}/versions/#{version}/submit/summary")
         req.headers['Content-Type'] = 'application/json'
       end
 
@@ -988,7 +988,7 @@ module Spaceship
 
       # ra/apps/1039164429/version/submit/complete
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/versions/#{version}/submit/complete"
+        req.url("ra/apps/#{app_id}/versions/#{version}/submit/complete")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -1019,7 +1019,7 @@ module Spaceship
       raise "version is required" unless version
 
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/versions/#{version}/releaseToStore"
+        req.url("ra/apps/#{app_id}/versions/#{version}/releaseToStore")
         req.headers['Content-Type'] = 'application/json'
         req.body = app_id.to_s
       end
@@ -1079,7 +1079,7 @@ module Spaceship
     def update_iap_family!(app_id: nil, family_id: nil, data: nil)
       with_tunes_retry do
         r = request(:put) do |req|
-          req.url "ra/apps/#{app_id}/iaps/family/#{family_id}/"
+          req.url("ra/apps/#{app_id}/iaps/family/#{family_id}/")
           req.body = data.to_json
           req.headers['Content-Type'] = 'application/json'
         end
@@ -1091,7 +1091,7 @@ module Spaceship
     def update_iap!(app_id: nil, purchase_id: nil, data: nil)
       with_tunes_retry do
         r = request(:put) do |req|
-          req.url "ra/apps/#{app_id}/iaps/#{purchase_id}"
+          req.url("ra/apps/#{app_id}/iaps/#{purchase_id}")
           req.body = data.to_json
           req.headers['Content-Type'] = 'application/json'
         end
@@ -1109,7 +1109,7 @@ module Spaceship
       data["details"]["value"] = versions
 
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/iaps/family/"
+        req.url("ra/apps/#{app_id}/iaps/family/")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -1169,14 +1169,14 @@ module Spaceship
 
       if review_screenshot
         # Upload Screenshot:
-        upload_file = UploadFile.from_path review_screenshot
+        upload_file = UploadFile.from_path(review_screenshot)
         screenshot_data = upload_purchase_review_screenshot(app_id, upload_file)
         data["versions"][0]["reviewScreenshot"] = screenshot_data
       end
 
       # Now send back the modified hash
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/iaps"
+        req.url("ra/apps/#{app_id}/iaps")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -1195,7 +1195,7 @@ module Spaceship
     def create_sandbox_tester!(tester_class: nil, email: nil, password: nil, first_name: nil, last_name: nil, country: nil)
       url = tester_class.url[:create]
       r = request(:post) do |req|
-        req.url url
+        req.url(url)
         req.body = {
           user: {
             emailAddress: { value: email },
@@ -1222,7 +1222,7 @@ module Spaceship
     def delete_sandbox_testers!(tester_class, emails)
       url = tester_class.url[:delete]
       request(:post) do |req|
-        req.url url
+        req.url(url)
         req.body = emails.map do |email|
           {
             emailAddress: {
@@ -1264,7 +1264,7 @@ module Spaceship
       }]
       url = "ra/apps/#{app_id}/promocodes/versions"
       r = request(:post) do |req|
-        req.url url
+        req.url(url)
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -1285,7 +1285,7 @@ module Spaceship
       raise "version is required" unless version
 
       r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/versions/#{version}/reject"
+        req.url("ra/apps/#{app_id}/versions/#{version}/reject")
         req.headers['Content-Type'] = 'application/json'
         req.body = app_id.to_s
       end
@@ -1301,18 +1301,18 @@ module Spaceship
     rescue Spaceship::TunesClient::ITunesConnectTemporaryError => ex
       unless (tries -= 1).zero?
         msg = "iTunes Connect temporary error received: '#{ex.message}'. Retrying after 60 seconds (remaining: #{tries})..."
-        puts msg
-        logger.warn msg
-        sleep 60 unless Object.const_defined?("SpecHelper")
+        puts(msg)
+        logger.warn(msg)
+        sleep(60) unless Object.const_defined?("SpecHelper")
         retry
       end
       raise ex # re-raise the exception
     rescue Spaceship::TunesClient::ITunesConnectPotentialServerError => ex
       unless (potential_server_error_tries -= 1).zero?
         msg = "Potential server error received: '#{ex.message}'. Retrying after 10 seconds (remaining: #{tries})..."
-        puts msg
-        logger.warn msg
-        sleep 10 unless Object.const_defined?("SpecHelper")
+        puts(msg)
+        logger.warn(msg)
+        sleep(10) unless Object.const_defined?("SpecHelper")
         retry
       end
       raise ex
@@ -1361,7 +1361,7 @@ module Spaceship
       }
 
       r = request(:post) do |req|
-        req.url url
+        req.url(url)
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
       end

data/spaceship/lib/spaceship/two_step_client.rb

@@ -11,7 +11,7 @@ module Spaceship
       @scnt = response["scnt"]
 
       r = request(:get) do |req|
-        req.url "https://idmsa.apple.com/appleauth/auth"
+        req.url("https://idmsa.apple.com/appleauth/auth")
         update_request_headers(req)
       end
 
@@ -31,8 +31,8 @@ module Spaceship
         end
         Tunes::RecoveryDevice.client = old_client
 
-        puts "Two Step Verification for account '#{self.user}' is enabled"
-        puts "Please select a device to verify your identity"
+        puts("Two Step Verification for account '#{self.user}' is enabled")
+        puts("Please select a device to verify your identity")
         available = devices.collect do |c|
           "#{c.name}\t#{c.model_name || 'SMS'}\t(#{c.device_id})"
         end
@@ -48,14 +48,14 @@ module Spaceship
 
     def handle_two_factor(response)
       two_factor_url = "https://github.com/fastlane/fastlane/tree/master/spaceship#2-step-verification"
-      puts "Two Factor Authentication for account '#{self.user}' is enabled"
+      puts("Two Factor Authentication for account '#{self.user}' is enabled")
 
       if !File.exist?(persistent_cookie_path) && self.class.spaceship_session_env.to_s.length.zero?
-        puts "If you're running this in a non-interactive session (e.g. server or CI)"
-        puts "check out #{two_factor_url}"
+        puts("If you're running this in a non-interactive session (e.g. server or CI)")
+        puts("check out #{two_factor_url}")
       else
         # If the cookie is set but still required, the cookie is expired
-        puts "Your session cookie has been expired."
+        puts("Your session cookie has been expired.")
       end
 
       security_code = response.body["securityCode"]
@@ -65,11 +65,11 @@ module Spaceship
       #  "securityCodeLocked"=>false}
       code_length = security_code["length"]
       code = ask("Please enter the #{code_length} digit code: ")
-      puts "Requesting session..."
+      puts("Requesting session...")
 
       # Send securityCode back to server to get a valid session
       r = request(:post) do |req|
-        req.url "https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode"
+        req.url("https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode")
         req.headers['Content-Type'] = 'application/json'
         req.body = { "securityCode" => { "code" => code.to_s } }.to_json
 
@@ -88,7 +88,7 @@ module Spaceship
     # Only needed for 2 step
     def load_session_from_file
       if File.exist?(persistent_cookie_path)
-        puts "Loading session from '#{persistent_cookie_path}'" if Spaceship::Globals.verbose?
+        puts("Loading session from '#{persistent_cookie_path}'") if Spaceship::Globals.verbose?
         @cookie.load(persistent_cookie_path)
         return true
       end
@@ -97,7 +97,7 @@ module Spaceship
 
     def load_session_from_env
       return if self.class.spaceship_session_env.to_s.length == 0
-      puts "Loading session from environment variable" if Spaceship::Globals.verbose?
+      puts("Loading session from environment variable") if Spaceship::Globals.verbose?
 
       file = Tempfile.new('cookie.yml')
       file.write(self.class.spaceship_session_env.gsub("\\n", "\n"))
@@ -106,8 +106,8 @@ module Spaceship
       begin
         @cookie.load(file.path)
       rescue => ex
-        puts "Error loading session from environment"
-        puts "Make sure to pass the session in a valid format"
+        puts("Error loading session from environment")
+        puts("Make sure to pass the session in a valid format")
         raise ex
       ensure
         file.unlink
@@ -123,7 +123,7 @@ module Spaceship
     def select_device(r, device_id)
       # Request Token
       r = request(:put) do |req|
-        req.url "https://idmsa.apple.com/appleauth/auth/verify/device/#{device_id}/securitycode"
+        req.url("https://idmsa.apple.com/appleauth/auth/verify/device/#{device_id}/securitycode")
         update_request_headers(req)
       end
 
@@ -131,13 +131,13 @@ module Spaceship
       # since this might be from the Dev Portal, but for 2 step
       Spaceship::TunesClient.new.handle_itc_response(r.body)
 
-      puts "Successfully requested notification"
+      puts("Successfully requested notification")
       code = ask("Please enter the 4 digit code: ")
-      puts "Requesting session..."
+      puts("Requesting session...")
 
       # Send token back to server to get a valid session
       r = request(:post) do |req|
-        req.url "https://idmsa.apple.com/appleauth/auth/verify/device/#{device_id}/securitycode"
+        req.url("https://idmsa.apple.com/appleauth/auth/verify/device/#{device_id}/securitycode")
         req.body = { "code" => code.to_s }.to_json
         req.headers['Content-Type'] = 'application/json'
 
@@ -166,7 +166,7 @@ module Spaceship
         #   }]
         # }
         if ex.to_s.include?("verification code") # to have a nicer output
-          puts "Error: Incorrect verification code"
+          puts("Error: Incorrect verification code")
           return select_device(r, device_id)
         end
 
@@ -192,7 +192,7 @@ module Spaceship
       # We actually only care about the DES value
 
       request(:get) do |req|
-        req.url "https://idmsa.apple.com/appleauth/auth/2sv/trust"
+        req.url("https://idmsa.apple.com/appleauth/auth/2sv/trust")
 
         update_request_headers(req)
       end