heroku_ssl 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b2f9d8f3eac58664d6b0ef978806f6e1ddce126
-  data.tar.gz: 2951332ed2adb95c02f06b0907b7f643449a6c81
+  metadata.gz: f1a74a4481afa7aeafe4b7d91bbeaeeeecd2ea0d
+  data.tar.gz: dadf4785d8616d78d91ed5f3302a656e8c5ad7ed
 SHA512:
-  metadata.gz: a9486a38ce0485a6e4f5b3385976148d06201a69f3bb17a6d165d8dfe22e5c3eabfa21652dd59cb41204c1c7652dcfd0350410401b9ec8339d475a1f8cff63a4
-  data.tar.gz: 9e447c5d91c2d925f831f3e234deae1a9e44a3cc7c635c55b2c6dc64cd4e024bd1f0d6187d3e348463371367987b8a34cf529f9c67114374858f6d67a0de0b5f
+  metadata.gz: 3055a5f62f7f7118de9cfa2a22801748ec3ae0e1e769a726c914697e792b99a4880e21160d39f6ce1c971e36270ed269db13f3940f00a925bfb2af505629cb04
+  data.tar.gz: 00d3881faaa14834ca195334cf7caefd7b678aa43a5a0be988e37a5e800d2e74340c22132b0686ecc9ac89222dcef5cadcd285fca3c0fc7c554021c4c4cedbba

data/README.md

@@ -21,12 +21,7 @@ and add them to your own servers and configure the DNS yourself.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'heroku-ssl'
-```
-
-Or, to test the bleeding edge version:
-```ruby
-gem 'heroku_ssl', git: 'https://github.com/KMarshland/heroku-ssl.git'
+gem 'heroku_ssl'
 ```
 
 And then execute:
@@ -39,6 +34,8 @@ It also requires one of the following:
 - The environment variable `REDIS_URL` is set
 - The environment variable `HEROKU_REDIS_URL` is set
 
+Note that this means you need to have a live version of redis; on Heroku the free tier will work: https://elements.heroku.com/addons/heroku-redis.
+
 ## Contributing
 Submit a pull request!
 
@@ -64,7 +61,7 @@ If your site is already pointed to your Heroku app, there will already be a CNAM
 you just need to change where it points to. 
 If not, you'll need to add a new line:
 ```
-[subdomain] [TTL] IN CNAME [yourdomain].herokudns.com
+[subdomain] [TTL] IN CNAME [yourdomain].herokudns.com.
 ```
 
 For example, I have

data/lib/heroku_ssl/version.rb

@@ -1,3 +1,3 @@
 module HerokuSsl
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/tasks/heroku_ssl_tasks.rake

@@ -13,7 +13,7 @@ namespace :heroku_ssl do
     puts "Attempting to generate ssl certificates for #{app} (registering #{domains} to #{email})"
 
     #generate the certs on the server
-    output = `unset RUBYOPT; heroku run rake heroku_ssl:generate_certs #{email} #{domains} --app #{app}`
+    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 ~~'
@@ -32,14 +32,13 @@ namespace :heroku_ssl do
       end
 
       # update heroku certs
-      # RUBYOPT breaks the heroku command for some reason, so you have to unset it
-      `unset RUBYOPT; heroku certs:update fullchain.pem privkey.pem --app #{get_app} --confirm #{get_app}`
+      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 `unset RUBYOPT; heroku domains`.split("\n")[4..-1].join("\n")
+      puts heroku_run('domains').split("\n")[4..-1].join("\n")
     else
       puts 'Full log: '
       puts output
@@ -95,10 +94,32 @@ namespace :heroku_ssl do
     @email = new_email
   end
 
+  def heroku_run(command)
+    # RUBYOPT breaks the heroku command for some reason, so you have to unset it
+    result = `unset RUBYOPT; heroku #{command}`
+
+    if result =~ /rake\saborted/i
+      puts "Don't know how to build task -- make sure you have deployed a version with this gem installed to heroku"
+    end
+
+    if result =~ /No\ssuch\sfile\sor\sdirectory/i || result =~ /command\snot\sfound/i
+      puts 'Cannot run command heroku -- are you sure you have it installed?'
+    end
+
+    if result =~ /Bundler::GemNotFound/i
+      puts 'Please log in to heroku by running `heroku login`'
+    end
+
+    result
+  end
+
   def get_domains
     return @domain if @domain.present?
 
-    domains = `unset RUBYOPT; heroku domains`.split("\n").select(&:present?)[5..-1]
+    domains = heroku_run('domains').split("\n").select(&:present?)[5..-1]
+    if domains.blank?
+      raise 'Could not load domains'
+    end
     domains.map! do |domain|
       domain.split(/\s+/).first
     end
@@ -125,7 +146,7 @@ namespace :heroku_ssl do
   def get_app
     return @app if @app.present?
 
-    @apps = @apps || `unset RUBYOPT; heroku apps`.split("\n")
+    @apps = @apps || heroku_run('apps').split("\n")
     remotes = `git remote -v`.split("\n").map do |r|
       r.split("\t").last
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_ssl
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Kai Marshland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails