atig 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 600b07b559862ae694b0c7c99890c9e043a9aa6a
-  data.tar.gz: ae106983e3d0c5846c41c8ff8e93370f981ac7d7
+  metadata.gz: 7289f78b0e27eb209b0db4dd0c8521c2f815def7
+  data.tar.gz: dafd598ceb3604b19b2504644f606497e5aa23c3
 SHA512:
-  metadata.gz: c9b3350f024a475f036f26734c2e5fae1bbd3fb73a93279579b060a44a04a897a88d2e7b66e8cd226d76eeedc16475e6ece90099900ee0cd6cea7c6fff6d1a35
-  data.tar.gz: 00ff15638abddb5064b478a30c3c30e15c3c15b36991418fc90f1adfd7f566a63c493360d7befe27d0c37c0e2368406a8cfde2124bf402406a72e8793020deec
+  metadata.gz: c1c26f3096adff2dfd36b4ab023a1bd1c03cf2748ce7a763ddc2e1981f1ec7f08afbf57a42e0657c3e6b2b75bf846f08c449efb9c2e5f95d292d32a64117adae
+  data.tar.gz: edb161638ae3aaa32c39cb45739fde1f1cfd77087f4f4f4f539ed2ec11ae35144d9d1f341b63302d888e9ab7f19531926007e7c2c4b2b338e6927cbe738e07e9

data/.rspec

@@ -1,2 +1,3 @@
+--require spec_helper
 --color
 --profile

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - 2.2
+  - ruby-head
 
 script: bundle exec rake spec

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'rspec', '~> 3.0.0.beta2'

data/README.mkdn

@@ -1,6 +1,8 @@
 Atig.rb - Another Twitter Irc Gateway
 ===========================================
 
+[![Gem Version](https://badge.fury.io/rb/atig.png)](https://rubygems.org/gems/atig) [![Code Climate](https://codeclimate.com/github/atig/atig.png)](https://codeclimate.com/github/atig/atig) [![Build Status](https://travis-ci.org/atig/atig.png)](https://travis-ci.org/atig/atig)
+
 OVERVIEW
 --------
 Atig.rb is Twitter Irc Gateway.

data/Rakefile

@@ -17,10 +17,4 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
-desc "building document with sphinx"
-task :docs do
-  build_dir = "docs/_build"
-  `LC_CTYPE=C sphinx-build -b html -d #{build_dir}/doctrees -D latex_paper_size=a4 docs #{build_dir}/html`
-end
-
 task :default => [:spec, :clean]

data/atig.gemspec

@@ -1,28 +1,29 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/atig/version', __FILE__)
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["MIZUNO Hiroki", "SHIBATA Hiroshi", ]
-  gem.email         = ["mzp@ocaml.jp", "shibata.hiroshi@gmail.com"]
-  gem.description   = %q{Atig.rb is Twitter Irc Gateway.}
-  gem.summary       = %q{Atig.rb is forked from cho45's tig.rb. We improve some features of tig.rb.}
-  gem.homepage      = "https://github.com/mzp/atig"
+Gem::Specification.new do |spec|
+  spec.name          = "atig"
+  spec.version       = Atig::VERSION
+  spec.authors       = ["MIZUNO Hiroki", "SHIBATA Hiroshi", ]
+  spec.email         = ["mzp@ocaml.jp", "shibata.hiroshi@gmail.com"]
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "atig"
-  gem.require_paths = ["lib"]
-  gem.version       = Atig::VERSION
+  spec.summary       = %q{Atig.rb is forked from cho45's tig.rb. We improve some features of tig.rb.}
+  spec.description   = %q{Atig.rb is Twitter Irc Gateway.}
+  spec.homepage      = "https://github.com/atig/atig"
 
-  gem.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
 
-  gem.add_dependency 'sqlite3', ['>= 1.3.2']
-  gem.add_dependency 'net-irc', ['>= 0']
-  gem.add_dependency 'oauth', ['>= 0']
-  gem.add_dependency 'twitter-text', ['~> 1.7.0']
+  spec.add_dependency 'sqlite3', ['>= 1.3.2']
+  spec.add_dependency 'net-irc', ['>= 0']
+  spec.add_dependency 'oauth', ['>= 0']
+  spec.add_dependency 'twitter-text', ['~> 1.7.0']
 
-  gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'coveralls'
 end

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "atig"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/atig/agent/agent.rb

@@ -15,18 +15,18 @@ module Atig
         log :info, "initialize"
 
         @api.repeat( interval ) do|t|
-          q = { :count => 200 }
+          q = { count: 200 }
           if @prev
-            q.update :since_id => @prev
+            q.update since_id: @prev
           else
-            q.update :count => 20
+            q.update count: 20
           end
 
           sources = t.get( path, q)
 
           sources.reverse_each do|s|
             db.statuses.transaction do|d|
-              d.add :source => source, :status => s, :user => s.user
+              d.add source: source, status: s, user: s.user
             end
           end
 

data/lib/atig/agent/dm.rb

@@ -15,18 +15,18 @@ module Atig
         log :info, "initialize"
 
         @api.repeat(600) do|t|
-          q = { :count => 200 }
+          q = { count: 200 }
           if @prev
-            q.update :since_id => @prev
+            q.update since_id: @prev
           else
-            q.update :count => 1
+            q.update count: 1
           end
           dms = t.get("direct_messages", q)
           log :debug, "You have #{dms.size} dm."
 
           dms.reverse_each do|dm|
             db.dms.transaction do|d|
-              d.add :status => dm, :user => dm.sender
+              d.add status: dm, user: dm.sender
             end
           end
         end

data/lib/atig/agent/following.rb

@@ -22,15 +22,15 @@ module Atig
 
       def update(api)
         if @db.followings.empty?
-          friends = api.page("friends/list", :users, {:user_id => @db.me.id, :count => 100})
+          friends = api.page("friends/list", :users, {user_id: @db.me.id, count: 100})
         else
           @db.me = api.post("account/update_profile")
           return if @db.me.friends_count == @db.followings.size
-          friends = api.page("friends/list", :users, {:user_id => @db.me.id, :count => 100})
+          friends = api.page("friends/list", :users, {user_id: @db.me.id, count: 100})
         end
 
         if @opts.only
-          followers = api.page("friends/ids", :ids, {:user_id => @db.me.id, :count => 2500})
+          followers = api.page("friends/ids", :ids, {user_id: @db.me.id, count: 2500})
           friends.each do|friend|
             friend[:only] = !followers.include?(friend.id)
           end

data/lib/atig/agent/list.rb

@@ -18,7 +18,7 @@ module Atig
             if name == :all then
               full_update t
             else
-              @db.lists[name].update t.page("lists/members", :users, {:owner_screen_name => @db.me.screen_name, :slug => name})
+              @db.lists[name].update t.page("lists/members", :users, {owner_screen_name: @db.me.screen_name, slug: name})
             end
           end
         end
@@ -41,7 +41,7 @@ module Atig
                  end
           begin
             users[name] =
-              t.page("lists/members", :users, {:owner_screen_name => list.user.screen_name, :slug => list.slug})
+              t.page("lists/members", :users, {owner_screen_name: list.user.screen_name, slug: list.slug})
           rescue => e
             log :error, e.inspect
             users[name] =

data/lib/atig/agent/list_status.rb

@@ -18,17 +18,17 @@ class Atig::Agent::ListStatus
       db.lists.each do |name, _|
         log :debug, "retrieve #{name} statuses"
         q = {}
-        q.update(:since_id => @prev[name]) if @prev.key?(name)
+        q.update(since_id: @prev[name]) if @prev.key?(name)
 
         screen_name, slug = parse name
-        q.update(:owner_screen_name => screen_name, :slug => slug)
+        q.update(owner_screen_name: screen_name, slug: slug)
         statuses = t.get("lists/statuses", q)
         statuses.reverse_each do|status|
           db.statuses.transaction do|d|
-            d.add(:status => status,
-                  :user => status.user,
-                  :source => :list,
-                  :list => name)
+            d.add(status: status,
+                  user: status.user,
+                  source: :list,
+                  list: name)
           end
         end
         @prev[name] = statuses[0].id if statuses && statuses.size > 0

data/lib/atig/agent/stream_follow.rb

@@ -24,10 +24,10 @@ module Atig
 
         @api.stream do|t|
           Thread.pass until @follows
-          t.watch('statuses/filter', :follow => @follows) do |status|
+          t.watch('statuses/filter', follow: @follows) do |status|
             if status and status.user
               db.transaction do|d|
-                d.statuses.add :status => status, :user => status.user, :source => :stream_follow
+                d.statuses.add status: status, user: status.user, source: :stream_follow
               end
             end
           end

data/lib/atig/agent/user_stream.rb

@@ -16,7 +16,7 @@ module Atig
         log :info, "initialize"
 
         @api.stream do|t|
-          options = context.opts.allreplies ? {:replies => :all} : {}
+          options = context.opts.allreplies ? {replies: :all} : {}
 
           t.watch('user', options) do |status|
 #            @log.debug status.inspect
@@ -24,11 +24,11 @@ module Atig
             if status.direct_message
               dm = status.direct_message
               db.dms.transaction do|d|
-                d.add :status => dm, :user => dm.sender
+                d.add status: dm, user: dm.sender
               end
             elsif status and status.user
               db.statuses.transaction do|d|
-                d.add :status => status, :user => status.user, :source => :user_stream
+                d.add status: status, user: status.user, source: :user_stream
               end
             elsif status and status.event
               case status.event

data/lib/atig/basic_twitter.rb

@@ -29,8 +29,6 @@ module Atig
       uri.path += ".json" if path != "users/username_available"
       uri.query = query.to_query_str unless query.empty?
 
-      header      = {}
-
       begin
         ret = request(uri, opts)
       rescue OpenSSL::SSL::SSLError => e
@@ -99,7 +97,7 @@ module Atig
       methods.each do |m|
         self.module_eval <<END
           def #{m}(path, query = {}, opts = {})
-            opts.update( :method => :#{m})
+            opts.update( method: :#{m})
             api path, query, opts
           end
 END

data/lib/atig/bitly.rb

@@ -27,7 +27,7 @@ module Atig
       if @login and @key
         bitly.path  = "/shorten"
         bitly.query = {
-          :format => "json", :longUrl => url, :login => @login, :apiKey => @key,
+          format: "json", longUrl: url, login: @login, apiKey: @key,
         }.to_query_str(";")
         req = @http.req(:get, bitly, {})
         res = @http.http(bitly, 5, 10).request(req)

data/lib/atig/channel/channel.rb

@@ -5,7 +5,7 @@ module Atig
     class Channel
       def initialize(context, gateway, db)
         @db      = db
-        @channel = gateway.channel channel_name, :handler=>self
+        @channel = gateway.channel channel_name, handler:self
         @channel.join_me
 
         db.statuses.listen do|entry|

data/lib/atig/channel/list.rb

@@ -12,14 +12,14 @@ module Atig
         def on_invite(api, nick)
           return if @name.include? '^'
 
-          api.post("lists/members/create", :screen_name => nick, :owner_screen_name => @db.me.screen_name, :slug => @name )
+          api.post("lists/members/create", screen_name: nick, owner_screen_name: @db.me.screen_name, slug: @name )
           @db.lists.invalidate @name
         end
 
         def on_kick(api, nick)
           return if @name.include? '^'
 
-          api.post("lists/members/destroy", :screen_name => nick, :owner_screen_name => @db.me.screen_name, :slug => @name )
+          api.post("lists/members/destroy", screen_name: nick, owner_screen_name: @db.me.screen_name, slug: @name )
           @db.lists.invalidate @name
         end
 
@@ -31,7 +31,7 @@ module Atig
 
       def initialize(context, gateway, db)
         @channels = Hash.new do|hash,name|
-          channel = gateway.channel "##{name}", :handler => Handler.new(db, name)
+          channel = gateway.channel "##{name}", handler: Handler.new(db, name)
           channel.join_me
           hash[name] = channel
         end

data/lib/atig/channel/retweet.rb

@@ -7,7 +7,7 @@ module Atig
       def initialize(context, gateway, db)
         super
 
-        db.statuses.find_all(:limit=>50).reverse_each {|entry|
+        db.statuses.find_all(limit:50).reverse_each {|entry|
           message entry
         }
 

data/lib/atig/channel/timeline.rb

@@ -16,7 +16,7 @@ module Atig
         @channel.notify "Client options: #{context.opts.marshal_dump.inspect}"
 
         # つないだときに発言がないとさみしいので
-        db.statuses.find_all(:limit=>50).reverse_each do|entry|
+        db.statuses.find_all(limit:50).reverse_each do|entry|
           case entry.source
           when :timeline, :me
             @channel.message entry

data/lib/atig/command/autofix.rb

@@ -31,17 +31,17 @@ module Atig
           return
         end
         text = mesg.split(" ", 2)[1]
-        q = gateway.output_message(:status => text)
+        q = gateway.output_message(status: text)
 
-        prev,*_ = db.statuses.find_by_user( db.me, :limit => 1)
+        prev,*_ = db.statuses.find_by_user( db.me, limit: 1)
 
         unless fix?(command, q[:status], prev) then
-          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
         else
-          api.delay(0, :retry=>3) do|t|
+          api.delay(0, retry:3) do|t|
             yield "Similar update in previous. Conclude that it has error."
             yield "And overwrite previous as new status: #{q[:status]}"
 

data/lib/atig/command/destroy.rb

@@ -18,7 +18,7 @@ module Atig
           if entry = Info.find_status(db, tid)
             if entry.user.id == db.me.id
               api.delay(0) do|t|
-                res = t.post("statuses/destroy/#{entry.status.id}")
+                t.post("statuses/destroy/#{entry.status.id}")
                 yield "Destroyed: #{entry.status.text}"
 
                 db.statuses.transaction do|d|

data/lib/atig/command/dm.rb

@@ -20,8 +20,8 @@ module Atig
         text = mesg.split(" ", 3)[2]
         api.delay(0) do|t|
           t.post("direct_messages/new",{
-                   :screen_name => user,
-                   :text => text
+                   screen_name: user,
+                   text: text
                  })
           yield "Sent message to #{user}: #{text}"
         end

data/lib/atig/command/favorite.rb

@@ -14,7 +14,7 @@ module Atig
         args.each do|tid|
           if entry = Info.find_status(db, tid)
             api.delay(0){|t|
-              res = t.post("favorites/#{method}", {:id => entry.status.id})
+              t.post("favorites/#{method}", {id: entry.status.id})
               yield "#{command.upcase}: #{entry.user.screen_name}: #{entry.status.text}"
             }
           else

data/lib/atig/command/info.rb

@@ -21,7 +21,7 @@ module Atig
           api.delay(0) do|t|
             status = t.get "statuses/show/#{id}"
             db.statuses.transaction do|d|
-              d.add :status => status, :user => status.user, :source => :thread
+              d.add status: status, user: status.user, source: :thread
               f.call d.find_by_status_id(id)
             end
           end
@@ -30,7 +30,7 @@ module Atig
 
       def find_status(db, tid_or_screen_name)
         find = lambda do|x|
-          xs = db.statuses.find_by_screen_name(x, :limit=>1)
+          xs = db.statuses.find_by_screen_name(x, limit:1)
           unless xs.empty? then
             xs.first
           else

data/lib/atig/command/reply.rb

@@ -21,8 +21,8 @@ module Atig
 
           text = "@#{name} #{text}" if text.nil? or not text.include?("@#{name}")
 
-          q = gateway.output_message(:status => text,
-                                     :in_reply_to_status_id => entry.status.id)
+          q = gateway.output_message(status: text,
+                                     in_reply_to_status_id: entry.status.id)
 
           api.delay(0) do|t|
             ret = t.post("statuses/update", q)