cinchize 0.3.0 → 0.4.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Victor Bergöö
+Copyright (c) 2010-2012 Victor Bergöö
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -18,13 +18,13 @@ The config file can either be in the current working directory or in /etc and sh
   
   cinchize -s --start network
   
-To daemonzize, use -d
+To daemonize, use -d
 
   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", "super_duper_amazing_network", "quakenet" or similar.
 
---start, --restart, --stop and --status assumes that the config file is located in the current working directory unless -s is used.
+--start, --restart, --stop and --status assumes that "cinchize.yml" is located in the current working directory unless -s is used, then we assume that it's located in "/etc/cinchize.yml" as stated above.
 
 == Config-file
 
@@ -43,18 +43,12 @@ All config options to each server object is optional, except for the channels an
         - "#cinchbots"
       plugins:
         - 
-          module: "cinch/plugins/some_plugin"
           class: "Cinch::Plugins::SomePlugin"
           options:
             option: value
         -
-          module: "cinch/plugins/another_plugin"
           class: "Cinch::Plugins::AnotherPlugin"
 
-=== JSON deprecation
-
-The JSON format has been deprecated and will be removed in a future release, YaML is the preferred format hence forth.
-
 === Options explained
 
 dir: the save path, absolute or relative to either /var/run or to the current working directory

data/Rakefile

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-require 'rubygems'
-require 'rake'
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -11,13 +8,11 @@ begin
     gem.description = %Q{Create dynamic Cinch IRC-bots and daemonize them, without the need of writing any code}
     gem.email = "victor.bergoo@gmail.com"
     gem.homepage = "http://github.com/netfeed/cinchize"
-    gem.authors = ["Victor Bergöö"]
-    gem.add_dependency "cinch"
+    gem.authors = ["Victor Bergoo"]
+    gem.add_dependency "cinch", ">= 2.0.1"
     gem.add_dependency "daemons"
-    gem.add_dependency "json"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-  Jeweler::GemcutterTasks.new
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/cinchize

@@ -1,8 +1,79 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-# Copyright (c) 2010 Victor Bergöö
+# Copyright (c) 2010-2012 Victor Bergöö
 # This program is made available under the terms of the MIT License.
 
 require File.expand_path('../../lib/cinchize', __FILE__)
 
-Cinchize.run
+require 'optparse'
+
+Options = {
+  :ontop => true,
+  :system => false,
+  :local_config => File.join(Dir.pwd, 'cinchize.yml'),
+  :system_config => '/etc/cinchize.yml',
+  :action => nil,
+}
+
+options = Options.dup
+
+ARGV.options do |o|
+  o.set_summary_indent '  '
+  o.banner = "Usage: #{File.basename $0} [Options] network"
+  
+  o.on("-d", "--daemonize", "Daemonize") { 
+    options[:ontop] = false
+  }
+  
+  o.on("-r", "--running", "Show status for all bots") {
+    options[:action] = :show_running
+  }
+  
+  o.on("-s", "--system-config", "Use system config") { 
+    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
+
+begin
+  if options[:action] == :show_running 
+    config_file = options[:system] ? options[:system_config]: options[:local_config]
+
+    raise ArgumentError.new "no such file: #{config_file}" unless File.exists? config_file
+    cfg = YAML.load_file config_file
+
+    raise ArgumentError.new "#{config_file} doesn't seem to be a YaML file" unless cfg
+    raise ArgumentError.new "cinchize isn't configured correctly, please recheck #{config_file}" unless cfg.key? "servers"
+    raise ArgumentError.new "there's no networks configured, please recheck #{config_file}" unless cfg["servers"]
+    cfg["servers"].keys.sort.each do |key|
+      daemon = Cinchize::Cinchize.new *Cinchize.config(options, key)
+      daemon.status
+    end
+  else 
+    daemon = Cinchize::Cinchize.new *Cinchize.config(options, ARGV.first)
+    daemon.send options[:action]
+  end
+rescue NoMethodError => e
+  puts "Error: no such method"
+  exit 1
+rescue ArgumentError => e
+  puts "Error: #{e}"
+  exit 1
+end

data/cinchize.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cinchize}
-  s.version = "0.3.0"
+  s.name = "cinchize"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Victor Bergöö"]
-  s.date = %q{2011-02-26}
-  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}
+  s.authors = ["Victor Bergoo"]
+  s.date = "2012-03-27"
+  s.description = "Create dynamic Cinch IRC-bots and daemonize them, without the need of writing any code"
+  s.email = "victor.bergoo@gmail.com"
   s.executables = ["cinchize"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -28,28 +27,27 @@ Gem::Specification.new do |s|
     "examples/cinchize.init",
     "lib/cinchize.rb"
   ]
