letsencrypt_heroku 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d5bd387cafb45b279e06f220f6870491972db79
-  data.tar.gz: c2b3138b060f3787c2773c662d34def92ef279e4
+  metadata.gz: 8eb284598baf493d90c746fc8e02e35b651876b6
+  data.tar.gz: 4c5ccbfee1f1acc8b41ad2a26fd3b7829592cd23
 SHA512:
-  metadata.gz: 68383095bfa7caebdbcb16067dfe269023ad6165f896555d76abe56bec75bb38f397ff8c8f607784b6dcf4979cc4922e73b8713fecddbc9e054417314ca2d047
-  data.tar.gz: cd545ffbd89bb3713a89323964131d39bd2ea320cb2277be03852835cf0d69c57fd5ec9f10a312cc8633886e4ba9fc1e509a19dd8618671987c8350f20035980
+  metadata.gz: 4a82db26f2f7c8f2bbb7b8c1831cdf9f964a0749a7e39d61c2fbbcf4597e7c796afba7a1f8475a65f51f1734a550291a7acbf8558d7f183dd6f2a21bf17a9875
+  data.tar.gz: 1f0923bdbd8a2036a1e59790e87d051d08d71d1bee4993d5cca2295e06b18d62be3c3852eece560d564fd15aa0fe844cce73c89a7bbd6eeac018f0e8fcf61273

data/README.md

@@ -39,6 +39,14 @@ To perform SSL certificate setup and renewal a command line tool is used: `letse
 
 `letsencrypt_rack` contains a tiny rack middleware, that answers challenge request at the following path: `/.well-known/acme-challenge`. It serves the contents of the `LETSENCRYPT_RESPONSE` environment variable.
 
+#### For non rails apps
+
+You need to add `LetsencryptRack::Middleware` to your rack stack:
+
+```ruby
+# in config.ru
+use LetsencryptRack::Middleware
+```
 
 ### Configuration
 
@@ -85,6 +93,17 @@ Once the process ran through the renewal is as simple as: run `letsencrypt_herok
 You'll receive emails from letsencrypt from time to time to remind you to renew your certificates.
 
 
+### CLI options
+
+
+```ruby
+# Use a custom config file location
+$ letsencrypt_heroku --config=another.yml
+
+# Restrict for which domains the process should be run
+$ letsencrypt_heroku --limit=foobar
+```
+
 ## Useful links and information
 
 * https://www.ssllabs.com/ssltest

data/bin/letsencrypt_heroku

@@ -1,40 +1,26 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
+require 'slop'
 require 'letsencrypt_heroku'
-require 'optparse'
 
-class Parser
-  def self.parse(options)
-    args = {}
+opts = Slop.parse do |o|
+  o.string '-c', '--config',
+    'path to config file (default: config/letsencrypt_heroku.yml)',
+    default: 'config/letsencrypt_heroku.yml'
 
-    opt_parser = OptionParser.new do |opts|
-      opts.banner = "Usage: letsencrypt_heroku [options]"
+  o.string '-l', '--limit',
+    'include only hosts that match the given string'
 
-      # opts.on("-rNAME", "--restriction=NAME", "Restrict process to config entries where at least one domain matches the given value") do |restriction|
-      #   args[:restriction] = restriction
-      # end
+  o.bool '-h', '--help',
+    'print this helpful information'
 
-      # opts.on("-s", "--setup", "Generate config and put it into config/letsencrypt_heroku.yml") do |n|
-      #   LetsencryptHeroku::ConfigBuilder.new.perform
-      #   exit
-      # end
-
-      # opts.on("-c", "--check", "Parse config and print problems") do |n|
-      #   puts "perform check"
-      #   exit
-      # end
-
-      opts.on("-h", "--help", "Prints this help") do
-        puts opts
-        exit
-      end
-    end
+  o.on('-v', '--version', 'print the version') { puts LetsencryptHeroku::VERSION ; exit }
+end
 
-    opt_parser.parse!(options)
-    return args
-  end
+if opts.help?
+  puts opts
+  exit
 end
-options = Parser.parse ARGV
 
-LetsencryptHeroku::CLI.run
+LetsencryptHeroku::CLI.run(opts)

data/letsencrypt_heroku.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rainbow'
   spec.add_dependency 'acme-client'
   spec.add_dependency 'tty-spinner'
+  spec.add_dependency 'slop'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake',    '~> 10.0'

data/lib/letsencrypt_heroku.rb

@@ -6,6 +6,7 @@ require 'openssl'
 require 'logger'
 require 'ostruct'
 require 'open3'
+require 'fileutils'
 require 'letsencrypt_heroku/version'
 require 'letsencrypt_heroku/tools'
 require 'letsencrypt_heroku/process'
@@ -19,16 +20,23 @@ module LetsencryptHeroku
   class CLI
     CONFIG_FILE = 'config/letsencrypt_heroku.yml'
 
-    # generate config?
+    def self.run(opts)
+      entries = read_config_file(opts[:config])
+      entries = limit_entries(entries, opts[:limit])
+      entries.each { |entry| Process.new(entry).perform }
+    end
 
-    # limit to domain, skip other configs
+    def self.limit_entries(entries, limit)
+      return entries if limit.nil?
+      puts "Restrict to domains including: #{Rainbow(limit).yellow}"
+      entries.select { |c| c.domains.include?(limit) }
+    end
 
-    def self.run
-      if File.exist?(CONFIG_FILE)
-        configs = Array(YAML.load(File.read(CONFIG_FILE))).map { |c| OpenStruct.new(c) }
-        configs.each { |config| Process.new(config).perform }
+    def self.read_config_file(file)
+      if File.exist?(file)
+        Array(YAML.load(File.read(file))).map { |c| OpenStruct.new(c) }
       else
-        puts Rainbow("Missing config: #{CONFIG_FILE}").red
+        abort "Config file not found: #{Rainbow(file).red}"
       end
     end
   end

data/lib/letsencrypt_heroku/version.rb

@@ -1,3 +1,3 @@
 module LetsencryptHeroku
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_heroku
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slop
+  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: bundler
   requirement: !ruby/object:Gem::Requirement