kajiki 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c2942d81bed01b0bcb60963889ac3808e953f21
-  data.tar.gz: 569978e43e6583e2f1122ce0188d71d059fb8db9
+  metadata.gz: aaa2f8a589d38633e1127cb46791ba33aa1ed969
+  data.tar.gz: 948f55323c048071fbb1b6f65604b5a91c8df1b1
 SHA512:
-  metadata.gz: 3d180d80edf52c80d7630bc5849618260f4c96cedf415991bc6d735212c9e0c6692149f9f5f584d67a1a55131ee2d51f0a545710bd2d61e994fc27552a3e2b0a
-  data.tar.gz: 6ce41aaed1ca9d574149c58ee55c3a3bfc0ab3ceddaecbcee8a048bff51c84df447a7826e9bb5d953e101f701c36556d21ed54978970308f05ddaf12bc64f662
+  metadata.gz: c4e7b1a1277af35a352a9f98e1a6f1f1d8d7f3a652696fbb679769effc76351dfba142704cd54db9a354930a6ecdd2c6fe14d5a29d1ccc4012e1bd43c2bb7563
+  data.tar.gz: a6b20639d643df6cb828e2c2b9d33337a02239bb01c1708a7ddc3ea4618b0f9d42ef582181aa824a6eff68f72eb774786e290eb846fec6be4745d90f3f4bcdda

data/README.md

@@ -1,5 +1,7 @@
 # Kajiki
 
+[![Gem Version](https://badge.fury.io/rb/kajiki.svg)](http://badge.fury.io/rb/kajiki)
+
 A simple gem to build daemons.
 
 It provides basic functions to start and stop a daemon process. It also parses command-line options.

data/kajiki.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = "kajiki"
-  s.version       = "1.0.2"
+  s.version       = "1.1.0"
   s.authors       = ["Ken J."]
   s.email         = ["kenjij@gmail.com"]
   s.description   = %q{A simple gem to build daemons}

data/lib/kajiki/presets.rb

@@ -7,6 +7,7 @@ module Kajiki
   OPT_DESCS = {
     banner: "Usage: #{File.basename($0)} [options] {#{SUB_COMMANDS.join('|')}}",
     address: 'Bind to address',
+    config: 'Load config from file',
     daemonize: 'Run in the background',
     error: 'Output error to file',
     group: 'Group to run as',
@@ -18,7 +19,7 @@ module Kajiki
 
   # Preset options for command-line parsing.
   # @param [Symbol] presets are: `:minimal`, `:simple`, or `:server`.
-  def self.preset_options(preset)
+  def self.preset_options(preset, options = {})
     case preset
     when :minimal
       Trollop.options do
@@ -29,26 +30,28 @@ module Kajiki
     when :simple
       Trollop.options do
         banner OPT_DESCS[:banner]
+        opt :config, OPT_DESCS[:config], type: :string if options[:config]
         opt :daemonize, OPT_DESCS[:daemonize]
-        opt :error, OPT_DESCS[:error], type: :string
-        opt :group, OPT_DESCS[:group], type: :string
+        opt :error, OPT_DESCS[:error], type: :string unless options[:error] == false
+        opt :group, OPT_DESCS[:group], type: :string unless options[:user] == false
         opt :log, OPT_DESCS[:log], type: :string
         opt :pid, OPT_DESCS[:pid], type: :string
-        opt :user, OPT_DESCS[:user], type: :string
-        depends(:user, :group)
+        opt :user, OPT_DESCS[:user], type: :string unless options[:user] == false
+        depends(:user, :group) unless options[:user] == false
       end
     when :server
       Trollop.options do
         banner OPT_DESCS[:banner]
         opt :address, OPT_DESCS[:address], default: '0.0.0.0'
+        opt :config, OPT_DESCS[:config], type: :string if options[:config]
         opt :daemonize, OPT_DESCS[:daemonize]
-        opt :error, OPT_DESCS[:error], type: :string
-        opt :group, OPT_DESCS[:group], type: :string
+        opt :error, OPT_DESCS[:error], type: :string unless options[:error] == false
+        opt :group, OPT_DESCS[:group], type: :string unless options[:user] == false
         opt :log, OPT_DESCS[:log], type: :string
         opt :pid, OPT_DESCS[:pid], short: 'P', type: :string
         opt :port, OPT_DESCS[:port], default: 4567
-        opt :user, OPT_DESCS[:user], type: :string
-        depends(:user, :group)
+        opt :user, OPT_DESCS[:user], type: :string unless options[:user] == false
+        depends(:user, :group) unless options[:user] == false
       end
     else
       fail 'Invalid preset option.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kajiki
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ken J.