spaceship 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b145c0d864b836e315d2e1a46c19c26592d2c7d
-  data.tar.gz: e37e5ca3bea8b4ec1051dbf529ac8ae0604d6c52
+  metadata.gz: 02178127118d73630e027800cd0c2c759145444c
+  data.tar.gz: d74fd79faf660145dceacfe275b59db20f24067d
 SHA512:
-  metadata.gz: 37de7537f2dc4640dfae3ac377f75aa7edf5282ce0130c67ce97731c0573eb436b0fb947612b7757df9d158bc70297ea311ce7e08bf5c0f9b8d2ee7d962d3e41
-  data.tar.gz: 66d166b14627edc4ff2f487afcebf2dca814784d75f3706c6c486d64a18a6c6a9feb93978d9b15d23983a75ad2c7b08d2fd8be5c31631f9c14c548c352a90f97
+  metadata.gz: 53c9952a624da716a1777b4ec5cff8d4a80c166bf8f2e710f956a231adfc77b2f254025da34473c3fd48a4ffced5ab821412e20e6417be100c3970b28c51c9e1
+  data.tar.gz: 884cc41a088ed45f6e257bd5f9355685cd6c95c1962272d0595ce844047b4dc46e168db0df0b5c05180daf538242ff21e8daeac132155b31d3daf66020c47f94

data/README.md

