heroku_ssl 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5a15d595a9cbb80a80661fffcf42cb21796c44e
-  data.tar.gz: 53d7e26c818e99e6ad04150983bc5b1d8028a36c
+  metadata.gz: 3d4e3a21b54b16213f57de94d699d80b45f2df98
+  data.tar.gz: 4f9b1457ccaa074660fcdc785bede574bea533ba
 SHA512:
-  metadata.gz: 1535b406a22a22607694a3481ee2334e3e9f06496c76bccd9796dc6c64270eec6e4bcfd597cd9bba749284589ac87e36ce65b72232d57205b0c90036e2c964c8
-  data.tar.gz: 738cd3bc32a3e3ab817fa669735fab5e628fc1a4a58b4045cf00e0c493918750b9c0c5d84af7cf94a166fc9634ef622bf10f355ea784820995d2bed9b53fdef2
+  metadata.gz: b8754c6ddb12f430443ebc9229eb2ad602edd8b76562334a90d5b0424e36357172dd063fffcd0abb4ef26d8430c0f628ea3d1dbfdb47f266169daa73016985c1
+  data.tar.gz: 23e4a7023a8cd8d42187dd18a58c9fbf2057ac6162aaaff234a388c9a4d0b07076a3ff89591f1f029ebb91a38826352e6284a5ffc6c63867cf9fdde2648500d3

data/lib/heroku_ssl/version.rb

@@ -1,3 +1,3 @@
 module HerokuSsl
-  VERSION = '0.6.5'
+  VERSION = '0.7.0'
 end

data/lib/tasks/heroku_ssl_tasks.rake

@@ -1,6 +1,32 @@
+
 namespace :heroku_ssl do
 
   task :update_certs do
+    update_certs
+  end
+
+  task :generate_certs do
+    email = (ARGV[1] || '').strip
+    email = get_email if email.blank?
+
+    puts "Registering #{email}"
+    HerokuSsl::register email
+
+    domain = ARGV[2..-1]
+    domain = get_domains if domain.blank?
+
+    puts "Authorizing and generating certificates for #{domain}"
+
+    certs = HerokuSsl::request_certificate domain
+
+    if certs.present?
+      STDOUT.puts '~~ GENERATED CERTIFICATES START ~~'
+      STDOUT.puts JSON(certs)
+      STDOUT.puts '~~ GENERATED CERTIFICATES END ~~'
+    end
+  end
+
+  def update_certs
     STDOUT.puts 'Once your app has been deployed to Heroku, hit enter.'
 
     STDIN.gets
@@ -15,58 +41,46 @@ namespace :heroku_ssl do
     output = heroku_run("run rake heroku_ssl:generate_certs #{email} #{domains} --app #{app}")
 
     #read out the certs to temporary files
-    if output.include? '~~ GENERATED CERTIFICATES START ~~'
-      puts 'Successfully generated certificates! Attempting to update Heroku DNS'
-
-      output = output.split('~~ GENERATED CERTIFICATES START ~~').last
-                   .split('~~ GENERATED CERTIFICATES END ~~').first
-      output = JSON(output)
-
-      File.open('fullchain.pem', 'wb') do |file|
-        file.write output['fullchain']
-      end
-
-      File.open('privkey.pem', 'wb') do |file|
-        file.write output['privkey']
-      end
-
-      # update heroku certs
-      heroku_run("certs:update fullchain.pem privkey.pem --app #{get_app} --confirm #{get_app}")
-
-      # clean up
-      File.delete('fullchain.pem', 'privkey.pem')
-
-      puts 'Successfully updated Heroku SSL certificates! Now you just need to make sure your DNS is configured to point as follows: '
-      puts heroku_run('domains').split("\n")[4..-1].join("\n")
-    else
+    unless output.include? '~~ GENERATED CERTIFICATES START ~~'
       puts 'Full log: '
       puts output
       puts ''
 
       puts 'Could not generate certificates. Please try again later or try running `heroku run rake heroku_ssl:generate_certs` directly'
+      return
     end
 
-  end
-
-  task :generate_certs do
-    email = (ARGV[1] || '').strip
-    email = get_email if email.blank?
+    output = output.split('~~ GENERATED CERTIFICATES START ~~').last
+                 .split('~~ GENERATED CERTIFICATES END ~~').first
+    output = JSON(output).with_indifferent_access
 
-    puts "Registering #{email}"
-    HerokuSsl::register email
+    unless output['fullchain'].present? && output['privkey'].present?
+      puts 'Output: '
+      puts output
+      puts ''
 
-    domain = ARGV[2..-1]
-    domain = get_domains if domain.blank?
+      puts 'Failed to read certificates'
+      return
+    end
 
-    puts "Authorizing and generating certificates for #{domain}"
+    puts 'Successfully generated certificates! Attempting to update Heroku DNS'
 
-    certs = HerokuSsl::request_certificate domain
+    File.open('fullchain.pem', 'wb') do |file|
+      file.write output['fullchain']
+    end
 
-    if certs.present?
-      STDOUT.puts '~~ GENERATED CERTIFICATES START ~~'
-      STDOUT.puts JSON(certs)
-      STDOUT.puts '~~ GENERATED CERTIFICATES END ~~'
+    File.open('privkey.pem', 'wb') do |file|
+      file.write output['privkey']
     end
+
+    # update heroku certs
+    heroku_run("certs:update fullchain.pem privkey.pem --app #{get_app} --confirm #{get_app}")
+
+    # clean up
+    File.delete('fullchain.pem', 'privkey.pem')
+
+    puts 'Successfully updated Heroku SSL certificates! Now you just need to make sure your DNS is configured to point as follows: '
+    puts heroku_run('domains').split("\n")[4..-1].join("\n")
   end
 
   def get_email

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_ssl
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Kai Marshland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails