motion-provisioning 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e38a22761737ec400d582f7679ff12216138db
-  data.tar.gz: 2573196e24dd07f10b68f7b27c96d8f1ec4a2163
+  metadata.gz: 4c059121bb4064c74fef8edd7607166484da18a9
+  data.tar.gz: 6b04043487931ed3f1f1072f5abb76ef50a55eee
 SHA512:
-  metadata.gz: b0f4fb569b2e4cccf7f6347b0d093e981c90a7c622792fb85e520e2436df04622c07c714a3cd231422055117487243ed861db98cf6fc10edf3ed73455af5ee00
-  data.tar.gz: 11eb96cc59e6753f007e03769aabafef8ce6df4f2800e0be3797882df6d4f5116b666fdfc8c429e0dcebaf010c4d1404dc1ca9313aee0642199acd0323e4f58f
+  metadata.gz: 323f9a8aaa00652f1a63ca601d92adf93e9eed4911801b5c02a7655211b3cf3b8e688a804eebd258e035337b0e9d4ab35e7df9a8fe55b19b97c7b6de55778e6f
+  data.tar.gz: 4b597603c530c67353989753221369d7c17b96b8aba9a2c057cb4d2640036c7092d1b93ae041da030204828a9ef7dd319df832a0fbdadbebcf7f27f2d507d35e

