saber 1.0.2 → 1.1.0

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.0 (Sep 12, 2012)
+
+**Improvements**
+
+  - Replace 'xmpp4r' with beeter one 'blather'
+
 ## 1.0.2 (Sep 12, 2012)
 
 **Bugfixes**

data/Gemfile

@@ -7,7 +7,7 @@ gem "pa", "~>1.3.2"
 gem "retort", "~>0.0.6"
 gem "thor", "~>0.16.0"
 gem "net-ssh", "~>2.5.2"
-gem "xmpp4r", "~>0.5"
+gem "blather", "~>0.8.0"
 gem "mechanize", "~>2.5.1"
 gem "highline", "~>1.6.14"
 gem "reverse_markdown", "~>0.3.0"

data/Gemfile.lock

@@ -5,11 +5,21 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
+    blather (0.8.0)
+      activesupport (>= 2.3.11)
+      eventmachine (>= 0.12.6)
+      girl_friday
+      niceogiri (~> 1.0)
+      nokogiri (~> 1.5.5)
+    connection_pool (0.9.2)
     crack (0.3.1)
     diff-lcs (1.1.3)
     domain_name (0.5.3)
       unf (~> 0.0.3)
+    eventmachine (1.0.0)
     ffi (1.1.5)
+    girl_friday (0.10.0)
+      connection_pool (~> 0.9.0)
     guard (1.3.2)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
@@ -32,6 +42,8 @@ GEM
     net-http-digest_auth (1.2.1)
     net-http-persistent (2.7)
     net-ssh (2.5.2)
+    niceogiri (1.0.2)
+      nokogiri (~> 1.4)
     nokogiri (1.5.5)
     ntlm-http (0.1.1)
     optimism (3.3.1)
