acme-pki 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9307776044f052681b8e87045cf8e346ec044fa7
-  data.tar.gz: c396901a57606839834a4d543d4b94f217a280c1
+  metadata.gz: 0da83256f324b55b404ebe0d3eff8ed8ae5544af
+  data.tar.gz: 4f023c30afe3e016f6b6d2509c5178f9ac0ef127
 SHA512:
-  metadata.gz: f0a079de8d32ae3d11b8e4d5d4a9aef6f949a01680ce9d51c24b8d580b88f96106dfe1639fd73bf8532a16870dc0b23679c7c12606564ec6d8e6aa0b9e6a73d9
-  data.tar.gz: 68f54cca1e87abf914f30f62fb8016bb208f2fb4176f37c83942981a26e47a6289e9995262fc7e879f675e1e83934500a0b17eb3dd9b83e17f6f588bbd7242a5
+  metadata.gz: 5fb90d0c30c5b57ec68124788bb84cfa51cc48d888465293d3a38f39a98aefe5724813d504d396bcb9a04f61726370f0cbc2cc7edbf9902be63d14f9f94a2061
+  data.tar.gz: 81a1577b768fcc2bb91d397bbf61156c3282364ec71fc6af0a02e60361e6b4279b23b869317a75dcdb6223779b5401fa4f3ba35ac503e1f9d3f979edffcacbb7

data/.gitignore

@@ -1,4 +1,7 @@
 *.gem
 *.iml
+*.key
+*.pem
+*.crt
+*.csr
 Gemfile.lock
-/pki/

data/acme-pki.gemspec

@@ -1,13 +1,14 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'acme/pki/version'
+
 Gem::Specification.new do |spec|
 	spec.name = 'acme-pki'
-	spec.version = '0.1.3'
+	spec.version = Acme::PKI::VERSION
 	spec.authors = ['Aeris']
 	spec.email = ['aeris@imirhil.fr']
