rabbiter 2.0.1 → 2.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b55054e7599c085620193a0a2b716c80064c7cdb
+  data.tar.gz: 7ca5f75407ad9efd99ac2e0742490111c89ba343
+SHA512:
+  metadata.gz: a04250f06e63f0b36d0c17904c73e0e1ba38956111f9003d3dac96c3fa6685e47c566ae75f42e4975fadca59dd6de7e175c537da2c65b31189466c284f070274
+  data.tar.gz: c94b77c06b2f2072f1584424247970df4d9ff1735ee9f67de0395bd35920c6687d4addc7ee554064110e593464685487cbc27c8c343c92f078de8031f6b35f20

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2014  Kouhei Sutou <kou@cozmixng.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 require "rubygems"
 require "bundler/gem_helper"
-require "gettext/task"
+require "gettext/tools/task"
 
 base_dir = File.expand_path(File.dirname(__FILE__))
 
@@ -30,7 +30,8 @@ end
 helper.install
 spec = helper.gemspec
 
-GetText::Task.new(spec) do |task|
+GetText::Tools::Task.define do |task|
+  task.spec = spec
 end
 
 task :build => "gettext"

data/lib/rabbiter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2010-2014  Kouhei Sutou <kou@cozmixng.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -162,32 +162,30 @@ module Rabbiter
           @client.tls_validation_flags -= :unknown_ca
         end
         @connection = @client.connect_to_host(@options[:host], @options[:port])
-        @socket = @connection.socket
-        @socket.blocking = false
         @input = @connection.input_stream
         @output = @connection.output_stream
 
-        reader_source = @socket.create_source(:in) do |socket, condition|
+        reader_source = @input.create_source do |stream|
           @logger.debug("[twitter][read][start]")
-          data = @input.read(8192) || ""
-          @logger.debug("[twitter][read][done] #{data.bytesize}")
-          if data.empty?
-            @source_ids.reject! {|id| id == reader_source.id}
-            @logger.debug("[twitter][read][eof]")
-            false
-          else
-            @handler.receive_data(data)
+          begin
+            data = @input.read_nonblocking(8192)
+          rescue Gio::IOError::WouldBlock
+              data = ""
+          rescue => error
+            @logger.debug("[twitter][read][error] #{error}")
+            @handler.send(:receive_error, "#{error.class}: #{error}")
+            data = nil
+          end
+          if data
+            @logger.debug("[twitter][read][done] #{data.bytesize}")
+            @handler.receive_data(data) unless data.empty?
             true
+          else
+            false
           end
         end
         @source_ids << reader_source.attach
 
-        error_source = @socket.create_source(:err) do |socket, condition|
-          @handler.send(:receive_error, condition)
-          true
-        end
-        @source_ids << error_source.attach
-
         @handler.extend(GLibAdapter)
         @handler.connection = self
         @handler.connection_completed
@@ -195,7 +193,7 @@ module Rabbiter
 
       def send_data(data)
         rest = data.bytesize
-        writer_source = @socket.create_source(:out) do |socket, condition|
+        writer_source = @output.create_source do |stream|
           if rest.zero?
             @logger.debug("[twitter][flush][start]")
             @output.flush
@@ -204,7 +202,7 @@ module Rabbiter
             false
           else
             @logger.debug("[twitter][write][start]")
-            written_size = @output.write(data)
+            written_size = @output.write_nonblocking(data)
             @logger.debug("[twitter][write][done] #{written_size}")
             rest -= written_size
             data[0, written_size] = ""
@@ -220,8 +218,6 @@ module Rabbiter
           GLib::Source.remove(id)
           true
         end
-        @socket.close
-        @socket = nil
         @input = nil
         @output = nil
         @connection = nil

data/lib/rabbiter/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@cozmixng.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,5 +15,5 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Rabbiter
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/rabbiter.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2012 Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2014 Kouhei Sutou <kou@cozmixng.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,10 +45,11 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_runtime_dependency("rabbit", ">= 2.0.0")
-  spec.add_runtime_dependency("gio2", ">= 1.1.4")
+  spec.add_runtime_dependency("gio2", ">= 2.1.1")
   spec.add_runtime_dependency("twitter_oauth")
   spec.add_runtime_dependency("twitter-stream", ">= 0.1.16")
 
   spec.add_development_dependency("rake")
   spec.add_development_dependency("bundler")
+  spec.add_development_dependency("gettext")
 end

metadata

@@ -1,110 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: rabbiter
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rabbit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: gio2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter-stream
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gettext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rabbiter receives comments from twitter and sends them to Rabbit. Rabbit
@@ -116,42 +117,41 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Rakefile
 - COPYING
 - GPL
-- README
 - Gemfile
-- rabbiter.gemspec
-- lib/rabbiter/version.rb
-- lib/rabbiter/gettext.rb
+- README
+- Rakefile
+- bin/rabbiter
 - lib/rabbiter.rb
-- po/ja/rabbiter.po
+- lib/rabbiter/gettext.rb
+- lib/rabbiter/version.rb
 - locale/ja/LC_MESSAGES/rabbiter.mo
-- bin/rabbiter
+- po/ja/rabbiter.po
+- rabbiter.gemspec
 homepage: http://rabbit-shocker.org/en/rabbiter/
 licenses:
 - GPLv2+
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rabbit
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rabbiter is a twitter client for Rabbit
 test_files: []
 has_rdoc: