puma-daemon 0.1.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 354e2bfa89bfc2998f3b70ecd66a9854f0e6ae181f4d58646571afd50c8d85f9
-  data.tar.gz: e9c5d6f64616786ffb204e156546d320afe0cfbdf6a13045156d37b850436b21
+  metadata.gz: 8bae578ae5bec9d82e347cbc82bdf97ef49a094b72c525930b584feab2dbfd63
+  data.tar.gz: '09ea3be6ec46d05ad27e60539699ab84234e9f2c51c354ee6ba0d8897a553a28'
 SHA512:
-  metadata.gz: 478d5657a49012c23b2b215aaa172f2e56b81116570d98dc78c980da0cf58c6b886b334385f41c4eff3eb592534ae27c68b47e4c700137dde2d87927259ac7ab
-  data.tar.gz: 9d95ce3e1b76e153e2eee51e6d3f007aca208afd7ce907d2ee23d07bbc90f6f41e8943964d7800d848fda3c97e1cd400a3cee4f4af5fc646f65f51ef80c1999a
+  metadata.gz: b541e8dcee17f59c37f13cae02ff999ce5cf589d65a11aaaf8c640c05c0b455d0caad6e30a71311bc0012c41642170499eac9d761862f2f0c0799d1c32572bb8
+  data.tar.gz: 054d3b730d753e07a0b638f3e8678e2aee72a3e2bd26ec717e01c515c282ca2367fd60ad24f1823853cc001b3ed0fb6e65fd9d3ef649078f72aa61c41df1cbea

data/.github/workflows/main.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [3.0.0, 2.7.2, 2.6.6, 2.5.7]
+        ruby-version: [3.2.0, 3.1.3, 3.0.5, 2.7.2, 2.6.6, 2.5.7]
 
     steps:
     - uses: actions/checkout@v2