@@ -65,12 +77,12 @@ GEM
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     webrobots (0.0.13)
-    xmpp4r (0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  blather (~> 0.8.0)
   guard
   guard-rspec
   highline (~> 1.6.14)
@@ -87,4 +99,3 @@ DEPENDENCIES
   thor (~> 0.16.0)
   vcr
   webmock
-  xmpp4r (~> 0.5)

data/README.md

@@ -122,7 +122,7 @@ Automatically fetch: when a file is finished download in rutorrent with label 's
 
 Manually fetch: right click 'Saber Fetch' in rutorrent web ui, then it'll add to aria2.
 
-Or from command line, send a download file to client: `saber drb_add <hash_id> saber`
+Or from command line, send a download file to client: `saber drb_add <hash_id> saber`, sometime the client need a long time(2 minutes) to recive the file list sent by server.
 	
 For ArchLinux, you can install `saber-server-daemon`, `user-saber-client-daemon`, `user-aria2-daemon` packages. 
 

data/lib/saber/autofetcher/client.rb

@@ -1,5 +1,4 @@
-require "tagen/xmpp4r"
-require "xmpp4r/client"
+require "blather/client/dsl"
 require "drb"
 
 module Saber
@@ -7,52 +6,47 @@ module Saber
     class Client
       class << self
         def start
-          client = Client.new
+          c = Client.new
+          c.start
 
-          client.start
-          p Thread.list
-
-          Thread.list.each{|v| v.join}
+          EM.run { c.run }
         end
       end
 
-      attr_reader :client, :fetcher
+      include Blather::DSL
+
+      attr_reader :fetcher
 
       def initialize
-        @client = Jabber::Client.new(Jabber::JID.new(Rc.client.xmpp.jid))
         @fetcher = Fetcher.new
       end
 
+      def run
+        client.run
+      end
+
       def start
-        client.connect Rc.client.xmpp.host, Rc.client.xmpp.port 
-        client.auth Rc.client.xmpp.password
+        rc = Rc.client.xmpp
+        setup rc.jid, rc.password, rc.host, rc.port
+        when_ready { Saber.ui.say ">> Connected to xmpp at #{jid}" }
+        disconnected { client.connect }
 
-        at_exit do
-          pd Thread.current
-          begin
-            client.send Jabber::Presence.new.set_type(:unavaliable)
-          rescue IOError # closed stream
-            Saber.ui.error "closed stream (IOError)"
-          end
+        message :chat?, :body, :from => /#{Rc.server.xmpp.jid}/ do |m|
+          process_msg m.body
         end
-
-        client.add_message_callback { |msg|
-          if msg.from.bare == Rc.server.xmpp.jid
-            files = msg.body.split("\n")
-            Saber.ui.debug "RECV #{files}"
-            fetcher.add *files
-          end
-          pd "add done"
-        }
-
-        client.send Jabber::Iq.new_rosterget
-        client.send Jabber::Presence.new.set_type(:avaliable)
-        Saber.ui.say ">> Connected to xmpp with #{Rc.client.xmpp.jid}"
       end
 
       def stop
         @client.close!
       end
+
+    protected
+
+      def process_msg(body)
+        files = body.split("\n")
+        Saber.ui.debug files.map{|v| "RECV #{v}"}.join("\n")
+        fetcher.add *files
+      end
     end
 
     class DRbClient
@@ -65,9 +59,11 @@ module Saber
       end
 
       def add(*names)
-        Saber.ui.say "ADD #{names}"
+        Saber.ui.debug "DRbClient-ADD #{names.inspect}"
         server.add(*names)
       end
     end
   end
 end
+
+# vim: fdn=4

data/lib/saber/autofetcher/server.rb

@@ -1,42 +1,35 @@
-require "tagen/xmpp4r"
-require "xmpp4r/client"
+require "blather/client/dsl"
 require "drb"
 
 module Saber
   module AutoFetcher
     class Server
+      include Blather::DSL
+
       def self.start
         s = Server.new
         DRbServer.start(s)
         s.start
 
-        Thread.list.each {|v| v.join}
+        EM.run { s.run }
       end
 
-      attr_reader :client
-
-      def initialize
-        @client = Jabber::Client.new(Jabber::JID.new(Rc.server.xmpp.jid))
+      def run
+        client.run
       end
 
       def start
-        client.connect Rc.server.xmpp.host, Rc.server.xmpp.port
-        client.auth Rc.server.xmpp.password
-
-        at_exit do
-          client.send Jabber::Presence.new.set_type(:unavaliable)
-        end
-
-        client.send Jabber::Iq.new_rosterget
-        client.send Jabber::Presence.new.set_type(:avaliable)
+        rc = Rc.server.xmpp
+        setup rc.jid, rc.password, rc.host, rc.port
 
-        Saber.ui.say ">> Connected to xmpp with #{Rc.server.xmpp.jid}"
+        when_ready { Saber.ui.say ">> Connected to xmpp at #{jid}" }
+        disconnected { client.connect }
       end
 
       def send(files)
-        Saber.ui.debug "SEND #{files.join("\n")}"
-        #client.send Jabber::Presence.new
-        client.send Jabber::Message.new(Rc.client.xmpp.jid, files.join("\n")).set_type(:chat)
+        msg = files.join("\n")
+        Saber.ui.debug files.map{|v| "SEND #{v}"}.join("\n")
+        say Rc.client.xmpp.jid , msg
       end
     end
 
@@ -61,9 +54,7 @@ module Saber
 
       # drb. add a complete torrent.
       def add(*names)
-        Saber.ui.debug "DRbServer-ADD #{names.inspect}"
         files = build_files(*names) 
-
         saber_server.send(files)
       end
 

data/lib/saber/rc.rb

@@ -11,3 +11,13 @@ aria2:
 port = 3014
 token = "641a16655dad688ab681c0279a4369b5"
 drb_uri = "druby://localhost:3015"
+
+server:
+  xmpp:
+    host = nil
+    port = nil
+
+client:
+  xmpp:
+    host = nil
+    port = nil

data/lib/saber/version.rb

@@ -1,3 +1,3 @@
 module Saber
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/saber.gemspec

@@ -24,7 +24,7 @@ A complete solution for PT users.
 	s.add_dependency "retort", "~> 0.0.6"
 	s.add_dependency "thor", "~> 0.16.0"
 	s.add_dependency "net-ssh", "~> 2.5.2"
-	s.add_dependency "xmpp4r", "~> 0.5"
+	s.add_dependency "blather", "~> 0.8.0"
 	s.add_dependency "mechanize", "~> 2.5.1"
 	s.add_dependency "highline", "~> 1.6.14"
 	s.add_dependency "reverse_markdown", "~> 0.3.0"

data/templates/_saberrc

@@ -19,18 +19,13 @@ bib:
 # [saber-fetch]
 server:
   ftp = "ftp://seedbox/bt"
-
   xmpp:
     jid = "x1@gmail.com"
     password = "y1"
-    host = nil
-    port = nil
 
 client:
   xmpp:
     jid = "x2@gmail.com"
     password = "y2"
-    host = nil
-    port = nil
 
 # vim: ft=ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saber
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -124,13 +124,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.5.2
 - !ruby/object:Gem::Dependency
-  name: xmpp4r
+  name: blather
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,7 @@ extensions:
 - extconf.rb
 extra_rdoc_files: []
 files:
+- .bundle/config
 - .gitignore
 - .rspec
 - .travis.yml