kentaroi-okayu 0.0.4 → 0.0.5

data/README.rdoc

@@ -7,18 +7,17 @@ Github: http://github.com/kentaroi/okayu/tree/master
 
 == Installing
 Linux:
-  # Install packagies for sqlite3
-  # if you use Debian:
+  # まず、sqlite3を入れてください。
+  # たとえば、Debian/Ubuntuの場合は、以下のようにします。
   sudo aptitude install sqlite3 libsqlite3-dev libsqlite3-ruby1.8
 
-  # Install the gem
+  # おかゆのgemを入れます。
   sudo gem install kentaroi-okayu --source http://gems.github.com
 
 Windows:
-http://www.sqlite.org/download.html
-上記サイトから、SQLiteのDLLをダウンロード
+http://www.sqlite.org/download.html　から、SQLiteのDLLをダウンロードします。
 
-  # Install the gem
+  # Ruby及びRubygemsをインストールしている場合は、gemを入れれば完了です。
   gem install kentaroi-okayu --source http://gems.github.com
 
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/app_dir.rb

@@ -1,28 +1,14 @@
 require 'rubygems'
-require 'facter'
 
 module Okayu
-  # for some windows environment
-  ENV['HOME'] = ENV['HOMEPATH'].gsub(/\\/, '/') unless ENV['HOME']
 
   class AppDir
-    if Facter.value(:kernel) == 'Linux'
-      if File.exist?(@@app_dir = ENV['HOME'] + '/.okayu')
-      else
-        Dir.mkdir(@@app_dir)
-      end
-    elsif Facter.value(:kernel) == 'windows'
-      if Facter.value(:operatingsystemrelease).slice(/^\d*/).to_i < 6 # Before Vista
-        if File.exist?(@@app_dir = ENV['HOME'] + '/Local Settings/Application Data/okayu')
-        else
-          Dir.mkdir(@@app_dir)
-        end
-      else # From Vista
-        if File.exist?(@@app_dir = ENV['HOME'] + '/AppData/Local/okayu')
-        else
-          Dir.mkdir(@@app_dir)
-        end
-      end
+    if OS == 'Linux'
+      @@app_dir = HOME_PATH + '/.okayu'
+      Dir.mkdir(@@app_dir) unless File.exist?(@@app_dir)
+    elsif OS == 'Windows'
+      @@app_dir = LOCALAPPDATA_PATH + '/okayu'
+      Dir.mkdir unless File.exist?(@@app_dir)
     end
 
     def self.to_s

data/lib/client.rb

@@ -159,8 +159,10 @@ module Okayu
 
     def comments
       comments = []
-      until @channel.queue.empty?
+      counter = 0
+      until @channel.queue.empty? || counter > 5
         comments << @channel.queue.deq
+        counter += 1
       end
       comments.map{|comment| comment_hash_from_xml(comment)}
     end

data/lib/constants.rb

@@ -0,0 +1,27 @@
+require 'rbconfig'
+
+# Facter don't work in exe which is generated with ocra.
+# 
+module Okayu
+  if ENV['OS'] =~ /Windows/i || Config::CONFIG['host_os'] =~ /mswin/i
+    OS = 'Windows'
+    HOME_PATH = (ENV['HOME'] || ENV['HOMEPATH']).gsub(/\\/, '/')
+    APPDATA_PATH = ENV['APPDATA'].gsub(/\\/, '/')
+    LOCALAPPDATA_PATH = (ENV['LOCALAPPDATA'] || ENV['TMP'].sub(/Temp$/,'Application Data')).gsub(/\\/, '/')
+    TMP_INET_FILES_PATH = ENV['TMP'].sub(/Temp$/, 'Temporary Internet Files').gsub(/\\/, '/')
+  elsif `uname -s 2>/dev/null`.chomp == 'Linux'
+    OS = 'Linux'
+    HOME_PATH = ENV['HOME']
+  else
+    OS = 'Linux' # This should be replaced when we got other platform information.
+    HOME_PATH = ENV['HOME']
+  end
+
+  if File.exist?("#{ENV['HOME']}/Local Settings")
+    BEFORE_VISTA = true
+    FROM_VISTA = false
+  elsif File.exist?("#{ENV['HOME']}/AppData")
+    BEFORE_VISTA = false
+    FROM_VISTA = true
+  end
+end

data/lib/cookie_thief.rb

@@ -82,17 +82,13 @@ module Okayu
 
       def cookie_filenames host
         cookie_filename = []