@@ -15,12 +15,8 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run RSpecs
-      run: bundle exec rspec --color
-    - name: Run Rubocop
-      run: bundle exec rubocop
+    - name: Run Specs
+      run: make test-all
     - name: Upload Code Coverage
       run: bash <(curl -s https://codecov.io/bash)
 

data/.gitignore

@@ -24,3 +24,5 @@
 **/tmp/
 /tmp/*
 /tmp/pids/*
+/Gemfile
+

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## [v0.2.1](https://github.com/kigster/puma-daemon/tree/v0.2.1) (2023-03-07)
+
+[Full Changelog](https://github.com/kigster/puma-daemon/compare/v0.2.0...v0.2.1)
+
+**Fixed bugs:**
+
+- pumad doesn't work with puma v6 [\#10](https://github.com/kigster/puma-daemon/issues/10)
+- doesn't daemonize [\#9](https://github.com/kigster/puma-daemon/issues/9)
+- Log is not working [\#8](https://github.com/kigster/puma-daemon/issues/8)
+- Currently breaks in a single \(non-cluster\) mode [\#1](https://github.com/kigster/puma-daemon/issues/1)
+
+**Merged pull requests:**
+
+- Hopefully fixing demonization for Puma v5 and v6 [\#11](https://github.com/kigster/puma-daemon/pull/11) ([kigster](https://github.com/kigster))
+
+## [v0.2.0](https://github.com/kigster/puma-daemon/tree/v0.2.0) (2023-03-07)
+
+[Full Changelog](https://github.com/kigster/puma-daemon/compare/v0.1.2...v0.2.0)
+
+**Merged pull requests:**
+
+- Fix README spelling [\#7](https://github.com/kigster/puma-daemon/pull/7) ([lulalala](https://github.com/lulalala))
+
+## [v0.1.2](https://github.com/kigster/puma-daemon/tree/v0.1.2) (2021-03-05)
+
+[Full Changelog](https://github.com/kigster/puma-daemon/compare/v0.1.1...v0.1.2)
+
+**Fixed bugs:**
+
+- uninitialized constant Puma::HAS\_SSL \(NameError\) [\#3](https://github.com/kigster/puma-daemon/issues/3)
+
+**Merged pull requests:**
+
+- Hoping to fix HAS\_SSL error [\#5](https://github.com/kigster/puma-daemon/pull/5) ([kigster](https://github.com/kigster))
+- Adding dockerfiles for testing Puma on Linux [\#2](https://github.com/kigster/puma-daemon/pull/2) ([kigster](https://github.com/kigster))
+
 ## [v0.1.1](https://github.com/kigster/puma-daemon/tree/v0.1.1) (2021-01-24)
 
 [Full Changelog](https://github.com/kigster/puma-daemon/compare/v0.1.0...v0.1.1)

data/{Gemfile → Gemfile.puma-v5}

@@ -5,7 +5,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in puma-daemon.gemspec
 gemspec
 
+gem 'puma', '~> 5.0'
 gem 'rake', '~> 13.0'
+
 group :test do
   gem 'codecov', require: false
   gem 'rspec', '~> 3.0'

data/Gemfile.puma-v6

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in puma-daemon.gemspec
+gemspec
+
+gem 'puma', '~> 6.0'
+gem 'rake', '~> 13.0'
+
+group :test do
+  gem 'codecov', require: false
+  gem 'rspec', '~> 3.0'
+  gem 'rubocop', '~> 0.80'
+end

data/Makefile

@@ -16,6 +16,23 @@ PUMAD_HOME			:= $(shell dirname $(MAKEFILE_PATH))
 help:	   			## Prints help message auto-generated from the comments.
 				@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
+puma-v5: 			## Installs puma 5.0.0
+				@ln -nfs Gemfile.puma-v5 Gemfile
+				@bundle install
+
+puma-v6: 			## Installs puma 5.0.0
+				@ln -nfs Gemfile.puma-v6 Gemfile
+				@bundle install
+
+test:				## Runs the test suite
+				@bundle exec rspec
+
+test-all:			## Test all supported Puma Versions
+				make puma-v5
+				make test
+				make puma-v6
+				make test
+				
 docker-build-ruby:		## Builds the Docker image by compiling ruby 3.0.0
 				@docker build -f Dockerfile.build    -t puma-daemon:latest .
 
@@ -28,4 +45,7 @@ docker-build-run: 		docker-build-ruby ## Drops you into a BASH session on ubuntu
 docker-download-run: 		docker-download-ruby ## Drops you into a BASH session on ubuntu with ruby 3.0.0
 				@docker run -it puma-daemon:latest
 
+
+clean:				## Clean-up
+				@rm -rf Gemfile Gemfile.lock coverage 
  

data/README.adoc

@@ -4,37 +4,48 @@
 :sectnums:
 :icons: font
 
-image:https://github.com/kigster/puma-daemon/workflows/Ruby/badge.svg[link=https://github.com/kigster/puma-daemon/actions?query=workflow%3ARuby] image:https://codecov.io/gh/kigster/puma-daemon/branch/master/graph/badge.svg?token=asxarMSGbz[link=https://codecov.io/gh/kigster/puma-daemon]
+image:https://github.com/kigster/puma-daemon/workflows/Ruby/badge.svg[link=https://github.com/kigster/puma-daemon/actions?query=workflow%3ARuby] 
+image:https://codecov.io/gh/kigster/puma-daemon/branch/master/graph/badge.svg?token=asxarMSGbz[link=https://codecov.io/gh/kigster/puma-daemon]
+image:https://app.fossa.com/api/projects/git%2Bgithub.com%2Fkigster%2Fpuma-daemon.svg?type=shield[link=https://app.fossa.com/projects/git%2Bgithub.com%2Fkigster%2Fpuma-daemon?ref=badge_shield]
+image:https://badge.fury.io/rb/puma-daemon.svg["Gem Version", link="https://badge.fury.io/rb/puma-daemon"]
+
+image:https://codecov.io/gh/kigster/puma-daemon/commit/9ebd665764786a9815b159b699087148e19e671a/graphs/sunburst.svg[sunbirst]
+
+== Motivation
 
 In version 5.0 of the popular Ruby HTTP server https://github.com/puma/puma[Puma] the developers chose to https://github.com/puma/puma/pull/2170/files[drop the daemonization] support from Puma. They did that because the code wasn't actively maintained. Other and perhaps better options now exist (such as `systemd`, etc), not to mention that many people have switched to Kubernetes and Docker, where you generally want to start all servers in the foreground.
 
-And yet, on occasion, it was rather useful and straightforward to use the built-in daemonization feature that was cross-platform and is now gone. Some folks are still using this feature and are therefore stuck with Puma version 4, or must wrap Puma either in the `systemd` manifest or `launchctl plist` on Mac OS-X, or a Docker container. Well, **not anymore!** 
+And yet, on occasion, it was rather useful and straightforward to use the built-in daemonization feature that was cross-platform and is now gone. Some folks are still using this feature and are therefore stuck with Puma version 4, or must wrap Puma either in the `systemd` manifest or `launchctl plist` on Mac OS-X, or a Docker container. Well, **not anymore!**
 
 NOTE: Add this gem to your dependencies, and make a one line change either in your `config/puma.rb` file, or use `pumad` binary to start Puma as per usual, and you can even leave `-d` flags there (they are ignored when started via `pumad`, and Puma always goes to the background when started that way).
 
-One of the nice features of the old daemonization functionality was that it worked across all platforms. 
+One of the nice features of the old daemonization functionality was that it worked across all platforms.
 
 So, if you want to use the latest and greatest Puma 5+, but have it self-daemonize, this gem is for you.
 
-== Compatility
+== Compatibility
+
+=== Ruby Versions
+
+We did not restore the daemon functionality for JRuby; so at the moment this will work with the MRI distribution, and possibly others that support https://ruby-doc.org/core-2.6.1/Process.html#method-c-daemon[`Process.daemon(true, true)`].
 
-We did not restore the daemonization code for JRuby; so at the moment this will work with the MRI distribution,  and possibly others that support `Process.daemon(true)`.
+For supported MRI Ruby Versions see the https://github.com/kigster/puma-daemon/blob/master/.github/workflows/main.yml#L10[Github Workflow] file.
 
-We currently run CI suite on Github Actions against
+=== Puma Versions
 
- * MRI Ruby 3.0.0
- * MRI Ruby 2.7.2
- * MRI Ruby 2.6.6
- * MRI Ruby 2.5.7
+Currently Puma versions 5 and 6 are supported.
 
+=== Known Issues
 
-== Design Decisions 
+Please see the list of open issues on the https://github.com/kigster/puma-daemon/issues[Issues Page]. Any help is always welcomed.
 
-This gem's goal was to surgically augment Puma's source code to restore daemonization by merely requiring `puma/daemon`. We almost got there, but not quite.
+== Design Decisions
 
-While this was an admirable goal, it has not been accomplished in the current version.  The internals of Puma isn't very easy to monkey-patch or augment. For example, we couldn't think of a way to add back the `-d` flags to the Option Parsing method without having to override the entire method: — which is _not a good solution_, because — what if Puma developers add a new flag in the future? We would have to keep this overridden method frequently updated and potentially choose a different version depending on what version of Puma you are using. That sounds like a nightmare.
+This gem's goal was to surgically augment Puma's source code to restore daemonization by merely requiring `puma/daemon`.
 
-It is why instead, we took an approach that requires you — the user — to make a couple of small changes in your Puma configuration to bring daemonization back, or in your scripts, change `puma` to `pumad`, and everything should work. If you run into problems, please https://github.com/kigster/puma-daemon/issues/new[submit an issue].
+We accomplished this goal by adding the daemonization call to the routine `output_header()` which is invoked by both `Puma::Single` runner and the `Puma::Cluster` runner at the very beginning of the launch process. While relatively brittle, particularly if the future versions of Puma change this, this approach seems to work with the currently released version of Puma (5 and 6).
+
+If you run into problems, please https://github.com/kigster/puma-daemon/issues/new[submit an issue].
 
 == Installation
 
@@ -43,23 +54,43 @@ Add this line to your application's Gemfile:
 [source,ruby]
 ----
 gem 'puma-daemon', require: false
-gem 'puma',  '~> 5'
+gem 'puma',  '~> 5' # or 6
+----
+
+In your `config/puma.rb`, eg.
+
+[source,ruby]
+----
+require 'puma/daemon'
+bind 'tcp://0.0.0.0:3000'
+workers 2
+threads 4
+daemonize
 ----
 
 And then execute:
 
  $ bundle install
+ $ bundle exec puma -C config/puma.rb
+
+Make sure you have `config.ru` Rackup file in the current folder. Checkout the shell script inside the `example` folder for more info.
 
 == Usage
 
 There were two ways you could daemonize Puma in the past:
 
  1. By specifying `daemonize` or `daemonize(true)` in your config file.
- 2. Or, by passing a `-d` or `--daemonize` command line flag.
+ 2. By specifying `-d` or `--daemonize` on the command line.
 
-This gem allows you to daemonize using both ways, but with a small caveat in each case.
+Both of these ways are supported, as long as you do `require 'puma/daemon'` in your puma config file, and — in the case of `-d` flag, you pass it to `pumad` executable, not `puma`.
 
-Please note that both ways require you to include this gem in your Gemfile, but you may specify it as `require: false` — it will only activate if you explicitly require it, or use `pumad` executable.
+The recommended way to daemonize is via the provided `pumad` executable, or via the require in `puma.rb` and a subsequent call to `daemonize()` method.
+
+Please note that you must include `puma-daemon` in your Gemfile, but you may specify it as `require: false` — it will only activate if you explicitly require it in your Puma config file.
+
+=== Examples
+
+Please see the https://github.com/kigster/puma-daemon/tree/master/example[`example`] directory in the source of the gem. It contains `single.sh` and `cluster.sh` scripts that boot Puma via `pumad` binary.
 
 === Daemonizing via the Config File
 
@@ -74,7 +105,7 @@ port 3001
 workers 3
 threads 2,3
 # accepts true or false, and if false is passed will NOT daemonize
-daemonize 
+daemonize
 ----
 
 With this method you can continue using the standard `puma` executable to get it started, but (and this is important) — **you must remove any `-d` or `--daemonize` from the command line**, or Puma v5 and above will fail with an error.
@@ -83,19 +114,21 @@ Here is an example of daemonizing via the config file shown above, and using the
 
 [source,bash]
 ----
-❯ gem install puma-daemon puma -N
-❯ puma -C config/puma.rb config.ru
-
-[98795] Puma starting in cluster mode...
-[98795] * Puma version: 5.1.1 (ruby 2.7.2-p137) ("At Your Service")
-[98795] *  Min threads: 2
-[98795] *  Max threads: 3
-[98795] *  Environment: production
-[98795] *   Master PID: 98795
-[98795] *      Workers: 3
-[98795] *     Restarts: (✔) hot (✔) phased
-[98795] * Listening on http://0.0.0.0:3001
-[98795] *  Puma Daemon: Daemonizing (puma-daemon v0.1.1)...
+❯ cd example
+❯ bundle exec puma -I ../lib -C $(pwd)/puma.rb -w 4 config.ru
+[62235] Puma starting in cluster mode...
+[62235] * Puma version: 6.1.1 (ruby 2.7.6-p219) ("The Way Up")
+[62235] *  Min threads: 0
+[62235] *  Max threads: 16
+[62235] *  Environment: development
+[62235] *   Master PID: 62235
+[62235] *  Puma Daemon: Daemonizing...
+[62235] *  Gem: puma-daemon v0.2.0
+[62235] *  Gem: puma v6.1.1
+[62258] *      Workers: 4
+[62258] *     Restarts: (✔) hot (✔) phased
+[62258] * Listening on unix:///tmp/puma.sock
+[62258] * Listening on http://0.0.0.0:9292
 ----
 
 Note that using this method you can decide whether to daemonize or not by passing true or false to the `daemonize` method.
@@ -106,32 +139,30 @@ If you prefer to make a decision whether to daemonize or not on the command line
 
 NOTE: We did not want to conflict with the `puma` gem by introducing another executable under the same name. The executable this gem provides is called `pumad` (where 'd' stands for daemon, and follows standard UNIX convention, as in eg `sshd`, `ftpd`, etc).
 
-If you replace `puma` with `pumad` — you no longer need to pass any aditional command line flag t ocontinue passing it `-d` or you can remove it (both `-d` and `--daemonize` are stripped out before ARGV is passed onto Puma's CLI parser.)
+If you replace `puma` with `pumad`, you no longer need to pass any additional command line flag (`-d` and `--daemonize`) to daemonize. You can continue passing them or you can remove them (these flags are stripped out before ARGV is passed onto Puma's CLI parser.)
 
 [source,bash]
 ----
-❯ gem install puma --version 5.1.1 -N
-❯ gem install puma-daemon -N
-
-❯ pumad -C config/puma.rb spec/rackup/bind.ru
-
-[98795] Puma starting in cluster mode...
-[98795] * Puma version: 5.1.1 (ruby 2.7.2-p137) ("At Your Service")
-[98795] *  Min threads: 2
-[98795] *  Max threads: 8
-[98795] *  Environment: production
-[98795] *   Master PID: 98795
-[98795] *      Workers: 3
-[98795] *     Restarts: (✔) hot (✔) phased
-[98795] * Listening on http://0.0.0.0:3000
-[98795] *  Puma Daemon: Daemonizing (puma-daemon v0.1.1)...
+❯ cd example
+❯ ../exe/pumad -C $(pwd)/puma.rb -w 0 config.ru
+
+Puma starting in single mode...
+* Puma version: 6.1.1 (ruby 2.7.6-p219) ("The Way Up")
+*  Min threads: 0
+*  Max threads: 16
+*  Environment: development
+*          PID: 63179
+*  Puma Daemon: Daemonizing...
+*  Gem: puma-daemon v0.2.0
+*  Gem: puma v6.1.1
+* Listening on unix:///tmp/puma.sock
+* Listening on http://0.0.0.0:9292
 ----
 
 As you can see, at the end it says "Daemonizing".
 
 If you start puma this way, you can still specify `daemonize(false)` in the configuration file to turn it off, but the default is to daemonize. Also, if you start with `pumad` you do not need to include `require 'puma/daemon'` in your configuration file, as the `pumad` binary loads all dependencies prior to parsing the config.
 
-
 == Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/Rakefile

@@ -26,7 +26,7 @@ end
 task build: :permissions
 
 YARD::Rake::YardocTask.new(:doc) do |t|
-  t.files = %w[lib/**/*.rb exe/*.rb - README.adoc CHANGELOG.md LICENSE.txt]
+  t.files = %w[lib/**/*.rb exe/* - README.adoc CHANGELOG.md LICENSE.txt]
   t.options.unshift('--title', '"Puma Daemon"')
   t.after = -> { exec('open doc/index.html') }
 end

data/bin/console

@@ -7,7 +7,7 @@ require 'puma/daemon'
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
+# (If you use this, don't forget to add pry to your Gemfile.puma-v5!)
 # require "pry"
 # Pry.start
 

data/example/cluster.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+export txtblk='\e[0;30m'
+export txtred='\e[0;31m'
+export txtgrn='\e[0;32m'
+export txtylw='\e[0;33m'
+export txtblu='\e[0;34m'
+export txtpur='\e[0;35m'
+export txtcyn='\e[0;36m'
+export txtwht='\e[0;37m'
+export clr='\e[0;0m'
+
+[[ -f cluster.sh ]] || {
+  echo -e "${txtred}Please run this from the ./example folder.${clr}"
+  exit 1
+}
+
+[[ -f ../Gemfile ]] || {
+  echo -e "${txtred}Please choose either Puma v5 or Puma v6, by running:${clr}"
+  echo -e "${txtgrn}make puma-v5 or make puma-v6"
+  exit 2
+}
+
+echo -e "${txtblu}Ensuring your dependencies are installed...${clr}"
+
+( 
+  cd .. || exit 2;
+  bundle check || bundle install
+) >/dev/null
+
+pid=$(ps -ef | grep puma | grep example | awk '{print $2}')
+
+[[ -n $pid ]] && kill $pid && sleep 1
+
+echo -e "${txtblu}Starting Puma in cluster mode.${clr}"
+
+command="bundle exec puma -I ../lib -C $(pwd)/puma.rb -w 4"
+echo -e "${txtblu}Running Command:"
+echo -e "${txtgrn}${command}${clr}"
+eval "${command}"
+
+echo -e "${txtblu}Verifying Puma is running...${clr}"
+
+sleep 0.5
+
+output=$(mktemp)
+
+set -e
+
+curl http://0.0.0.0:9292/ > "${output}" 2>/dev/null
+
+[[ $(cat ${output}) == "Hello World" ]] || {
+  echo -e "${txtred}Invalid response:${clr}">&2
+  cat ${output}
+  exit 3
+}
+
+echo -e "${txtgrn}Puma Daemon is running and returning the expected string.${clr}"
+
+ps -ef | grep [p]uma
+

data/example/config.ru

@@ -0,0 +1,3 @@
+# config.ru
+run Proc.new { |_env| ['200', {'Content-Type' => 'text/html'}, ['Hello World']] }
+# run this with rackup command

data/example/puma.rb

@@ -0,0 +1,76 @@
+require 'puma/daemon'
+
+# The directory to operate out of.
+# The default is the current directory.
+
+# The default is “development”.
+
+environment 'development'
+
+# Store the pid of the server in the file at “path”.
+
+pidfile '/tmp/puma.pid'
+
+# Use “path” as the file to store the server info state. This is
+# used by “pumactl” to query and control the server.
+state_path '/tmp/puma.state'
+
+# Redirect STDOUT and STDERR to files specified. The 3rd parameter
+# (“append”) specifies whether the output is appended, the default is
+# “false”.
+stdout_redirect '/tmp/puma_access.log', '/tmp/puma_error.log', true
+
+quiet
+
+threads 0, 16
+
+# Bind the server to “url”. “tcp://”, “unix://” and “ssl://” are the only
+# accepted protocols.
+# The default is “tcp://0.0.0.0:9292”.
+
+bind 'unix:///tmp/puma.sock'
+bind 'tcp://0.0.0.0:9292'
+
+# Instead of “bind 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'” you
+# can also use the “ssl_bind” option.
+
+ # ssl_bind '127.0.0.1', '9292', { key: path_to_key, cert: path_to_cert }
+
+# Code to run before doing a restart. This code should
+# close log files, database connections, etc.
+
+# This can be called multiple times to add code each time.
+
+on_restart do
+  puts 'On restart...'
+end
+
+# Command to use to restart puma. This should be just how to
+# load puma itself (ie. 'ruby -Ilib bin/puma'), not the arguments
+# to puma, as those are the same as the original process.
+
+# === Cluster mode ===
+
+# How many worker processes to run.
+# The default is “0”.
+
+workers 2
+
+# Code to run when a worker boots to setup the process before booting
+# the app.
+# This can be called multiple times to add hooks.
+
+# === Puma control rack application ===
+
+# Start the puma control rack application on “url”. This application can
+# be communicated with to control the main server. Additionally, you can
+# provide an authentication token, so all requests to the control server
+# will need to include that token as a query parameter. This allows for
+# simple authentication.
+
+# Check out https://github.com/puma/puma/blob/master/lib/puma/app/status.rb
+# to see what the app has available.
+
+#activate_control_app 'unix:///var/run/pumactl.sock'
+
+daemonize

data/example/single.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+export txtblk='\e[0;30m'
+export txtred='\e[0;31m'
+export txtgrn='\e[0;32m'
+export txtylw='\e[0;33m'
+export txtblu='\e[0;34m'
+export txtpur='\e[0;35m'
+export txtcyn='\e[0;36m'
+export txtwht='\e[0;37m'
+export clr='\e[0;0m'
+
+[[ -f single.sh ]] || {
+  echo -e "${txtred}Please run this from the ./example folder.${clr}"
+  exit 1
+}
+
+[[ -f ../Gemfile ]] || {
+  echo -e "${txtred}Please choose either Puma v5 or Puma v6, by running:${clr}"
+  echo -e "${txtgrn}make puma-v5 or make puma-v6${clr}"
+  exit 2
+}
+
+echo -e "${txtblu}Ensuring your dependencies are installed...${clr}"
+
+( 
+  cd .. || exit 2;
+  bundle check || bundle install
+) >/dev/null
+
+[[ -d example ]] && cd example
+
+pid=$(ps -ef | grep puma | grep example | awk '{print $2}')
+
+[[ -n $pid ]] && kill $pid && sleep 1
+
+echo -e "${txtblu}Starting Puma in Single mode.${clr}"
+
+command="../exe/pumad -C $(pwd)/puma.rb -w 0"
+echo "Executing:"
+echo -e "${txtgrn}${command}${clr}"
+eval "${command}"
+
+echo "Verifying Puma is running"
+
+output=$(mktemp)
+
+set -e
+
+curl http://0.0.0.0:9292/ > "${output}" 2>/dev/null
+
+[[ $(cat ${output}) == "Hello World" ]] || {
+  echo -e "${txtred}Invalid response:${clr}">&2
+  cat ${output}
+  exit 3
+}
+
+echo -e "${txtgrn}Puma Daemon is running and returning the expected string.${clr}"
+
+ps -ef | grep [p]uma
+
+echo
+
+

data/exe/pumad

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+# vim: ft=ruby
+
+lib_path = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+$LOAD_PATH << lib_path if File.exist?(lib_path) && !$LOAD_PATH.include?(lib_path)
 
 require 'puma/daemon'
 

data/lib/puma/daemon/cli.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require_relative '../daemon'
+
 module Puma
   module Daemon
     class CLI
       attr_accessor :argv, :cli
 
-      def initialize(argv = ARGV, events = Events.stdio)
+      def initialize(argv = ARGV)
         self.argv = argv
-        self.cli = ::Puma::CLI.new(argv, events)
+        self.cli = ::Puma::CLI.new(argv)
       end
 
       def run

data/lib/puma/daemon/configuration.rb

@@ -8,6 +8,10 @@ module Puma
       def puma_default_options
         super.merge({ daemon: true })
       end
+
+      def daemonize
+        super.merge({ daemon: true })
+      end
     end
   end
 end

data/lib/puma/daemon/runner_adapter.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'version'
+
+module Puma
+  module Daemon
+    module RunnerAdapter
+      attr_reader :options
+      attr_accessor :has_demonized
+
+      def output_header(mode)
+        super(mode)
+
+        daemonize! if daemon?
+      end
+
+      def daemon?
+        options[:daemon]
+      end
+
+      def daemonize!
+        return if has_demonized
+
+        log '*  Puma Daemon: Demonizing...'
+        log "*  Gem: puma-daemon v#{::Puma::Daemon::VERSION}"
+        log "*  Gem: puma v#{::Puma::Const::VERSION}"
+
+        Process.daemon(true, true)
+        self.has_demonized = true
+      end
+
+      def log(str)
+        super(str) unless str == 'Use Ctrl-C to stop'
+      end
+    end
+  end
+end

data/lib/puma/daemon/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Daemon
-    VERSION = '0.1.2'
+    VERSION = '0.2.2'
   end
 end

data/lib/puma/daemon.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'puma'
+require 'puma/const'
 require 'puma/runner'
 require 'puma/single'
 require 'puma/cluster'
@@ -8,7 +9,7 @@ require 'puma/dsl'
 require 'puma/cli'
 
 require 'puma/daemon/version'
-require 'puma/daemon/runner'
+require 'puma/daemon/runner_adapter'
 require 'puma/daemon/configuration'
 require 'puma/daemon/cli'
 require 'puma/daemon/dsl'
@@ -16,8 +17,8 @@ require 'puma/daemon/dsl'
 module Puma
   module Daemon
     def self.daemonize!
-      ::Puma::Single.include(::Puma::Daemon::Runner)
-      ::Puma::Cluster.include(::Puma::Daemon::Runner)
+      ::Puma::Single.include(::Puma::Daemon::RunnerAdapter)
+      ::Puma::Cluster.include(::Puma::Daemon::RunnerAdapter)
       ::Puma::DSL.include(::Puma::Daemon::DSL)
       ::Puma::Configuration.prepend(::Puma::Daemon::Configuration)
       ::Puma::CLI.instance_eval { attr_reader :options }

data/puma-daemon.gemspec

@@ -26,20 +26,21 @@ Gem::Specification.new do |spec|
     your config file.
   DESCRIPTION
 
-  spec.homepage      = 'https://github.com/kig/puma-daemon'
+  spec.homepage      = 'https://github.com/kigster/puma-daemon'
   spec.license       = 'MIT'
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/kig/puma-daemon'
-  spec.metadata['changelog_uri'] = 'https://github.com/kig/puma-daemon/master/CHANAGELOG'
+  spec.metadata['source_code_uri'] = 'https://github.com/kigster/puma-daemon'
+  spec.metadata['changelog_uri'] = 'https://github.com/kigster/puma-daemon/master/CHANAGELOG.md'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
+
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-daemon
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.2
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -162,7 +162,8 @@ files:
 - CHANGELOG.md
 - Dockerfile.build
 - Dockerfile.download
-- Gemfile
+- Gemfile.puma-v5
+- Gemfile.puma-v6
 - LICENSE.txt
 - Makefile
 - README.adoc
@@ -171,22 +172,26 @@ files:
 - bin/setup
 - config/puma_cluster.rb
 - config/puma_single.rb
+- example/cluster.sh
+- example/config.ru
+- example/puma.rb
+- example/single.sh
 - exe/pumad
 - lib/puma-daemon.rb
 - lib/puma/daemon.rb
 - lib/puma/daemon/cli.rb
 - lib/puma/daemon/configuration.rb
 - lib/puma/daemon/dsl.rb
-- lib/puma/daemon/runner.rb
+- lib/puma/daemon/runner_adapter.rb
 - lib/puma/daemon/version.rb
 - puma-daemon.gemspec
-homepage: https://github.com/kig/puma-daemon
+homepage: https://github.com/kigster/puma-daemon
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/kig/puma-daemon
-  source_code_uri: https://github.com/kig/puma-daemon
-  changelog_uri: https://github.com/kig/puma-daemon/master/CHANAGELOG
+  homepage_uri: https://github.com/kigster/puma-daemon
+  source_code_uri: https://github.com/kigster/puma-daemon
+  changelog_uri: https://github.com/kigster/puma-daemon/master/CHANAGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -202,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Restore somewhat Puma's ability to self-daemonize, since Puma 5.0 dropped

data/lib/puma/daemon/runner.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'version'
-
-module Puma
-  module Daemon
-    module Runner
-      attr_reader :options
-
-      def redirect_io
-        super
-
-        daemonize! if daemon?
-      end
-
-      def daemon?
-        options[:daemon]
-      end
-
-      def daemonize!
-        log "*  Puma Daemon: Daemonizing (puma-daemon v#{::Puma::Daemon::VERSION})..."
-        Process.daemon(true)
-      end
-
-      def log(str)
-        super(str) unless str == 'Use Ctrl-C to stop'
-      end
-    end
-  end
-end