cinchize 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/cinchize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cinchize}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Bergöö"]
-  s.date = %q{2010-11-08}
+  s.date = %q{2010-12-05}
   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}

data/lib/cinchize.rb

@@ -53,80 +53,16 @@ module Cinchize
       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
+    daemon = Cinchize.new *config(options, ARGV.first)
+    daemon.send options[:action]
+  rescue NoMethodError => e
+    puts "Error: no such method"
+    exit 1
   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],
-      :dir_mode => d_options[:dir_mode]
-    })
-    app = daemon.new_application :mode => :none, :log_output => d_options[:log_output]
-    app.start
-    
-    loop do
-      bot = Cinch::Bot.new do  
-        configure do |c|
-          network.keys.each { |key| c.send("#{key}=".to_sym, network[key]) }
-
-          c.plugins.plugins = plugins
-          c.plugins.options = plugin_options
-        end
-      end
 
-      bot.start
-    end
-  end
-  
-  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]
     
@@ -165,8 +101,8 @@ module Cinchize
     raise ArgumentError.new "no plugins loaded" if plugins.size == 0
 
     cfg["options"] ||= {}
-    dir_mode = cfg["options"]["dir_mode"].nil? ? "normal" : cfg["options"]["dir_mode"]
-    
+    dir_mode = cfg["options"].key?("dir_mode") ? cfg["options"]["dir_mode"] : "normal"
+        
     daemon_options = {
       :dir_mode => dir_mode.to_sym,
       :dir => cfg["options"]["dir"] || Dir.getwd,
@@ -177,6 +113,94 @@ module Cinchize
 
     [daemon_options, ntw, plugins, plugin_options]
   end
+  
+  class Cinchize
+    attr_reader :options
+    
+    def initialize options, network, plugins, plugin_options
+      @network = network
+      @plugins = plugins      
+      @plugin_options = plugin_options
+      @options = options
+    end
+
+    def app_name
+      options[:app_name]
+    end
+
+    def dir
+      options[:dir]
+    end
+    
+    def clean_app_name
+      app_name.split('_').last
+    end
+
+    def restart
+      stop
+      start
+    end
+
+    def start 
+      if running?
+        raise ArgumentError.new "#{clean_app_name} is already running"      
+      end
+
+      puts "* starting #{clean_app_name}"
+
+      daemon = Daemons::ApplicationGroup.new(app_name, {
+        :ontop => options[:ontop],
+        :dir => dir,
+        :dir_mode => options[:dir_mode]
+      })
+      app = daemon.new_application :mode => :none, :log_output => options[:log_output]
+      app.start
+
+      network = @network
+      plugins = @plugins
+      plugin_options = @plugin_options
+
+      loop do
+        bot = Cinch::Bot.new do  
+          configure do |c|
+            network.each_pair { |key, value| c.send("#{key}=".to_sym, value) }
+
+            c.plugins.plugins = plugins
+            c.plugins.options = plugin_options
+          end
+        end
+
+        bot.start
+      end
+    end
+    
+    def stop 
+      unless running?
+        puts "* #{clean_app_name} is not running"
+        return
+      end
+
+      pidfile = Daemons::PidFile.new dir, app_name
+      puts "* stopping #{clean_app_name}"
+
+      Process.kill(9, pidfile.pid)
+      File.delete(pidfile.filename)
+    end
+    
+    def status 
+      if running?
+        puts "* #{clean_app_name} is running"
+      else
+        puts "* #{clean_app_name} is not running"
+      end
+    end
+    
+    def running? 
+      pidfile = Daemons::PidFile.new dir, app_name
+      return false if pidfile.pid.nil?
+      return Process.kill(0, pidfile.pid) != 0
+    end
+  end
 end
 
 # We need to open up Daemons::Application#start_none so we can log the output

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Victor Berg\xC3\xB6\xC3\xB6"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +01:00
+date: 2010-12-05 00:00:00 +01:00
 default_executable: cinchize
 dependencies: 
 - !ruby/object:Gem::Dependency