mitten 0.0.5 → 0.0.6

data/.gitignore

@@ -1,25 +1,6 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
 /configs/environment.yaml
-/lib/mint.rb.pid
-/amazonrc
-
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
+.rvmrc

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in mitten.gemspec
+gemspec

data/LICENSE

@@ -1,6 +1,6 @@
-The MIT License
+MAHALO License (based on MIT License) by Wataru, MIYAGUNI
 
-Copyright (c) 2010 Tomohiro, TAIRA
+Copyright (c) 2011 Tomohiro, TAIRA
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,8 +9,9 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+  1. The above copyright notice and this permission notice shall be included in
+     all copies or substantial portions of the Software.
+  2. Shall be grateful for something (including, but not limited this software).
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

data/README.markdown

@@ -0,0 +1,53 @@
+Mitten [![Still Maintained](http://stillmaintained.com/Tomohiro/mitten.png)](http://stillmaintained.com/Tomohiro/mitten)
+================================================================================
+
+
+Overview
+-------------------------------------------------------------------------------
+
+### What's this?
+
+Mitten is A Ruby IRC Bot Pluggable Framework.
+
+
+Installation
+-------------------------------------------------------------------------------
+
+### RubyGems
+
+    $ sudo gem install mitten
+
+### GitHub
+
+    $ git clone http://github.com/Tomohiro/mitten.git
+
+
+How to use
+-------------------------------------------------------------------------------
+
+TODO
+
+
+Note on Patches/Pull Requests
+-------------------------------------------------------------------------------
+
+- Fork the project.
+- Make your feature addition or bug fix.
+- Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+- Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+- Send me a pull request. Bonus points for topic branches.
+
+
+Author
+-------------------------------------------------------------------------------
+
+Tomohiro, TAIRA [@Tomohiro](http://twitter.com/Tomohiro)
+
+
+LICENSE
+-------------------------------------------------------------------------------
+
+This project is dual licensed under the MAHALO license or GPL Version 2 licenses.
+See LICENSE for details.

data/Rakefile

@@ -1,50 +1,24 @@
-require 'rubygems'
-require 'rake'
+require 'rake/clean'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'mitten'
-    gem.summary = 'IRC Bot Framework'
-    gem.description = 'Mitten is A Ruby IRC Bot Pluggable Framework'
-    gem.email = 'tomohiro.t@gmail.com'
-    gem.homepage = 'http://rubygems.org/gems/mitten'
-    gem.authors = ['Tomohiro, TAIRA']
-    gem.add_dependency 'net-irc', '>= 0.0.9'
-    gem.add_dependency 'daemons', '>= 1.0.10'
-    gem.add_dependency 'json_pure', '>= 1.2.0'
-    gem.add_development_dependency 'rspec', '>= 1.2.9'
-    gem.add_development_dependency 'rake', '>= 0.8.7'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+#CLEAN.include('config/test.yml', 'tmp', 'log', '/tmp/rig_issues.*')
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+namespace :mitten do
+  namespace :development do
+    desc 'Setup development environments'
+    task  :setup do
+      sh 'rvm use 1.9.3'
+      sh 'rvm gemset create mitten'
+      sh 'rvm gemset use mitten'
+      sh 'gem install bundler'
+      sh 'gem list'
+      sh 'bundle install --system'
+      sh 'bundle show'
+    end
+  end
 end
 
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mitten #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.options = ['-c', 'utf-8', '-N']
+begin
+  require 'bundler/gem_tasks'
+rescue LoadError
+  abort 'NOTE: Run `$ rake mitten:development:setup`'
 end

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/mitten

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$:.push File.expand_path('../../lib', __FILE__)
+require 'mitten'
+
+puts 'Booting Mitten ...'
+Mitten::Bot.boot

data/configs/example_environment.yaml

@@ -10,19 +10,20 @@ production:
   plugin_dir: example # normal => plugins
   charset:
     default: utf-8
- 
+
 development:
-  host: chat.freenode.net
+  host: my.irc.server.example.com
   port: 6667
   user: Mitten
   nick: Mitten
   real: Mitten is IRC Bot Framework
   pass:
   channel: '#Mitten'
-  plugin_dir: example # normal => plugins
+  plugin_dir: plugins
   charset:
     default: utf-8
- 
+
 plugins:
-  Sample:
+  Echo:
     channel: '#Mitten'
+    sleep: 10

data/example/{sample.rb → echo.rb}

@@ -1,4 +1,7 @@
-class Sample < Mitten::Plugin
+# encoding: utf-8
+
+class Echo < Mitten::Plugin
+
   def initialize(*args)
     super
   end
@@ -8,6 +11,9 @@ class Sample < Mitten::Plugin
   end
 
   def main
-    @channels.each { |channel| notice(channel, Time.now.to_s) }
+    @channels.each do |channel|
+      notice(channel, Time.now.to_s)
+    end
   end
+
 end

data/lib/mitten.rb

@@ -1,6 +1,4 @@
-#!/usr/bin/env ruby
-
-$KCODE = 'u'
+# encoding:utf-8
 
 require 'ostruct'
 require 'yaml'
@@ -10,8 +8,9 @@ require 'pathname'
 require 'rubygems'
 require 'net/irc'
 
-require 'lib/utils'
-require 'lib/plugin'
+require 'mitten/version'
+require 'mitten/utils'
+require 'mitten/plugin'
 
 module Mitten
   DEFAULT_CONFIG_FILE_PATH = 'configs/environment.yaml'
@@ -102,21 +101,20 @@ module Mitten
       Pathname.glob("#{plugin_dir}/*.rb") do |file|
         plugin = {}
         m = Module.new
-        m.module_eval(file.read, file)
+        m.module_eval(file.read, file.to_s)
         m.constants.each do |name|
-          break unless plugin_configs.has_key? name
+          break unless plugin_configs.has_key? name.to_s
           const = m.const_get(name)
           if const.is_a? Class 
             plugin[name] = {
               :class   => const,
               :file    => file,
-              :configs => plugin_configs[name]
+              :configs => plugin_configs[name.to_s]
             }
           end
         end
         class_tables.update(plugin)
       end
-
       plugins = instantiation(class_tables)
       instance_categorize(plugins)
     end

data/lib/{plugin.rb → mitten/plugin.rb}

@@ -1,5 +1,4 @@
-require 'rubygems'
-require 'net/irc'
+# encoding:utf-8
 
 module Mitten
   DEFAULT_SLEEP = 360
@@ -12,10 +11,14 @@ module Mitten
       @config   = config || {}
       @server   = server
       @socket   = socket
-      @channels = @config['channels'] || @config['channel'] || @server.channel
+      @channels = @config['channels'] || (@config['channel'] || [@server.channel])
       @sleep    = @config['sleep'] || DEFAULT_SLEEP
     end
 
+    def before_hook
+      # Do something
+    end
+
     def post(command, *args)
       @socket <<  Message.new(nil, command, args.map { |s| s.gsub(/\r|\n/, " ") })
     end
@@ -39,12 +42,14 @@ module Mitten
     def notify
       begin
         loop do
-          main
+          p @sleep
           sleep @sleep
+          main
         end
       rescue Exception => e
         post(NOTICE, @server.channel, "#{e.class} #{e.to_s}") if @server.channel
       end
     end
+
   end
 end

data/lib/{utils.rb → mitten/utils.rb}

@@ -1,4 +1,5 @@
-require 'rubygems'
+# encoding:utf-8 
+
 require 'open-uri'
 require 'json'
 
@@ -9,7 +10,7 @@ module URI
   def self.short(uri)
     return uri if SHORT_URI_API_LOGIN == nil
     begin
-      query  = "http://api.j.mp/shorten?version=2.0.1&longUrl=#{uri.gsub('&', '%26')}&login=#{SHORT_URI_API_LOGIN}&apiKey=#{SHORT_URI_API_TOKEN}"
+      query  = "http://api.bit.ly/v3/shorten?version=2.0.1&longUrl=#{uri.gsub('&', '%26')}&login=#{SHORT_URI_API_LOGIN}&apiKey=#{SHORT_URI_API_TOKEN}"
       result = JSON.parse(open(query).read)
 
       result.first[1].first[1]['shortUrl']

data/lib/mitten/version.rb

@@ -0,0 +1,3 @@
+module Mitten
+  VERSION = '0.0.6'
+end

data/mitten.gemspec

@@ -1,99 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'mitten/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{mitten}
-  s.version = "0.0.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tomohiro, TAIRA"]
-  s.date = %q{2010-03-16}
+  s.name        = 'mitten'
+  s.version     = Mitten::VERSION
+  s.authors     = ['Tomohiro, TAIRA']
+  s.email       = ['tomohiro.t@gmail.com']
+  s.homepage    = 'http://github.com/Tomohiro/mittenn'
+  s.summary     = %q{Mitten}
   s.description = %q{Mitten is A Ruby IRC Bot Pluggable Framework}
-  s.email = %q{tomohiro.t@gmail.com}
-  s.executables = ["daemon", "client"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/client",
-     "bin/daemon",
-     "configs/example_environment.yaml",
-     "configs/time_call.yaml",
-     "configs/twitter_bot.yaml",
-     "example/sample.rb",
-     "lib/mitten.rb",
-     "lib/plugin.rb",
-     "lib/utils.rb",
-     "mitten.gemspec",
-     "plugins/amazon_search.rb",
-     "plugins/bmi.rb",
-     "plugins/codepad.rb",
-     "plugins/fortune.rb",
-     "plugins/gasoline.rb",
-     "plugins/gmail.rb",
-     "plugins/google_profile.rb",
-     "plugins/google_transit.rb",
-     "plugins/google_weather.rb",
-     "plugins/holoscope.rb",
-     "plugins/loo_holoscope.rb",
-     "plugins/mixi_voice.rb",
-     "plugins/nanapi.rb",
-     "plugins/newspaper_headlines.rb",
-     "plugins/openpne_new_diary_check.rb",
-     "plugins/ramen.rb",
-     "plugins/rate.rb",
-     "plugins/screen_time_search.rb",
-     "plugins/time_call.rb",
-     "plugins/tweet.rb",
-     "plugins/twitter_bot.rb",
-     "plugins/typhoon.rb",
-     "plugins/uri_shorten.rb",
-     "spec/mitten_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://rubygems.org/gems/mitten}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{IRC Bot Framework}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/mitten_spec.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = 'mitten'
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<net-irc>, [">= 0.0.9"])
-      s.add_runtime_dependency(%q<daemons>, [">= 1.0.10"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<rake>, [">= 0.8.7"])
-    else
-      s.add_dependency(%q<net-irc>, [">= 0.0.9"])
-      s.add_dependency(%q<daemons>, [">= 1.0.10"])
-      s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<rake>, [">= 0.8.7"])
-    end
-  else
-    s.add_dependency(%q<net-irc>, [">= 0.0.9"])
-    s.add_dependency(%q<daemons>, [">= 1.0.10"])
-    s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<rake>, [">= 0.8.7"])
-  end
-end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
 
+  s.add_development_dependency 'rake'
+  s.add_runtime_dependency 'net-irc'
+end