spaceship 0.36.2 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a51a5af0da545a0926ac2b3f43e3fd9579038e8a
-  data.tar.gz: 52015e9dbc1bdbf7cf4f31e33ccbc2283d83b703
+  metadata.gz: 5876ed2b557a73506b42f22b1845d8e532574b96
+  data.tar.gz: 8b70dd155a884a368c2b55ea67b320674581928a
 SHA512:
-  metadata.gz: 095f8d076be50fa867bb4f28c81d4fc0377390487278b4f3003c558fa59e2bea9d27168d19a25db67bc138ba77c5daa143537c152ef27e3afb2a6d8f95250053
-  data.tar.gz: 135ee2ce6245dc4e7a1b21b7124687e496eaf20172a365619d5d37aaeac8130791a73cbf4b74347ddf8a1d3ed2012fadbab4649b6e4664f83386f835f404d9fe
+  metadata.gz: 705f85a89b839339b2b7b32344f8abf0525416add39db3a7ba07faf7b8fa2ae33f6db1dc7df0e7f225dce468fe60afd7400bcc8cfd82a59129ea783319bb8f17
+  data.tar.gz: 70d0bd2a25191aff18e84378fb0e300383c2a56fc9a1282f0286d8d5b868733677bfdf1790a02c6c6297f8c218a8d5816b7c1accfcc181c434c13e29cfde576a

data/README.md

@@ -111,7 +111,7 @@ This requires you to install `pry` using `sudo gem install pry`. `pry` is not in
 
 ## 2 Step Verification
 
-When your Apple account has 2 step verification enabled, you'll automatically be asked to verify your identity using your phone. The resulting session will be stored in `~/.spaceship/[email]/cookie`. The session should be valid for about one month, however there is no way to test this without actually waiting for over a month.
+When your Apple account has 2 factor verification enabled, you'll automatically be asked to verify your identity using your phone. The resulting session will be stored in `~/.spaceship/[email]/cookie`. The session should be valid for about one month, however there is no way to test this without actually waiting for over a month.
 
 Since your CI system probably doesn't allow you to input values (like the verification code), you can use `spaceauth`:
 
@@ -127,9 +127,9 @@ export FASTLANE_SESSION='---\n- !ruby/object:HTTP::Cookie\n  name: DES5c148586df
 
 Copy everything from `---\n` to your CI server and provide it as environment variable named `FASTLANE_SESSION`.
 
-### Spaceship in use
+### _spaceship_ in use
 
