sam-shepherd 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f74445b9a25d5ab1038deeaa2b3ce215c657b3df4888ee6e01e2586919c189b
-  data.tar.gz: '04593b3b97f42e5d083aa5eea1d20624815083eee2eb2e079a6505b8d83d5889'
+  metadata.gz: 06abe7f1d5b6691e01a1df7433ae4ed8d9f2ec0e153c3fe82dfc558677c33fa7
+  data.tar.gz: 204385c6f7c60f1ce2c18b7a44d98af94fc52850f2770725ab0418eeb158fa86
 SHA512:
-  metadata.gz: 5dd1b4de7a1883409ed26e98f7156a1d761eb806e7a290540c8729cfda8916a972481e6c048bd715bf270c6d4bdb68bccc17c9e47cf0034538f9fc349e95b153
-  data.tar.gz: 286afdcf6ba6806752e879ab7798ad6c6e4a0bef0b87940bda672105a00cade3b1f7e24fafd099cac333027213661079cce2899933a13bf61950ac16417a02db
+  metadata.gz: 6b2b3ea89e0147e321dbe787e25ab4480dca6144c4de4fb1a5369d9272a950caffb4b36120191134fa2d0cae3b9cc796f4f81e128e3695ed12f5dbc7f665665e
+  data.tar.gz: edc6d81e4befc3090877d25157681c888095922aea8cc7dffd39fae8a1407a4cf7459c6fad83412a3fb3e07079ab43ccd03c220c747c10f8cf7a3d005c8fed45

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sam-shepherd (0.8.2)
+    sam-shepherd (0.9.0)
       hanami-cli (~> 0.2)
       tty-command (~> 0.7)
 
@@ -22,7 +22,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    backports (3.11.1)
+    backports (3.11.3)
     builder (3.2.3)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
@@ -46,7 +46,7 @@ GEM
       backports (>= 3.8.0)
       cucumber-tag_expressions (~> 1.1.0)
       gherkin (>= 5.0.0)
-    cucumber-expressions (5.0.14)
+    cucumber-expressions (5.0.17)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     descendants_tracker (0.0.4)
@@ -57,7 +57,7 @@ GEM
     equatable (0.5.0)
     erubis (2.7.0)
     ffi (1.9.23)
