pem 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53a49d82dfa51942bda7945a2abe14519aa1628d
-  data.tar.gz: 18add6dbe91bfb711a6277001f2317e7b40b023b
+  metadata.gz: 441f838576b5abd063e89f7619a9f3c14574c35d
+  data.tar.gz: a4f7a7821bc379329248e5b7d4bf7c9f0394a2f7
 SHA512:
-  metadata.gz: d79b9265d80ad370c50339a890e3aeafbac1ee3a7a7cdf94ab053a48739bb5d7863f423ed8b15d5d77759fd5e8bd4a9f8d89a4d2e258e5762060db51e0151f9f
-  data.tar.gz: 4699b6fa184d3e69bd472e41aa3ee29fc8fbdd82e24c60fcdc3655473004e037ae034a8dd68d926899a97e6f404f4e397f33073da7d1c0c9e83d39fe48cab5fa
+  metadata.gz: d669e76632dab4da9dd21add714e8e75a665113fa661c00a26f9cf58ddedbd4246badcb3347c8575fdeaddc96e4416ef8a35347346074c64833afa06ac24246c
+  data.tar.gz: 4769e953014210318a78c0a90c5c7205f14f68dcd8c49e7137a37cdb4d45fc8449bab52acbb535e5943a9c03fb0ebd2d73cc6fff00cf44477b79476f65bc55e9

data/README.md

@@ -72,6 +72,7 @@ Make sure, you have the latest version of the Xcode command line tools installed
 # Usage
 
     pem
+
 Yes, that's the whole command!
 
 This does the following:
@@ -83,6 +84,10 @@ This does the following:
 
 ```PEM``` will never revoke your existing certificates. 
 
+If you already have a push certificate enabled, which is active for at least 2 more weeks, `PEM` will not create a new certificate. If you still want to create one, use the `force`:
+
+    pem --force
+
 You can pass parameters like this:
 
     pem -a com.krausefx.app -u username

data/lib/pem/cert_manager.rb

@@ -13,21 +13,23 @@ module PEM
       dev = PEM::DeveloperCenter.new
 
       self.cert_file = dev.fetch_cer_file
-      self.rsa_file = File.join(TMP_FOLDER, 'private_key.key')
-      self.certificate_type = (PEM.config[:development] ? 'development' : 'production')
-      self.pem_file = File.join(TMP_FOLDER, "#{certificate_type}_#{PEM.config[:app_identifier]}.pem")
-      self.passphrase = ''
-
-      File.write(pem_file, pem_certificate)
-
-      # Generate p12 file as well
-      if PEM.config[:generate_p12]
-        output = "#{certificate_type}_#{PEM.config[:app_identifier]}.p12"
-        File.write(output, p12_certificate.to_der)
-        puts output.green
+      if self.cert_file
+        self.rsa_file = File.join(TMP_FOLDER, 'private_key.key')
+        self.certificate_type = (PEM.config[:development] ? 'development' : 'production')
+        self.pem_file = File.join(TMP_FOLDER, "#{certificate_type}_#{PEM.config[:app_identifier]}.pem")
+        self.passphrase = ''
+
+        File.write(pem_file, pem_certificate)
+
+        # Generate p12 file as well
+        if PEM.config[:generate_p12]
+          output = "#{certificate_type}_#{PEM.config[:app_identifier]}.p12"
+          File.write(output, p12_certificate.to_der)
+          puts output.green
+        end
+
+        return pem_file, rsa_file
       end
-
-      return pem_file, rsa_file
     end
 
     def private_key

data/lib/pem/developer_center.rb

@@ -4,7 +4,7 @@ module PEM
   class DeveloperCenter < FastlaneCore::DeveloperCenter
     APP_IDS_URL = "https://developer.apple.com/account/ios/identifiers/bundle/bundleList.action"
 
-    
+
     # This method will enable push for the given app
     # and download the cer file in any case, no matter if it existed before or not
     # @return the path to the push file
@@ -25,13 +25,30 @@ module PEM
           sleep 3 # this takes some time
         end
 
-        Helper.log.warn "Creating push certificate for app '#{@app_identifier}'."
-        create_push_for_app
+        if has_actual_cert and not PEM.config[:force]
+          Helper.log.info "You already have a push certificate, which is active for more than 2 more weeks. No need to create a new one".green
+          Helper.log.info "If you still want to create a new one, use the --force option when running PEM.".green
+          false
+        else
+          Helper.log.warn "Creating push certificate for app '#{@app_identifier}'."
+          create_push_for_app
+        end
       rescue => ex
         error_occured(ex)
       end
     end
 
+    def has_actual_cert
+      apps = all(:xpath, "//div[@class = 'certificate']")
+      cert_type = PEM.config[:development] ?  'Development' : 'Production'
+      cert_section = apps.select { |c| c.text.include? cert_type }
+
+      unless cert_section.empty?
+        data_s = cert_section.last.all('dd').last.text
+        data = Date.parse(data_s)
+        data - Time.now.to_date > 14  # valid for more than 2 weeks
+      end
+    end
 
     private
       def open_app_page
@@ -98,20 +115,20 @@ module PEM
         url = download_button['href']
         url = [host, url].join('')
         Helper.log.info "Downloading URL: '#{url}'"
-        
+
         cookie_string = page.driver.cookies.collect { |key, cookie| "#{cookie.name}=#{cookie.value}" }.join(";")
-        
+
         data = open(url, {'Cookie' => cookie_string}).read
 
         raise "Something went wrong when downloading the certificate" unless data
 
         path = "#{TMP_FOLDER}aps_#{certificate_type}_#{@app_identifier}.cer"
         dataWritten = File.write(path, data)
-        
+
         if dataWritten == 0
           raise "Can't write to #{TMP_FOLDER}"
         end
-        
+
         Helper.log.info "Successfully downloaded latest .cer file to '#{path}'".green
         return path
       end

data/lib/pem/manager.rb

@@ -17,7 +17,7 @@ module PEM
         FileUtils.mv(rsa_file, output)
         puts output.green          
       else
-        File.delete(rsa_file)
+        File.delete(rsa_file) if rsa_file
       end
     end
   end

data/lib/pem/options.rb

@@ -17,6 +17,10 @@ module PEM
                                      env_name: "PEM_SAVE_PRIVATEKEY",
                                      description: "Set to save the private RSA key in the current directory",
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :force,
+                                     env_name: "PEM_FORCE",
+                                     description: "Create a new push certificate, even if the current one is active for 2 more weeks",
+                                     is_string: false),
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      short_option: "-a",
                                      env_name: "PEM_APP_IDENTIFIER",

data/lib/pem/version.rb

@@ -1,3 +1,3 @@
 module PEM
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pem
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core