letsencrypt_webfaction 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49a9118552a12e9d48c4d2f658cd1e3a4c4fd5c3
-  data.tar.gz: a624bbc75b9e58430299075d8387a3e0479b3d72
+  metadata.gz: 24af7709e41cb05f35a0a884eb284a7a3bbb30a4
+  data.tar.gz: 3d1c3303455833a75fd5631899fd630c50541148
 SHA512:
-  metadata.gz: d2867a2916c1f2bb0de599e836fcf25857a2609a4d372b2296e479be0872416fd0a74e5e04e076771eb1aec8a6d87d762f6de726e9b24fe72821091197794068
-  data.tar.gz: 4a3d38f3824f189849fb7b4af96ba057d7359275055573b825110630165fbf30706a6bc4e88e7b1e490b90eb94bca58540973580e8c3f5efaea30b39aefaabed
+  metadata.gz: 624a345096ef14cb19c2259d7dc4d1746dbe156c275d835bd2a3987b71485514cb9a20a56548d12474f510e61c84a8a3932ca5eb6f080aa249b165d296fc80fe
+  data.tar.gz: 4435a224019ea95c1913c3ee0d040494066b6f0b79fd8b2ed431861e825560c6f1aa0a4870a3627a614a8b7b3ed5b615c7101ada3ea29e3544a8ca776daf1df6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v1.1.7
+
+* Manually require fileutils, something formerly done automatically.
+* Require Acme::Client 0.4.1 to fix `require` issue.
+* Output improved help text in case of failure.
+
 v1.1.6
 
 * Fix issue with pulling in ActiveSupport when no longer needed.

data/exe/letsencrypt_webfaction

@@ -2,4 +2,5 @@
 
 require 'letsencrypt_webfaction/application'
 
-LetsencryptWebfaction::Application.new(ARGV).run!
+res = LetsencryptWebfaction::Application.new(ARGV).run!
+exit(res ? 0 : 1)

data/letsencrypt_webfaction.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1.0'
 
-  spec.add_runtime_dependency 'acme-client', '>=0.4.0'
+  spec.add_runtime_dependency 'acme-client', '>=0.4.1'
   spec.add_runtime_dependency 'pony', '~> 1.11'
 
   spec.add_development_dependency 'bundler', '~> 1.11'

data/lib/letsencrypt_webfaction.rb

@@ -1,3 +1,3 @@
 module LetsencryptWebfaction
-  VERSION = '1.1.6'.freeze
+  VERSION = '1.1.7'.freeze
 end

data/lib/letsencrypt_webfaction/application.rb

@@ -21,7 +21,7 @@ module LetsencryptWebfaction
       register_key!
 
       # Validate the domains.
-      validator.validate!
+      return unless validator.validate!
 
       # Write the obtained certificates.
       certificate_writer.write!

data/lib/letsencrypt_webfaction/domain_validator.rb

@@ -1,3 +1,6 @@
+require 'fileutils'
+require 'pry'
+
 module LetsencryptWebfaction
   class DomainValidator
     def initialize(domains, client, public_dir)
@@ -11,15 +14,13 @@ module LetsencryptWebfaction
 
       challenges.each(&:request_verification)
 
-      i = 0
-      until all_challenges_valid? || i == 10
-        # Wait a bit for the server to make the request, or really just blink, it should be fast.
+      10.times do
+        return true if all_challenges_valid?
         sleep(1)
-
-        i += 1
       end
 
-      raise 'Failed to verify statuses in 10 seconds.' unless all_challenges_valid?
+      print_errors
+      false
     end
 
     private
@@ -45,5 +46,31 @@ module LetsencryptWebfaction
         File.write(File.join(@public_dir, challenge.filename), challenge.file_content)
       end
     end
+
+    def print_errors
+      validations = authorizations.map(&:domain).zip(challenges)
+      $stderr.puts 'Failed to verify statuses.'
+      validations.each { |tuple| Validation.new(*tuple).print_error }
+    end
+
+    class Validation
+      def initialize(domain, challenge)
+        @domain = domain
+        @challenge = challenge
+      end
+
+      def print_error
+        if @challenge.verify_status == 'valid'
+          $stderr.puts "#{@domain}: Success"
+        else
+          $stderr.puts "#{@domain}: #{@challenge.error['detail']}"
+          $stderr.puts "Make sure that you can access #{url}"
+        end
+      end
+
+      def url
+        "http://#{@domain}/#{@challenge.filename}"
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_webfaction
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - William Johnston
@@ -30,7 +30,7 @@ cert_chain:
   urnVFSXSvmjoq2UEqNf39Ffw4ZJ2QYuxlOLEInXhf1Rij1+KYHwHoT6qaOmk+fgY
   XWr3WAp8Tv/ogSwGuBGWtsjMTEzbRxAJbRXQDFEMeXJAvzon0o6hUtU=
   -----END CERTIFICATE-----
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement