flame_server_toys 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f45aba613713cf69e1168a2ee6dac2391d22f034f707ac8651445d284c37c6a
-  data.tar.gz: e379aac82ee993b8469031b147ba217f83bd3d92f85eba7608c4e8bf53a6dcea
+  metadata.gz: 7430614acb1e7abe6a1f8bcaa9c7e281ba077a3cb0288db3ce559f8021100edf
+  data.tar.gz: fda0da85de411f6aed5df4d19289d0bdf3d8047500c776ee0ef8b94f69a16cf5
 SHA512:
-  metadata.gz: 02ca275f76b08a1a388a8e1e14bcf25ac0508dde5978fe5744229e8f5e340bb9d42716fb0fa6cf52031b99785335546f5e6cdafb942b739eb74b9fc8e143838e
-  data.tar.gz: 779be44bf684f2351ecbc1e4a59ab9dc7bcfdd05b9599dd2af43e402ba84c5d97bba6b04dc7f6bf7a822a45f67e0cb270840e45092937494801343f338f97222
+  metadata.gz: 6829b8e3cdfd47b6230e40fc4faca0cb396f228405c95a9ba2f95f683922f81155ac6e6481b8d7301f68ab89483940524f8046d83366e6d805e7c483d58fa5c1
+  data.tar.gz: b8160d1cd665669a22e7a8bdf8d007d113eeab6c73af839b257b3f66f098272642f3d1f33656f2eed47d2f9588381727e846e4656d78c0a7a43d46626c99e810

data/CHANGELOG.md

@@ -2,8 +2,12 @@
 
 ## master (unreleased)
 
+## 0.3.0 (2020-12-02)
+
 ## 0.2.2 (2020-09-23)
 
+*   Fix `status` command.
+
 ## 0.2.1 (2020-08-24)
 
 *   Fix system calls.

data/README.md

@@ -45,7 +45,8 @@ expand FlameServerToys::Template,
 ```
 
 On `start` and `restart` commands in `development` environment there will be spawned
-[Filewatchers](https://github.com/filewatcher/filewatcher) from `filewatcher.yaml` file.
+`Filewatcher`s from `filewatcher.yaml` file
+via [`filewatcher-matrix`](https://github.com/filewatcher/filewatcher-matrix).
 
 ## Development
 

data/lib/flame_server_toys/template/_base.rb

@@ -3,8 +3,6 @@
 require 'memery'
 require 'yaml'
 
-require_relative '_pids_file'
-
 module FlameServerToys
 	class Template
 		## Base class for toys
@@ -33,11 +31,6 @@ module FlameServerToys
 					super sh_command(command), **options
 				end
 
-				def sh_spawn(command, print: true)
-					puts "spawn #{command}" if print
-					spawn sh_command(command), pgroup: true
-				end
-
 				def sh_command(command)
 					require 'shellwords'
 
@@ -51,11 +44,6 @@ module FlameServerToys
 					sh "#{context_directory}/exe/setup/ruby.sh"
 					sh("#{context_directory}/exe/setup/node.sh") if %i[start restart].include?(command)
 
-					if %i[stop restart].include?(command)
-						filewatcher_pids_file = pids_file_class.new(:filewatcher)
-						filewatcher_pids_file.kill_each.delete
-					end
-
 					web_server(command)
 				end
 
@@ -77,29 +65,15 @@ module FlameServerToys
 					spawn_development_filewatchers
 
 					puma_command File.exist?(@config[:server][:puma_pid_file]) ? 'restart' : 'start'
-				rescue SystemExit, Interrupt => e
-					pids_file_class.new(:filewatcher).kill_each.delete
-
-					raise e
 				end
 
 				def spawn_development_filewatchers
-					development_filewatchers =
-						YAML.load_file("#{context_directory}/filewatchers.yaml").map do |args|
-							filewatcher_command args[:pattern], args[:command], exclude: args[:exclude]
-						end
-
-					filewatcher_pids = development_filewatchers.map { |command| sh_spawn command }
+					require 'filewatcher/matrix'
 
-					pids_file_class.new(:filewatcher, filewatcher_pids).dump
-				end
-
-				def filewatcher_command(pattern, execute, exclude: nil)
-					## Don't use `bundle exec`, it's already required by `toys`
-					## https://github.com/dazuma/toys/issues/65
-					<<-CMD.split.join(' ')
-						filewatcher #{"--exclude '#{exclude}'" unless exclude.nil?} '#{pattern}' '#{execute}'
-					CMD
+					Thread.new do
+						matrix = Filewatcher::Matrix.new("#{context_directory}/filewatchers.yaml")
+						matrix.start
+					end
 				end
 
 				def waiting_mailing_lock
@@ -109,15 +83,6 @@ module FlameServerToys
 						sleep 1
 					end
 				end
-
-				memoize def pids_file_class
-					subclass = Class.new(PidsFile)
-					pids_dir = @config[:pids_dir]
-					subclass.class_exec do
-						self.pids_dir = pids_dir
-					end
-					subclass
-				end
 			end
 		end
 	end

data/lib/flame_server_toys/template/status.rb

@@ -9,10 +9,6 @@ module FlameServerToys
 					to_run do
 						@config = template.config
 
-						puts
-						puts 'Filewatcher:'
-						puts
-						ps_with_grep '[f]ilewatcher'
 						puts
 						puts 'Puma:'
 						puts

data/lib/flame_server_toys/template/stop.rb

@@ -10,8 +10,6 @@ module FlameServerToys
 						@config = template.config
 
 						server :stop
-
-						pids_file_class.new(:filewatcher).kill_each.delete
 					end
 				end
 			end

data/lib/flame_server_toys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlameServerToys
-	VERSION = '0.2.2'
+	VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flame_server_toys
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexander Popov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alt_memery
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: filewatcher-cli
+  name: filewatcher-matrix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: gorilla_patch
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: toys
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: 'Toys for Flame web application server management, like start, stop,
   restart, etc.
 
@@ -222,7 +222,6 @@ files:
 - lib/flame_server_toys.rb
 - lib/flame_server_toys/template.rb
 - lib/flame_server_toys/template/_base.rb
-- lib/flame_server_toys/template/_pids_file.rb
 - lib/flame_server_toys/template/monitor.rb
 - lib/flame_server_toys/template/phased_restart.rb
 - lib/flame_server_toys/template/restart.rb
@@ -252,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Toys for Flame web application server management

data/lib/flame_server_toys/template/_pids_file.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'English'
-require 'fileutils'
-
-module FlameServerToys
-	class Template
-		## Class for pids files
-		class PidsFile
-			class << self
-				## It will be set in the Base template from received config
-				attr_accessor :pids_dir
-			end
-
-			def initialize(name, *pids)
-				@file = File.join self.class.pids_dir, "#{name}.pids"
-				@pids = pids.any? ? pids : read
-			end
-
-			def dump(pids = @pids)
-				FileUtils.mkdir_p self.class.pids_dir
-				puts "PidsFile dump : #{pids} => #{@file}"
-				File.write @file, pids.join($RS)
-			end
-
-			def read
-				return unless File.exist?(@file)
-
-				@pids = File.read(@file).split($RS).map(&:to_i)
-				puts "PidsFile read : #{@pids}"
-				@pids
-			end
-
-			def kill_each(pids = @pids)
-				Array(pids).each do |pid|
-					puts "PidsFile kill : #{pid}"
-					Process.kill('TERM', -Process.getpgid(pid))
-				rescue Errno::ESRCH
-					puts "Process #{pid} doesn't exist"
-				end
-				self
-			end
-
-			def delete
-				return unless File.exist?(@file)
-
-				File.delete @file
-			end
-		end
-
-		private_constant :PidsFile
-	end
-end