data/README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/HipByte/motion-provisioning.svg?branch=master)](https://travis-ci.org/HipByte/motion-provisioning)
 
-# MotionProvisioning
+# motion-provisioning
 
 Simplified provisioning for RubyMotion iOS, tvOS and macOS apps.
 
@@ -8,9 +8,9 @@ Getting started with iOS development has a very high barrier. Just
 getting a app and device registered requires you to go through a *very*
 complex web interface at developer.apple.com
 
-MotionProvisioning significantly alleviates the pain of these steps.
+motion-provisioning significantly alleviates the pain of these steps.
 
-By providing your developer account, MotionProvisioning automatically performs
+By providing your developer account, motion-provisioning automatically performs
 the following tasks in the Developer Portal for you:
 
 - Creates an application matching your app's name and bundle
@@ -19,6 +19,8 @@ the following tasks in the Developer Portal for you:
 - Creates development, distribution and adhoc profiles.
 - Registers iOS devices.
 
+For more awesomeness, use motion-provisioning along with [motion-appstore](https://github.com/HipByte/motion-appstore)!
+
 ![motion-provisioning in the terminal](img/motion-provisioning.gif)
 
 ## Installation
@@ -155,7 +157,7 @@ The distribution certificate (and it's corresponding private key) must
 be shared between all team members who will be creating distribution
 builds.
 
-MotionProvisioning will ask before revoking the existing distribution
+motion-provisioning will ask before revoking the existing distribution
 certificate and creating a new one.
 
 After you create a new distribution certificate, share the
@@ -174,7 +176,7 @@ For example, to recreate the development profile:
 
 ## Entitlements and App Services
 
-MotionProvisioning does not (yet) manage entitlements and app services (like
+motion-provisioning does not (yet) manage entitlements and app services (like
 HealthKit, HomeKit or iCloud). To enable them, you need to go to the Developer
 Portal. Then, recreate your provisioning profile and add the appropriate
 entitlements to the `app.entitlements` hash in your Rakefile.

data/lib/motion-provisioning/application.rb

@@ -1,6 +1,5 @@
 module MotionProvisioning
   class Application
-
     # Finds or create app for the given bundle id and name
     def self.find_or_create(bundle_id: nil, name: nil, mac: false)
       app = Spaceship::Portal::App.find(bundle_id, mac: mac)
@@ -13,12 +12,12 @@ module MotionProvisioning
         rescue Spaceship::Client::UnexpectedResponse => e
           if e.to_s.include?("is not a valid identifier")
             Utils.log("Error", "'#{bundle_id}' is not a valid identifier for an app. Please choose an identifier containing only alphanumeric characters, dots and asterisk")
-            exit 1
+            exit(1)
           elsif e.to_s.include?("is not available")
             Utils.log("Error", "'#{bundle_id}' has already been taken. Please enter a different string.")
-            exit 1
+            exit(1)
           else
-            raise e
+            raise(e)
           end
         end
       end

data/lib/motion-provisioning/certificate.rb

@@ -1,17 +1,5 @@
-module Spaceship
-  module Portal
-    class Certificate
-      # The PLIST request for the free certificate returns the certificate content
-      # in the certContent variable. It's stored in this attribute for later use.
-      attr_accessor :motionprovisioning_certContent,
-                    :motionprovisioning_serialNumber
-    end
-  end
-end
-
 module MotionProvisioning
   class Certificate
-
     attr_accessor :type, :output_path, :platform
 
     def client
@@ -41,7 +29,7 @@ module MotionProvisioning
           # The certificate is not installed, so we install the cert and the key
           import_file(private_key_path)
           import_file(certificate_path)
-          name =  common_name(certificate_path)
+          name = common_name(certificate_path)
           Utils.log("Info", "Using certificate '#{name}'.")
           return name
         end
@@ -53,9 +41,6 @@ module MotionProvisioning
       # Make sure a client is created and logged in
       client
 
-      # All the certificates for the specified type
-      user_certificates = certificates
-
       # Lets see if any of the user certificates is in the keychain
       installed_certificate = nil
       if !certificates.empty?
@@ -67,7 +52,7 @@ module MotionProvisioning
       end
 
       # There are no certificates in the server so we create a new one
-      if user_certificates.empty?
+      if certificates.empty?
         Utils.log("Warning", "Couldn't find any existing certificates... creating a new one.")
         if certificate = create_certificate
           return common_name(certificate)
@@ -77,23 +62,23 @@ module MotionProvisioning
         end
       # There are certificates in the server, but none is installed locally. Revoke all and create a new one.
       elsif installed_certificate.nil?
-        Utils.log("Error", "None of the available certificates (#{user_certificates.count}) is installed on the local machine. Revoking...")
+        Utils.log("Error", "None of the available certificates (#{certificates.count}) is installed on the local machine. Revoking...")
 
         # For distribution, ask before revoking
         if self.type == :distribution
-          answer = Utils.ask("Info", "There are #{user_certificates.count} distribution certificates in your account, but none installed locally.\n" \
+          answer = Utils.ask("Info", "There are #{certificates.count} distribution certificates in your account, but none installed locally.\n" \
                     "Before revoking and creating a new one, ask other team members who might have them installed to share them with you.\n" \
                     "Do you want to continue revoking the certificates? (Y/n):")
-          abort if answer.downcase != "y"
+          abort if answer.no?
         end
 
         # Revoke all and create new one
         if MotionProvisioning.free
-          user_certificates.each do |certificate|
+          certificates.each do |certificate|
             client.revoke_development_certificate(certificate.motionprovisioning_serialNumber)
           end
         else
-          user_certificates.each(&:revoke!)
+          certificates.each(&:revoke!)
         end
 
         if certificate = create_certificate
@@ -106,20 +91,16 @@ module MotionProvisioning
       else
         Utils.log("Info", "Found certificate '#{installed_certificate.name}' which is installed in the local machine.")
 
-        path = store_certificate_raw(installed_certificate.motionprovisioning_certContent ||installed_certificate.download_raw)
+        path = store_certificate_raw(installed_certificate.motionprovisioning_certContent || installed_certificate.download_raw)
 
         password = Utils.ask_password("Info", "Exporting private key from Keychain for certificate '#{installed_certificate.name}'. Choose a password (you will be asked for this password when importing this key into the Keychain in another machine):")
         private_key_contents = private_key(common_name(path), sha1_fingerprint(path), password)
-        if private_key_contents.empty?
-          Utils.log("Error", "Could not export private key for certificate '#{installed_certificate.name}'.")
-          abort
-        end
         File.write(private_key_path, private_key_contents)
 
         # This certificate is installed on the local machine
         Utils.log("Info", "Using certificate '#{installed_certificate.name}'.")
 
-        return common_name(path)
+        common_name(path)
       end
     end
 
@@ -219,7 +200,7 @@ module MotionProvisioning
       end
       Utils.ask("Info", "Press any key to continue...")
 
-      return cert_path
+      cert_path
     end
 
     def store_certificate_raw(raw_data)

data/lib/motion-provisioning/mobileprovision.rb

@@ -1,7 +1,6 @@
 module MotionProvisioning
   # Represents a .mobileprobision file on disk
   class MobileProvision
-
     attr_accessor :hash, :enabled_services, :certificates
 
     # @param path (String): Path to the .mobileprovision file
@@ -42,6 +41,5 @@ module MotionProvisioning
 
       true
     end
-
   end
 end

data/lib/motion-provisioning/provisioning_profile.rb

@@ -55,7 +55,7 @@ module MotionProvisioning
           ids.each do |id|
             next if profile_devices.include?(id.downcase)
             answer = Utils.ask("Info", "This computer is connected to an iOS device with ID '#{id}' which is not included in the profile. Do you want to register it? (Y/n):")
-            if answer.downcase == 'y'
+            if answer.yes?
               Utils.log('Info', "Registering device with ID '#{id}'")
               Spaceship::Portal::Device.create!(name: 'iOS Device', udid: id)
               force_repair = true
@@ -66,7 +66,7 @@ module MotionProvisioning
             existing = Spaceship::Portal::Device.find_by_udid(id)
             next if existing
             answer = Utils.ask("Info", "This computer is connected to an iOS device with ID '#{id}' which is not registered in the Developer Portal. Do you want to register it? (Y/n):")
-            if answer.downcase == 'y'
+            if answer.yes?
               Utils.log('Info', "Registering device with ID '#{id}'")
               client.create_device!('iOS Device', id)
             end

data/lib/motion-provisioning/spaceship/free_portal_client.rb

@@ -2,19 +2,19 @@ module Spaceship
   class FreePortalClient < Spaceship::PortalClient
 
     def create_provisioning_profile!(name, distribution_method, app_id, certificate_ids, device_ids, mac: false, sub_platform: nil)
-      ensure_csrf
+      ensure_csrf(Spaceship::App)
 
       params = {
         teamId: team_id,
         appIdId: app_id,
       }
 
-      r = request_plist(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(mac)}/downloadTeamProvisioningProfile.action", params)
+      r = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/downloadTeamProvisioningProfile.action", params)
       parse_response(r, 'provisioningProfile')
     end
 
     def download_provisioning_profile(profile_id, mac: false)
-      r = request_plist(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(mac)}/downloadProvisioningProfile.action", {
+      r = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/downloadProvisioningProfile.action", {
         teamId: team_id,
         provisioningProfileId: profile_id
       })
@@ -26,7 +26,7 @@ module Spaceship
 
     def devices(mac: false)
       paging do |page_number|
-        r = request_plist(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(mac)}/listDevices.action", {
+        r = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/listDevices.action", {
           teamId: team_id,
           pageNumber: page_number,
           pageSize: page_size,
@@ -37,19 +37,18 @@ module Spaceship
     end
 
     def create_device!(device_name, device_id, mac: false)
-      req = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/addDevice.action", {
-	teamId: team_id,
-	deviceNumber: device_id,
-	name: device_name
+      r = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/addDevice.action", {
+        teamId: team_id,
+        deviceNumber: device_id,
+        name: device_name
       })
 
-      parse_response(req, 'device')
+      parse_response(r, 'device')
     end
 
     def apps(mac: false)
       paging do |page_number|
-
-        r = request_plist(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(mac)}/listAppIds.action?clientId=XABBG36SBA", {
+        r = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/listAppIds.action?clientId=XABBG36SBA", {
           teamId: team_id,
           pageNumber: page_number,
           pageSize: page_size,
@@ -60,7 +59,7 @@ module Spaceship
     end
 
     def details_for_app(app)
-      r = request_plist(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(app.mac?)}/getAppIdDetail.action", {
+      r = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(app.mac?)}/getAppIdDetail.action", {
         teamId: team_id,
         identifier: app.app_id
       })
