atig 0.0.1 → 0.3.3

data/atig.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Atig::VERSION
 
-  gem.add_dependency 'sqlite3-ruby', ['~> 1.2.5']
+  gem.add_dependency 'sqlite3', ['>= 1.3.2']
   gem.add_dependency 'net-irc', ['>= 0']
   gem.add_dependency 'oauth', ['>= 0']
 

data/bin/atig

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+# stolen from termtter
 self_file =
   if File.symlink?(__FILE__)
     require 'pathname'
@@ -9,66 +10,5 @@ self_file =
   end
 $:.unshift(File.dirname(self_file) + "/../lib")
 
-require "optparse"
-
-opts = {
-  :port  => 16668,
-  :host  => "localhost",
-  :log   => nil,
-  :debug => false,
-  :foreground => false,
-  :conf => '~/.atig/config',
-}
-
-OptionParser.new do |parser|
-  parser.instance_eval do
-    self.banner = <<EOB.gsub(/^\t+/, "")
-age: #{$0} [opts]
-EOB
-    separator ""
-
-    separator "Options:"
-    on("-p", "--port [PORT=#{opts[:port]}]", "port number to listen") do |port|
-      opts[:port] = port
-    end
-
-    on("-h", "--host [HOST=#{opts[:host]}]", "host name or IP address to listen") do |host|
-      opts[:host] = host
-    end
-
-    on("-l", "--log LOG", "log file") do |log|
-      opts[:log] = log
-    end
-
-    on("--debug", "Enable debug mode") do |debug|
-      opts[:log]   ||= $stderr
-      opts[:debug]   = true
-    end
-
-    on("--memprof", "Enable memory profiler") do|_|
-      require 'memory_profiler'
-      require 'fileutils'
-      FileUtils.mkdir_p "log"
-      MemoryProfiler.start(:string_debug => true)
-    end
-
-    on("-c","--conf [file=#{opts[:conf]}]", "atig configuration file; default is '~/.atig/config'") do|name|
-      opts[:conf] = name
-    end
-
-    parse!(ARGV)
-  end
-end
-
-require 'logger'
-opts[:logger] = Logger.new(opts[:log], "weekly")
-opts[:logger].level = opts[:debug] ? Logger::DEBUG : Logger::INFO
-
-conf = File.expand_path opts[:conf]
-if  File.exist? conf then
-  opts[:logger].info "Loading #{conf}"
-  load conf
-end
-
 require 'atig'
-Net::IRC::Server.new(opts[:host], opts[:port], Atig::Gateway::Session, opts).start
+Atig::Client.run

data/docs/changelog.rst

@@ -1,7 +1,27 @@
 更新履歴
 ==============
 
-v0.3.2(2010-10-10)
+v0.3.3(2012-01-24)
+------------------------------
+http://github.com/mzp/atig/tree/v0.3.3
+
+機能追加
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ - gem コマンドでインストールできるようにしました
+
+機能修正
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ - Ruby 1.9 に対応しました
+ - SQLite3-1.3.5 に対応しました
+ - bundler に対応しました
+ - HTTP アクセス時の media-range から Quality 指定を削除しました
+ - bit.ly の API 変更に追従しました
+
+バグ修正
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ - 非公式RTが実行できない不具合を修正
+
+ v0.3.2(2010-10-10)
 ------------------------------
 http://github.com/mzp/atig/tree/v0.3.2
 

data/lib/atig.rb

@@ -9,6 +9,8 @@ require 'json'
 
 require 'atig/version'
 require 'atig/monkey'
+require 'atig/optparse'
+require 'atig/client'
 require 'atig/twitter'
 require 'atig/scheduler'
 require 'atig/agent'

data/lib/atig/client.rb

@@ -0,0 +1,22 @@
+require 'logger'
+
+module Atig
+  module Client
+    class << self
+      def run
+        opts = Atig::OptParser.parse!(ARGV)
+
+        opts[:logger] = Logger.new(opts[:log], "weekly")
+        opts[:logger].level = opts[:debug] ? Logger::DEBUG : Logger::INFO
+
+        conf = File.expand_path opts[:conf]
+        if File.exist? conf then
+          opts[:logger].info "Loading #{conf}"
+          load conf
+        end
+
+        Net::IRC::Server.new(opts[:host], opts[:port], Atig::Gateway::Session, opts).start
+      end
+    end
+  end
+end

data/lib/atig/db/followings.rb

@@ -70,6 +70,10 @@ module Atig
         end
       end
 
