puma-daemon 0.1.2 → 0.2.3

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/codecov.yml

@@ -0,0 +1,4 @@
+comment: 
+  layout: "reach,diff,flags,tree,betaprofiling"
+  show_critical_paths: true
+

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,5 @@
+# frozen_string_literal: true
+
+# config.ru
+run(proc { |*| ['200', { 'Content-Type' => 'text/html' }, ['Hello World']] })
+# run this with rackup command

data/example/puma.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+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,6 +1,11 @@
 #!/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'
 
 # If we are passing -d or --daemonize, do so

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,49 @@
+# frozen_string_literal: true
+
+require_relative 'version'
+
+module Puma
+  module Daemon
+    module RunnerAdapter
+      class << self
+        def included(base)
+          base.class_eval do
+            attr_reader :options
+            attr_accessor :has_demonized
+          end
+
+          base.class_eval do
+            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)
+              if super.respond_to?(:log)
+                super(str) unless str == 'Use Ctrl-C to stop'
+              else
+                puts(str)
+              end
+            end
+          end
+        end
+      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.3'
   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/blob/master/CHANGELOG.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']
@@ -49,6 +50,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'asciidoctor'
   spec.add_development_dependency 'codecov'
+  spec.add_development_dependency 'httparty'
   spec.add_development_dependency 'relaxed-rubocop'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'rubocop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-daemon
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: relaxed-rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -162,31 +176,38 @@ files:
 - CHANGELOG.md
 - Dockerfile.build
 - Dockerfile.download
-- Gemfile
+- Gemfile.puma-v5
+- Gemfile.puma-v6
 - LICENSE.txt
 - Makefile
 - README.adoc
+- README.pdf
 - Rakefile
 - bin/console
 - bin/setup
+- codecov.yml
 - 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/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -202,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
+rubygems_version: 3.3.22
 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