@@ -74,14 +73,14 @@ module Spaceship
         teamId: team_id
       }
 
-      ensure_csrf
+      ensure_csrf(Spaceship::App)
 
-      r = request_plist(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(mac)}/addAppId.action?clientId=XABBG36SBA", params)
+      r = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/addAppId.action?clientId=XABBG36SBA", params)
       parse_response(r, 'appId')
     end
 
     def revoke_development_certificate(serial_number, mac: false)
-      r = request_plist(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(mac)}/revokeDevelopmentCert.action?clientId=XABBG36SBA", {
+      r = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/revokeDevelopmentCert.action?clientId=XABBG36SBA", {
         teamId: team_id,
         serialNumber: serial_number,
       })
@@ -89,9 +88,9 @@ module Spaceship
     end
 
     def create_development_certificate(csr, mac: false)
-      ensure_csrf
+      ensure_csrf(Spaceship::Certificate)
 
-      r = request_plist(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(mac)}/submitDevelopmentCSR.action?clientId=XABBG36SBA&teamId=#{team_id}", {
+      r = request_plist(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/submitDevelopmentCSR.action?clientId=XABBG36SBA&teamId=#{team_id}", {
         teamId: team_id,
         csrContent: csr
       })
@@ -101,23 +100,15 @@ module Spaceship
 
     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
