opener-property-tagger 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085b45bdd5a5ed331d4bd1a26aa12f2fb190b868
-  data.tar.gz: 87293fed9992e559c1e5585eaf23c50ae66207d7
+  metadata.gz: 82ca8f5699711207bc1d8e887283935485fbea9e
+  data.tar.gz: 6fd3356565e075bb6aa1090022d78c6acaf6440b
 SHA512:
-  metadata.gz: 2984efb780e57144e170db49d09b924b96f9dd8008332d26d2728971b8b36d2e805be5d9703504bfb976cf9b09ef8ed167057d607f5776393700801b14214822
-  data.tar.gz: 3270b38a1bffd451a4ada8251a0076553f4fd57398f70639cfca82f602586e42c55567ca4cc3a7ea79a03e6ded003a56b5251898e66069161d3050118ce8c7b6
+  metadata.gz: 74944c1fff030df12a81d22638e6045b6848d7527b04d1aeb04a12fc3cf4226694de371f698de7c9adb5f117a202d41c3a1406bf8aed0da5ef824644448df5db
+  data.tar.gz: b7748f186238dab3c8c70e35e46d279cffe7d88020aac9b377878e2fb8ef00aadc9cb1822b73a2e70bbe045cdcbaaf588b3b024a666af466b65e0d80f9e287e6

data/bin/property-tagger-server

@@ -4,50 +4,47 @@ require 'puma/cli'
 require 'optparse'
 require 'opener/core/resource_switcher'
 
-# Puma sadly does not provide a system that allows us to cleanly inject custom
-# options into their CLI. At the same time Puma doesn't provide an easy system
-# of starting it *without* using the `Puma::CLI` class.
-#
-# To work around these problems we create our own parser and ignore any invalid
-# option errors it throws up. This parser is used to handle options for the
-# resource switcher.
-
 rack_config   = File.expand_path('../../config.ru', __FILE__)
 switcher      = Opener::Core::ResourceSwitcher.new
+puma_args     = [rack_config]
 switcher_opts = {}
-show_help     = false
 
-parser = OptionParser.new do |opts|
+option_parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [OPTIONS]"
 
-  opts.separator "\nOptions:\n"
+  opts.separator "\nOptions:\n\n"
 
-  # Don't abort in this block as we otherwise can't show Puma's help message.
   opts.on('-h', '--help', 'Shows this help message') do
-    show_help = true
+    abort option_parser.to_s
+  end
 
-    puts parser
+  opts.on('-S', '--state PATH', 'Where to store the state details') do |val|
+    puma_args += ['--state', val]
   end
 
-  switcher.bind(opts, switcher_opts)
+  opts.on('-b', '--bind URI', 'URI to bind to (tcp://, unix://, ssl://)') do |val|
+    puma_args += ['--bind', val]
+  end
 
-  opts.separator "\nPuma Usage:\n\n"
-end
+  opts.on('--pidfile PATH', 'Use PATH as a pidfile') do |val|
+    puma_args += ['--pidfile', val]
+  end
 
-begin
-  # Parse destructively so that Puma doesn't break on our custom options.
-  parser.parse!(ARGV)
-rescue OptionParser::InvalidOption => error
-  error.recover(ARGV)
-  # Catch errors generated by Puma options and ignore them.
-end
+  opts.on('--daemon', 'Daemonize the server into the background') do |val|
+    puma_args << '--daemon'
+  end
+
+  opts.on('-e', '--environment ENVIRONMENT', 'The environment to use') do |val|
+    puma_args += ['--environment', val]
+  end
 
-# Trigger the Puma help message since we overwrite this option and parse
-# destructively.
-if show_help
-  ARGV << '--help'
+  opts.separator "\nResource Options:\n\n"
+
+  switcher.bind(opts, switcher_opts)
 end
 
+option_parser.parse!(ARGV)
+
 switcher.install(switcher_opts)
 
-Puma::CLI.new([rack_config] + ARGV).run
+Puma::CLI.new(puma_args).run

data/lib/opener/property_tagger/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class PropertyTagger
-    VERSION = '2.2.1'
+    VERSION = '2.2.2'
   end # PropertyTagger
 end # Opener

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opener-property-tagger
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - development@olery.com