pem 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7edf95975cba2399652b2744959bfed9685c4294
-  data.tar.gz: e389b47259d1fbfd6aaa36287a5187b697c99784
+  metadata.gz: b953613039c526d03c52b0341dfbd8b235302e7d
+  data.tar.gz: 24327d42b6d028ce77a15fcefcdbb2e8dad66751
 SHA512:
-  metadata.gz: 0bc479d395be07e1d7614b55b6a4c2ea5a81da9fb87f911c46debb687432c2e0cf41ba03a084750689f7f40b31a5e68aeb1c6fc321529a253262462cf943548d
-  data.tar.gz: eb66fe2cc46d49e55571abb17d6803d9e0b558132ddc91ca845d123f4ee5f147e871e29b641be52ad1e498ddd4996c39dfab87470f2fe4d783d6a9d1f1589a40
+  metadata.gz: 3d4de449003920eb1594f7fc546ba97c793a26b1768e3829863e69811d1a1e02e726aa77def4f6599fff9cac8c5ab6dbc7370b9516a9181dc7279a92cd4242ef
+  data.tar.gz: 5d436da8f8de0a09a673cf187f201b8e09200211e4dd6ef63aad7cba961949dd073e9a3f0ca1c46c1913689a9a32abf37d764ed203cb53cff940a576420a9370

data/README.md