-        teams
-      end
-    end
-
     def request_plist(method, url_or_path = nil, params = nil, headers = {}, &block)
       headers['X-Xcode-Version'] = '7.3.1 (7D1014)'
       headers['Content-Type'] = 'text/x-xml-plist'
-      params = params.to_plist if params
-      headers.merge!(csrf_tokens)
       headers['User-Agent'] = USER_AGENT
-      response = send_request(method, url_or_path, params, headers, &block)
-      return response
-    end
+      headers.merge!(csrf_tokens)
 
+      params = params.to_plist if params
+
+      send_request(method, url_or_path, params, headers, &block)
+    end
   end
 end

data/lib/motion-provisioning/spaceship/portal/certificate.rb

@@ -0,0 +1,10 @@
+module Spaceship
+  module Portal
+    class Certificate
+      # The PLIST request for the free certificate returns the certificate content
+      # in the certContent variable. It's stored in this attribute for later use.
+      attr_accessor :motionprovisioning_certContent,
+                    :motionprovisioning_serialNumber
+    end
+  end
+end

data/lib/motion-provisioning/spaceship/portal_client.rb

@@ -1,23 +1,22 @@
 module Spaceship
   class PortalClient < Spaceship::Client
-
     def distribution_certificates(mac: false)
       paging do |page_number|
-        r = request(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(mac)}/downloadDistributionCerts.action?clientId=XABBG36SBA&teamId=#{team_id}")
+        r = request(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/downloadDistributionCerts.action?clientId=XABBG36SBA&teamId=#{team_id}")
         parse_response(r, 'certificates')
       end
     end
 
     def development_certificates(mac: false)
       paging do |page_number|
-        r = request(:post, "https://developerservices2.apple.com/services/QH65B2/#{platform_slug(mac)}/listAllDevelopmentCerts.action?clientId=XABBG36SBA&teamId=#{team_id}")
+        r = request(:post, "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/#{platform_slug(mac)}/listAllDevelopmentCerts.action?clientId=XABBG36SBA&teamId=#{team_id}")
         parse_response(r, 'certificates')
       end
     end
 
     # Fix a bug in Fastlane where the slug is hardcoded to ios
     def create_certificate!(type, csr, app_id = nil)
-      ensure_csrf
+      ensure_csrf(Spaceship::Certificate)
 
       mac = Spaceship::Portal::Certificate::MAC_CERTIFICATE_TYPE_IDS.keys.include?(type)
 
@@ -29,6 +28,5 @@ module Spaceship
       })
       parse_response(r, 'certRequest')
     end
-
   end
 end

data/lib/motion-provisioning/utils.rb

@@ -1,5 +1,19 @@
 module MotionProvisioning
   module Utils
