shared-infrastructure 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a1421df4f78041aebbbaf255a6e676f8303b1c5844e96da104f3308893d3eb8a
-  data.tar.gz: d189b196f9f75dd554d6ee87418af780b1471486da956271c9c5de3a236cd07b
+SHA1:
+  metadata.gz: 952588ec658831e6f80ec3416acf9ac03a68654d
+  data.tar.gz: e7ef7fc53e131c962e7caaddc5da8e4bbad85fb2
 SHA512:
-  metadata.gz: 2270b0180add1ef0781ccce7b6f37e9ff9e7c34673b8744c5592522d78b472e92d5796e4ca85c0412b34b5fa604e30fe151b40c521f96166295abf38f04a75c8
-  data.tar.gz: 72cc132a02f851a6f9840b91063e73aa1343df4463b49eac969022abf541c4005dc410e100e3868622f09d46df8d87c954d4d3b7926e1c059cab9fe329bd8be1
+  metadata.gz: ec0dcf44cccc795ab31da3f2b1cd2096db384b8f39cbf5c3ac3b5b6747453f8e6de7d8b93a89e3af35dda800c385ed713ae8d504eecb040f3522d472d20d10c8
+  data.tar.gz: 2bfcbe876bcc438b16ff77eb2e54d061370d385380fedac45c599277b22bc39b251c194ec662685733627b1e57be79f7063edf2ea53f24c6d234f955717d9d9d

data/lib/shared_infrastructure/domain.rb

@@ -7,19 +7,24 @@ module SharedInfrastructure
     end
 
     def certbot_domain_names
-      "#{domain_name} www.#{domain_name}"
+      domain_names.map { |domain| "#{domain} www.#{domain}" }.join(" ")
     end
 
     def certificate_directory
       "/etc/letsencrypt/live/#{domain_name}"
     end
 
+    def domain_name
+      domain_names.first
+    end
+
     def enabled_site
       "/etc/nginx/sites-enabled/#{domain_name}"
     end
 
-    def initialize(domain_name)
-      @domain_name = domain_name
+    def initialize(domain_names)
+      domain_names = [domain_names] unless domain_names.respond_to?(:map)
+      @domain_names = domain_names
     end
 
     def rails_env_log(rails_env = "production")
@@ -39,6 +44,6 @@ module SharedInfrastructure
       File.join(root, "html")
     end
 
-    attr_reader :domain_name
+    attr_reader :domain_names
   end
 end

data/lib/shared_infrastructure/runner/base.rb

@@ -28,8 +28,8 @@ module Runner
     end
 
     def process_args(opts = nil)
-      raise MissingArgument.new("domain required", opts) unless ARGV.size == 1
-      { domain_name: ARGV[0] }
+      raise MissingArgument.new("domain required", opts) if ARGV.size == 0
+      { domain_name: ARGV }
     end
 
     def process_options(http_builder_class = Nginx::Builder::SiteHttp,
@@ -106,7 +106,7 @@ module Runner
         options[:protocol]
       else
         certificate_directory = Nginx.certificate_directory(
-          options[:certificate_domain] || options[:domain_name]
+          options[:certificate_domain] || options[:domain_name].first # FIXME:
         )
         if File.exist?(File.join(certificate_directory, "privkey.pem")) &&
            File.exist?(File.join(certificate_directory, "fullchain.pem")) &&

data/lib/shared_infrastructure/runner/reverse_proxy.rb

@@ -11,7 +11,7 @@ module Runner
     def process_args(opts = nil)
       raise MissingArgument.new("domain and target url required", opts) unless ARGV.size == 2
       {
-        domain_name: ARGV[0],
+        domain_name: [ARGV.first],
         proxy_url: ARGV[1]
       }
     end

data/lib/shared_infrastructure/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SharedInfrastructure
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shared-infrastructure
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Larry Reid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chandler
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Configure nginx, systemd, and/or Puma