mitten 0.0.2 → 0.0.3

data/README.rdoc

@@ -9,50 +9,65 @@ Mitten is A Ruby IRC Bot Pluggable Framework.
 
 === RubyGems
 
-1. rake
+1. gemcutter
+
+    $ sudo gem install gemcutter
+
+2. rake
 
     $ sudo gem install rake
 
-2. rspec
+3. rspec
 
     $ sudo gem install rspec
 
-3. net-irc
+4. net-irc
 
     $ sudo gem install net-irc
 
-4. daemons
+5. daemons
 
     $ sudo gem install daemons
 
 
+== Installation
+
+1. RubyGems
+
+    $ sudo gem install mitten
+
+2. GitHub
+
+    $ git clone http://github.com/Tomohiro/mitten.git
+
+
 == Usage
 
 1. Usage
 
-    ./bin/server -h
-    ./bin/daemon run -- -h
+    $ ./bin/server -h
+    $ ./bin/daemon run -- -h
 
 2. Start
 
-    ./bin/daemon start
+    $ ./bin/daemon start
 
 3. Restart
 
-    ./bin/daemon restart
+    $ ./bin/daemon restart
 
 4. Stop
 
-    ./bin/daemon stop
+    $ ./bin/daemon stop
 
 5. Changed config file
 
-    ./bin/daemon start -- -c lib/environment.yaml
+    $ ./bin/daemon start -- -c lib/environment.yaml
 
 6. Run on the top(not daemonize)
 
-    ./bin/server
-    ./bin/daemon run
+    $ ./bin/server
+    $ ./bin/daemon run
 
 
 == Rake tasks

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/utils.rb

@@ -3,19 +3,18 @@ require 'open-uri'
 require 'json'
 
 module URI
-  def short(uri)
-    begin
-      login   = 'tomohiro'
-      api_key = 'R_9ed4fae410ab7b729a15dc91c8f7687c'
+  SHORT_URI_API_LOGIN = ENV['SHORT_URI_API_LOGIN']
+  SHORT_URI_API_TOKEN = ENV['SHORT_URI_API_TOKEN']
 
-      query  = "http://api.j.mp/shorten?version=2.0.1&longUrl=#{uri}&login=#{login}&apiKey=#{api_key}"
+  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}"
       result = JSON.parse(open(query).read)
 
       result.first[1].first[1]['shortUrl']
-    rescue
+    rescue Exception => e
       URI.encode(uri)
     end
   end
-
-  module_function :short
 end

data/mitten.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mitten}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomohiro, TAIRA"]
@@ -64,8 +64,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{IRC Bot Framework}
   s.test_files = [
-    "spec/mitten_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+     "spec/mitten_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mitten
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tomohiro, TAIRA
@@ -101,5 +101,5 @@ signing_key:
 specification_version: 3
 summary: IRC Bot Framework
 test_files: 
-- spec/mitten_spec.rb
 - spec/spec_helper.rb
+- spec/mitten_spec.rb