kirby 4.2.1 → 4.2.2

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v4.2.2. Fix Delicious integration.
+
 v4.2.1. Small fix for tryruby compatibility.
 
 v4.2. Add channel logging; clean up options handling; fix docs.

data/README

@@ -9,7 +9,7 @@ Copyright 2007, 2008 Cloudburst, LLC. Licensed under the AFL 3. See the included
 
 The public certificate for the gem is here[http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem]. 
 
-If you like this software, please {make a donation}[http://blog.evanweaver.com/donate/], or {recommend Evan}[http://www.workingwithrails.com/person/7739-evan-weaver] at Working with Rails.
+If you use this software, please {make a donation}[http://blog.evanweaver.com/donate/], or {recommend Evan}[http://www.workingwithrails.com/person/7739-evan-weaver] at Working with Rails.
 
 == Features
 
@@ -35,10 +35,10 @@ To start a basic Kirby from the command line:
 Logs and repository histories get saved to the working directory.
 
 Available post-parameters are:
-<tt>--daemon</tt>:: Daemonize.
-<tt>--silent</tt>:: Never speak, even for errors.
-<tt>--log</tt>:: Log channel chatter to a file.
-<tt>--debug</tt>:: Debug mode.
+<tt>----daemon</tt>:: Daemonize.
+<tt>----silent</tt>:: Never speak, even for errors.
+<tt>----log</tt>:: Log channel chatter to a file.
+<tt>----debug</tt>:: Debug mode.
 
 See the Kirby class for in-channel commands.
 

data/Rakefile

@@ -0,0 +1,16 @@
+
+require 'rubygems'
+require 'echoe'
+
+Echoe.new("kirby", `cat CHANGELOG`[/^v([\d\.]+)\. /, 1]) do |p|  
+  p.name = "kirby"
+  p.rubyforge_name = "fauna"
+  p.description = p.summary = "A super-clean IRC bot with sandboxed Ruby evaluation, svn watching, and link-logging to del.icio.us."
+  p.url = "http://blog.evanweaver.com/files/doc/fauna/kirby/"
+  p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
+  p.changes = `cat CHANGELOG`[/^v([\d\.]+\. .*)/, 1]
+
+  p.extra_deps = ["hpricot", "daemons"]  
+  p.rdoc_pattern = /bin|lib|README|CHANGELOG|LICENSE/    
+  p.require_signed = true
+end

data/kirby.gemspec

@@ -1,48 +1,40 @@
-
-# Gem::Specification for Kirby-4.2.1
-# Originally generated by Echoe
+# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{kirby}
-  s.version = "4.2.1"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "4.2.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [""]
-  s.date = %q{2008-01-30}
+  s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
+  s.date = %q{2009-11-18}
   s.default_executable = %q{kirby}
   s.description = %q{A super-clean IRC bot with sandboxed Ruby evaluation, svn watching, and link-logging to del.icio.us.}
   s.email = %q{}
   s.executables = ["kirby"]
-  s.files = ["lib/kirby.rb", "bin/kirby", "README", "LICENSE", "CHANGELOG", "kirby.gemspec"]
-  s.has_rdoc = true
+  s.extra_rdoc_files = ["lib/kirby.rb", "bin/kirby", "README", "LICENSE", "CHANGELOG"]
+  s.files = ["lib/kirby.rb", "bin/kirby", "README", "LICENSE", "CHANGELOG", "kirby.gemspec", "Rakefile"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/kirby/}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Kirby", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.0.1}
+  s.rubygems_version = %q{1.3.5}
+  s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{A super-clean IRC bot with sandboxed Ruby evaluation, svn watching, and link-logging to del.icio.us.}
 
-  s.add_dependency(%q<hpricot>, [">= 0"])
-  s.add_dependency(%q<daemons>, [">= 0"])
-end
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
 
-
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# 
-# require 'rubygems'
-# require 'echoe'
-# 
-# Echoe.new("kirby", `cat CHANGELOG`[/^v([\d\.]+)\. /, 1]) do |p|  
-#   p.name = "kirby"
-#   p.rubyforge_name = "fauna"
-#   p.description = p.summary = "A super-clean IRC bot with sandboxed Ruby evaluation, svn watching, and link-logging to del.icio.us."
-#   p.url = "http://blog.evanweaver.com/files/doc/fauna/kirby/"
-#   p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
-#   p.changes = `cat CHANGELOG`[/^v([\d\.]+\. .*)/, 1]
-# 
-#   p.extra_deps = ["hpricot", "daemons"]  
-#   p.rdoc_pattern = /bin|lib|README|CHANGELOG|LICENSE/    
-#   p.require_signed = true
-# end
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
+    else
+      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<daemons>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<daemons>, [">= 0"])
+  end
+end

data/lib/kirby.rb

@@ -1,4 +1,4 @@
-%w[open3 daemons socket singleton open-uri cgi pathname hpricot yaml net/https].map{|s| require s}
+%w[open3 daemons socket singleton open-uri cgi pathname hpricot yaml net/https timeout].map{|s| require s}
 
 =begin rdoc
 In-channel commands:
@@ -88,7 +88,7 @@ class Kirby
               when /^reset_irb/ then reset_irb
               when /^add_svn (.+?)(\s|\r|\n|$)/ then @svns[$1] = 0 and say @svns.inspect
               when /^add_atom (.+?)(\s|\r|\n|$)/ then @atoms[$1] = '' and say @atoms.inspect
-              when /(http:\/\/.*?)(\s|\r|\n|$)/ then post($1) if config[:delicious_pass] 
+              when /(http(s|):\/\/.*?)(\s|\r|\n|$)/ then post($1) if config[:delicious_pass] 
             end
           end
       end
@@ -168,23 +168,43 @@ class Kirby
     File.open(config[:atoms], 'w') {|f| f.puts YAML.dump(@atoms)}
   end
   
-  # Post a url to the del.icio.us account.
+  # Post a url to the del.i	cio.us account.
   def post url
-    puts "POST: #{url}" if config[:debug]
-    query = {:url => url,
-      :description => (((Hpricot(open(url))/:title).first.innerHTML or url) rescue url),
-      :tags => (Hpricot(open("http://del.icio.us/url/check?url=#{CGI.escape(url)}"))/'.alphacloud'/:a).map{|s| s.innerHTML}.join(" "),
-      :replace => 'yes' }
-    begin
+    Timeout.timeout(60) do
+      puts "POST: #{url}" if config[:debug]
+  
+      tags = (Hpricot(open("http://del.icio.us/url/check?url=#{CGI.escape(url)}"))/
+      '#top-tags'/'li')[0..10].map do |li| 
+        (li/'span').innerHTML[/(.*?)<em/, 1]
+      end.join(" ")
+      puts "POST-TAGS: #{tags}" if config[:debug]
+      
+      description = begin
+        Timeout.timeout(5) do 
+          (((Hpricot(open(url))/:title).first.innerHTML or url) rescue url)
+        end
+      rescue Timeout::Error
+        puts "POST: URL timeout" if config[:debug]
+        url
+      end
+      
+      query = { :url => url, :description => description, :tags => tags, :replace => 'yes' }
+
       http = Net::HTTP.new('api.del.icio.us', 443)         
       http.use_ssl = true      
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       response = http.start do |http|
-        req = Net::HTTP::Get.new('/v1/posts/add?' + query.map{|k,v| "#{k}=#{CGI.escape(v)}"}.join('&'))
+        post_url = '/v1/posts/add?' + query.map {|k,v| "#{k}=#{CGI.escape(v)}"}.join('&')
+        puts "POST: post url #{post_url}" if config[:debug]
+        req = Net::HTTP::Get.new(post_url, {"User-Agent" => "Kirby"})
         req.basic_auth config[:delicious_user], config[:delicious_pass]
         http.request(req)
       end.body
+
       puts "POST: #{response.inspect}" if config[:debug]
     end
+  rescue Exception => e
+    puts "POST: #{e.inspect}" if config[:debug]
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kirby
 version: !ruby/object:Gem::Version 
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors: 
 - ""
@@ -30,11 +30,12 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-01-30 00:00:00 -05:00
+date: 2009-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -44,6 +45,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -57,8 +59,12 @@ executables:
 - kirby
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- lib/kirby.rb
+- bin/kirby
+- README
+- LICENSE
+- CHANGELOG
 files: 
 - lib/kirby.rb
 - bin/kirby
@@ -66,11 +72,19 @@ files:
 - LICENSE
 - CHANGELOG
 - kirby.gemspec
+- Rakefile
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/kirby/
-post_install_message: 
-rdoc_options: []
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Kirby
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -83,14 +97,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.0.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A super-clean IRC bot with sandboxed Ruby evaluation, svn watching, and link-logging to del.icio.us.
 test_files: []