foreverb 0.2.5 → 0.2.6

data/CHANGES.md

@@ -1,3 +1,14 @@
+# Version 0.2.6 - August 27, 2011
+
+* Added back support for update the daemon config
+* Improved a bit our outputs showing the daemon name
+
+# Version 0.2.5 - August 26, 2011
+
+* Moved stop to kill
+* Added a new stop method that wait until workers are idle
+* Improved a bit outputs
+
 # Version 0.2.4 - July 25, 2011
 
 * Ruby 1.9.2 compatibility
@@ -13,4 +24,4 @@
 * Added `restart` CLI command
 * Added `tail` CLI command
 * Added `update` CLI command (useful to update daemons config)
-* Improved documentation (aka the readme)
+* Improved documentation (aka the readme)

data/Rakefile

@@ -10,9 +10,12 @@ end
 
 desc "Bump version on github"
 task :bump do
-  puts "\e[31mNothing to commit (working directory clean)\e[0m" and return if `git status -s`.strip == ""
-  version  = Bundler.load_gemspec(Dir[File.expand_path('../*.gemspec', __FILE__)].first).version
-  sh "git add .; git commit -a -m \"Bump to version #{version}\""
+  if `git status -s`.strip == ""
+    puts "\e[31mNothing to commit (working directory clean)\e[0m"
+  else
+    version  = Bundler.load_gemspec(Dir[File.expand_path('../*.gemspec', __FILE__)].first).version
+    sh "git add .; git commit -a -m \"Bump to version #{version}\""
+  end
 end
 
 task :release => :bump

data/bin/foreverb

@@ -99,7 +99,7 @@ class CLI < Thor
     return if match.empty?
     FileUtils.rm_rf(FOREVER_PATH)
     match.each do |conf|
-      system(conf[:file], 'up') if options.yes || yes?("Do you want really update config from \e[1m#{conf[:file]}\e[0m?")
+      system(conf[:file], 'update') if options.yes || yes?("Do you want really update config from \e[1m#{conf[:file]}\e[0m?")
     end
   end
 

data/lib/forever/base.rb

@@ -28,9 +28,12 @@ module Forever
         when 'kill'
           stop!
           exit
-        when 'help', '-h'
-          print <<-RUBY.gsub(/ {10}/,'') % File.basename(file)
-            Usage: \e[1m./%s\e[0m [start|stop|kill|restart|config]
+        when 'update'
+          print "[\e[90m%s\e[0m] Config written in \e[1m%s\e[0m\n" % [name, FOREVER_PATH]
+          exit
+        else
+          print <<-RUBY.gsub(/ {10}/,'') % name
+            Usage: \e[1m./%s\e[0m [start|stop|kill|restart|config|update]
 
             Commands:
 
@@ -39,6 +42,7 @@ module Forever
               restart    same as start
               kill       force stop by sending a KILL signal to the process
               config     show the current daemons config
+              update     update the daemon config
 
           RUBY
           exit
@@ -46,7 +50,7 @@ module Forever
 
       fork do
         $0 = "Forever: #{$0}"
-        print "=> Process demonized with pid \e[1m#{Process.pid}\e[0m with Forever v.#{Forever::VERSION}\n"
+        print "[\e[90m%s\e[0m] Process demonized with pid \e[1m%d\e[0m with Forever v.%s\n" % [name, Process.pid, Forever::VERSION]
 
         %w(INT TERM KILL).each { |signal| trap(signal)  { stop! } }
         trap(:HUP) do
@@ -94,6 +98,13 @@ module Forever
       value ? @_file = value : @_file
     end
 
+    ##
+    # Daemon name
+    #
+    def name
+      File.basename(file, '.*')
+    end
+
     ##
     # Base working Directory
     #
@@ -107,7 +118,7 @@ module Forever
     # Default: dir + 'log/[process_name].log'
     #
     def log(value=nil)
-      @_log ||= File.join(dir, "log/#{File.basename(file)}.log") if exists?(dir, file)
+      @_log ||= File.join(dir, "log/#{name}.log") if exists?(dir, file)
       value.nil? ? @_log : @_log = value
     end
 
@@ -117,7 +128,7 @@ module Forever
     # Default: dir + 'tmp/[process_name].pid'
     #
     def pid(value=nil)
-      @_pid ||= File.join(dir, "tmp/#{File.basename(file)}.pid") if exists?(dir, file)
+      @_pid ||= File.join(dir, "tmp/#{name}.pid") if exists?(dir, file)
       value.nil? ? @_pid : @_pid = value
     end
 
@@ -129,11 +140,11 @@ module Forever
       if running?
         pid_was = File.read(pid).to_i
         FileUtils.rm_f(pid)
-        print "=> Killing process \e[1m%d\e[0m...\n" % pid_was
+        print "[\e[90m%s\e[0m] Killing process \e[1m%d\e[0m...\n" % [name, pid_was]
         on_exit.call if on_exit
         Process.kill(:KILL, pid_was)
       else
-        print "=> Process with \e[1mnot found\e[0m"
+        print "[\e[90m%s\e[0m] Process with \e[1mnot found\e[0m" % name
       end
     end
 
@@ -142,7 +153,7 @@ module Forever
     #
     def stop
       if running?
-        print '=> Waiting the daemon\'s death '
+        print "[\e[90m%s\e[0m] Waiting the daemon\'s death " % name
         FileUtils.touch(stop_txt)
         while running?(true)
           print '.'; $stdout.flush
@@ -179,9 +190,9 @@ module Forever
     def running?(silent=false)
       if exists?(pid)
         current = File.read(pid).to_i
-        print "=> Found pid \e[1m%d\e[0m...\n" % current unless silent
+        print "[\e[90m%s\e[0m] Found pid \e[1m%d\e[0m...\n" % [name, current] unless silent
       else
-        print "=> Pid \e[1mnot found\e[0m, process seems don't exist!\n" unless silent
+        print "[\e[90m%s\e[0m] Pid \e[1mnot found\e[0m, process seems don't exist!\n" % name unless silent
         return false
       end
 

data/lib/forever/version.rb

@@ -1,3 +1,3 @@
 module Forever
-  VERSION = "0.2.5" unless defined?(Forever::VERSION)
+  VERSION = "0.2.6" unless defined?(Forever::VERSION)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreverb
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - DAddYE
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 +02:00
+date: 2011-08-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency