puma-daemon 0.3.2 → 0.5.0

data/bin/setup

@@ -3,6 +3,6 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install
+BUNDLE_GEMFILE=Gemfile.puma-v5 bundle install
+BUNDLE_GEMFILE=Gemfile.puma-v6 bundle install
 
-# Do any other automated setup that you need to do here

data/codecov.yml

@@ -1,4 +1,34 @@
-comment: 
-  layout: "reach,diff,flags,tree,betaprofiling"
-  show_critical_paths: true
+codecov:
+  ci:
+    - "github.com"
+  max_report_age: 24
+  disable_default_path_fixes: no
+  require_ci_to_pass: yes
+  notify:
+    after_n_builds: 1
+    wait_for_ci: yes
+
+github_checks:
+  annotations: true
+
+coverage:
+  range: 50..75
+  round: down
+  precision: 2
+  status:
+    patch: false
+    project:
+      puma-daemon: # This can be anything, but it needs to exist as the name
+        # basic settings
+        target: 80%
+        threshold: 5%
+        base: auto 
+        if_ci_failed: ignore #success, failure, error, ignore
+        only_pulls: false
+        flags: 
+          - rspecs
+        paths: 
+          - lib
+        informational: true
+        removed_code_behavior: off 
 

data/example/cluster.sh

@@ -1,39 +1,52 @@
 #!/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'
+source colors.sh
 
 [[ -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}"
-
-( 
+if [[ -n "${BUNDLE_GEMFILE}" || -f ../Gemfile ]]; then
+  echo -e "${txtgrn}OK: We have either BUNDLE_GEMFILE defined or ../Gemfile"
+  [[ -z $BUNDLE_GEMFILE ]] && BUNDLE_GEMFILE=Gemfile
+else
+  export BUNDLE_GEMFILE=Gemfile.puma-v6
+  echo -e "${txtylw}WARNING: Set BUNDLE_GEMFILE to either v5 or v6."
+  echo -e "${txtylw}         Since none we set, we selected v6 for now."
+  sleep 2
+fi
+
+export GEMFILE=${BUNDLE_GEMFILE}
+
+if [[ -z ${GEMFILE} || ! -f "${GEMFILE}" ]]; then
+  export GEMFILE="../${BUNDLE_GEMFILE}"
+  [[ -f ${GEMFILE} ]] || {
+    echo  -e "${txtred}ERROR: File [${GEMFILE}] does not exist ${clr}"
+    exit 3
+  }
+fi
+
+echo -e "${txtylw}Using GEMFILE: ${txtgrn}[${GEMFILE}]${clr}"
+echo -e "${txtylw}Installing Bundled Gems...${clr}"
+
+(
   cd .. || exit 2;
+  export BUNDLE_GEMFILE=${BUNDLE_GEMFILE:-"Gemfile"} ;
   bundle check || bundle install
 ) >/dev/null
 
+echo -e "${txtblu}Ensuring your dependencies are installed...${clr}"
+sleep 1
+
 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}"
 
+export BUNDLE_GEMFILE=$GEMFILE
+
 command="bundle exec puma -I ../lib -C $(pwd)/puma.rb -w 4"
 echo -e "${txtblu}Running Command:"
 echo -e "${txtgrn}${command}${clr}"
@@ -55,7 +68,15 @@ curl http://0.0.0.0:9292/ > "${output}" 2>/dev/null
   exit 3
 }
 
-echo -e "${txtgrn}Puma Daemon is running and returning the expected string.${clr}"
+echo -e "${txtblu}Currently Running Puma Processes:${txtcyn}"
+
+ps auxww | grep [p]uma
+
+echo
+echo -e "${txtgrn}┌─────────────────────────────────────────────────────────────────────────┐"
+echo -e "${txtgrn}│ Puma Daemon is UP in the CLUSTER/WORKERS mode & HTTP response is 200/OK │"
+echo -e "${txtgrn}└─────────────────────────────────────────────────────────────────────────┘${clr}"
+echo
+
 
-ps -ef | grep [p]uma
 

data/example/colors.sh

@@ -0,0 +1,11 @@
+
+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'
+

data/example/kill-puma.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+source colors.sh
+
+# Kill any process matching "puma" in the name
+declare -a pids
+pids=( $(ps -ef | grep [p]uma | grep -v puma: | grep -v kill-puma | grep -v grep | awk '{print $2}') )
+
+echo -e "${txtgrn}Currently running Puma Processes:${clr}"
+echo -e "${txtylw}"
+ps -ef | grep [p]uma | grep -v kill-puma
+echo -en "${clr}"
+if [[  -z ${pids[*]} ]] ; then
+  echo -e "${txtred}No puma processes were found, nothing to kill.${clr}"
+else
+  echo "Found the following pids matching Puma: [${pids[*]}]" 
+  echo "Let the killing commence..."
+  for pid in "${pids[@]}"; do
+    [[ -n $(ps -p $pid) ]] && {
+      echo "killing $pid..."
+      kill $pid 2>/dev/null
+    }
+  done
+  sleep 1
+  for pid in "${pids[@]}"; do
+    [[ -n $(ps -p $pid) ]] && {
+      echo "nuking $pid..."
+      kill -9 $pid 2>/dev/null
+    }
+  done
+fi
+

