letsencrypt_heroku 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52be9e0e2fe21b8964da504173ac1c2738df3d1
-  data.tar.gz: 6f692ca48375a72b5144533a2b2bda01307e57e8
+  metadata.gz: 2cac0b25f72c3190be77975f3a93dec7041cc3a0
+  data.tar.gz: c02456232fa21321e1b6edda57f4ecd49e2e7973
 SHA512:
-  metadata.gz: 8dc68e1b0c70986fd5e4b28abc6f6f759f7db358b035e6c4ee65a8574d678b6cbd5a00b29b1a93be244999d8530b206345cafd78a0a9a57e758aed10592643ca
-  data.tar.gz: 9fda84ec7e8bece8a56de57a06d09e16987c7dc318c40f7c832159a224c599d27315389e6b5b8abb5914d01ddea8ef8b23464392ed5e1fddba846e7f82937b83
+  metadata.gz: 1dbeb5d5b31f62654d02085d2e62423ea4b0c04c56a10514ffa2e6518ef3cd09f3279231825fe3b2c0a4101efa7fb7ab48a25c3d5bad298b327a0d76cb588186
+  data.tar.gz: 07fe6c940ecb08a24937c8e34b18c720a16b28fe0151664a6832328b26db4580c47df48cace4a4c662d3f0fea5398a9820592e8013e57c74884aeeca7316f81b

data/letsencrypt_heroku.gemspec

@@ -14,14 +14,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/xijo/letsencrypt_heroku'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "bin"
-  spec.require_paths = ["lib"]
+  spec.bindir        = 'bin'
+  spec.require_paths = ['lib']
   spec.executables   << 'letsencrypt_heroku'
 
-  spec.add_dependency "rainbow"
-  spec.add_dependency "acme-client"
+  spec.add_dependency 'rainbow'
+  spec.add_dependency 'acme-client'
+  spec.add_dependency 'tty-spinner'
+  # See https://github.com/schubergphilis/letsencrypt/issues/36
+  spec.add_dependency 'json-jwt', '1.5.2'
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'rake',    '~> 10.0'
+  spec.add_development_dependency 'rspec',   '~> 3.0'
 end

data/lib/letsencrypt_heroku.rb

@@ -1,4 +1,5 @@
 require 'rainbow'
+require 'tty-spinner'
 require 'yaml'
 require 'acme-client'
 require 'openssl'

data/lib/letsencrypt_heroku/setup.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module LetsencryptHeroku
   class Setup
     class SetupError < StandardError ; end
@@ -33,9 +35,7 @@ module LetsencryptHeroku
         run_task "authorize #{domain}" do
           @challenge = @client.authorize(domain: domain).http01
 
-          command = "heroku config:set LETSENCRYPT_RESPONSE=#{@challenge.file_content}"
-          output = `#{command}`
-          $?.success? or fail_task(output)
+          execute "heroku config:set LETSENCRYPT_RESPONSE=#{@challenge.file_content}"
 
           test_response(domain: domain, challenge: @challenge)
 
@@ -53,14 +53,11 @@ module LetsencryptHeroku
         File.write('privkey.pem', certificate.request.private_key.to_pem)
         File.write('fullchain.pem', certificate.fullchain_to_pem)
 
-        command = "heroku _certs:update fullchain.pem privkey.pem --confirm #{config.herokuapp}"
-        output = `#{command}`
-        $?.success? or fail_task(output)
-
+        execute "heroku _certs:update fullchain.pem privkey.pem --confirm #{config.herokuapp}"
         FileUtils.rm %w(privkey.pem fullchain.pem)
       end
     rescue SetupError => e
-      puts Rainbow(e.message).red
+      exit
     end
 
     def test_response(domain:, challenge:)
@@ -78,15 +75,27 @@ module LetsencryptHeroku
       fail_task('failed test response')
     end
 
+    def execute(command)
+      Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+        wait_thr.value.success? or fail_task(stderr.read.force_encoding('utf-8').sub(' ▸    ', 'heroku: '))
+      end
+    end
+
     def run_task(name)
-      @_current_task = name
-      print Rainbow("      #{@_current_task}").yellow
+      @_spinner = TTY::Spinner.new(" :spinner #{name}",
+        format: :dots,
+        interval: 20,
+        frames: [ "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" ].map { |s| Rainbow(s).yellow.bright },
+        success_mark: Rainbow('✔').green,
+        error_mark: Rainbow('✘').red
+      )
+      @_spinner.start
       yield
-      puts Rainbow("\r    ✔ #{@_current_task}").green
+      @_spinner.success
     end
 
     def fail_task(reason = nil)
-      puts Rainbow("\r    ✘ #{@_current_task}").red
+      @_spinner.error("(#{reason.strip})")
       raise SetupError, reason
     end
   end

data/lib/letsencrypt_heroku/version.rb

@@ -1,3 +1,3 @@
 module LetsencryptHeroku
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_heroku
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json-jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement