nginxtra 1.10.1.12 → 1.10.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d784fb7c6e974f8523d9ef4d1c02ccd6995068db
-  data.tar.gz: dd8ea99c04482fe24fb8405e4c400e25e520e99e
+  metadata.gz: 59e3d6509dacb33baf0e1bc51cb916dde15ade0a
+  data.tar.gz: c0a32a24f41e650a0ddaba0b72d0ed5e34ea4045
 SHA512:
-  metadata.gz: 4a65ae656e8d973b5d336ec765c36ce17812bf5ba9345d71c584db4dca551add2d337523c263800bc74e0c79bcbdecae7119140f83286468c762aa635b47d3e4
-  data.tar.gz: e5d0d9944a72ec36922b7b28d862eaac9db7fb6401e3e9a7646faa7efe5d9e109de44056fac2e8af1d1bfbccb359b5fcea92f3d8415a575de7c75f7b8a8315e8
+  metadata.gz: 6a2cfb5cc51aced1a956a4d22165f6c73d279dd318fcc7dba8f0a0b3bcd04f364c1b94dda3c1b0182e35dc6489154e30b63eab0e27826df6edffa5da5a443d18
+  data.tar.gz: 726f5d2601271e6855156a1a8cab5926ba59ca73f9762f0990eccc65d47eb2849ab08a12c3751a6c5656c8bf7ea4f626aba181da7d0e61a6bbba9db6b7f24cda

data/bin/nginxtra

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "rubygems"
-gem "nginxtra", "= 1.10.1.12"
+gem "nginxtra", "= 1.10.1.13"
 gem "thor", "~> 0.16"
 require "nginxtra"
 Nginxtra::CLI.start

data/bin/nginxtra_rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "rubygems"
-gem "nginxtra", "= 1.10.1.12"
+gem "nginxtra", "= 1.10.1.13"
 gem "thor", "~> 0.16"
 require "nginxtra"
 Nginxtra::Rails::CLI.start

data/lib/nginxtra/actions/start.rb

@@ -49,9 +49,13 @@ module Nginxtra
         !Nginxtra::Config.nginx_running?
       end
 
-      # Start nginx as a daemon.
+      # Start nginx as a daemon, unless --no-daemon is provided.
       def start_nginx
-        daemon :start
+        if @thor.options["daemon"]
+          daemon :start
+        else
+          exec [Nginxtra::Config.nginx_executable, "nginx"]
+        end
       end
 
       # Update the last nginx start time.

data/lib/nginxtra/cli.rb

@@ -86,7 +86,11 @@ module Nginxtra
       matches what is defined in nginxtra.conf.rb.  If it is already running, this
       will do nothing, unless --force is passed.  Note that compilation will NOT be
       forced with the --force option and should be invoked separately if it needs to
-      be forced."
+      be forced.  The --no-daemon option can be used if you want to run without
+      start-stop-daemon, though be aware this might break other nginxtra actions like
+      stop, restart, and reload.  The process will be replaced with nginx when
+      --no-daemon is used."
+    method_option "daemon", type: :boolean, default: true, banner: "Start with start-stop-daemon", aliases: "-d"
     def start
       Nginxtra::Error.protect self do
         set_working_dir!

data/lib/nginxtra/version.rb

@@ -6,7 +6,7 @@ module Nginxtra
       end
 
       def to_s
-        "1.10.1.12"
+        "1.10.1.13"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nginxtra
 version: !ruby/object:Gem::Version
-  version: 1.10.1.12
+  version: 1.10.1.13
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -522,7 +522,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Wrapper of nginx for easy install and use.