@@ -216,7 +216,7 @@ profile = Spaceship.provisioning_profile.ad_hoc.create!(bundle_id: "com.krausefx
 File.write("NewProfile.mobileprovision", profile.download)
 ```
 
-### Repair a broken provisioning profile
+### Repair all broken provisioning profiles
 
 ```ruby
 # Select all 'Invalid' or 'Expired' provisioning profiles
@@ -398,7 +398,7 @@ This project is licensed under the terms of the MIT license. See the LICENSE fil
 # Contributing
 
 1. Create an issue to start a discussion about your idea
-2. Fork it (https://github.com/KrauseFx/fastlane/fork)
+2. Fork it (https://github.com/fastlane/spaceship/fork)
 3. Create your feature branch (`git checkout -b my-new-feature`)
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)

data/lib/spaceship.rb

@@ -1,7 +1,6 @@
 require 'spaceship/version'
 require 'spaceship/base'
 require 'spaceship/client'
-require 'spaceship/profile_types'
 require 'spaceship/app'
 require 'spaceship/certificate'
 require 'spaceship/device'

data/lib/spaceship/certificate.rb

@@ -262,9 +262,7 @@ module Spaceship
 
     # @return (Bool): Is this certificate a push profile for apps? 
     def is_push?
-      # does display_type_id match push?
-      [Client::ProfileTypes::Push.development, Client::ProfileTypes::Push.production].include?(type_display_id)
+      self.kind_of?PushCertificate
     end
-
   end
 end

data/lib/spaceship/client.rb

@@ -5,13 +5,12 @@ require 'spaceship/ui'
 require 'spaceship/helper/plist_middleware'
 require 'spaceship/helper/net_http_generic_request'
 
-if ENV['DEBUG']
-  require 'pry' # TODO: Remove
+if ENV["DEBUG"]
   require 'openssl'
+  # this has to be on top of this file, since the value can't be changed later
   OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 end
 
-
 module Spaceship
   class Client
     PROTOCOL_VERSION = "QH65B2"
@@ -23,7 +22,9 @@ module Spaceship
     # /tmp/spaceship.log by default
     attr_accessor :logger
 
+    # Invalid user credentials were provided
     class InvalidUserCredentialsError < StandardError; end
+
     class UnexpectedResponse < StandardError; end
 
     # Authenticates with Apple's web services. This method has to be called once
@@ -56,17 +57,30 @@ module Spaceship
         c.adapter Faraday.default_adapter
 
         if ENV['DEBUG']
-          # for debugging:
+          # for debugging only
+          # This enables tracking of networking requests using Charles Web Proxy
           c.response :logger
           c.proxy "https://127.0.0.1:8888"
         end
       end
     end
 
+    # Fetches the latest API Key from the Apple Dev Portal
     def api_key
-      page = @client.get("https://developer.apple.com/devcenter/ios/index.action").body
-      if page =~ %r{<a href="https://idmsa.apple.com/IDMSWebAuth/login\?.*appIdKey=(\h+)}
-        return $1
+      cache_path = "/tmp/spaceship_api_key.txt"
+      cached = File.read(cache_path) rescue nil
+      return cached if cached
+
+      landing_url = "https://developer.apple.com/membercenter/index.action"
+      logger.info("GET: " + landing_url)
+      headers = @client.get(landing_url).headers
+      results = headers['location'].match(/.*appIdKey=(\h+)/)
+      if results.length > 1
+        api_key = results[1]
+        File.write(cache_path, api_key)
+        return api_key
+      else
+        raise "Could not find latest API Key from the Dev Portal"
       end
     end
 
@@ -78,8 +92,11 @@ module Spaceship
           @logger = Logger.new(STDOUT)
         else
           # Log to file by default
-          @logger = Logger.new("/tmp/spaceship.log")
+          path = "/tmp/spaceship.log"
+          puts "Logging spaceship web requests to '#{path}'"
+          @logger = Logger.new(path)
         end
+
         @logger.formatter = proc do |severity, datetime, progname, msg|
           string = "[#{datetime.strftime('%H:%M:%S')}]: #{msg}\n"
         end
@@ -88,8 +105,11 @@ module Spaceship
       @logger
     end
 
-    # Automatic paging
+    #####################################################
+    # @!group Automatic Paging
+    #####################################################
 
+    # The page size we want to request, defaults to 500
     def page_size
       @page_size ||= 500
     end
@@ -111,6 +131,10 @@ module Spaceship
       return results
     end
 
+    #####################################################
+    # @!group Login and Team Selection
+    #####################################################
+
     # 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.
@@ -151,15 +175,18 @@ module Spaceship
       end
     end
 
+    # @return (Bool) Do we have a valid session? 
     def session?
       !!@cookie
     end
 
+    # @return (Array) A list of all available teams
     def teams
       r = request(:post, 'account/listTeams.action')
       parse_response(r, 'teams')
     end
 
+    # @return (String) The currently selected Team ID
     def team_id
       return @current_team_id if @current_team_id
 
@@ -169,14 +196,21 @@ module Spaceship
       @current_team_id ||= teams[0]['teamId']
     end
 
+    # Shows a team selection for the user in the terminal. This should not be
+    # called on CI systems
     def select_team
       @current_team_id = self.UI.select_team
     end
 
-    def current_team_id=(team_id)
+    # Set a new team ID which will be used from now on
+    def team_id=(team_id)
       @current_team_id = team_id
     end
 
+    #####################################################
+    # @!group Apps
+    #####################################################
+
     def apps
       paging do |page_number|
         r = request(:post, 'account/ios/identifiers/listAppIds.action', {
@@ -227,6 +261,10 @@ module Spaceship
       parse_response(r)
     end
 
+    #####################################################
+    # @!group Devices
+    #####################################################
+
     def devices
       paging do |page_number|
         r = request(:post, 'account/ios/device/listDevices.action', {
@@ -252,6 +290,10 @@ module Spaceship
       parse_response(r, 'device')
     end
 
+    #####################################################
+    # @!group Certificates
+    #####################################################
+
     def certificates(types)
       paging do |page_number|
         r = request(:post, 'account/ios/certificate/listCertRequests.action', {
@@ -294,6 +336,10 @@ module Spaceship
       parse_response(r, 'certRequests')
     end
 
+    #####################################################
+    # @!group Provisioning Profiles
+    #####################################################
+
     def provisioning_profiles
       r = request(:post) do |r|
         r.url "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/ios/listProvisioningProfiles.action"
@@ -350,7 +396,7 @@ module Spaceship
     end
 
     private
-      # Is called from `parse_response` to store
+      # Is called from `parse_response` to store the latest csrf_token (if available)
       def store_csrf_tokens(response)
         if response and response.headers
           tokens = response.headers.select { |k, v| %w[csrf csrf_ts].include?(k) }
@@ -359,7 +405,7 @@ module Spaceship
           end
         end
       end
-      ##
+      
       # memoize the last csrf tokens from responses
       def csrf_tokens
         @csrf_tokens || {}

data/lib/spaceship/helper/net_http_generic_request.rb

@@ -7,6 +7,6 @@ require 'net/http'
 # This monkey-patch allows us to leave out the content-type if we do not specify one.
 class Net::HTTPGenericRequest
   def supply_default_content_type
-    return if content_type()
+    return if content_type
   end
 end

data/lib/spaceship/provisioning_profile.rb

@@ -238,9 +238,9 @@ module Spaceship
         end
       end
 
-      # @return (ProvisioningProfile) Find a provisioning based on the
-      #  bundle_id (app identifier). This will return nil if it can't be
-      #  found.
+      # @return (Array) Returns an array of provisioning
+      #   profiles matching the bundle identifier
+      #   Returns [] if no profiles were found
       def find_by_bundle_id(bundle_id)
         all.find_all do |profile|
           profile.app.bundle_id == bundle_id
@@ -310,8 +310,10 @@ module Spaceship
       unless certificate_valid?
         if self.kind_of?Development
           self.certificates = [Spaceship::Certificate::Development.all.first]
+        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
 

data/lib/spaceship/ui/select_team.rb

@@ -66,7 +66,7 @@ module Spaceship
           # Multiple teams, user has to select
           puts "Multiple teams found, please enter the number of the team you want to use: "
           teams.each_with_index do |team, i|
-            puts "#{i + 1}) #{team['teamId']} #{team['name']} (#{team['type']})"
+            puts "#{i + 1}) #{team['teamId']} \"#{team['name']}\" (#{team['type']})"
           end
 
           selected = ($stdin.gets || '').strip.to_i - 1

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Stefan Natchev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager
@@ -213,7 +213,6 @@ files:
 - lib/spaceship/helper/net_http_generic_request.rb
 - lib/spaceship/helper/plist_middleware.rb
 - lib/spaceship/launcher.rb
-- lib/spaceship/profile_types.rb
 - lib/spaceship/provisioning_profile.rb
 - lib/spaceship/ui.rb
 - lib/spaceship/ui/select_team.rb

data/lib/spaceship/profile_types.rb

@@ -1,39 +0,0 @@
-module Spaceship
-  # This class contains the codes used for the different types of profiles
-  class Client
-    class ProfileTypes
-      class SigningCertificate
-        def self.development
-          "5QPB9NHCEI"
-        end
-        def self.distribution
-          "R58UK2EWSO"
-        end
-      end
-
-      class Push
-        def self.development
-          "BKLRAVXMGM"
-        end
-        def self.production
-          "3BQKVH9I2X"
-        end
-      end
-
-      def self.all_profile_types
-        [
-          "5QPB9NHCEI", # Development Code Signing Identity
-          "R58UK2EWSO", # Distribution Code Signing Identity
-          "9RQEK7MSXA", # iOS Distribution certificate signing request
-          "LA30L5BJEU", # MDM CSR certificate signing request
-          "BKLRAVXMGM", # Development Push Certificates
-          "3BQKVH9I2X", # Production Push Certificates
-          "Y3B2F3TYSI", # Pass Type ID pass certificate request
-          "3T2ZP62QW8", # Website Push Id
-          "E5D663CMZW", # Website Push Id
-          "4APLUP237T"  # Apple Pay
-        ]
-      end
-    end
-  end
-end