+      def bool(b)
+        if b then 1 else 0 end
+      end
+
       def update(users)
         @db.execute do|db|
           may_notify :join, users.select{|u|
@@ -90,7 +94,7 @@ module Atig
           may_notify :mode, users.select{|u|
             exists?(db,
                     "screen_name = ? AND (protected != ? OR only != ?)",
-                    u.screen_name, u.protected, u.only)
+                    u.screen_name, bool(u.protected), bool(u.only))
           }
 
           users.each do|user|
@@ -98,8 +102,8 @@ module Atig
             if id then
               db.execute("UPDATE users SET screen_name = ?, protected = ?, only = ?, data = ? WHERE id = ?",
                          user.screen_name,
-                         user.protected,
-                         user.only,
+                         bool(user.protected),
+                         bool(user.only),
                          @db.dump(user),
                          id)
             else
@@ -107,8 +111,8 @@ module Atig
                           VALUES(NULL, :screen_name, :user_id, :protected, :only, :data)",
                          :screen_name => user.screen_name,
                          :user_id     => user.id,
-                         :protected   => user.protected,
-                         :only        => user.only,
+                         :protected   => bool(user.protected),
+                         :only        => bool(user.only),
                          :data        => @db.dump(user))
             end
           end

data/lib/atig/optparse.rb

@@ -0,0 +1,60 @@
+require "optparse"
+
+module Atig
+  module OptParser
+    class << self
+      def parse!(argv)
+        opts = {
+          :port  => 16668,
+          :host  => "localhost",
+          :log   => nil,
+          :debug => false,
+          :foreground => false,
+          :conf => '~/.atig/config',
+        }
+
+        OptionParser.new do |parser|
+          parser.instance_eval do
+            self.banner = <<EOB.gsub(/^\t+/, "")
+usage: #{$0} [opts]
+EOB
+            separator ""
+
+            separator "Options:"
+            on("-p", "--port [PORT=#{opts[:port]}]", "port number to listen") do |port|
+              opts[:port] = port
+            end
+
+            on("-h", "--host [HOST=#{opts[:host]}]", "host name or IP address to listen") do |host|
+              opts[:host] = host
+            end
+
+            on("-l", "--log LOG", "log file") do |log|
+              opts[:log] = log
+            end
+
+            on("--debug", "Enable debug mode") do |debug|
+              opts[:log]   ||= $stderr
+              opts[:debug]   = true
+            end
+
+            on("--memprof", "Enable memory profiler") do|_|
+              require 'memory_profiler'
+              require 'fileutils'
+              FileUtils.mkdir_p "log"
+              MemoryProfiler.start(:string_debug => true)
+            end
+
+            on("-c","--conf [file=#{opts[:conf]}]", "atig configuration file; default is '~/.atig/config'") do|name|
+              opts[:conf] = name
+            end
+
+            parse!(argv)
+          end
+        end
+
+        opts
+      end
+    end
+  end
+end

data/lib/atig/version.rb

@@ -1,3 +1,3 @@
 module Atig
-  VERSION = "0.0.1"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atig
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &70111072362400 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &70109117034800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70111072362400
+  version_requirements: *70109117034800
 - !ruby/object:Gem::Dependency
   name: net-irc
-  requirement: &70111072361840 !ruby/object:Gem::Requirement
+  requirement: &70109117051120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111072361840
+  version_requirements: *70109117051120
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70111072361120 !ruby/object:Gem::Requirement
+  requirement: &70109117050100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111072361120
+  version_requirements: *70109117050100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70111072360260 !ruby/object:Gem::Requirement
+  requirement: &70109117071120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111072360260
+  version_requirements: *70109117071120
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70111072359240 !ruby/object:Gem::Requirement
+  requirement: &70109117070540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70111072359240
+  version_requirements: *70109117070540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70111072358620 !ruby/object:Gem::Requirement
+  requirement: &70109117069900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70111072358620
+  version_requirements: *70109117069900
 description: Atig.rb is Twitter Irc Gateway.
 email:
 - shibata.hiroshi@gmail.com
@@ -143,6 +143,7 @@ files:
 - lib/atig/channel/mention.rb
 - lib/atig/channel/retweet.rb
 - lib/atig/channel/timeline.rb
+- lib/atig/client.rb
 - lib/atig/command.rb
 - lib/atig/command/autofix.rb
 - lib/atig/command/command.rb
@@ -200,6 +201,7 @@ files:
 - lib/atig/ofilter/geo.rb
 - lib/atig/ofilter/short_url.rb
 - lib/atig/option.rb
+- lib/atig/optparse.rb
 - lib/atig/scheduler.rb
 - lib/atig/search.rb
 - lib/atig/search_twitter.rb
@@ -268,12 +270,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 411555485053826307
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 411555485053826307
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15