+    class Answer
+      def initialize(answer)
+        @answer = answer.downcase
+      end
+
+      def yes?
+        @answer == 'y'
+      end
+
+      def no?
+        @answer == 'n'
+      end
+    end
+
     module_function
     def log(what, msg)
       require 'thread'
@@ -17,7 +31,7 @@ module MotionProvisioning
 
       result = $stdin.gets
       result.chomp! if result
-      result
+      Answer.new(result)
     end
 
     def ask_password(what, question)

data/lib/motion-provisioning/version.rb

@@ -1,3 +1,3 @@
 module MotionProvisioning
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/motion-provisioning.rb

@@ -6,6 +6,7 @@ require 'date'
 require 'plist'
 require 'security'
 require 'spaceship'
+require 'motion-provisioning/spaceship/portal/certificate'
 require 'motion-provisioning/spaceship/portal_client'
 require 'motion-provisioning/spaceship/free_portal_client'
 
@@ -28,7 +29,7 @@ module MotionProvisioning
 
       if File.exist?('.gitignore') && File.read('.gitignore').match(/^provisioning$/).nil?
         answer = Utils.ask("Info", "Do you want to add the 'provisioning' folder fo your '.gitignore' file? (Recommended) (Y/n):")
-        `echo provisioning >> .gitignore` if answer.downcase == 'y'
+        `echo provisioning >> .gitignore` if answer.yes?
       end
 
       client = if free
@@ -43,7 +44,7 @@ module MotionProvisioning
 
       if ENV['MOTION_PROVISIONING_EMAIL'].nil? && !File.exist?(config_path)
         answer = Utils.ask("Info", "Do you want to save the email to the config file ('provisioning/config.yaml') so you dont have to type it again? (Y/n):")
-        if answer.downcase == 'y'
+        if answer.yes?
           FileUtils.mkdir_p(File.expand_path('./provisioning'))
           File.write(config_path, { 'email' => email }.to_yaml)
         end
@@ -68,7 +69,7 @@ module MotionProvisioning
       rescue Spaceship::Client::InvalidUserCredentialsError => ex
         Utils.log("Error", "There was an error logging into your account. Your password may be wrong.")
 
-        if Utils.ask("Info", 'Do you want to reenter your password? (Y/n):').downcase == 'y'
+        if Utils.ask("Info", 'Do you want to reenter your password? (Y/n):').yes?
 
           # The 'delete' method is very verbose, temporarily disable output
           orig_stdout = $stdout.dup
@@ -115,7 +116,7 @@ module MotionProvisioning
 
           if File.exist?(config_path) && ENV['MOTION_PROVISIONING_TEAM_ID'].nil?
             answer = Utils.ask("Info", "Do you want to save the team id (#{team_id}) in the config file ('provisioning/config.yaml') so you dont have to select it again? (Y/n):")
-            if answer.downcase == 'y'
+            if answer.yes?
               config = YAML.load(File.read(config_path))
               config['team_id'] = team_id
               File.write(config_path, config.to_yaml)
@@ -194,7 +195,6 @@ module MotionProvisioning
     Certificate.new.certificate_name(opts[:type], opts[:platform])
   end
 
-
   def self.profile(opts = {})
     unless opts[:bundle_identifier]
       Utils.log("Error", "'bundle_identifier' is required")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-provisioning
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mark Villacampa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spaceship
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.31.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.31.9
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,7 @@ files:
 - lib/motion-provisioning/mobileprovision.rb
 - lib/motion-provisioning/provisioning_profile.rb
 - lib/motion-provisioning/spaceship/free_portal_client.rb
+- lib/motion-provisioning/spaceship/portal/certificate.rb
 - lib/motion-provisioning/spaceship/portal_client.rb
 - lib/motion-provisioning/tasks.rb
 - lib/motion-provisioning/utils.rb
@@ -183,4 +184,3 @@ signing_key:
 specification_version: 4
 summary: Simplified provisioning for RubyMotion iOS, tvOS and macOS apps.
 test_files: []
-has_rdoc: