atig 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fa3205294dc32a30048fe0bb019a00ee64b993b
-  data.tar.gz: af811c86345b7f465ea7d461332a24f929054c3a
+  metadata.gz: f5849d378b18e123fd9dcf8bf9a1ee96e6401434
+  data.tar.gz: f0e7fc07a38030e1beb7b2fb9fd2633fb289db1e
 SHA512:
-  metadata.gz: b527ca8c8e5526320297014377b0ff46979622c846bb459b064e32e8dd1c5f6a394645a6521240693677d57d20fd614ae26e5d0fa88ce7c259862167b79b56cb
-  data.tar.gz: 30616c567a4fe5359fe331de8ecd3f12acfa088d262a4d97baa5457bc1a5903312fb61234490be3018a85811efb7638bb524dccdfaec471b5f2049a42cae2520
+  metadata.gz: f8418c16aa59ad77355d7ccb591d1ef21cfe0c3963c0626c3f9e1ecdefdebaf76db89286e62e1528a5f07242f2f76aa06cf172b166ee3d2e08439c56623770af
+  data.tar.gz: c50550489c0888bb2bba2facf47ee41b6524a44b2f7c85c0d3661dcaacc2ae93f5542d2e0c2431d84721bc6881f7cf97795184f05743f18bc0a9c9a0be6bf025

data/.travis.yml

@@ -1,5 +1,7 @@
+language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 
 script: bundle exec rake spec

data/Rakefile

@@ -1,5 +1,4 @@
 # -*- mode:ruby -*-
-require 'rubygems'
 require 'rake'
 require 'rake/clean'
 require 'rspec/core/rake_task'
@@ -10,7 +9,8 @@ CLEAN.include(
 )
 
 CLOBBER.include(
-  "pkg"
+  "pkg",
+  "coverage"
 )
 
 RSpec::Core::RakeTask.new do |t|
@@ -20,7 +20,7 @@ end
 desc "building document with sphinx"
 task :docs do
   build_dir = "docs/_build"
-  `sphinx-build -b html -d #{build_dir}/doctrees -D latex_paper_size=a4 docs #{build_dir}/html`
+  `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

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/atig/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["SHIBATA Hiroshi"]
-  gem.email         = ["shibata.hiroshi@gmail.com"]
+  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"
@@ -15,13 +15,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Atig::VERSION
 
+  gem.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 'rake', ['>= 0'] unless defined? Rake
-  gem.add_dependency 'json', ['>= 0'] unless defined? JSON
-
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'coveralls'

data/docs/changelog.rst

@@ -1,6 +1,31 @@
 更新履歴
 ==============
 
+v0.4.4(2013-12-29)
+------------------------------
+http://github.com/mzp/atig/tree/v0.4.4
+
+機能変更
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ - サポート対象を Ruby 1.9.3 以降にしました
+ - follower 取得時の1回の取得数を100件に拡張しました
+
+ v0.4.3(2013-10-18)
+------------------------------
+http://github.com/mzp/atig/tree/v0.4.3
+
+不具合修正
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ - 短縮 URL の展開が動かない問題を修正しました
+
+v0.4.2(2013-10-13)
+------------------------------
+http://github.com/mzp/atig/tree/v0.4.2
+
+機能変更
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ - タイムラインの取得間隔を 1 分にしました
+
 v0.4.1(2013-08-02)
 ------------------------------
 http://github.com/mzp/atig/tree/v0.4.1

data/docs/conf.py

@@ -38,16 +38,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'atig.rb'
-copyright = u'2010, mzp'
+copyright = u'2010-2013, mzp'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.3'
+version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.8'
+release = '0.4.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

data/docs/index.rst

@@ -15,11 +15,11 @@ atig.rbはTwitterとIRCを結ぶゲートウェイです。
 ダウンロード
 ------------------------------
 
- - 安定板: `atigrb-0.3.8.tgz`_. ( `過去のバージョン`_ )
+ - 安定板: `atigrb-0.4.3.tgz`_. ( `過去のバージョン`_ )
  - 開発版: `Github Repository`_.
 
-.. _atigrb-0.3.8.tgz: http://github.com/mzp/atig/tarball/v0.3.8
-.. _過去のバージョン: http://github.com/mzp/atig/downloads
+.. _atigrb-0.4.3.tgz: http://github.com/mzp/atig/tarball/v0.4.3
+.. _過去のバージョン: http://github.com/mzp/atig/tags
 .. _GitHub Repository: http://github.com/mzp/atig
 
 特徴

data/docs/options.rst

@@ -63,10 +63,6 @@ bitlify=\ ``username``:\ ``api_key``:\ ``size``
   ``size``\ 字以上のURLを http://bit.ly のAPIによって短縮します。
   APIを利用して短縮すると、ユーザページに短縮したURLが記録されたりします。
   詳しくは、 http://bit.ly のSign up for bit.lyを読んでください。
-unuify
-  |len| 字以上のURLを http://u.nu によって短縮します。
-unuify= \ ``size``
-  ``size`` 字以上のURLを http://u.nu によって短縮します。
 
 .. |len| replace:: 20
 

data/docs/quickstart.rst

@@ -36,7 +36,7 @@ trunk版
 ~~~~~~~~~~
 githubからpullしてください。::
 
- $ git pull http://mzp.github.com/atig
+ $ git clone https://github.com/mzp/atig.git
 
 使ってみる
 ----------

data/lib/atig.rb

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-$KCODE = "u" unless defined? ::Encoding # json use this
-
 require 'atig/version'
 require 'atig/monkey'
 require 'atig/optparse'

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})
+          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})
+          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})
+          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/bitly.rb

@@ -1,5 +1,4 @@
 # -*- mode:ruby; coding:utf-8 -*-
-require 'rubygems'
 require 'json'
 require 'atig/http'
 

data/lib/atig/channel/timeline.rb

@@ -32,7 +32,7 @@ module Atig
             messages[0, 3].each do |m|
               @channel.notify "  \002#{m[/.+/]}\017"
             end
-            @channel.notify("  ... and more. check it: http://mzp.github.com/atig/") if messages.size > 3
+            @channel.notify("  ... and more. check it: http://mzp.github.io/atig/") if messages.size > 3
           end
           sleep (3*60*60)
         end if UpdateChecker.git_repos?

data/lib/atig/db/sql.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require 'rubygems'
 require 'sqlite3'
 
 module Atig

data/lib/atig/db/statuses.rb

@@ -1,7 +1,6 @@
 # -*- mode:ruby; coding:utf-8 -*-
 require 'atig/db/listenable'
 require 'atig/db/transaction'
-require 'rubygems'
 require 'sqlite3'
 require 'atig/db/roman'
 require 'atig/db/sql'

data/lib/atig/ifilter/expand_url.rb

@@ -44,7 +44,6 @@ module Atig
                       | nico\.ms
                       | airme\.us
                       | twurl\.nl
-                      | u\.nu
                       | htn\.to)
                     / [0-9a-z=-]+ |
                     blip\.fm/~ (?> [0-9a-z]+) (?! /) |

data/lib/atig/monkey.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'net/irc'
 
 # monkey hack

data/lib/atig/oauth.rb

@@ -1,5 +1,4 @@
 # -*- mode:ruby; coding:utf-8 -*-
-require 'rubygems'
 require 'oauth'
 require 'atig/oauth-patch'
 

data/lib/atig/ofilter/short_url.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require 'atig/unu'
 require 'atig/bitly'
 
 module Atig
@@ -28,9 +27,6 @@ module Atig
                   when @opts.bitlify
                     @len = (@opts.bitlify.to_s || MIN_LEN).to_i
                     Bitly.no_login @log
-                  when @opts.unuify
-                    @len = (@opts.unuify.to_s || MIN_LEN).to_i
-                    Unu.new @log
                   else
                     return mesg
                   end

data/lib/atig/search.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'json'
 require 'atig/http'
 require 'atig/url_escape'

data/lib/atig/stream.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require 'rubygems'
 require 'json'
 require 'uri'
 require 'logger'

data/lib/atig/version.rb

@@ -1,3 +1,3 @@
 module Atig
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/requirements.txt

@@ -0,0 +1,5 @@
+Jinja2==2.7.1
+MarkupSafe==0.18
+Pygments==1.6
+Sphinx==1.2b3
+docutils==0.11

data/spec/ofilter/short_url_spec.rb

@@ -76,42 +76,6 @@ describe Atig::OFilter::ShortUrl,"when login bitly with size" do
   end
 end
 
-describe Atig::OFilter::ShortUrl,"when unu bitly" do
-  before do
-    logger = double('Logger')
-    unu =  double("Unu")
-    unu.stub(:shorten).and_return{|s|
-      "[#{s}]"
-    }
-    Atig::Unu.should_receive(:new).with(logger).and_return(unu)
-    @ofilter = Atig::OFilter::ShortUrl.new(OpenStruct.new(:log=>logger, :opts=>OpenStruct.new('unuify'=>true)))
-  end
-
-  it "should shorten url by unu" do
-    @ofilter.call({:status => "this is http://example.com/a http://example.com/b"}).should == {
-      :status => "this is [http://example.com/a] [http://example.com/b]"
-    }
-  end
-end
-
-describe Atig::OFilter::ShortUrl,"when no-login unu with size" do
-  before do
-    logger = double('Logger')
-    unu =  double("Unu")
-    unu.stub(:shorten).and_return{|s|
-      "[#{s}]"
-    }
-    Atig::Unu.should_receive(:new).with(logger).and_return(unu)
-    @ofilter = Atig::OFilter::ShortUrl.new(OpenStruct.new(:log=>logger, :opts=>OpenStruct.new('unuify'=>13)))
-  end
-
-  it "should only shorten large url" do
-    @ofilter.call({:status => "this is http://example.com/a http://a.com"}).should == {
-      :status => "this is [http://example.com/a] http://a.com"
-    }
-  end
-end
-
 describe Atig::OFilter::ShortUrl,"when nop" do
   before do
     logger = double('Logger')

data/spec/spec_helper.rb

@@ -1,10 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
-require 'rubygems'
-require 'bundler'
-
-Bundler.setup
-Bundler.require :default, :test
-
+require 'bundler/setup'
 require 'atig/monkey'
 require 'command_helper'
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: atig
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
+- MIZUNO Hiroki
 - SHIBATA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -52,34 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +97,7 @@ dependencies:
         version: '0'
 description: Atig.rb is Twitter Irc Gateway.
 email:
+- mzp@ocaml.jp
 - shibata.hiroshi@gmail.com
 executables:
 - atig
@@ -250,12 +224,12 @@ files:
 - lib/atig/stream.rb
 - lib/atig/twitter.rb
 - lib/atig/twitter_struct.rb
-- lib/atig/unu.rb
 - lib/atig/update_checker.rb
 - lib/atig/url_escape.rb
 - lib/atig/util.rb
 - lib/atig/version.rb
 - lib/memory_profiler.rb
+- requirements.txt
 - spec/command/autofix_spec.rb
 - spec/command/destroy_spec.rb
 - spec/command/dm_spec.rb
@@ -310,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -318,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Atig.rb is forked from cho45's tig.rb. We improve some features of tig.rb.
@@ -366,3 +340,4 @@ test_files:
 - spec/sized_hash_spec.rb
 - spec/spec_helper.rb
 - spec/update_checker_spec.rb
+has_rdoc: 

data/lib/atig/unu.rb

@@ -1,27 +0,0 @@
-# -*- mode:ruby; coding:utf-8 -*-
-module Atig
-  class Unu
-    def initialize(logger)
-      @log = logger
-      @http = Atig::Http.new logger
-    end
-
-    def shorten(url)
-      unu_url = "http://u.nu/"
-      unu     = URI("#{unu_url}unu-api-simple")
-      url = URI.rstrip url
-      unu.query = { :url => url }.to_query_str
-      res = @http.http(unu, 5, 5).request(@http.req(:get, unu)).body
-
-      if res[0, 12] == unu_url
-        res
-      else
-        @log.error res
-        url
-      end
-    rescue Errno::ETIMEDOUT, JSON::ParserError, IOError, Timeout::Error, Errno::ECONNRESET => e
-      @log.error e
-      url
-    end
-  end
-end