saber 0.0.3 → 0.0.4

data/Gemfile

@@ -1,8 +1,7 @@
 source :rubygems
 
-gem "tagen", "~>1.1.5"
 gem "optimism", "~>3.1.2"
-gem "pa", "~>1.2.2"
+gem "pa", "~>1.2.3"
 gem "retort", "~>0.0.6"
 gem "thor", "~>0.14.6"
 gem "net-ssh", "~>2.3.0", :require => "net/ssh"

data/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
     net-ssh (2.3.0)
     optimism (3.1.2)
       hike (~> 1.2.0)
-    pa (1.2.2)
+    pa (1.2.3)
     rag (1.2.1)
       optimism (~> 3.1.0)
       pa (~> 1.2.0)
@@ -38,11 +38,10 @@ PLATFORMS
 DEPENDENCIES
   net-ssh (~> 2.3.0)
   optimism (~> 3.1.2)
-  pa (~> 1.2.2)
+  pa (~> 1.2.3)
   rag
   retort (~> 0.0.6)
   rspec
-  tagen (~> 1.1.5)
   thor (~> 0.14.6)
   watchr
   xmpp4r (~> 0.5)

data/README.md

@@ -3,13 +3,10 @@ Saber, a complete solution for PT users.
 
 | Homepage:      |  https://github.com/GutenYe/saber       |
 |----------------|-----------------------------------------|
-| Author:	       | Guten Ye                                |
+| Author:	       | Guten                                   |
 | License:       | MIT-LICENSE                             |
-| Documentation: | http://rubydoc.info/gems/saber/frames   |
 | Issue Tracker: | https://github.com/GutenYe/saber/issues |
 
-the saber.
-
 ### Is It Good?
 
 Yes.
@@ -18,30 +15,60 @@ Yes.
 
 No.
 
+What saber can do for you?
+
+* addtorrent: send torrent file to rutorrent in a PT website directly.
+* download: 
+		1. manually download a file to home laptop in rutorrent web ui.
+		2. automatically downlad files to home laptop when files are completed in seedbox.
+* task:
+		1. cleanup files not in rtorrent.
+
 Usage
 -----
 
-Task: manually download file from server.
+### addtorrent
 
-	# start aria2 user daemon
-	$ ~/etc/rc.d/aria2 start
-	$ saber download "Prison Break"
-	# aria2 will begin download.
+see https://github.com/Gutenye/saber-addtorrent
 
-Task: clean up undownload files, all files remains in disk, but don't in rtorrent client.
 
-	$ saber clean
+### download
 
-Install
---------
+	# server side
+	# start rtorrent
+	$ /etc/rc.d/saber-server start  # start saber server daemon.
 
-server side
+	# client side
+	$ ~/etc/rc.d/aria2 start  # start aria2 daemon.
+	$ ~/etc/rc.d/saber-client start # start saber client daemon.
+	
+	# manually download
+	right click 'Saber Download' in rutorrent web ui, then it adds to aria2.
 
-	begin ssh
+	# automatically download
+	when a file is finished download in rutorrent with label 'saber', then it adds to aria2.
 
-client side
+	
+### task
+
+clean up undownload files, all files remains in disk, but don't in rtorrent client.
+
+	# server side
+	$ saber clean
+
+Install
+--------
 
-  gem install saber
+	# server side
+	$ gem install saber
+	$ pacaur -S rutorrent-saber-git
+	$ pacaur -S saber-server-daemon-git 
+	
+	# client side
+	$ gem install saber
+	$ pacaur -S user-aria2-daemon-git  # an aria2 daemon
+	$ pacaur -S thebear-git  # optional. a web front end to aria2.
+	$ pacaur -S user-saber-client-daemon-git
 
 Contributing
 -------------
@@ -58,14 +85,15 @@ Credits
 Resources
 ---------
 
-	some related resources to help each other.
+* [pacaur](https://github.com/Spyhawk/pacaur): An AUR installer for ArchLinux.
+* [TheBear](http://sourceforge.net/projects/thebear/): a web front end to aria2. 
 
 Copyright
 ---------
 
 (the MIT License)
 
-Copyright (c) 2011 Guten Ye
+Copyright (c) 2011 Guten
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/bin/saber

@@ -7,8 +7,7 @@ rescue Saber::Error => e
   Saber.ui.error e.message
   Saber.ui.debug e.backtrace.join("\n")
   exit 1
-rescue Interrupt => e
-  Saber.ui.error "\nQuitting..."
-  Saber.ui.debug e.backtrace.join("\n")
+rescue Exception => e
+  raise e
   exit 1
 end

data/doc/Development.md

@@ -0,0 +1,3 @@
+
+	$ saber client -V --pid a.pid 
+	# stay foreground. and print to STDOUT.

data/lib/saber.rb

@@ -1,9 +1,12 @@
-libdir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
 ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
 require "bundler/setup"
-Bundler.require
+#Bundler.require
+require "pa"
+require "optimism"
+require "retort"
+
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 Retort::Service.configure do |c|
 	c.url = "http://localhost/RPC2"

data/lib/saber/cli.rb

@@ -1,4 +1,5 @@
-require "xmlrpc/client"
+require "thor"
+require "drb"
 
 module Saber
   class CLI < Thor
@@ -6,12 +7,16 @@ module Saber
 
     class_option "no-color", :type => :boolean, :banner => "Disable colorization in output"
     class_option "verbose",  :aliases => "-V", :type => :boolean, :banner => "Enable verbose output mode"
+    class_option "log", :banner => "log file", :type => :string
+
+    attr_reader :o
 
     def initialize(*)
       super
+      o = @o = options.dup
       the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
       Saber.ui = UI::Shell.new(the_shell)
-      Saber.ui.debug! if options["verbose"]
+      Saber.ui.debug! if o["verbose"]
     end
 
     desc "clean", "clean up files doesn't in rtorrent client"
@@ -26,11 +31,19 @@ module Saber
 
     desc "server", "start saber-server daemon"
     def server
+      require "logger"
+      o["log"] ||= "/var/log/saber-server.log"
+
+      $log = Logger.new options["verbose"] ? STDOUT : o["log"]
       Server.start
     end
 
     desc "client", "start saber-client daemon"
     def client
+      require "logger"
+      o["log"] ||= "/var/log/saber-client.log"
+
+      $log = Logger.new options["verbose"] ? STDOUT : o["log"]
       Client.start
     end
 

data/lib/saber/client.rb

@@ -5,7 +5,9 @@ module Saber
   class Client
     class << self
       def start
-        Client.new.start
+        client = Client.new
+        client.start
+
         sleep
       end
     end
@@ -25,14 +27,18 @@ module Saber
         pd msg.from.bare
         if msg.from.bare == Rc.server.xmpp.jid
           files = msg.body.split("\n")
-          Saber.ui.say "::recv files::\n #{files.join("\n")}\n\n"
-          #downloader.add *files
+          $log.debug "::recv::\n #{files.join("\n")}\n\n"
+          downloader.add *files
         end
       }
 
       client.send Jabber::Presence.new
       Saber.ui.say ">> Connected to xmpp with #{Rc.client.xmpp.jid}"
     end
+
+    def stop
+      @client.close!
+    end
   end
 
   class DRbClient
@@ -41,10 +47,11 @@ module Saber
     def initialize
       DRb.start_service
       @server = DRbObject.new_with_uri(Rc.drb_uri)
-      Saber.ui.debug "DRbClient connected to #{Rc.drb_uri}"
+      Saber.ui.say ">> DRbClient connected to #{Rc.drb_uri}"
     end
 
     def add(*names)
+      Saber.ui.say "::add::\n#{names.join("\n")}"
       server.add(*names)
     end
   end

data/lib/saber/downloader.rb

@@ -1,4 +1,5 @@
 require "xmlrpc/client"
+require "net/ssh"
 
 module Saber
   class Downloader
@@ -13,6 +14,7 @@ module Saber
     def add(*files)
       files.each { |file|
         uri = "#{Rc.server.ftp}/#{file}"
+        $log.debug "::add_url:: #{uri}"
         gid = aria2_add([uri], :dir => Pa.dir2("#{Rc.p.download}/#{file}"))
         Saber.ui.say "DOWNLOAD #{gid}:: #{uri}"
       }

data/lib/saber/server.rb

@@ -8,8 +8,9 @@ module Saber
       Retort::Service.call("system.method.set_key", "event.download.closed", "saber-download", "execute= /usr/bin/saber-drb_add, $d.get_hash=, $d.get_custom1=")
 
       s = Server.new
-      s.start
       DRbServer.start(s)
+      s.start
+
       DRb.thread.join
     end
 
@@ -27,7 +28,7 @@ module Saber
     end
 
     def send(files)
-      Saber.ui.say %~::send::\n #{files.join("\n")}\n\n~
+      $log.debug %~::send::\n #{files.join("\n")}\n\n~
       client.send Jabber::Message.new(Rc.client.xmpp.jid, files.join("\n"))
     end
   end
@@ -53,7 +54,7 @@ module Saber
 
     # drb. add a complete torrent.
     def add(*names)
-      Saber.ui.debug "::DRbServer add:: #{names.inspect}"
+      $log.debug "::DRbServer add:: #{names.inspect}"
       files = build_files(*names) 
 
       saber_server.send(files)

data/lib/saber/version.rb

@@ -1,3 +1,3 @@
 module Saber
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/rutorrent/README.md

@@ -0,0 +1,34 @@
+rutorrent-saber-download, a rutorrent plugin to auto download files into home laptop.
+==========================================================================
+
+| Homepage:      |  https://github.com/GutenYe/rutorrent-saber-download       |
+|----------------|------------------------------------------------------       |
+| Author:	       | Guten                                                 |
+| License:       | MIT-LICENSE                                                |
+| Issue Tracker: | https://github.com/GutenYe/saber-download/issues |
+
+This is a part of the [Saber](https://github.com/GutenYe/saber) project.
+
+Install
+-------
+
+  gem install saber-download
+
+
+Resources
+---------
+
+	some related resources to help each other.
+
+Copyright
+---------
+
+(the MIT License)
+
+Copyright (c) 2011 Guten
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/rutorrent/init.js

@@ -0,0 +1,28 @@
+pd = console.log;
+
+if(plugin.canChangeMenu())
+{
+	theWebUI.saberDownload = function(id){
+    theWebUI.perform("saberDownload");
+  }
+
+	plugin.createMenu = theWebUI.createMenu;
+	theWebUI.createMenu = function( e, id )
+	{
+		plugin.createMenu.call(this, e, id);
+		if(plugin.enabled)
+		{
+			var el = theContextMenu.get("Update trackers")
+			if( el )
+				theContextMenu.add( el, ["Saber Download", "theWebUI.saberDownload('"+id+"')"]);
+		}
+	}
+}
+
+rTorrentStub.prototype.saberDownload = function()
+{
+  var cmd = new rXMLRPCCommand("execute");
+  cmd.addParameter("string", "/usr/bin/saber-drb_add");
+  cmd.addParameter("string", this.hashes.join(","));
+  this.commands.push(cmd);
+}

data/rutorrent/init.php

@@ -0,0 +1,5 @@
+<?php
+
+	$theSettings->registerPlugin($plugin["name"],$pInfo["perms"]);
+
+?>

data/rutorrent/plugin.info

@@ -0,0 +1,4 @@
+plugin.description: a rutorrent plugin to auto download files into home laptop.
+plugin.author: Guten
+plugin.version: 0.1
+plugin.help: https://github.com/GutenYe/rutorrent-saber-download

data/saber.gemspec

@@ -18,9 +18,8 @@ the saber
 	s.executables = ["saber"]
   s.extensions << "extconf.rb"
 
-	s.add_dependency "tagen", "~>1.1.5"
   s.add_dependency "optimism", "~>3.1.2"
-  s.add_dependency "pa", "~>1.2.2"
+  s.add_dependency "pa", "~>1.2.3"
   s.add_dependency "retort","~>0.0.6"
   s.add_dependency "thor", "~>0.14.6"
   s.add_dependency "net-ssh", "~>2.3.0"

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require "saber"
+require "logger"
 
 $spec_dir = File.expand_path("..", __FILE__)
 $spec_data = File.expand_path("../data", __FILE__)
@@ -17,6 +18,7 @@ port = 8914
 token = "token"
 drb_uri = "druby://localhost:8915"
 EOF
+$log = Logger.new(StringIO.new)
 
 RSpec.configure do |config|
   def capture(stream)
@@ -56,5 +58,3 @@ private
     end
   end
 end
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saber
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: tagen
-  requirement: &17018160 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *17018160
 - !ruby/object:Gem::Dependency
   name: optimism
-  requirement: &17031380 !ruby/object:Gem::Requirement
+  requirement: &14540700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +21,21 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *17031380
+  version_requirements: *14540700
 - !ruby/object:Gem::Dependency
   name: pa
-  requirement: &17028780 !ruby/object:Gem::Requirement
+  requirement: &14540200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *17028780
+  version_requirements: *14540200
 - !ruby/object:Gem::Dependency
   name: retort
-  requirement: &17516180 !ruby/object:Gem::Requirement
+  requirement: &14539720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *17516180
+  version_requirements: *14539720
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &17510260 !ruby/object:Gem::Requirement
+  requirement: &14539240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +54,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *17510260
+  version_requirements: *14539240
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &17528700 !ruby/object:Gem::Requirement
+  requirement: &14538780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +65,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *17528700
+  version_requirements: *14538780
 - !ruby/object:Gem::Dependency
   name: xmpp4r
-  requirement: &17526300 !ruby/object:Gem::Requirement
+  requirement: &14538320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +76,7 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *17526300
+  version_requirements: *14538320
 description: ! 'the saber
 
 '
@@ -106,6 +95,7 @@ files:
 - Ragfile
 - bin/saber
 - bin/saber-drb_add
+- doc/Development.md
 - extconf.rb
 - lib/saber.rb
 - lib/saber/cli.rb
@@ -116,6 +106,10 @@ files:
 - lib/saber/task.rb
 - lib/saber/ui.rb
 - lib/saber/version.rb
+- rutorrent/README.md
+- rutorrent/init.js
+- rutorrent/init.php
+- rutorrent/plugin.info
 - saber.gemspec
 - saber.watchr
 - spec/data/bt/lost.mkv