opener-opinion-detector 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cffcde32f748cd6a76134c85be493c8384f6fc62
-  data.tar.gz: 82dad1008e90926321bde2b14a1488aea97c92af
+  metadata.gz: a4dce5b1a9a3888005c12068e17b688e22ae9a59
+  data.tar.gz: b11fdc456f1fceff08699263333e5f7305e30dc6
 SHA512:
-  metadata.gz: 5b35b4dc318071660d1162d62d7f6d1469dea83651643411c45c866da3712359add9187b979466d182a76f349e8525bfb35bfcf7409992a69f25f3336bb40d6e
-  data.tar.gz: 1ff811eda10fced7f29d49b7fe3c474aa8e28032ce3a65f071e15ece354bcc95805442a58cc40eeecac3c0b895068218a56f2c2caf31da11e62824ce43c92c15
+  metadata.gz: 0b29925a2426e06194159b1e17645749f3acc2a8e50cef8827bd6dcf9bec73723a78ddf3e817edaf48863e38f55c3617092a426a507fda2ee487fc6ec88cb5d8
+  data.tar.gz: 83229e5298bf70f5e3d35f3921d090d0525d9fa8a248c6dcbd1d31e041d88ff9889b5aa9deafa83f9c106e335a690d2da001942ec45dee0129fde3b2b276ad2b

data/bin/opinion-detector-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
-  # Catch errors generated by Puma options and ignore them.
-  error.recover(ARGV)
-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/opinion_detector/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class OpinionDetector
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opener-opinion-detector
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - development@olery.com