-  s.homepage = %q{http://github.com/netfeed/cinchize}
+  s.homepage = "http://github.com/netfeed/cinchize"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Create dynamic Cinch IRC-bots and daemonize them}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Create dynamic Cinch IRC-bots and daemonize them"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<cinch>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<cinch>, [">= 2.0.1"])
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<cinch>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<cinch>, [">= 2.0.1"])
       s.add_dependency(%q<daemons>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<cinch>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<cinch>, [">= 2.0.1"])
     s.add_dependency(%q<daemons>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
   end
 end
 

data/lib/cinchize.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2010 Victor Bergöö
+# Copyright (c) 2010-2012 Victor Bergöö
 # This program is made available under the terms of the MIT License.
 
 dir = File.dirname(__FILE__)
@@ -8,92 +8,31 @@ $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include? dir
 require 'cinch'
 require 'daemons'
 require 'yaml'
-require 'optparse'
 
 module Cinchize
-  Options = {
-    :ontop => true,
-    :system => false,
-    :local_config => File.join(Dir.pwd, 'cinchize.yml'),
-    :system_config => '/etc/cinchize.yml',
-    :action => nil,
-  }
-  
-  def self.run
-    options = Options.dup
-    
-    ARGV.options do |o|
-      o.set_summary_indent '  '
-      o.banner = "Usage: #{File.basename $0} [Options] network"
-      
-      o.on("-d", "--daemonize", "Daemonize") { 
-        options[:ontop] = false
-      }
-      
-      o.on("-s", "--system-config", "Use system config") { 
-        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
-
-    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.config options, network
     config_file = options[:system] ? options[:system_config]: options[:local_config]
-    unless File.exists? config_file
-      config_file.gsub! /yml$/, "json"
-    end
     
-    raise ArgumentError.new "there's no config file located at: #{config_file.gsub(/json$/, 'yml')}" unless File.exists? config_file
+    raise ArgumentError.new "there's no config file located at: #{config_file}" unless File.exists? config_file
     raise ArgumentError.new "needs a network" if network.nil? or network.empty?
 
-    if File.extname(config_file) == ".yml"
-      cfg = YAML.load_file config_file
-    else 
-      require 'json'
-      puts "WARNING: the json config format has be deprecated in favour of YaML"
-      cfg = JSON.parse open(config_file, 'r').read()
-    end
+    cfg = YAML.load_file config_file
     
     raise ArgumentError.new "there's no server config in the config file" unless cfg.has_key? "servers"
+    raise ArgumentError.new "there's no networks configured, please recheck #{config_file}" unless cfg["servers"]
     raise ArgumentError.new "the config file doesn't contain a config for #{network}" unless cfg["servers"].has_key? network
     
     ntw = cfg["servers"][network]
     
     plugins = []
     plugin_options = {}
-    
+
+    ntw["plugins"] ||= []
     ntw.delete("plugins").each do |plugin|
       begin
-        raise LoadError.new "the module can't be null" if plugin["module"].nil?
         raise NameError.new "the class can't be null" if plugin["class"].nil?
         
-        require plugin["module"]
+        require plugin["class"].downcase.gsub('::', '/')
       
         clazz = nil
         plugin["class"].split("::").inject(Object) { |m,n| clazz = m.const_get(n) }
@@ -107,8 +46,6 @@ module Cinchize
       end
     end
 
-    raise ArgumentError.new "no plugins loaded" if plugins.size == 0
-
     cfg["options"] ||= {}
     dir_mode = cfg["options"].key?("dir_mode") ? cfg["options"]["dir_mode"] : "normal"
         
@@ -165,14 +102,14 @@ module Cinchize
       app = daemon.new_application :mode => :none, :log_output => options[:log_output]
       app.start
 
-      network = @network
+      network = @network.keys.inject({}) { |memo, key| memo[key.to_sym] = @network[key]; memo }
       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.load network
 
             c.plugins.plugins = plugins
             c.plugins.options = plugin_options
@@ -192,7 +129,7 @@ module Cinchize
       pidfile = Daemons::PidFile.new dir, app_name
       puts "* stopping #{clean_app_name}"
 
-      Process.kill(9, pidfile.pid)
+      Process.kill("QUIT", pidfile.pid)
       File.delete(pidfile.filename)
     end
     

metadata

@@ -1,71 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cinchize
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Victor Berg\xC3\xB6\xC3\xB6"
+authors:
+- Victor Bergoo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-26 00:00:00 +01:00
-default_executable: cinchize
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: cinch
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-03-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70130010159940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70130010159940
+- !ruby/object:Gem::Dependency
+  name: cinch
+  requirement: &70130010157280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70130010157280
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &70130010156080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: Create dynamic Cinch IRC-bots and daemonize them, without the need of writing any code
+  prerelease: false
+  version_requirements: *70130010156080
+description: Create dynamic Cinch IRC-bots and daemonize them, without the need of
+  writing any code
 email: victor.bergoo@gmail.com
-executables: 
+executables:
 - cinchize
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -74,37 +62,31 @@ files:
 - cinchize.gemspec
 - examples/cinchize.init
 - lib/cinchize.rb
-has_rdoc: true
 homepage: http://github.com/netfeed/cinchize
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4552393900521943504
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Create dynamic Cinch IRC-bots and daemonize them
 test_files: []
-