atig 0.4.5 → 0.5.0

data/lib/atig/command/retweet.rb

@@ -23,10 +23,10 @@ module Atig
 
         chars = text.each_char.to_a
         if chars.size > 140 then
-          url = @bitly.shorten "http://twitter.com/#{entry.user.screen_name}/status/#{entry.status.id}"
+          url = @bitly.shorten "https://twitter.com/#{entry.user.screen_name}/status/#{entry.status.id}"
           text = chars[0,140-url.size-1].join('') + ' ' + url
         end
-        q = gateway.output_message(:status => text)
+        q = gateway.output_message(status: text)
         api.delay(0) do|t|
           ret = t.post("statuses/update", q)
           gateway.update_status ret,target, "RT to #{entry.user.screen_name}: #{entry.status.text}"

data/lib/atig/command/search.rb

@@ -17,7 +17,7 @@ module Atig
         end
 
         q = mesg.sub(/^#{command}\s+/, '')
-        opts = { :q => q }
+        opts = { q: q }
         while /^:(?:(lang)=(\w+))/ =~ args.first
            opts[$1] = $2
            q.sub!(/^#{args.first}\W+/, "")
@@ -35,7 +35,7 @@ module Atig
           db.statuses.transaction do|d|
             user = TwitterStruct.make('id'          => status.from_user_id,
                                       'screen_name' => status.from_user)
-            d.add :status => status, :user => user, :source => :user
+            d.add status: status, user: user, source: :user
           end
         end
 

data/lib/atig/command/status.rb

@@ -15,14 +15,14 @@ module Atig
           return
         end
         text = mesg.split(" ", 2)[1]
-        previous,*_ = db.statuses.find_by_user( db.me, :limit => 1)
+        previous,*_ = db.statuses.find_by_user( db.me, limit: 1)
         if previous and
             ((::Time.now - ::Time.parse(previous.status.created_at)).to_i < 60*60*24 rescue true) and
             text.strip == previous.status.text.strip
           yield "You can't submit the same status twice in a row."
           return
         end
-        q = gateway.output_message(:status => text)
+        q = gateway.output_message(status: text)
 
         case tweet_invalid? q[:status]
         when :too_long
@@ -33,7 +33,7 @@ module Atig
           return
         end
 
-        api.delay(0, :retry=>3) do|t|
+        api.delay(0, retry:3) do|t|
           ret = t.post("statuses/update", q)
           gateway.update_status ret,target
         end

data/lib/atig/command/user.rb

@@ -20,15 +20,15 @@ module Atig
         api.delay(0) do|t|
           begin
             statuses = t.get("statuses/user_timeline",
-                             { :count => count, :screen_name => nick})
+                             { count: count, screen_name: nick})
             statuses.reverse_each do|status|
               db.statuses.transaction do|d|
-                d.add :status => status, :user => status.user, :source => :user
+                d.add status: status, user: status.user, source: :user
               end
             end
 
             db.statuses.
-              find_by_screen_name(nick, :limit=>count).
+              find_by_screen_name(nick, limit:count).
               reverse_each do|entry|
               gateway[target].message entry, Net::IRC::Constants::NOTICE
             end

data/lib/atig/command/version.rb

@@ -15,7 +15,7 @@ module Atig
         end
         nick,*_ = args
 
-        entries = db.statuses.find_by_screen_name(nick, :limit => 1)
+        entries = db.statuses.find_by_screen_name(nick, limit: 1)
         if entries && !entries.empty? then
           entry = TwitterStruct.make('user'   => entries.first.user,
                                      'status' => { 'text' =>
@@ -24,9 +24,9 @@ module Atig
         else
           api.delay(0) do|t|
             begin
-              user = t.get("users/show", { :screen_name => nick})
+              user = t.get("users/show", { screen_name: nick})
               db.statuses.transaction do|d|
-                d.add :user => user, :status => user.status, :source => :version
+                d.add user: user, status: user.status, source: :version
                 entry = TwitterStruct.make('user'   => user,
                                            'status' => { 'text' =>
                                              format(user.status.source) })

data/lib/atig/db/followings.rb

@@ -83,7 +83,6 @@ module Atig
           }
 
           names = users.map{|u| u.screen_name.inspect }.join(",")
-          parts =
           may_notify :part, db.execute(%{SELECT screen_name,data FROM users
                                          WHERE screen_name NOT IN (#{names})}).map{|_,data|
             @db.load(data)
@@ -109,11 +108,11 @@ module Atig
             else
               db.execute("INSERT INTO users
                           VALUES(NULL, :screen_name, :user_id, :protected, :only, :data)",
-                         :screen_name => user.screen_name,
-                         :user_id     => user.id,
-                         :protected   => bool(user.protected),
-                         :only        => bool(user.only),
-                         :data        => @db.dump(user))
+                         screen_name: user.screen_name,
+                         user_id: user.id,
+                         protected: bool(user.protected),
+                         only: bool(user.only),
+                         data: @db.dump(user))
             end
           end
         end

data/lib/atig/db/statuses.rb

@@ -63,17 +63,17 @@ module Atig
           screen_name = opt[:user].screen_name
           sum   = db.get_first_value("SELECT sum(count) FROM id").to_i
           count = db.get_first_value("SELECT count      FROM id WHERE screen_name = ?", screen_name).to_i
-          entry = OpenStruct.new opt.merge(:tid => @roman.make(sum),
-                                           :sid => "#{screen_name}:#{@roman.make(count)}")
+          entry = OpenStruct.new opt.merge(tid: @roman.make(sum),
+                                           sid: "#{screen_name}:#{@roman.make(count)}")
           db.execute(%{INSERT INTO status
                       VALUES(NULL, :id, :tid, :sid, :screen_name, :user_id, :created_at, :data)},
-                     :id          => id,
-                     :tid         => entry.tid,
-                     :sid         => entry.sid,
-                     :screen_name => screen_name,
-                     :user_id     => opt[:user].id,
-                     :created_at  => Time.parse(opt[:status].created_at).to_i,
-                     :data        => @db.dump(entry))
+                     id: id,
+                     tid: entry.tid,
+                     sid: entry.sid,
+                     screen_name: screen_name,
+                     user_id: opt[:user].id,
+                     created_at: Time.parse(opt[:status].created_at).to_i,
+                     data: @db.dump(entry))
           if count == 0 then
             db.execute("INSERT INTO id VALUES(NULL,?,?)", screen_name, 1)
           else
@@ -129,8 +129,10 @@ module Atig
 
       private
       def find(lhs,rhs, opt={},&f)
+        rhs.encoding!("UTF-8") if rhs.respond_to? :encoding!
+
         query  = "SELECT id,data FROM status WHERE #{lhs} = :rhs ORDER BY created_at DESC LIMIT :limit"
-        params = { :rhs => rhs, :limit => opt.fetch(:limit,20) }
+        params = { rhs: rhs, limit: opt.fetch(:limit,20) }
         res = []
 
         @db.execute do|db|

data/lib/atig/db/transaction.rb

@@ -18,7 +18,7 @@ module Atig
 
           if respond_to?(:timeout_interval) && timeout_interval > 0 then
             begin
-              timeout(timeout_interval){ f.call self }
+              Timeout.timeout(timeout_interval){ f.call self }
             rescue TimeoutError
               debug "transaction is timeout at #{src}"
             end

data/lib/atig/gateway/channel.rb

@@ -44,7 +44,6 @@ END
       def message(entry, command = PRIVMSG)
         GC.start
         user        = entry.user
-        screen_name = user.screen_name
         prefix      = prefix user
         str         = run_filters entry
 
@@ -88,7 +87,7 @@ END
       private
 
       def run_filters(entry)
-        status = entry.status.merge(:tid=>entry.tid, :sid=>entry.sid)
+        status = entry.status.merge(tid:entry.tid, sid:entry.sid)
         @filters.inject(status) {|x, f| f.call x }.text
       end
 

data/lib/atig/gateway/session.rb

@@ -16,7 +16,7 @@ require 'atig/option'
 
 begin
   require 'continuation'
-rescue LoadError => e
+rescue LoadError
 end
 
 module Atig
@@ -50,7 +50,7 @@ END
 
       def update_status(ret, target, msg='')
         @db.transaction do|db|
-          db.statuses.add(:source => :me, :status => ret, :user => ret.user )
+          db.statuses.add(source: :me, status: ret, user: ret.user )
         end
 
         msg = "(#{msg})" unless msg.empty?
@@ -58,12 +58,12 @@ END
       end
 
       def channel(name,opts={})
-        opts.update(:session => self,
-                    :name    => name,
-                    :filters => @ifilters,
-                    :prefix  => @prefix,
-                    :nick    => @nick,
-                    :opts    => @opts)
+        opts.update(session: self,
+                    name: name,
+                    filters: @ifilters,
+                    prefix: @prefix,
+                    nick: @nick,
+                    opts: @opts)
         channel = Channel.new opts
         @channels[name] = channel
         channel
@@ -111,7 +111,7 @@ END
         load_config
 
         @opts = Atig::Option.parse @real
-        context = OpenStruct.new(:log=>@log, :opts=>@opts)
+        context = OpenStruct.new(log:@log, opts:@opts)
 
         oauth = OAuth.new(context, @nick)
         unless oauth.verified? then
@@ -166,12 +166,12 @@ END
 
           post server_name, MODE, @nick, "+o"
 
-          @db = Atig::Db::Db.new context, :me=>me, :size=> 100, :tmpdir => @tmpdir
+          @db = Atig::Db::Db.new context, me:me, size: 100, tmpdir: @tmpdir
           run_new @@commands, context, self, @api, @db
           run_new @@agents  , context, @api, @db
           run_new @@channels, context, self, @db
 
-          @db.statuses.add :user => me, :source => :me, :status => me.status
+          @db.statuses.add user: me, source: :me, status: me.status
         end
       end
 
@@ -210,7 +210,7 @@ END
       def on_ctcp_action(target, mesg)
         command, *args = mesg.split(" ")
         last_match = nil
-        commond = command.to_s.downcase
+        command = command.to_s.downcase
         _, action = @ctcp_actions.find{|define, f|
           r = (define === command)
           last_match = Regexp.last_match
@@ -244,7 +244,7 @@ END
       end
 
       def on_kick(m)
-        channel, nick, msg = *m.params
+        channel, nick, _ = *m.params
 
         if not nick.screen_name? or @db.me.screen_name.casecmp(nick).zero?
           post server_name, ERR_NOSUCHNICK, nick, "No such nick: #{nick}" # or yourself

data/lib/atig/http.rb

@@ -9,10 +9,10 @@ module Atig
     def self.proxy=(proxy)
       if proxy =~ /\A(?:([^:@]+)(?::([^@]+))?@)?([^:]+)(?::(\d+))?\z/ then
         @@proxy = OpenStruct.new({
-                                   :user => $1,
-                                   :password => $2,
-                                   :address => $3,
-                                   :port => $4.to_i,
+                                   user: $1,
+                                   password: $2,
+                                   address: $3,
+                                   port: $4.to_i,
                                  })
       end
     end

data/lib/atig/ifilter/expand_url.rb

@@ -18,7 +18,7 @@ module Atig
       def call(status)
         target = short_url_regexp
         entities = (entities = status.entities).nil? ? [] : entities.urls
-        status.merge :text => status.text.gsub(target) {|url|
+        status.merge text: status.text.gsub(target) {|url|
           unless entities.nil? or entities.empty?
             @cache[url] ||= search_url_from_entities(url, entities)
             url = @cache[url] if @cache[url] =~ target

data/lib/atig/ifilter/retweet.rb

@@ -7,7 +7,7 @@ module Atig
       def self.call(status)
         return status unless status.retweeted_status
         rt = status.retweeted_status
-        status.merge :text => "#{Prefix}RT @#{rt.user.screen_name}: #{rt.text}"
+        status.merge text: "#{Prefix}RT @#{rt.user.screen_name}: #{rt.text}"
       end
     end
   end

data/lib/atig/ifilter/retweet_time.rb

@@ -8,7 +8,7 @@ module Atig
           status
         else
           t = Time.gm(*Time.parse(status.retweeted_status.created_at).to_a)
-          status.merge :text => "#{status.text} \x0310[#{t.strftime "%Y-%m-%d %H:%M"}]\x0F"
+          status.merge text: "#{status.text} \x0310[#{t.strftime "%Y-%m-%d %H:%M"}]\x0F"
         end
       end
     end

data/lib/atig/ifilter/sanitize.rb

@@ -12,7 +12,7 @@ module Atig
           gsub("&lt;", "<").
           gsub("&amp;", "&").
           gsub(WSP_REGEX, " ")
-      status.merge :text => text
+      status.merge text: text
     }
   end
 end

data/lib/atig/ifilter/strip.rb

@@ -8,7 +8,7 @@ module Atig
       end
 
       def call(status)
-        status.merge :text => status.text.sub(@rsuffix, "").strip
+        status.merge text: status.text.sub(@rsuffix, "").strip
       end
     end
   end

data/lib/atig/ifilter/xid.rb

@@ -20,7 +20,7 @@ module Atig
         unless xid and @opts.send(name)
           status
         else
-          status.merge :text => "#{status.text} #{@format % xid}"
+          status.merge text: "#{status.text} #{@format % xid}"
         end
       end
     end

data/lib/atig/oauth.rb

@@ -27,8 +27,8 @@ module Atig
 
       @nick  = nick
       @oauth = ::OAuth::Consumer.new(CONSUMER_KEY, CONSUMER_SECRET, {
-                                       :site => site,
-                                       :proxy => ENV["HTTP_PROXY"] || ENV["http_proxy"]
+                                       site: site,
+                                       proxy: ENV["HTTP_PROXY"] || ENV["http_proxy"]
                                      })
 
       if @@profiles.key? @nick
@@ -47,7 +47,7 @@ module Atig
     end
 
     def verify(code)
-      @access = @request.get_access_token(:oauth_verifier => code)
+      @access = @request.get_access_token(oauth_verifier: code)
       if @access then
         @@profiles[@nick] = [ @access.token , @access.secret ]
       end

data/lib/atig/ofilter/escape_url.rb

@@ -19,7 +19,7 @@ module Atig
       end
 
       def call(status)
-        status.merge(:status => escape_http_urls(status[:status]))
+        status.merge(status: escape_http_urls(status[:status]))
       end
 
       def exist_uri?(uri, limit = 1)

data/lib/atig/ofilter/footer.rb

@@ -9,7 +9,7 @@ module Atig
 
       def call(q)
         if @opts.footer && !@opts.footer.empty? then
-          q.merge :status => "#{q[:status]} #{@opts.footer}"
+          q.merge status: "#{q[:status]} #{@opts.footer}"
         else
           q
         end

data/lib/atig/ofilter/geo.rb

@@ -10,7 +10,7 @@ module Atig
       def call(q)
         return q unless @opts.ll
         lat, long = @opts.ll.split(",", 2)
-        q.merge :lat  => lat.to_f, :long => long.to_f
+        q.merge lat: lat.to_f, long: long.to_f
       end
     end
   end

data/lib/atig/ofilter/short_url.rb

@@ -15,7 +15,7 @@ module Atig
 
       def call(status)
         mesg = status[:status]
-        status.merge(:status => short_urls(mesg))
+        status.merge(status: short_urls(mesg))
       end
 
       def short_urls(mesg)

data/lib/atig/option.rb

@@ -30,7 +30,7 @@ module Atig
     end
 
     default_value :api_base,        'https://api.twitter.com/1.1/'
-    default_value :stream_api_base, 'https://userstream.twitter.com/2/'
+    default_value :stream_api_base, 'https://userstream.twitter.com/1.1/'
     default_value :search_api_base, 'https://search.twitter.com/'
 
     def initialize(table)

data/lib/atig/optparse.rb

@@ -6,16 +6,17 @@ module Atig
     class << self
       def parse!(argv)
         opts = {
-          :port  => 16668,
-          :host  => "localhost",
-          :log   => nil,
-          :debug => false,
-          :foreground => false,
-          :tmpdir => ::Dir.tmpdir,
-          :conf => '~/.atig/config',
+          port: 16668,
+          host: "localhost",
+          log: nil,
+          debug: false,
+          foreground: false,
+          tmpdir: ::Dir.tmpdir,
+          conf: '~/.atig/config',
         }
 
         OptionParser.new do |parser|
+          parser.version = Atig::VERSION
           parser.instance_eval do
             self.banner = <<EOB.gsub(/^\t+/, "")
 usage: #{$0} [opts]
@@ -23,6 +24,16 @@ EOB
             separator ""
 
             separator "Options:"
+            on("--help", "show this help") do
+              puts help
+              exit
+            end
+
+            on("-v", "--version", "show version") do
+              puts version
+              exit
+            end
+
             on("-p", "--port [PORT=#{opts[:port]}]", "port number to listen") do |port|
               opts[:port] = port
             end
@@ -35,20 +46,20 @@ EOB
               opts[:log] = log
             end
 
-            on("--debug", "Enable debug mode") do |debug|
+            on("-d", "--debug", "Enable debug mode") do |debug|
               opts[:log]   ||= $stderr
               opts[:debug]   = true
             end
 
-            on("--tmpdir path", "temporary directory path") do |tmp|
+            on("-t", "--tmpdir path", "temporary directory path") do |tmp|
               opts[:tmpdir] = tmp
             end
 
-            on("--memprof", "Enable memory profiler") do|_|
+            on("-m", "--memprof", "Enable memory profiler") do|_|
               require 'memory_profiler'
               require 'fileutils'
               FileUtils.mkdir_p "log"
-              MemoryProfiler.start(:string_debug => true)
+              MemoryProfiler.start(string_debug: true)
             end
 
             on("-c","--conf [file=#{opts[:conf]}]", "atig configuration file; default is '~/.atig/config'") do|name|