@@ -29,12 +29,14 @@ Alexander Schuch ([@schuchalexander](https://twitter.com/schuchalexander)) who a
 
 
 -------
-[Features](#features) •
-[Installation](#installation) •
-[Usage](#usage) •
-[How does it work?](#how-does-it-work) •
-[Tips](#tips) •
-[Need help?](#need-help)
+<p align="center">
+    <a href="#features">Features</a> &bull; 
+    <a href="#installation">Installation</a> &bull; 
+    <a href="#usage">Usage</a> &bull; 
+    <a href="#how-does-it-work">How does it work?</a> &bull; 
+    <a href="#tips">Tips</a> &bull; 
+    <a href="#need-help">Need help?</a>
+</p>
 
 -------
 
@@ -84,7 +86,6 @@ In case you prefer environment variables:
 
 - ```PEM_USERNAME```
 - ```PEM_APP_IDENTIFIER```
-- ```PEM_CERT_SIGNING_REQUEST``` in case you want to pass your own signing request file
 
 # How does it work?
 There are 2 actions involved:

data/lib/pem/cert_manager.rb

@@ -9,34 +9,21 @@ module PEM
 
       dev = PEM::DeveloperCenter.new
 
-      keychain = "PEM.keychain"
-
       cert_file = dev.fetch_cer_file(app_identifier, production)
-      rsa_file = [TMP_FOLDER, 'myrsa'].join('/')
-
-      previous_keychain = command("security default-keychain")
-
-
-
-      command("security create-keychain -p '' #{keychain}") # create a new keychain for this type
+      rsa_file = File.join(TMP_FOLDER, 'private_key.key')
 
-      command("security list-keychains -d user -s #{keychain}") # add it to the list of keychains
-
-      command("openssl genrsa -out '#{rsa_file}' 2048") # generate a new RSA file
-      command("security import '#{rsa_file}' -P '' -k #{keychain}") # import the RSA file into the Keychain
-      command("security import '#{cert_file}' -k #{keychain}") # import the profile from Apple into the Keychain
-
-      p12_file = [TMP_FOLDER, "push_prod.12"].join('/')
-
-      command("security export -k '#{keychain}' -t all -f pkcs12 -P '' -o #{p12_file}") # export code signing identity
+      pem_temp = File.join(TMP_FOLDER, 'pem_temp.pem')
 
       certificate_type = (production ? 'production' : 'development')
-      pem_file = [TMP_FOLDER, "#{certificate_type}_#{app_identifier}.pem"].join('')
-      command("openssl pkcs12 -passin pass: -nodes -in #{p12_file} -out #{pem_file}")
 
-      command("security delete-keychain #{keychain}")
 
-      command("security list-keychains -d user -s #{previous_keychain}") # switch back to default keychain
+      pem_file = File.join(TMP_FOLDER, "#{certificate_type}_#{app_identifier}.pem")
+      command("openssl x509 -inform der -in '#{cert_file}' -out #{pem_temp}")
+      content = File.read(pem_temp) + File.read(rsa_file)
+      File.write(pem_file, content)
+      
+
+      File.delete(rsa_file)
 
       return pem_file
     end

data/lib/pem/developer_center.rb

@@ -179,33 +179,9 @@ module PEM
         if not download_button
           Helper.log.warn "Push for app '#{app_identifier}' is enabled, but there is no #{certificate_type} certificate yet."
           create_push_for_app(app_identifier, production)
-
-          download_button = find_download_button(section_title)
-          raise "Could not find download button for #{section_title}. Check out: '#{current_url}'" unless download_button
+        else
+          raise "Could not create a new push profile for app '#{app_identifier}'. There is already a profile active.".red
         end
-
-
-        Helper.log.info "Going to download the latest profile"
-
-        # It is enabled, now just download it
-        # Taken from http://stackoverflow.com/a/17111206/445598
-        sleep 2
-
-        host = Capybara.current_session.current_host
-        url = download_button['href']
-        url = [host, url].join('')
-        
-        myacinfo = page.driver.cookies['myacinfo'].value # some magic Apple, which is required for the profile download
-        data = open(url, {'Cookie' => "myacinfo=#{myacinfo}"}).read
-
-        raise "Something went wrong when downloading the certificate" unless data
-
-        path = "#{TMP_FOLDER}/aps_#{certificate_type}_#{app_identifier}.cer"
-        File.write(path, data)
-
-        Helper.log.info "Successfully downloaded latest .cer file."
-        return path
-
       rescue Exception => ex
         error_occured(ex)
       end
@@ -252,8 +228,30 @@ module PEM
           sleep 2
         end
 
-        open_app_page(app_identifier)
-        click_on "Edit"
+        certificate_type = (production ? 'production' : 'development')
+
+        # Download the newly created certificate
+        Helper.log.info "Going to download the latest profile"
+
+        # It is enabled, now just download it
+        sleep 2
+
+        download_button = first(".button.small.blue")
+        host = Capybara.current_session.current_host
+        url = download_button['href']
+        url = [host, url].join('')
+        puts url
+        
+        myacinfo = page.driver.cookies['myacinfo'].value # some magic Apple, which is required for the profile download
+        data = open(url, {'Cookie' => "myacinfo=#{myacinfo}"}).read
+
+        raise "Something went wrong when downloading the certificate" unless data
+
+        path = "#{TMP_FOLDER}/aps_#{certificate_type}_#{app_identifier}.cer"
+        File.write(path, data)
+
+        Helper.log.info "Successfully downloaded latest .cer file."
+        return path
       end
 
 

data/lib/pem/signing_request.rb

@@ -1,16 +1,7 @@
 module PEM
   class SigningRequest
     def self.get_path
-      return ENV["PEM_CERT_SIGNING_REQUEST"] if (ENV["PEM_CERT_SIGNING_REQUEST"] and File.exists?(ENV["PEM_CERT_SIGNING_REQUEST"]))
-
-      # Check if there is one in the current directory
-      files = Dir["./*.certSigningRequest"]
-      if files.count == 1
-        Helper.log.info "Found a .certSigningRequest at the current folder. Using that."
-        return files.first
-      end
-
-      return self.generate
+      self.generate
     end
 
     def self.generate
@@ -28,6 +19,8 @@ module PEM
        
       path = File.join(TMP_FOLDER, 'PEMCertificateSigningRequest.certSigningRequest')
       File.write(path, csr.to_pem)
+      File.write(File.join(TMP_FOLDER, 'private_key.key'), @key)
+
       Helper.log.info "Successfully generated .certSigningRequest at path '#{path}'"
       return path
     end

data/lib/pem/version.rb

@@ -1,3 +1,3 @@
 module PEM
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pem
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: security
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement