firefly_server 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb5687fb5987282aabd7bef45c9e809f4c441073
-  data.tar.gz: ea78cfbefe2a30a37dab8e6d6453e2a7749c6f50
+SHA256:
+  metadata.gz: 405b9ef168240c98cbff1894205a76cb8ee7e9c71d6f670cab90680d7d55b55d
+  data.tar.gz: c0c0c513a8509b4081a22ff3e9144020dcb82db8ee6ed0d2dee13d64f0ef5fb4
 SHA512:
-  metadata.gz: 9afd135d1650259ad139cd162dc9b04b73824aa530b227ec0034e5c856a8167c8d8a09e3260c4e77493a7571434c8dfa348868270c891987eecf2a2eec0a979d
-  data.tar.gz: bdaa9c8cb516ab2324562103150d040a188c7c5baf29f824d2d5e3c71a2cdbab366068f77f6cd58e257dd577382e139732246c941fb187479e06de2b08796ff8
+  metadata.gz: 2379994efd9b6f2cb58d63730273de356e5899b5dabedd84a6f863566032dd4cb58ef7bb533e55b932a1e2e4684404d153ba8c97ee9d8d7d84867eb08cbab752
+  data.tar.gz: 50598ea448729dbd8b119ea436382a87ace73bd95e93dd089d03e8f8d499a582b61dbee95c721f33dd85d74eb56672f7f532942a1fc5c6fa4c7a43e5041ee0bf

data/firefly_server.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   # custom
   spec.add_runtime_dependency("listen", "~> 3.1")
   # defaults
-  spec.add_development_dependency("bundler", "~> 1.15")
+  spec.add_development_dependency("bundler", "~> 2.0")
   spec.add_development_dependency("rake", "~> 10.0")
   spec.add_development_dependency("minitest", "~> 5.0")
 end

data/lib/firefly_server.rb

@@ -15,13 +15,38 @@ class FireflyServer
     self
   end
 
+  def process_exists?(pid)
+    Process.kill(0, pid)
+    true
+  rescue Errno::ESRCH
+    false
+  end
+
   def start!
+    server_pid = nil
     configuration.validate!
     # stop server if it is running
     %x(#{configuration.stop_server})
     # trap signals and exit
     configuration.exit_signals.each do |signal|
       Signal.trap(signal) do
+        # attempt to stop server
+        if server_pid && process_exists?(server_pid)
+          puts "Stopping Server: #{configuration.stop_server}"
+          %x(#{configuration.stop_server})
+          # give server a moment to exit
+          begin
+            Timeout.timeout(2) do
+              Process.wait(server_pid)
+            end
+          rescue Timeout::Error
+          end
+        end
+        # reset shell in case of server crash messing with prompt (common byebug problem)
+        if server_pid && process_exists?(server_pid)
+          %x{reset}
+          puts 'Server Stop Failed: Shell was "reset" to ensure access after possible crash'
+        end
         puts "\rStopping Firefly Server"
         exit 130
       end

data/lib/firefly_server/version.rb

@@ -1,3 +1,3 @@
 class FireflyServer
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firefly_server
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Griffith Chaffee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Restarts a web server when watched files or directories are changed.