-        case Facter.value(:kernel)
-        when 'windows'
-          if Facter.value(:operatingsystemrelease).to_i < 6 # before Vista
-            unless cookie_filenames =  Dir.glob("#{ENV['HOME']}/Application Data/Microsoft/Windows/Cookies/Low/*").select{|path| path =~ /#{host_main_str(host)}/}
-              cookie_filenames =  Dir.glob("#{ENV['HOME']}/../Administrator/Application Data/Microsoft/Windows/Cookies/Low/*").select{|path| path =~ /#{host_main_str(host)}/}
-
-            end
-          else # from Vista
-            cookie_filenames =  Dir.glob("#{ENV['HOME']}/AppData/Roaming/Microsoft/Windows/Cookies/Low/*").select{|path| path =~ /#{host_main_str(host)}/}
+        if OS == 'Windows'
+          cookie_filenames =  Dir.glob("#{APPDATA_PATH}/Microsoft/Windows/Cookies/Low/*").select{|path| path =~ /#{host_main_str(host)}/}
+          if cookie_filenames == []
+            cookie_filename = Dir.glob("#{TMP_INET_FILES_PATH}/*").select{|path| path =~ /#{host_main_str(host)}/}
           end
         end
+
         cookie_filenames
       end
 
@@ -112,27 +108,17 @@ module Okayu
 
       def cookies_filename
         cookies_filename = nil
-        case Facter.value(:kernel)
+        case OS
         when 'Linux'
           if dir = Dir.glob("#{ENV['HOME']}/.mozilla/firefox/*").select{|path| path =~ /.*\.default$/}.first
             if File.exist?("#{dir}/cookies.sqlite")
               cookies_filename = "#{dir}/cookies.sqlite"
             end
           end
-        when 'windows'
-          if Facter.value(:operatingsystemrelease).to_i < 6 # before Vista
-            unless dir = Dir.glob("#{ENV['HOME']}/Application Data/Mozilla/Firefox/Profiles/*").select{|path| path =~ /.*\.default$/}.first
-              dir = Dir.glob("#{ENV['HOME']}/../Administrator/Application Data/Mozilla/Firefox/Profiles/*").select{|path| path =~ /.*\.default$/}.first
-            end
-            if dir && File.exist?("#{dir}/cookies.sqlite")
-                cookies_filename = "#{dir}/cookies.sqlite"
-            end
-          else # from Vista
-            if dir = Dir.glob("#{ENV['HOME']}/AppData/Roaming/Mozilla/Firefox/Profiles/*").select{|path| path =~ /.*\.default$/}.first
-              if File.exist?("#{dir}/cookies.sqlite")
-                cookies_filename = "#{dir}/cookies.sqlite"
-              end
-            end
+        when 'Windows'
+          dir = Dir.glob("#{APPDATA_PATH}/Mozilla/Firefox/Profiles/*").select{|path| path =~ /.*\.default$/}.first
+          if dir && File.exist?("#{dir}/cookies.sqlite")
+              cookies_filename = "#{dir}/cookies.sqlite"
           end
         end
         cookies_filename
@@ -144,18 +130,10 @@ module Okayu
     class << self
       def cookies_filename
         cookies_filename = nil
-        case Facter.value(:kernel)
-        when 'windows'
-          if Facter.value(:operatingsystemrelease).to_i < 6 # before Vista
-            if File.exist?(filename = "#{ENV['HOME']}/LocalApplication Data/Google/Chrome/User Data/Default/Cookies")
-              cookies_filename = filename
-            elsif File.exist?(filename = "#{ENV['HOME']}/../Administrator/LocalApplication Data/Google/Chrome/User Data/Default/Cookies")
-              cookies_filename = filename
-            end
-          else # from Vista
-            if File.exist?(filename = "#{ENV['HOME']}/AppData/Local/Google/Chrome/User Data/Default/Cookies")
-              cookies_filename = filename
-            end
+        case OS
+        when 'Windows'
+          if File.exist?(filename = "#{LOCALAPPDATA_PATH}/Google/Chrome/User Data/Default/Cookies")
+            cookies_filename = filename
           end
         end
         cookies_filename

data/lib/for_windows.rb

@@ -0,0 +1,9 @@
+# This is the dummy definition for ocra
+module ActiveRecord::ActionController
+  module Session
+    class AbstractStore
+    end
+  end
+end
+
+

data/lib/okayu.rb

@@ -1,3 +1,4 @@
+require 'constants.rb'
 require 'app_dir.rb'
 require 'user_info.rb'
 require 'cookie_thief.rb'
@@ -8,3 +9,4 @@ require 'controllers.rb'
 require 'client.rb'
 require 'app.rb'
 
+require 'for_windows.rb'

data/okayu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{okayu}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kentaro Imai"]
-  s.date = %q{2009-09-19}
+  s.date = %q{2009-09-21}
   s.default_executable = %q{okayu}
   s.description = %q{A comment viewer for http://live.nicovideo.jp/}
   s.email = %q{kentaroi@gmail.com}
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/app.rb",
      "lib/app_dir.rb",
      "lib/client.rb",
+     "lib/constants.rb",
      "lib/controllers.rb",
      "lib/controllers/live_controller.rb",
      "lib/cookie_thief.rb",
@@ -39,6 +40,7 @@ Gem::Specification.new do |s|
      "lib/db/migrate/004_create_communities.rb",
      "lib/db/migrate/005_create_listeners_programs.rb",
      "lib/db/migrate/006_create_programs_visitors.rb",
+     "lib/for_windows.rb",
      "lib/models.rb",
      "lib/models/comment.rb",
      "lib/models/community.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kentaroi-okayu
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kentaro Imai
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-19 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: okayu
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - lib/app.rb
 - lib/app_dir.rb
 - lib/client.rb
+- lib/constants.rb
 - lib/controllers.rb
 - lib/controllers/live_controller.rb
 - lib/cookie_thief.rb
@@ -122,6 +123,7 @@ files:
 - lib/db/migrate/004_create_communities.rb
 - lib/db/migrate/005_create_listeners_programs.rb
 - lib/db/migrate/006_create_programs_visitors.rb
+- lib/for_windows.rb
 - lib/models.rb
 - lib/models/comment.rb
 - lib/models/community.rb