-Most [fastlane tools](https://fastlane.tools) already use `spaceship`, like `sigh`, `cert`, `produce`, `pilot` and `boarding`.
+All [fastlane tools](https://fastlane.tools) that communicate with Apple's web services in some way, use _spaceship_ to do so.
 
 # Technical Details
 

data/lib/spaceship.rb

@@ -2,6 +2,7 @@ require 'spaceship/version'
 require 'spaceship/base'
 require 'spaceship/client'
 require 'spaceship/launcher'
+require 'spaceship/update_checker'
 
 # Dev Portal
 require 'spaceship/portal/portal'
@@ -27,4 +28,6 @@ module Spaceship
   AppVersion = Spaceship::Tunes::AppVersion
   AppSubmission = Spaceship::Tunes::AppSubmission
   Application = Spaceship::Tunes::Application
+
+  UpdateChecker.ensure_spaceship_version
 end

data/lib/spaceship/client.rb

@@ -101,8 +101,8 @@ module Spaceship
     def initialize
       options = {
        request: {
-          timeout:       300,
-          open_timeout:  300
+          timeout:       (ENV["SPACESHIP_TIMEOUT"] || 300).to_i,
+          open_timeout:  (ENV["SPACESHIP_TIMEOUT"] || 300).to_i
         }
       }
       @cookie = HTTP::CookieJar.new

data/lib/spaceship/du/upload_file.rb

@@ -33,10 +33,16 @@ module Spaceship
       def remove_alpha_channel(original)
         path = "/tmp/#{Digest::MD5.hexdigest(original)}.png"
         FileUtils.copy(original, path)
-        `sips -s format bmp '#{path}' &> /dev/null` # &> /dev/null since there is warning because of the extension
-        `sips -s format png '#{path}'`
+        if mac? # sips is only available on macOS
+          `sips -s format bmp '#{path}' &> /dev/null` # &> /dev/null since there is warning because of the extension
+          `sips -s format png '#{path}'`
+        end
         return path
       end
+
+      def mac?
+        (/darwin/ =~ RUBY_PLATFORM) != nil
+      end
     end
 
     private

data/lib/spaceship/portal/app_service.rb

@@ -35,6 +35,10 @@ module Spaceship
           self::AppGroup
         end
 
+        def apple_pay
+          self::ApplePay
+        end
+
         def associated_domains
           self::AssociatedDomains
         end
@@ -43,6 +47,10 @@ module Spaceship
           self::DataProtection
         end
 
+        def game_center
+          self::GameCenter
+        end
+
         def health_kit
           self::HealthKit
         end
@@ -63,6 +71,10 @@ module Spaceship
           self::CloudKit
         end
 
+        def in_app_purchase
+          self::InAppPurchase
+        end
+
         def inter_app_audio
           self::InterAppAudio
         end
@@ -75,6 +87,10 @@ module Spaceship
           self::PushNotification
         end
 
+        def siri_kit
+          self::SiriKit
+        end
+
         def vpn_configuration
           self::VPNConfiguration
         end
@@ -100,6 +116,16 @@ module Spaceship
         end
       end
 
+      module ApplePay
+        def self.off
+          AppService.new("OM633U5T5G", false)
+        end
+
+        def self.on
+          AppService.new("OM633U5T5G", true)
+        end
+      end
+
       module AssociatedDomains
         def self.off
           AppService.new("SKC3T5S89Y", false)
@@ -128,6 +154,16 @@ module Spaceship
         end
       end
 
+      module GameCenter
+        def self.off
+          AppService.new("gameCenter", false)
+        end
+
+        def self.on
+          AppService.new("gameCenter", true)
+        end
+      end
+
       module HealthKit
         def self.off
           AppService.new("HK421J6T7P", false)
@@ -178,6 +214,16 @@ module Spaceship
         end
       end
 
+      module InAppPurchase
+        def self.off
+          AppService.new("inAppPurchase", false)
+        end
+
+        def self.on
+          AppService.new("inAppPurchase", true)
+        end
+      end
+
       module InterAppAudio
         def self.off
           AppService.new("IAD53UNK2F", false)
@@ -208,6 +254,16 @@ module Spaceship
         end
       end
 
+      module SiriKit
+        def self.off
+          AppService.new("SI015DKUHP", false)
+        end
+
+        def self.on
+          AppService.new("SI015DKUHP", true)
+        end
+      end
+
       module VPNConfiguration
         def self.off
           AppService.new("V66P55NK2I", false)

data/lib/spaceship/tunes/app_version.rb

@@ -30,6 +30,9 @@ module Spaceship
       # @return (String) App Status (e.g. 'readyForSale'). You should use `app_status` instead
       attr_accessor :raw_status
 
+      # @return (String) Build Version
+      attr_accessor :build_version
+
       # @return (Bool)
       attr_accessor :can_reject_version
 
@@ -133,6 +136,7 @@ module Spaceship
         'largeAppIcon.value.url' => :app_icon_url,
         'releaseOnApproval.value' => :release_on_approval,
         'status' => :raw_status,
+        'preReleaseBuild.buildVersion' => :build_version,
         'supportsAppleWatch' => :supports_apple_watch,
         'versionId' => :version_id,
         'version.value' => :version,
@@ -215,6 +219,16 @@ module Spaceship
         nil
       end
 
+      def current_build_number
+        if self.is_live?
+          build_version
+        else
+          if candidate_builds.length > 0
+            candidate_builds.first.build_version
+          end
+        end
+      end
+
       # Returns an array of all builds that can be sent to review
       def candidate_builds
         res = client.candidate_builds(self.application.apple_id, self.version_id)

data/lib/spaceship/tunes/build_train.rb

@@ -141,7 +141,28 @@ module Spaceship
           end
         end
 
-        result = client.update_build_trains!(application.apple_id, testing_type, data)
+        begin
+          result = client.update_build_trains!(application.apple_id, testing_type, data)
+        rescue Spaceship::TunesClient::ITunesConnectError => ex
+          if ex.to_s.include?("You must provide an answer for this question")
+            # This is a very common error message that's raised by TestFlight
+            # We want to show a nicer error message with instructions on how
+            # to resolve the underlying issue
+            # https://github.com/fastlane/fastlane/issues/1873
+            # https://github.com/fastlane/fastlane/issues/4002
+            error_message = [""] # to have a nice new-line in the beginning
+            error_message << "TestFlight requires you to provide the answer to the encryption question"
+            error_message << "to provide the reply, please add the following to your Info.plist file"
+            error_message << ""
+            error_message << "<key>ITSAppUsesNonExemptEncryption</key><false/>"
+            error_message << ""
+            error_message << "Afterwards re-build your app and try again"
+            error_message << "iTunes Connect reported: '#{ex}'"
+            raise error_message.join("\n")
+          else
+            raise ex
+          end
+        end
         self.internal_testing_enabled = new_value if testing_type == 'internal'
         self.external_testing_enabled = new_value if testing_type == 'external'
 

data/lib/spaceship/tunes/tester.rb

@@ -21,6 +21,16 @@ module Spaceship
       #   "Bennett"
       attr_accessor :last_name
 
+      # @return (Array) an array of associated groups
+      # @example
+      #    [{
+      #      "id": "e031e048-4f0f-4c1e-8d8a-a5341a267986",
+      #      "name": {
+      #        "value": "My App Testers"
+      #      }
+      #    }]
+      attr_accessor :groups
+
       # @return (Array) An array of registered devices for this user
       # @example
       #    [{
@@ -50,6 +60,7 @@ module Spaceship
         'emailAddress.value' => :email,
         'firstName.value' => :first_name,
         'lastName.value' => :last_name,
+        'groups' => :groups,
         'devices' => :devices,
         'latestInstalledAppAdamId' => :latest_install_app_id,
         'latestInstalledDate' => :latest_install_date,
@@ -83,18 +94,24 @@ module Spaceship
           end
         end
 
+        def groups
+          client.groups
+        end
+
         # Create new tester in iTunes Connect
         # @param email (String) (required): The email of the new tester
         # @param first_name (String) (optional): The first name of the new tester
         # @param last_name (String) (optional): The last name of the new tester
+        # @param groups (Array) (option): Names/IDs of existing groups for the new tester
         # @example
-        #   Spaceship::Tunes::Tester.external.create!(email: "tester@mathiascarignani.com", first_name: "Cary", last_name:"Bennett")
+        #   Spaceship::Tunes::Tester.external.create!(email: "tester@mathiascarignani.com", first_name: "Cary", last_name:"Bennett", groups:["Testers"])
         # @return (Tester): The newly created tester
-        def create!(email: nil, first_name: nil, last_name: nil)
+        def create!(email: nil, first_name: nil, last_name: nil, groups: nil)
           data = client.create_tester!(tester: self,
                                         email: email,
                                    first_name: first_name,
-                                    last_name: last_name)
+                                    last_name: last_name,
+                                       groups: groups)
           self.factory(data)
         end
 
@@ -187,6 +204,19 @@ module Spaceship
       def remove_from_app!(app_id)
         client.remove_tester_from_app!(self, app_id)
       end
+
+      #####################################################
+      # @!group Helpers
+      #####################################################
+
+      # Return a list of the Tester's group, if any
+      # @return
+      def groups_list(separator = ', ')
+        if groups
+          group_names = groups.map { |group| group["name"]["value"] }
+          group_names.join(separator)
+        end
+      end
     end
 
     class SandboxTester < TunesBase

data/lib/spaceship/tunes/tunes_client.rb

@@ -87,7 +87,10 @@ module Spaceship
 
       response = request(:post) do |req|
         req.url "ra/v1/session/webSession"
-        req.body = { contentProviderId: team_id, dsId: user_detail_data.ds_id }.to_json
+        req.body = {
+          contentProviderId: team_id,
+          dsId: user_detail_data.ds_id # https://github.com/fastlane/fastlane/issues/6711
+        }.to_json
         req.headers['Content-Type'] = 'application/json'
       end
 
@@ -538,7 +541,7 @@ module Spaceship
       return @cached if @cached
       r = request(:get, '/WebObjects/iTunesConnect.woa/ra/user/detail')
       data = parse_response(r, 'data')
-      @cached ||= Spaceship::Tunes::UserDetail.factory(data)
+      @cached = Spaceship::Tunes::UserDetail.factory(data)
     end
 
     #####################################################
@@ -785,7 +788,13 @@ module Spaceship
       parse_response(r, 'data')['users']
     end
 
-    def create_tester!(tester: nil, email: nil, first_name: nil, last_name: nil)
+    def groups
+      return @cached_groups if @cached_groups
+      r = request(:get, '/WebObjects/iTunesConnect.woa/ra/users/pre/ext')
+      @cached_groups = parse_response(r, 'data')['groups']
+    end
+
+    def create_tester!(tester: nil, email: nil, first_name: nil, last_name: nil, groups: nil)
       url = tester.url[:create]
       raise "Action not provided for this tester type." unless url
 
@@ -803,6 +812,9 @@ module Spaceship
               value: true
             }
           }