data/example/single.sh

@@ -1,14 +1,6 @@
 #!/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'
+source colors.sh
 
 [[ -f single.sh ]] || {
   echo -e "${txtred}Please run this from the ./example folder.${clr}"
@@ -23,7 +15,7 @@ export clr='\e[0;0m'
 
 echo -e "${txtblu}Ensuring your dependencies are installed...${clr}"
 
-( 
+(
   cd .. || exit 2;
   bundle check || bundle install
 ) >/dev/null
@@ -55,10 +47,15 @@ curl http://0.0.0.0:9292/ > "${output}" 2>/dev/null
   exit 3
 }
 
-echo -e "${txtgrn}Puma Daemon is running and returning the expected string.${clr}"
+echo -e "${txtblu} Currently Running Puma Processes:$clr"
 
-ps -ef | grep [p]uma
+ps auxww | grep [p]uma
 
 echo
+echo -e "${txtgrn}┌────────────────────────────────────────────────────────────────────────┐"
+echo -e "${txtgrn}│ Puma Daemon is UP in the Single Process mode & HTTP response is 200/OK │"
+echo -e "${txtgrn}└────────────────────────────────────────────────────────────────────────┘${clr}"
+echo
+
 
 

data/lib/puma/daemon/configuration.rb

@@ -5,7 +5,7 @@ module Puma
     module Configuration
       attr_reader :default_dsl, :file_dsl, :user_dsl
 
-      def puma_default_options
+      def puma_default_options(*args, **opts, &block)
         super.merge({ daemon: true })
       end
 

data/lib/puma/daemon/runner_adapter.rb

@@ -4,6 +4,7 @@ require_relative 'version'
 
 module Puma
   module Daemon
+    # noinspection RubySuperCallWithoutSuperclassInspection
     module RunnerAdapter
       class << self
         def included(base)
@@ -14,7 +15,7 @@ module Puma
 
           base.class_eval do
             def output_header(mode)
-              super(mode)
+              super
 
               daemonize! if daemon?
             end
@@ -35,10 +36,10 @@ module Puma
             end
 
             def log(str)
-              return if str =~ /Ctrl-C/
+              return if str.include?('Ctrl-C')
 
               begin
-                super(str)
+                super
               rescue StandardError
                 puts(str)
               end

data/lib/puma/daemon/version.rb

@@ -2,6 +2,6 @@
 
 module Puma
   module Daemon
-    VERSION = '0.3.2'
+    VERSION = '0.5.0'
   end
 end

data/puma-daemon.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |spec|
   spec.summary       = "Restore somewhat Puma's ability to self-daemonize, since Puma 5.0 dropped it"
   spec.description   = <<~DESCRIPTION
 
-    In version 5.0 the authors of the popular Ruby web server Puma chose to remove the 
+    In version 5.0 the authors of the popular Ruby web server Puma chose to remove the#{' '}
     daemonization support from Puma, because the code wasn't wall maintained,
     and because other and better options exist for production deployments. For example
-    systemd, Docker/Kubernetes, Heroku, etc. 
+    systemd, Docker/Kubernetes, Heroku, etc.#{' '}
 
     Having said that, it was neat and often useful to daemonize Puma in development.
     This gem adds this support to Puma 5 & 6 (hopefully) without breaking anything in Puma
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/kigster/puma-daemon'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/kigster/puma-daemon'
@@ -46,15 +46,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'puma', '>= 5.0'
   spec.add_dependency 'rack'
 
-  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'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'yard'
-
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
   spec.metadata['rubygems_mfa_required'] = 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma-daemon
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -38,118 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: asciidoctor
-  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: codecov
-  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: 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
-    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: rspec-its
-  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: rubocop
-  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: simplecov
-  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: yard
-  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'
 description: "\nIn version 5.0 the authors of the popular Ruby web server Puma chose
   to remove the \ndaemonization support from Puma, because the code wasn't wall maintained,\nand
   because other and better options exist for production deployments. For example\nsystemd,
@@ -166,6 +54,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".envrc"
+- ".github/workflows/license.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -175,7 +64,9 @@ files:
 - Dockerfile.build
 - Dockerfile.download
 - Gemfile.puma-v5
+- Gemfile.puma-v5.lock
 - Gemfile.puma-v6
+- Gemfile.puma-v6.lock
 - LICENSE.txt
 - Makefile
 - README.adoc
@@ -187,7 +78,9 @@ files:
 - config/puma_cluster.rb
 - config/puma_single.rb
 - example/cluster.sh
+- example/colors.sh
 - example/config.ru
+- example/kill-puma.sh
 - example/puma.rb
 - example/single.sh
 - exe/pumad
@@ -215,14 +108,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Restore somewhat Puma's ability to self-daemonize, since Puma 5.0 dropped