-	spec.summary = %q{Ruby client for Let’s Encrypt}
+	spec.summary = %q{Ruby client for Let's Encrypt}
 	spec.description = %q{Manage your keys, requests and certificates.}
 	spec.homepage = 'https://github.com/aeris/acme-pki/'
 	spec.license = 'AGPL-3.0+'
@@ -19,8 +20,8 @@ Gem::Specification.new do |spec|
 
 	spec.add_development_dependency 'bundler', '~> 1.11'
 
-	spec.add_dependency 'acme-client', '~> 0.3.1'
-	spec.add_dependency 'faraday_middleware', '~> 0.10.0'
-	spec.add_dependency 'colorize', '~> 0.7.7'
+	spec.add_dependency 'acme-client', '~> 0.5.5'
+	spec.add_dependency 'faraday_middleware', '~> 0.11.0.1'
+	spec.add_dependency 'colorize', '~> 0.8.1'
 	spec.add_dependency 'simpleidn', '~> 0.0.7'
 end

data/bin/letsencrypt

@@ -3,7 +3,28 @@ require 'acme/pki'
 
 pki = Acme::PKI.new
 
+MYNAME = File.basename $PROGRAM_NAME
+
+HELP = <<-"EOTEXT"
+#{MYNAME} v#{Acme::PKI::VERSION}
+
+Available Commands:
+crt
+csr
+help
+info
+key
+register
+renew
+EOTEXT
+
+# if nothing, force help
+ARGV << 'help' if ARGV.length.zero?
+
 case ARGV.shift
+	when /help|-[hH]|--help/
+		puts HELP
+		exit 0
 	when 'register'
 		OptionParser.new do |opts|
 			opts.banner = "Usage: #{File.basename __FILE__} register <email>"
@@ -16,12 +37,12 @@ case ARGV.shift
 	when 'key'
 		options = OpenStruct.new type: Acme::PKI::DEFAULT_KEY
 		OptionParser.new do |opts|
-			opts.banner = "Usage: #{File.filename __FILE__} key <domain> [options]"
+			opts.banner = "Usage: #{File.basename __FILE__} key <domain> [options]"
 			opts.on('-r [KEYSIZE]', '--rsa [KEYSIZE]', 'RSA key, key size') { |k| options.type = [:rsa, k.to_i] }
 			opts.on('-e [CURVE]', '--ecc [CURVE]', 'ECC key, curve') { |k| options.type = [:ecc, k] }
 		end.parse!
 		if ARGV.empty?
-			puts "A domain is required !"
+			puts 'A domain is required !'
 			exit -1
 		end
 		pki.generate_key ARGV.first, type: options.type
@@ -33,7 +54,7 @@ case ARGV.shift
 			opts.on('-d [DOMAIN]', '--domain [DOMAIN]', 'Domain') { |d| options.domains << d }
 		end.parse!
 		if ARGV.empty?
-			puts "A domain is required !"
+			puts 'A domain is required !'
 			exit -1
 		end
 		pki.generate_csr ARGV.first, key: options.key, domains: options.domains
@@ -44,7 +65,7 @@ case ARGV.shift
 			opts.on('-c [CSR]', '--csr [CSR]', 'CSR file') { |c| options.csr = c }
 		end.parse!
 		if ARGV.empty?
-			puts "A domain is required !"
+			puts 'A domain is required !'
 			exit -1
 		end
 		pki.generate_crt ARGV.first, csr: options.csr
@@ -55,7 +76,7 @@ case ARGV.shift
 			opts.on('-c [CSR]', '--csr [CSR]', 'CSR file') { |c| options.csr = c }
 		end.parse!
 		if ARGV.empty?
-			puts "A domain is required !"
+			puts 'A domain is required !'
 			exit -1
 		end
 		exit pki.renew(ARGV.first, csr: options.csr) ? 0 : 1
@@ -67,7 +88,7 @@ case ARGV.shift
 			opts.on('-c', '--crt', 'Certificate information') { type = :crt }
 		end.parse!
 		if ARGV.empty?
-			puts "A domain is required !"
+			puts 'A domain is required !'
 			exit -1
 		end
 		case type

data/lib/acme/pki.rb

@@ -10,18 +10,19 @@ require 'simpleidn'
 
 require 'acme/pki/monkey_patch'
 require 'acme/pki/information'
+require 'acme/pki/version'
 
 module Acme
 	class PKI
 		include Information
 
 		DEFAULT_ENDPOINT       = ENV['ACME_ENDPOINT'] || 'https://acme-v01.api.letsencrypt.org/'
+		DEFAULT_DIRECTORY      = ENV['ACME_DIRECTORY'] || Dir.pwd
 		DEFAULT_ACCOUNT_KEY    = ENV['ACME_ACCOUNT_KEY'] || 'account.key'
-		DEFAULT_KEY            = [:ecc, 'secp384r1']
-		#DEFAULT_KEY            = [:rsa, 4096]
-		DEFAULT_RENEW_DURATION = 60*60*24*30 # 1 month
+		DEFAULT_KEY            = [:ecc, 'prime256v1'].freeze
+		DEFAULT_RENEW_DURATION = 60 * 60 * 24 * 30 # 1 month
 
-		def initialize(directory: Dir.pwd, account_key: DEFAULT_ACCOUNT_KEY, endpoint: DEFAULT_ENDPOINT)
+		def initialize(directory: DEFAULT_DIRECTORY, account_key: DEFAULT_ACCOUNT_KEY, endpoint: DEFAULT_ENDPOINT)
 			@directory        = directory
 			@challenge_dir    = ENV['ACME_CHALLENGE'] || File.join(@directory, 'acme-challenge')
 			@account_key_file = File.join @directory, account_key
@@ -227,7 +228,7 @@ module Acme
 						conn.adapter Faraday.default_adapter
 					end.get url
 				rescue => e
-				    raise Exception, e.message
+					raise Exception, e.message
 				end
 				raise Exception, "Got response code #{response.status}" unless response.success?
 				real_content = response.body

data/lib/acme/pki/version.rb

@@ -0,0 +1,5 @@
+module Acme
+	class PKI
+		VERSION = '0.1.4'
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acme-pki
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Aeris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: simpleidn
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - lib/acme/pki.rb
 - lib/acme/pki/information.rb
 - lib/acme/pki/monkey_patch.rb
+- lib/acme/pki/version.rb
 homepage: https://github.com/aeris/acme-pki/
 licenses:
 - AGPL-3.0+
@@ -117,8 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Ruby client for Let’s Encrypt
+summary: Ruby client for Let's Encrypt
 test_files: []