spaceship 0.32.4 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ed1ed0e0ca3f83e0938bfef281e22c419dda58
-  data.tar.gz: 671c565c25a2f2f36471ad8a11409a6f2d857067
+  metadata.gz: 6527cb5f13885b7110623e37d316ad0b3e24bac3
+  data.tar.gz: d0f1215849af1de633648dff9051dce6fd0f61c0
 SHA512:
-  metadata.gz: cd6289e6ba47c42d84ed2f6e077f891510b4c03538e3d786a434610755768ef995f34aa87846e5c8a454fc4bb86e267971d3724276f5e0a87dbc45653446bee1
-  data.tar.gz: cd6b1a3daa56dbc8ab755e8f49ca653c2992988572e586c521e111b98c85d9d4ff11459f98051becb66891a0c4e61fad3a17b59039eb65c51af84a90a5ea23a0
+  metadata.gz: 13b7d83d1a90279d13bd8b3eb5a0e08eee363f04c37cfac8bcfc318e7de17a93d24923dea9ce203020b7d37d70b0cf7a9a3f2d53246b1153c97b01a3a6f2e1b4
+  data.tar.gz: 28e7c27957dce185f925de0575aa60779f1124dc1d0b060bd41ac7fe4716e5fafad4e040a59ff37d3bc18c4873a1c2d997a46bae7efeed36d9b565d34b2af628

data/README.md

@@ -185,19 +185,6 @@ I won't go into too much technical details about the various API endpoints, but
 - **Profile Magic**: Create and upload code signing requests, all managed by `spaceship`
 - **Multiple Spaceship**: You can launch multiple `spaceships` with different Apple accounts to do things like syncing the registered devices.
 