-    flay (2.10.0)
+    flay (2.11.0)
       erubis (~> 2.7.0)
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
@@ -114,7 +114,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.12.1)
-    parser (2.5.0.5)
+    parser (2.5.1.0)
       ast (~> 2.4.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
@@ -125,7 +125,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
-    puma (3.11.3)
+    puma (3.11.4)
     rack (2.0.4)
     rack-protection (2.0.1)
       rack
@@ -135,10 +135,10 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    reek (4.8.0)
+    reek (4.8.1)
       codeclimate-engine-rb (~> 0.4.0)
       parser (>= 2.5.0.0, < 2.6)
-      rainbow (~> 3.0)
+      rainbow (>= 2.0, < 4.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -152,7 +152,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.54.0)
+    rubocop (0.55.0)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -173,7 +173,7 @@ GEM
       ruby_parser (~> 3.8)
       tty-which (~> 0.3.0)
       virtus (~> 1.0)
-    sexp_processor (4.10.1)
+    sexp_processor (4.11.0)
     shellany (0.0.1)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -190,7 +190,7 @@ GEM
     tilt (2.0.8)
     transproc (1.0.2)
     tty-color (0.4.2)
-    tty-command (0.7.0)
+    tty-command (0.8.0)
       pastel (~> 0.7.0)
     tty-which (0.3.0)
     unicode-display_width (1.3.0)

data/README.md

@@ -1,8 +1,7 @@
 # Sam
 
 [![Maintainability](https://api.codeclimate.com/v1/badges/a8c24394996582c1b59f/maintainability)](https://codeclimate.com/github/VAGAScom/sam/maintainability)
-[![Gem Version](https://badge.fury.io/rb/sam.svg)](https://badge.fury.io/rb/sam)
-[![Build Status](https://travis-ci.org/VAGAScom/sam.svg?branch=master)](https://travis-ci.org/VAGAScom/sam)
+[![Gem Version](https://badge.fury.io/rb/sam-shepherd.svg)](https://badge.fury.io/rb/sam)
 [![Dependency Status](https://beta.gemnasium.com/badges/github.com/VAGAScom/sam.svg)](https://beta.gemnasium.com/projects/github.com/VAGAScom/sam)
 
 
@@ -29,13 +28,8 @@ Or install it yourself as:
 
 ## Usage
 
-**Sam** comes with the following commands:
+**Sam** is pretty straightforward and you can rely on its internal documentation. By invoking `sam` you can see the list of available commands. For a more in-depth help for each command, you can pass a `-h` flag to it, like this: `sam run -h`
 
-1. `unicorn start`: starts an  `unicorn` instance
-2. `unicorn stop`: stops an `unicorn` instance
-3. `unicorn monitor`: start a monitoring loop over the running `unicorn` instance. It will forward the signals `HUP, USR2, TERM, QUIT, TTIN, TTOU` to the `unicorn` instance. `HUP` will do an graceful reload of the application
-4. `unicorn reload`: reloads the `unicorn` instance by issuing a `USR2` followed by a `QUIT` signal a few seconds later
-5. `unicorn run`: starts and monitors an `unicorn` instance
 
 ## Development
 

data/lib/sam/cli.rb

@@ -1,42 +1,26 @@
 # frozen_string_literal: true
 
 require 'hanami/cli'
+require_relative 'servers'
 
 module Sam
   module CLI
     module Commands
       extend Hanami::CLI::Registry
 
-      require_relative 'cli/version'
+      require_relative 'commands/version'
+      require_relative 'commands/spawner'
+      require_relative 'commands/reaper'
+      require_relative 'commands/reloader'
+      require_relative 'commands/monitor'
+      require_relative 'commands/runner'
 
       register 'version', Version
-      begin
-        gem 'unicorn'
-        require_relative 'unicorn'
-        require_relative 'cli/unicorn'
-        register 'unicorn' do |cmd|
-          cmd.register 'start', Unicorn::Spawner
-          cmd.register 'stop', Unicorn::Reaper
-          cmd.register 'reload', Unicorn::Reloader
-          cmd.register 'monitor', Unicorn::Monitor
-          cmd.register 'run', Unicorn::Runner
-        end
-      rescue Gem::LoadError
-        warn 'Unicorn not found. Not loading unicorn commands'
-      end
-
-      begin
-        gem 'puma'
-        require_relative 'puma'
-        require_relative 'cli/puma'
-        register 'puma' do |cmd|
-          cmd.register 'start', Puma::Spawner
-          cmd.register 'stop', Puma::Reaper
-          # cmd.register 'stop', Puma::Reaper
-        end
-      rescue Gem::LoadError
-        warn 'Puma not found. Not loading puma commands'
-      end
+      register 'start', Spawner
+      register 'stop', Reaper
+      register 'reload', Reloader
+      register 'monitor', Monitor
+      register 'run', Runner
     end
   end
 end

data/lib/sam/commands/monitor.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Sam
+  module CLI
+    module Commands
+      class Monitor < Hanami::CLI::Command
+        desc 'Monitor an already running server'
+
+        # rubocop:disable Metrics/LineLength
+        argument :server, required: true, values: %w[unicorn puma], desc: 'The application server to be started'
+        argument :config, required: true, desc: 'The path to the server configuration file'
+
+        option :timeout, aliases: ['-t'], default: 10, desc: 'The amount of time waiting for the server  process to fork new workers'
+
+        example [
+          'unicorn config/server_settings.rb  #Starts the server in production mode using the config/server_settings.rb config file'
+        ]
+        # rubocop:enable Metrics/LineLength
+
+        def call(server:, config:, timeout:)
+          path = Pathname.new(Dir.pwd).join(config)
+          Sam::Servers::Shepherd.new.call(server: server, config: path, timeout: timeout)
+        rescue Errors::ProcessNotFound
+          warn "#{server} exited"
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/sam/commands/reaper.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Sam
+  module CLI
+    module Commands
+      class Reaper < Hanami::CLI::Command
+        # rubocop:disable Metrics/LineLength
+        desc 'Stops the server process'
+        argument :server, required: true, values: %w[unicorn puma], desc: 'The application server to be started'
+        argument :config, required: true, desc: 'The path to the server configuration file'
+
+        example [
+          'puma config/puma/development.rb # Stops the server in production mode using the config/puma/development.rb config file'
+        ]
+        # rubocop:enable Metrics/LineLength
+
+        def call(server:, config:)
+          exit 1 unless server_found(server)
+          path = Pathname.new(Dir.pwd).join(config)
+          result = Sam::Servers::Predator.new.call(server: server, config: path)
+          warn "Hunted one #{server} with pid #{result}"
+        rescue Errors::PidfileNotFound
+          warn "No running #{server}s found"
+          exit 1
+        rescue Errors::ConfigfileNotFound => ex
+          warn ex.message
+          exit 1
+        end
+
+        private
+
+        def server_found(server)
+          gem server
+        rescue Gem::LoadError
+          warn "#{server} not found. Make sure it's in your Gemfile"
+          false
+        end
+      end
+    end
+  end
+end

data/lib/sam/commands/reloader.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Sam
+  module CLI
+    module Commands
+      class Reloader < Hanami::CLI::Command
+        desc 'Reloads the code on a running server'
+
+        # rubocop:disable Metrics/LineLength
+        argument :server, required: true, values: %w[unicorn puma], desc: 'The application server to be started'
+        argument :config, required: true, desc: 'The path to the server configuration file'
+
+        option :timeout, aliases: ['-t'], default: 10, desc: 'The amount of time waiting for the server  process to fork new workers'
+
+        example [
+          'puma config/server_settings.rb      # Starts the server in test mode using the config/server_settings.rb config file',
+          'unicorn config/server_settings.rb   # Starts the server in production mode using the config/server_settings.rb config file'
+        ]
+        # rubocop:enable Metrics/LineLength
+
+        def call(server:, config:, timeout:)
+          path = Pathname.new(Dir.pwd).join(config)
+          Sam::Servers::Cloner.new.call(server: server, config: path, timeout: timeout)
+        rescue Errors::ProcessNotFound
+          warn "No running #{server}s found"
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/sam/commands/runner.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Sam
+  module CLI
+    module Commands
+      class Runner < Hanami::CLI::Command
+        desc 'Starts and monitor an already running server'
+        # rubocop:disable Metrics/LineLength
+        argument :server, required: true, values: %w[unicorn puma], desc: 'The application server to be started'
+        argument :config, required: true, desc: 'The path to the server configuration file'
+
+        option :env, values: %w[production development test staging], default: 'production', desc: 'RACK_ENV to be used', aliases: ['-e']
+        option :timeout, aliases: ['-t'], default: 10, desc: 'The amount of time waiting for the server  process to fork new workers'
+
+        example [
+          'puma config/server_settings.rb -e test # Starts and monitors the server in test mode using the config/server_settings.rb config file',
+          'unicorn config/server_settings.rb  #Starts and monitors the server in production mode using the config/server_settings.rb config file'
+        ]
+        # rubocop:enable Metrics/LineLength
+
+        def call(server:, config:, env:, timeout:)
+          Sam::Servers::Breeder.new.call(server: server, config: config, env: env)
+          Sam::Servers::Monitor.new.call(server: server, config: config, timeout: timeout)
+        rescue Sam::Errors::ProcessNotFound
+          warn "#{server} exited"
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/sam/commands/spawner.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'hanami/cli'
+
+module Sam
+  module CLI
+    module Commands
+      class Spawner < Hanami::CLI::Command
+        desc 'Starts the server'
+
+        # rubocop:disable Metrics/LineLength
+        argument :server, required: true, values: %w[unicorn puma], desc: 'The application server to be started'
+        argument :config, required: true, desc: 'The path to the server configuration file'
+
+        option :env, values: %w[production development test staging], default: 'production', desc: 'RACK_ENV to be used', aliases: ['-e']
+
+        example [
+          'puma config/server_settings.rb -e test # Starts the server in test mode using the config/server_settings.rb config file',
+          'unicorn config/server_settings.rb      # Starts the server in production mode using the config/server_settings.rb config file'
+        ]
+        # rubocop:enable Metrics/LineLength
+
+        def call(server:, config:, env:)
+          path_to_config = Pathname.new(Dir.pwd).join(config)
+          Sam::Servers::Breeder.new.call(server: server, config: path_to_config, env: env)
+        end
+      end
+    end
+  end
+end

data/lib/sam/servers.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+begin
+  gem 'unicorn'
+  require 'unicorn'
+  require_relative 'servers/unicorn/identifier'
+rescue Gem::LoadError
+  warn 'unicorn unavailable'
+end
+
+begin
+  gem 'puma'
+  require 'puma/cli'
+  require_relative 'servers/puma/identifier'
+rescue Gem::LoadError
+  warn 'puma unavailable'
+end
+
+module Sam
+  module Servers
+    PUMA_PID = ->(config) { Sam::Puma::Identifier.new.call(config) }
+    UNICORN_PID = ->(config) { Sam::Unicorn::Identifier.new.call(config) }
+  end
+end
+
+require_relative 'servers/breeder'
+require_relative 'servers/cloner'
+require_relative 'servers/predator'
+require_relative 'servers/shepherd'

data/lib/sam/servers/breeder.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'tty-command'
+
+module Sam
+  module Servers
+    class Breeder
+      UNICORN = 'bundle exec unicorn -D -c ${CONF_PATH} -E ${RACK_ENV}'
+      PUMA = 'bundle exec puma -C ${CONF_PATH} -e ${RACK_ENV}'
+
+      def initialize
+        @cmd = TTY::Command.new(timeout: 120, printer: :quiet)
+      end
+
+      def call(server:, config:, env: 'production')
+        cmdline = self.class.const_get(server.upcase)
+        @cmd.run(cmdline, env: { CONF_PATH: config, RACK_ENV: env })
+      end
+    end
+  end
+end

data/lib/sam/servers/cloner.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Sam
+  module Servers
+    class Cloner
+      PUMA_PID = ->(config) { Sam::Puma::Identifier.new.call(config) }
+      UNICORN_PID = ->(config) { Sam::Unicorn::Identifier.new.call(config) }
+
+      UNICORN_STRATEGY = lambda do |config, timeout = 10|
+        pid = UNICORN_PID.call(config)
+        Process.kill('USR2', pid)
+        sleep timeout
+        newpid = UNICORN_PID.call(config)
+        Process.kill('QUIT', pid)
+        newpid
+      end
+
+      PUMA_STRATEGY = lambda do |config, _timeout|
+        settings = (::Puma::Configuration.new({}) { |conf| conf.load config.to_s }).load
+        Process.kill(settings.file_options[:preload_app] ? 'USR1' : 'USR2', PUMA_PID.call(config))
+      end
+
+      def call(server:, config:, timeout: 10)
+        restart_strategy(server, config, timeout)
+      end
+
+      private
+
+      def restart_strategy(server, config, timeout)
+        self.class.const_get("#{server.upcase}_STRATEGY").call(config, timeout)
+      end
+    end
+  end
+end

data/lib/sam/servers/predator.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Sam
+  module Servers
+    class Predator
+      PUMA_PID = ->(config) { Sam::Puma::Identifier.new.call(config) }
+      UNICORN_PID = ->(config) { Sam::Unicorn::Identifier.new.call(config) }
+
+      def call(server:, config:)
+        @server = server
+        @config = config
+        Process.kill(signal, pid) && pid
+      end
+
+      private
+
+      def signal
+        @server == 'unicorn' ? 'QUIT' : 'INT'
+      end
+
+      def pid
+        @pid ||= self.class.const_get("#{@server.upcase}_PID").call(@config)
+      end
+    end
+  end
+end

data/lib/sam/{puma → servers/puma}/identifier.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'puma/cli'
-
 module Sam
   module Puma
     class Identifier

data/lib/sam/{puma → servers}/shepherd.rb

@@ -1,30 +1,32 @@
 # frozen_string_literal: true
 
 module Sam
-  module Puma
+  module Servers
     class Shepherd
       def initialize
-        setup_signal_handlers
+        trap_signals
         @restarting = false
       end
 
-      def call(path, timeout: 10)
+      def call(server:, config:, timeout: 0.5)
+        @config = config
+        @server = server
         @timeout = timeout
-        @config ||= Pathname.new(Dir.pwd).join(path)
         loop do
-          alive?
-          sleep 1
+          Process.kill(0, pid)
+        rescue Errno::ESRCH
+          raise Errors::ProcessNotFound unless @restarting
         end
       end
 
       private
 
       def pid
-        @pid ||= Identifier.new.call(@config)
+        @pid ||= self.class.const_get("Sam::Servers::#{@server.upcase}_PID").call(@config)
       end
 
-      def setup_signal_handlers
-        trap('HUP') { reload_puma }
+      def trap_signals
+        trap('HUP') { reload_server }
         trap('QUIT') { forward_signal('QUIT') }
         trap('USR2') { forward_signal('USR2') }
         trap('TTOU') { forward_signal('TTOU') }
@@ -33,23 +35,17 @@ module Sam
         trap('INT') { forward_signal('INT') }
       end
 
-      def reload_puma
+      def reload_server
         @restarting = true
-        @pid = Cloner.new.call(@config, timeout: @timeout)
+        @pid = Cloner.new.call(server: @server, config: @config, timeout: @timeout)
         @restarting = false
       end
 
       def forward_signal(signal)
-        warn "Sending #{signal} to unicorn #{pid}"
         Process.kill(signal, pid)
       end
 
-      def alive?
-        return if @restarting
-        Process.kill(0, pid)
-      rescue Errno::ESRCH
-        raise Errors::ProcessNotFound
-      end
+      def heartbeat; end
     end
   end
 end

data/lib/sam/{unicorn → servers/unicorn}/identifier.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'unicorn'
-
 module Sam
   module Unicorn
     class Identifier

data/lib/sam/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sam
-  VERSION = '0.8.2'
+  VERSION = '0.9.0'
 end

data/sam.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  #if spec.respond_to?(:metadata)
+  # if spec.respond_to?(:metadata)
   #  spec.metadata['allowed_push_host'] = 'https://gemfury.org'
-  #else
+  # else
   #  raise 'RubyGems 2.0 or newer is required to protect against ' \
   #    'public gem pushes.'
-  #end
+  # end
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sam-shepherd
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - mereghost
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-cli
@@ -258,29 +258,20 @@ files:
 - exe/sam
 - lib/sam.rb
 - lib/sam/cli.rb
-- lib/sam/cli/puma.rb
-- lib/sam/cli/puma/monitor.rb
-- lib/sam/cli/puma/reaper.rb
-- lib/sam/cli/puma/spawner.rb
-- lib/sam/cli/unicorn.rb
-- lib/sam/cli/unicorn/monitor.rb
-- lib/sam/cli/unicorn/reaper.rb
-- lib/sam/cli/unicorn/reloader.rb
-- lib/sam/cli/unicorn/runner.rb
-- lib/sam/cli/unicorn/spawner.rb
-- lib/sam/cli/version.rb
+- lib/sam/commands/monitor.rb
+- lib/sam/commands/reaper.rb
+- lib/sam/commands/reloader.rb
+- lib/sam/commands/runner.rb
+- lib/sam/commands/spawner.rb
+- lib/sam/commands/version.rb
 - lib/sam/errors.rb
-- lib/sam/puma.rb
-- lib/sam/puma/breeder.rb
-- lib/sam/puma/identifier.rb
-- lib/sam/puma/predator.rb
-- lib/sam/puma/shepherd.rb
-- lib/sam/unicorn.rb
-- lib/sam/unicorn/breeder.rb
-- lib/sam/unicorn/cloner.rb
-- lib/sam/unicorn/identifier.rb
-- lib/sam/unicorn/predator.rb
-- lib/sam/unicorn/shepherd.rb
+- lib/sam/servers.rb
+- lib/sam/servers/breeder.rb
+- lib/sam/servers/cloner.rb
+- lib/sam/servers/predator.rb
+- lib/sam/servers/puma/identifier.rb
+- lib/sam/servers/shepherd.rb
+- lib/sam/servers/unicorn/identifier.rb
 - lib/sam/version.rb
 - sam.gemspec
 homepage: https://github.com/vagas/sam

data/lib/sam/cli/puma.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'puma/spawner'
-require_relative 'puma/reaper'

data/lib/sam/cli/puma/monitor.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module CLI
-    module Commands
-      module Puma
-        class Monitor < Hanami::CLI::Command
-          # rubocop:disable Metrics/LineLength
-          desc 'Monitor an already running unicorn'
-          option :config, type: :path, desc: 'The path to the server configuration', default: 'config/unicorn/production.rb', aliases: ['-c']
-          option :timeout, type: :integer, desc: 'The number of seconds to wait for starting the unicorn server', aliases: ['-t']
-          example [
-            '--config=config/server_settings.rb  #Starts the server in production mode using the config/server_settings.rb config file'
-          ]
-          # rubocop:enable Metrics/LineLength
-
-          def call(config:)
-            path = Pathname.new(Dir.pwd).join(config)
-            Sam::Puma::Shepherd.new.call(path)
-          rescue Errors::ProcessNotFound
-            warn 'Puma exited'
-            exit 1
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sam/cli/puma/reaper.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module CLI
-    module Commands
-      module Puma
-        class Reaper < Hanami::CLI::Command
-          NO_MORE_PUMAS = 'Pumas are extinct =('
-
-          # rubocop:disable Metrics/LineLength
-          desc 'Stops the puma process'
-          option :config, type: :path, desc: 'The path to the server configuration', default: 'config/unicorn/production.rb', aliases: ['-c']
-
-          example [
-            '-config config/server_settings.rb  Stops the server in production mode using the config/server_settings.rb config file'
-          ]
-          # rubocop:enable Metrics/LineLength
-
-          def call(config:)
-            path = Pathname.new(Dir.pwd).join(config)
-            result = Sam::Puma::Predator.new.call(path)
-            warn "Hunted a puma with pid #{result}"
-          rescue Errors::PidfileNotFound
-            warn NO_MORE_PUMAS
-            exit 1
-          rescue Errors::ConfigfileNotFound => ex
-            warn ex.message
-            exit 1
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sam/cli/puma/spawner.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module CLI
-    module Commands
-      module Puma
-        class Spawner < Hanami::CLI::Command
-          # rubocop:disable Metrics/LineLength
-          desc 'Start the puma process'
-
-          option :environment, values: %w[production development test staging], default: 'production', desc: 'RACK_ENV to be used', aliases: %w[--env -e]
-          option :config, type: :path, desc: 'The path to the server configuration', default: 'config/puma/production.rb', aliases: ['-c']
-
-          example [
-            '-e development  #Starts the server in development mode',
-            '-e production --config=config/server_settings.rb  #Starts the server in production mode using the config/server_settings.rb config file'
-          ]
-          # rubocop:enable Metrics/LineLength
-
-          def call(environment:, config:)
-            config = Pathname.new(Dir.pwd).join(config)
-            Sam::Puma::Breeder.new.call(environment, config)
-            warn "We have a newborn puma for environment #{environment} and configuration file: #{config}"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sam/cli/unicorn.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'unicorn/monitor'
-require_relative 'unicorn/reaper'
-require_relative 'unicorn/reloader'
-require_relative 'unicorn/spawner'
-require_relative 'unicorn/runner'
-
-# Upstart reload sends SIGHUP to the process
-# Systemd expects an ExecReload= that syncronously reloads the confs.

data/lib/sam/cli/unicorn/monitor.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module CLI
-    module Commands
-      module Unicorn
-        class Monitor < Hanami::CLI::Command
-          # rubocop:disable Metrics/LineLength
-          desc 'Monitor an already running unicorn'
-          option :config, type: :path, desc: 'The path to the server configuration', default: 'config/unicorn/production.rb', aliases: ['-c']
-          option :timeout, type: :integer, desc: 'The number of seconds to wait for starting the unicorn server', aliases: ['-t']
-          example [
-            '--config=config/server_settings.rb  #Starts the server in production mode using the config/server_settings.rb config file'
-          ]
-          # rubocop:enable Metrics/LineLength
-
-          def call(config:)
-            path = Pathname.new(Dir.pwd).join(config)
-            Sam::Unicorn::Shepherd.new.call(path)
-          rescue Errors::ProcessNotFound
-            warn 'Unicorn exited'
-            exit 1
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sam/cli/unicorn/reaper.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module CLI
-    module Commands
-      module Unicorn
-        class Reaper < Hanami::CLI::Command
-          NO_MORE_UNICORNS = 'Unicorns are already extinct'
-
-          # rubocop:disable Metrics/LineLength
-          desc 'Stops the unicorn process'
-          option :config, type: :path, desc: 'The path to the server configuration', default: 'config/unicorn/production.rb', aliases: ['-c']
-
-          example [
-            '-config config/server_settings.rb  Stops the server in production mode using the config/server_settings.rb config file'
-          ]
-          # rubocop:enable Metrics/LineLength
-
-          def call(config:)
-            path = Pathname.new(Dir.pwd).join(config)
-            result = Sam::Unicorn::Predator.new.call(path)
-            warn "Hunted unicorn with pid #{result}"
-          rescue Errors::PidfileNotFound
-            warn NO_MORE_UNICORNS
-            exit 1
-          rescue Errors::ConfigfileNotFound => ex
-            warn ex.message
-            exit 1
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sam/cli/unicorn/reloader.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module CLI
-    module Commands
-      module Unicorn
-        class Reloader < Hanami::CLI::Command
-          # rubocop:disable Metrics/LineLength
-          desc 'Reloads the unicorn configuration'
-          option :config, type: :path, desc: 'The path to the server configuration', default: 'config/unicorn/production.rb', aliases: ['-c']
-
-          example [
-            '--config=config/server_settings.rb  #Starts the server in production mode using the config/server_settings.rb config file'
-          ]
-          # rubocop:enable Metrics/LineLength
-
-          def call(config)
-            path = Pathname.new(Dir.pwd).join(config)
-            Sam::Unicorn::Cloner.new.call(path)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sam/cli/unicorn/runner.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module CLI
-    module Commands
-      module Unicorn
-        class Runner < Hanami::CLI::Command
-          # rubocop:disable Metrics/LineLength
-          desc 'Monitor an already running unicorn'
-          option :config, type: :path, desc: 'The path to the server configuration', default: 'config/unicorn/production.rb', aliases: ['-c']
-          option :environment, values: %w[production development test staging], default: 'production', desc: 'RACK_ENV to be used', aliases: %w[--env -e]
-          option :timeout, type: :integer, desc: 'The number of seconds to wait for starting the unicorn server', default: 5, aliases: ['-t']
-          example [
-            '--config=config/server_settings.rb  #Starts the server in production mode using the config/server_settings.rb config file',
-            '-t 20 # Waits for 20 seconds for the master process to fork',
-            '-e production --config=config/server_settings.rb  #Starts the server in production mode using the config/server_settings.rb config file'
-
-          ]
-          # rubocop:enable Metrics/LineLength
-
-          def call(config:, environment:, timeout:)
-            path = Pathname.new(Dir.pwd).join(config)
-            Sam::Unicorn::Breeder.new.call(environment, path)
-            Sam::Unicorn::Shepherd.new.call(path, timeout: Integer(timeout))
-          rescue Errors::ProcessNotFound
-            warn 'Unicorn seems dead.'
-            exit 1
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sam/cli/unicorn/spawner.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module CLI
-    module Commands
-      module Unicorn
-        class Spawner < Hanami::CLI::Command
-          # rubocop:disable Metrics/LineLength
-          desc 'Start the unicorn process'
-
-          option :environment, values: %w[production development test staging], default: 'production', desc: 'RACK_ENV to be used', aliases: %w[--env -e]
-          option :config, type: :path, desc: 'The path to the server configuration', default: 'config/unicorn/production.rb', aliases: ['-c']
-
-          example [
-            '-e development  #Starts the server in development mode',
-            '-e production --config=config/server_settings.rb  #Starts the server in production mode using the config/server_settings.rb config file'
-          ]
-          # rubocop:enable Metrics/LineLength
-
-          def call(environment:, config:)
-            config = Pathname.new(Dir.pwd).join(config)
-            Sam::Unicorn::Breeder.new.call(environment, config)
-            warn "We have a newborn unicorn for environment #{environment} and configuration file: #{config}"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sam/puma.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'puma/identifier'
-require_relative 'puma/breeder'
-require_relative 'puma/predator'
-require_relative 'puma/shepherd'

data/lib/sam/puma/breeder.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'tty-command'
-
-module Sam
-  module Puma
-    class Breeder
-      COMMAND = 'bundle exec puma -C ${CONF_PATH} -e ${RACK_ENV}'
-
-      def call(env, config)
-        cmd = TTY::Command.new(timeout: 120)
-        cmd.run(COMMAND, env: { CONF_PATH: config, RACK_ENV: env })
-      end
-    end
-  end
-end

data/lib/sam/puma/predator.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module Puma
-    class Predator
-      def call(config)
-        pid = Sam::Puma::Identifier.new.call(config)
-        Process.kill('INT', pid) && pid
-      end
-    end
-  end
-end

data/lib/sam/unicorn.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'unicorn/identifier'
-require_relative 'unicorn/breeder'
-require_relative 'unicorn/predator'
-require_relative 'unicorn/cloner'
-require_relative 'unicorn/shepherd'

data/lib/sam/unicorn/breeder.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'tty-command'
-
-module Sam
-  module Unicorn
-    class Breeder
-      COMMAND = 'bundle exec unicorn -D -c ${CONF_PATH} -E ${RACK_ENV}'
-
-      def call(env, config)
-        cmd = TTY::Command.new(timeout: 120)
-        cmd.run(COMMAND, env: { CONF_PATH: config, RACK_ENV: env })
-      end
-    end
-  end
-end

data/lib/sam/unicorn/cloner.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module Unicorn
-    class Cloner
-      def call(config, timeout: 10)
-        pid = Identifier.new.call(config)
-        # warn "Cloning unicorn tagged #{pid}"
-        Process.kill('USR2', pid)
-        # warn "Waiting #{timeout} seconds for clone process to conclude..."
-        sleep timeout
-        newpid = Identifier.new.call(config)
-        # warn "New unicorn cloned with tag #{newpid}. Reaping it's predecessor..."
-        Process.kill('QUIT', pid)
-        newpid
-        # warn 'No one suspects a thing.'
-      rescue Errno::ESRCH
-        raise Errors::ProcessNotFound, "No process with PID #{pid} found"
-      end
-    end
-  end
-end

data/lib/sam/unicorn/predator.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module Unicorn
-    class Predator
-      def call(config)
-        pid = Sam::Unicorn::Identifier.new.call(config)
-        Process.kill('QUIT', pid) && pid
-      end
-    end
-  end
-end

data/lib/sam/unicorn/shepherd.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-module Sam
-  module Unicorn
-    class Shepherd
-      def initialize
-        setup_signal_handlers
-        @restarting = false
-      end
-
-      def call(path, timeout: 10)
-        @timeout = timeout
-        @config ||= Pathname.new(Dir.pwd).join(path)
-        loop do
-          alive?
-          sleep 1
-        end
-      end
-
-      private
-
-      def pid
-        @pid ||= Identifier.new.call(@config)
-      end
-
-      def setup_signal_handlers
-        trap('HUP') { reload_unicorn }
-        trap('QUIT') { forward_signal('QUIT') }
-        trap('USR2') { forward_signal('USR2') }
-        trap('TTOU') { forward_signal('TTOU') }
-        trap('TTIN') { forward_signal('TTIN') }
-        trap('TERM') { forward_signal('QUIT') }
-        trap('INT') { forward_signal('INT') }
-      end
-
-      def reload_unicorn
-        @restarting = true
-        @pid = Cloner.new.call(@config, timeout: @timeout)
-        @restarting = false
-      end
-
-      def forward_signal(signal)
-        warn "Sending #{signal} to unicorn #{pid}"
-        Process.kill(signal, pid)
-      end
-
-      def alive?
-        return if @restarting
-        Process.kill(0, pid)
-      rescue Errno::ESRCH
-        raise Errors::ProcessNotFound
-      end
-    end
-  end
-end