+      if groups
+        tester_data[:groups] = groups.map { |x| { "id" => x } }
+      end
 
       data = { testers: [tester_data] }
 

data/lib/spaceship/tunes/user_detail.rb

@@ -1,7 +1,8 @@
 module Spaceship
   module Tunes
     class UserDetail < TunesBase
-      attr_accessor :content_provider_id, :ds_id
+      attr_accessor :content_provider_id
+      attr_accessor :ds_id # used for the team selection (https://github.com/fastlane/fastlane/issues/6711)
 
       attr_mapping(
         'contentProviderId' => :content_provider_id,

data/lib/spaceship/two_step_client.rb

@@ -36,7 +36,6 @@ module Spaceship
         device_id = result.match(/.*\t.*\t\((.*)\)/)[1]
         select_device(r, device_id)
       elsif r.body.kind_of?(Hash) && r.body["phoneNumberVerification"].kind_of?(Hash)
-        puts "Two Factor Authentication for account '#{self.user}' is enabled"
         handle_two_factor(r)
       else
         raise "Invalid 2 step response #{r.body}"
@@ -44,6 +43,11 @@ module Spaceship
     end
 
     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 "If you're running this in a non-interactive session (e.g. server or CI)"
+      puts "check out #{two_factor_url}"
+
       security_code = response.body["phoneNumberVerification"]["securityCode"]
       # {"length"=>6,
       #  "tooManyCodesSent"=>false,

data/lib/spaceship/update_checker.rb

@@ -0,0 +1,42 @@
+module Spaceship
+  class UpdateChecker
+    UPDATE_URL = "https://fastlane-refresher.herokuapp.com/spaceship"
+
+    def self.ensure_spaceship_version
+      return if defined?(SpecHelper) # is this running via tests
+      return if ENV["FASTLANE_SKIP_UPDATE_CHECK"]
+
+      require 'faraday'
+      require 'json'
+
+      response = Faraday.get(UPDATE_URL)
+      return if response.nil? || response.body.to_s.length == 0
+
+      version = JSON.parse(response.body)["version"]
+      puts "Comparing spaceship version (remote #{version} - local #{Spaceship::VERSION})" if $verbose
+      return if Gem::Version.new(version) <= Gem::Version.new(Spaceship::VERSION)
+
+      show_update_message(Spaceship::VERSION, version)
+    rescue => ex
+      puts ex.to_s if $verbose
+      puts "Couldn't verify that spaceship is up to date"
+    end
+
+    def self.show_update_message(local_version, live_version)
+      puts "---------------------------------------------".red
+      puts "-------------------WARNING-------------------".red
+      puts "---------------------------------------------".red
+      puts "You're using an old version of spaceship"
+      puts "To ensure spaceship and fastlane works"
+      puts "update to the latest version."
+      puts ""
+      puts "Run `[sudo] gem update spaceship`"
+      puts ""
+      puts "or `bundle update` if you use bundler."
+      puts ""
+      puts "You're on spaceship version: #{local_version}".yellow
+      puts "Latest spaceship version  : #{live_version}".yellow
+      puts ""
+    end
+  end
+end

data/lib/spaceship/version.rb

@@ -1,4 +1,4 @@
 module Spaceship
-  VERSION = "0.36.2".freeze
+  VERSION = "0.37.0".freeze
   DESCRIPTION = "Ruby library to access the Apple Dev Center and iTunes Connect".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.36.2
+  version: 0.37.0
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager
@@ -379,6 +379,7 @@ files:
 - lib/spaceship/tunes/user_detail.rb
 - lib/spaceship/two_step_client.rb
 - lib/spaceship/ui.rb
+- lib/spaceship/update_checker.rb
 - lib/spaceship/version.rb
 homepage: https://fastlane.tools
 licenses:
@@ -400,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby library to access the Apple Dev Center and iTunes Connect