-# Credits
-
-The initial release was sponsored by [ZeroPush](https://zeropush.com).
-
-`spaceship` was developed by
-- [@KrauseFx](https://twitter.com/KrauseFx).
-- [@snatchev](https://twitter.com/snatchev/)
-- [@mathcarignani](https://twitter.com/mathcarignani/)
-
-[Open full list of contributors](https://github.com/fastlane/spaceship/graphs/contributors).
-
-##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
-
 # Code of Conduct
 Help us keep `fastlane` open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/fastlane/blob/master/CODE_OF_CONDUCT.md).
 

data/bin/spaceauth

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.push File.expand_path("../../lib", __FILE__)
+require "colored"
+
+# First we have to check if the user has `pry` installed
+# We don't want to add pry as a spaceship dependency, as
+# it shouldn't really be added to production systems
+
+require "spaceship"
+require "credentials_manager"
+
+username = ARGV[1] if ARGV[0] == '-u'
+username ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
+username ||= ask("Username: ")
+
+begin
+  puts "Logging into to iTunes Connect (#{username})..."
+  Spaceship::Tunes.login(username)
+  puts "Successfully logged in to iTunes Connect".green
+  puts ""
+rescue
+  puts "Could not login to iTunes Connect...".red
+end
+
+itc_cookie_content = Spaceship::Tunes.client.store_cookie
+
+# The only value we actually need is the "DES5c148586daa451e55afb017aa62418f91" cookie
+# We're not sure if the key changes
+#
+# Example:
+# name: DES5c148586daa451e55afb017aa62418f91
+# value: HSARMTKNSRVTWFlaF/ek8asaa9lymMA0dN8JQ6pY7B3F5kdqTxJvMT19EVEFX8EQudB/uNwBHOHzaa30KYTU/eCP/UF7vGTgxs6PAnlVWKscWssOVHfP2IKWUPaa4Dn+I6ilA7eAFQsiaaVT
+
+require 'yaml'
+cookies = YAML.load(itc_cookie_content)
+
+# We remove all the un-needed cookies
+cookies.delete_if do |current|
+  ['aa', 'X-SESS', 'site', 'acn01', 'myacinfo', 'itctx', 'wosid', 'woinst', 'NSC_17ofu-jud-jud-mc'].include?(current.name)
+end
+
+yaml = cookies.to_yaml.gsub("\n", "\\n")
+
+puts "---"
+puts ""
+puts "Pass the following via the FASTLANE_SESSION environment variable:"
+puts yaml.cyan.underline
+puts ""
+puts ""
+puts "Example:"
+puts "export FASTLANE_SESSION='#{yaml}'".cyan.underline

data/lib/spaceship/client.rb

@@ -331,6 +331,9 @@ module Spaceship
       File.write(itc_service_key_path, @service_key)
 
       return @service_key
+    rescue => ex
+      puts ex.to_s
+      raise AppleTimeoutError.new, "Could not receive latest API key from iTunes Connect, this might be a server issue."
     end
 
     #####################################################

data/lib/spaceship/portal/provisioning_profile.rb

@@ -152,22 +152,12 @@ module Spaceship
         # Create a new object based on a hash.
         # This is used to create a new object based on the server response.
         def factory(attrs)
-          # Ad Hoc Profiles look exactly like App Store profiles, but usually include devices
-          profile_details = client.provisioning_profile_details(provisioning_profile_id: attrs["provisioningProfileId"])
-
-          # The only difference between App Store and Ad Hoc provisioniong profile is the devices that are attached
-          if attrs['distributionMethod'] == 'store' && (profile_details['devices'] || []).size > 0
-            attrs['distributionMethod'] = 'adhoc'
-          end
           # available values of `distributionMethod` at this point: ['adhoc', 'store', 'limited']
-
           klass = case attrs['distributionMethod']
                   when 'limited'
                     Development
                   when 'store'
                     AppStore
-                  when 'adhoc'
-                    AdHoc
                   when 'inhouse'
                     InHouse
                   else
@@ -180,23 +170,6 @@ module Spaceship
           klass.client = @client
           obj = klass.new(attrs)
 
-          # Set the response of the details request, in case we want to access it later on
-          obj.profile_details = profile_details
-
-          # Since 15th September 2016 certificates and devices are hidden behind another request
-          # see https://github.com/fastlane/fastlane/issues/6137 for more information
-          # That's why we set it here
-
-          # Parse all the devices from the details request
-          obj.devices = (profile_details["devices"] || []).collect do |device|
-            Device.set_client(client).factory(device)
-          end
-
-          # Parse all the certificates from the details request
-          obj.certificates = (profile_details["certificates"] || []).collect do |cert|
-            Certificate.set_client(client).factory(cert)
-          end
-
           return obj
         end
 
@@ -279,9 +252,20 @@ module Spaceship
 
           return profiles if self == ProvisioningProfile
 
+          # To distinguish between AppStore and AdHoc profiles, we need to send
+          # a details request (see `fetch_details`). This is an expensive operation
+          # which we can't do for every single provisioning profile
+          # Instead we'll treat App Store profiles the same way as Ad Hoc profiles
+          # Spaceship::ProvisioningProfile::AdHoc.all will return the same array as
+          # Spaceship::ProvisioningProfile::AppStore.all, containing only AppStore
+          # profiles. To determine if it's an Ad Hoc profile, you can use the
+          # is_adhoc? method on the profile.
+          klass = self
+          klass = AppStore if self == AdHoc
+
           # only return the profiles that match the class
-          profiles.select do |profile|
-            profile.class == self
+          return profiles.select do |profile|
+            profile.class == klass
           end
         end
 
@@ -354,6 +338,9 @@ module Spaceship
       # @return (ProvisioningProfile) A new provisioning profile, as
       #  the repair method will generate a profile with a new ID
       def update!
+        # sigh handles more specific filtering and validation steps that make this logic OK
+        #
+        # This is the minimum protection needed for people using spaceship directly
         unless certificate_valid?
           if mac?
             if self.kind_of? Development
@@ -405,8 +392,9 @@ module Spaceship
       end
 
       # @return (Bool) Is the current provisioning profile valid?
+      #                To also verify the certificate call certificate_valid?
       def valid?
-        return (status == 'Active' and certificate_valid?)
+        return status == 'Active'
       end
 
       # @return (Bool) Is this profile managed by Xcode?
@@ -418,6 +406,42 @@ module Spaceship
       def mac?
         platform == 'mac'
       end
+
+      def devices
+        fetch_details
+
+        @devices = (self.profile_details["devices"] || []).collect do |device|
+          Device.set_client(client).factory(device)
+        end if (@devices || []).empty?
+
+        @devices
+      end
+
+      def certificates
+        fetch_details
+
+        @certificates = (profile_details["certificates"] || []).collect do |cert|
+          Certificate.set_client(client).factory(cert)
+        end if (@certificates || []).empty?
+
+        return @certificates
+      end
+
+      # @return (Bool) Is this current provisioning profile adhoc?
+      #                AppStore and AdHoc profiles are the same except that AdHoc has devices
+      def is_adhoc?
+        return false unless self.kind_of?(AppStore) || self.kind_of?(AdHoc)
+
+        return devices.count > 0
+      end
+
+      private
+
+      def fetch_details
+        # Since 15th September 2016 certificates and devices are hidden behind another request
+        # see https://github.com/fastlane/fastlane/issues/6137 for more information
+        self.profile_details ||= client.provisioning_profile_details(provisioning_profile_id: self.id)
+      end
     end
   end
 end

data/lib/spaceship/version.rb

@@ -1,4 +1,4 @@
 module Spaceship
-  VERSION = "0.32.4".freeze
+  VERSION = "0.33.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.32.4
+  version: 0.33.0
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager
@@ -310,12 +310,14 @@ email:
 - spaceship@krausefx.com
 - stefan@natchev.com
 executables:
+- spaceauth
 - spaceship
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/spaceauth
 - bin/spaceship
 - lib/assets/languageMapping.json
 - lib/assets/languageMappingReadable.json