cinchize 0.0.3 → 0.1.0

data/README.rdoc

@@ -10,17 +10,19 @@ An early version of program which purpose is to daemonize Cinch ircbots from "si
 
 Basic
 
-  cinchize network
+  cinchize --start network
 
 The config file can either be in the current working directory or in /etc, should be called cinchize.json, i.e. /etc/cinchize.json, use -s to look for the file in /etc
   
-  cinchize -s network
+  cinchize -s --start network
   
 To daemonzize, use -d
 
-  cinchize -d network
+  cinchize -d --start network
 
-Network is the name you call the a server config in the servers part of the config file, i.e. "freenode", "my_cute_bot", "quakenet" or similar. 
+Network is the name you call the a server config in the servers part of the config file, i.e. "freenode", "my_cute_bot", "quakenet" or similar.
+
+--start, --restart, --stop and --status assumes that the config file is located in the current working directory unless -s is used.
 
 == Config-file
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/cinchize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cinchize}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Bergöö"]
-  s.date = %q{2010-10-31}
+  s.date = %q{2010-11-08}
   s.default_executable = %q{cinchize}
   s.description = %q{Create dynamic Cinch IRC-bots and daemonize them, without the need of writing any code}
   s.email = %q{victor.bergoo@gmail.com}
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/cinchize",
      "cinchize.gemspec",
+     "examples/cinchize.init",
      "lib/cinchize.rb"
   ]
   s.homepage = %q{http://github.com/netfeed/cinchize}

data/examples/cinchize.init

@@ -0,0 +1,41 @@
+#!/bin/bash
+# Copyright (c) 2010 Victor Bergöö
+# This program is made available under the terms of the MIT License.
+
+# assumes that the config file is located at /etc/cinchize.json
+
+RETVAL=0;
+NETWORK="freenode"
+
+start() {
+  cinchize -ds --start $NETWORK
+}
+
+status() {
+  cinchize -s --status $NETWORK
+}
+
+stop() {
+  cinchize -s --stop $NETWORK
+}
+
+restart() {
+  cinchize -ds --restart $NETWORK
+}
+
+case "$1" in
+  start)
+    start
+    ;;
+  status)
+    status
+    ;;
+  stop)
+    stop
+    ;;  
+  restart)
+    restart
+    ;;
+esac
+
+exit $RETVAL

data/lib/cinchize.rb

@@ -16,6 +16,7 @@ module Cinchize
     :system => false,
     :local_config => File.join(Dir.pwd, 'cinchize.json'),
     :system_config => '/etc/cinchize.json',
+    :action => nil,
   }
   
   def self.run
@@ -33,10 +34,49 @@ module Cinchize
         options[:system] = true
       }
       
+      o.on("--start", "Start the bot") {
+        options[:action] = :start
+      }
+
+      o.on("--status", "Status of the bot") {
+        options[:action] = :status
+      }
+      
+      o.on("--stop", "Stop the bot") {
+        options[:action] = :stop
+      }
+      
+      o.on("--restart", "Restart the bot") {
+        options[:action] = :restart
+      }
+      
       o.parse!
     end
 
     d_options, network, plugins, plugin_options = config(options, ARGV.first)
+
+    case options[:action]
+    when :start then 
+      start(d_options, network, plugins, plugin_options)
+    when :status then 
+      status(d_options[:dir], d_options[:app_name])
+    when :stop then 
+      stop(d_options[:dir], d_options[:app_name])
+    when :restart then 
+      stop(d_options[:dir], d_options[:app_name])
+      start(d_options, network, plugins, plugin_options)
+    else
+      puts "Error: no valid action supplied"
+      exit 1
+    end
+  rescue ArgumentError => e
+    puts "Error: #{e}"
+    exit 1
+  end
+  
+  def self.start d_options, network, plugins, plugin_options
+    puts "* starting #{d_options[:app_name].split('_').last}"
+    
     daemon = Daemons::ApplicationGroup.new(d_options[:app_name], {
       :ontop => d_options[:ontop],
       :dir => d_options[:dir],
@@ -57,14 +97,37 @@ module Cinchize
 
       bot.start
     end
-  rescue ArgumentError => e
-    puts "Error: #{e}"
-    exit 1
   end
   
-  def self.config options, network
-    cmd_options = []
+  def self.stop dir, app_name
+    pidfile = Daemons::PidFile.new dir, app_name
+    unless pidfile.pid
+      puts "* #{app_name.split('_').last} is not running"
+      return
+    end
+    
+    puts "* stopping #{app_name.split('_').last}"
     
+    Process.kill(9, pidfile.pid)
+    File.delete(pidfile.filename)
+  end
+  
+  def self.status dir, app_name
+    pidfile = Daemons::PidFile.new dir, app_name
+
+    unless pidfile.pid
+      puts "* #{app_name.split('_').last} is not running"
+      return
+    end
+    
+    if Process.kill(0, pidfile.pid) != 0
+      puts "* #{app_name.split('_').last} is running"
+    else
+      puts "* #{app_name.split('_').last} is not running"
+    end
+  end
+  
+  def self.config options, network
     config_file = options[:system] ? options[:system_config]: options[:local_config]
     
     raise ArgumentError.new "the config file #{config_file} doesn't exist" unless File.exists? config_file
@@ -123,7 +186,7 @@ module Daemons
   class Application
     def start_none
       unless options[:ontop]
-        Daemonize.daemonize(output_logfile, @group.app_name)
+        Daemonize.daemonize(output_logfile, @group.app_name) # our change goes here
       else
         Daemonize.simulate
       end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - "Victor Berg\xC3\xB6\xC3\xB6"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +02:00
+date: 2010-11-08 00:00:00 +01:00
 default_executable: cinchize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - VERSION
 - bin/cinchize
 - cinchize.gemspec
+- examples/cinchize.init
 - lib/cinchize.rb
 has_rdoc: true
 homepage: http://github.com/netfeed/cinchize