saber 0.0.7 → 1.0.0

data/Rakefile

@@ -0,0 +1,46 @@
+PROJECT = "saber"
+
+namespace :test do
+  desc "Run all specs on multiple ruby versions (requires rvm)"
+  task :portability do
+    require "yaml"
+    travis_options = YAML::load_file(File.expand_path("../.travis.yml", __FILE__))
+    travis_options["rvm"].each do |version|
+      system <<-BASH
+bash -c 'source ~/.rvm/scripts/rvm;
+rvm #{version};
+ruby_version_string_size=`ruby -v | wc -m`
+echo;
+for ((c=1; c<$ruby_version_string_size; c++)); do echo -n "="; done
+echo;
+echo "`ruby -v`";
+for ((c=1; c<$ruby_version_string_size; c++)); do echo -n "="; done
+echo;
+bundle install;
+bundle exec rspec spec 2>&1;'
+      BASH
+    end
+  end
+end
+
+desc "rewrite gemspec with add_dependency from Gemfile"
+task :gemspec do
+  require "bundler"
+  gemspec = "#{PROJECT}.gemspec"
+
+  deps = Bundler.definition.dependencies.find_all{|v|
+    v.groups.include? :default
+  }
+
+  deps = deps.map {|dep|
+    list = [dep.name] + dep.requirements_list
+    "\ts.add_dependency #{list.map(&:inspect).join(', ')}\n"
+  }
+
+  lines = File.read(gemspec).lines.to_a
+  idx = lines.find_index{|v| v =~ /s\.add_dependency/} || -2
+  lines.delete_if{|v| v =~ /s\.add_dependency/}
+  lines.insert(idx, *deps)
+
+  File.write(gemspec, lines.join(""))
+end

data/bin/1saber

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
-ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
-require "bundler/setup"
+dir = File.expand_path("../..", File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__)
+libdir = File.join(dir, "lib"); $:.unshift(libdir) unless $:.include?(libdir)
+ENV["BUNDLE_GEMFILE"] = File.join(dir, "Gemfile")
 
-load File.expand_path("../saber", __FILE__)
+require "bundler/setup"
+load File.join(dir, "bin/saber")

data/bin/saber

@@ -7,6 +7,10 @@ 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")
+  exit 1
 rescue Exception => e
   raise e
   exit 1

data/bin/saber.bib

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+SABER_TRACKER=bib saber $*

data/bin/saber.what

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+SABER_TRACKER=what saber $*

data/extconf.rb

@@ -2,6 +2,9 @@
 require "fileutils"
 require "mkmf"
 
-FileUtils.install File.expand_path("../bin/saber-drb_add", __FILE__), Gem.bindir
+bindir = File.expand_path("../bin", __FILE__)
+
+FileUtils.install File.join(bindir, "saber-drb_add"), Gem.bindir
+FileUtils.install File.join(bindir, "saber.bib"), Gem.bindir
 
 create_makefile("saber")

data/lib/saber.rb

@@ -1,27 +1,21 @@
-libdir = File.dirname(__FILE__); $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
+require "pd"
 require "pa"
 require "optimism"
-require "retort"
-
-Retort::Service.configure do |c|
-	c.url = "http://localhost/RPC2"
-end
+require "active_support/core_ext/module/attribute_accessors"
+require "active_support/concern"
 
 module Saber
   autoload :VERSION, "saber/version"
   autoload :CLI, "saber/cli"
   autoload :UI, "saber/ui"
   autoload :Task, "saber/task"
-  autoload :Downloader, "saber/downloader"
-  autoload :Server, "saber/server"
-  autoload :Client, "saber/client"
-  autoload :DRbServer, "saber/server"
-  autoload :DRbClient, "saber/client"
+  autoload :Fetcher, "saber/fetcher"
+  autoload :AutoFetcher, "saber/autofetcher"
+  autoload :Tracker, "saber/tracker"
 
   Error = Class.new Exception
   FatalError = Class.new Exception
-  Rc = Optimism.require "saber/rc", "/etc/saber"
+  Rc = Optimism.require "saber/rc", "~/.saberrc"
 
   class << self
     attr_accessor :ui

data/lib/saber/autofetcher.rb

@@ -0,0 +1,8 @@
+module Saber
+  module AutoFetcher
+    autoload :Server, "saber/autofetcher/server"
+    autoload :Client, "saber/autofetcher/client"
+    autoload :DRbServer, "saber/autofetcher/server"
+    autoload :DRbClient, "saber/autofetcher/client"
+  end
+end

data/lib/saber/autofetcher/client.rb

@@ -0,0 +1,66 @@
+require "tagen/xmpp4r"
+require "xmpp4r/client"
+require "drb"
+
+module Saber
+  module AutoFetcher
+    class Client
+      class << self
+        def start
+          client = Client.new
+
+          client.start
+
+          Thread.list.each{|v| v.join}
+        end
+      end
+
+      attr_reader :client, :fetcher
+
+      def initialize
+        @client = Jabber::Client.new(Jabber::JID.new(Rc.client.xmpp.jid))
+        @fetcher = Fetcher.new
+      end
+
+      def start
+        client.connect Rc.client.xmpp.host, Rc.client.xmpp.port 
+        client.auth Rc.client.xmpp.password
+
+        at_exit do
+          client.send Jabber::Presence.new.set_type(:unavaliable)
+        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
+        }
+
+        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
+    end
+
+    class DRbClient
+      attr_reader :server
+
+      def initialize
+        DRb.start_service
+        @server = DRbObject.new_with_uri(Rc.drb_uri)
+        Saber.ui.say ">> DRbClient connected to #{Rc.drb_uri}"
+      end
+
+      def add(*names)
+        Saber.ui.say "ADD #{names}"
+        server.add(*names)
+      end
+    end
+  end
+end

data/lib/saber/autofetcher/server.rb

@@ -0,0 +1,78 @@
+require "tagen/xmpp4r"
+require "xmpp4r/client"
+require "drb"
+
+module Saber
+  module AutoFetcher
+    class Server
+      def self.start
+        s = Server.new
+        DRbServer.start(s)
+        s.start
+
+        Thread.list.each {|v| v.join}
+      end
+
+      attr_reader :client
+
+      def initialize
+        @client = Jabber::Client.new(Jabber::JID.new(Rc.server.xmpp.jid))
+      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)
+
+        Saber.ui.say ">> Connected to xmpp with #{Rc.server.xmpp.jid}"
+      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)
+      end
+    end
+
+    class DRbServer
+      class << self
+        def start(saber_server)
+          DRbServer.new(saber_server).start
+        end
+      end
+
+      attr_reader :saber_server
+
+      # @params [Server] server
+      def initialize(saber_server)
+        @saber_server = saber_server
+      end
+
+      def start
+        DRb.start_service Rc.drb_uri, self
+        Saber.ui.say ">> DRbSever listening on #{Rc.drb_uri}"
+      end
+
+      # drb. add a complete torrent.
+      def add(*names)
+        Saber.ui.debug "DRbServer-ADD #{names.inspect}"
+        files = build_files(*names) 
+
+        saber_server.send(files)
+      end
+
+    private
+
+      # ["filea", "foo/filea", "foo/fileb"]
+      def build_files(*names)
+        Pa.ls2_r(*names, :base_dir => Rc.p.remote_download, :file => true, :include => true) { |p,abs| not Pa.directory?(abs) }
+      end
+    end
+  end
+end

data/lib/saber/cli.rb

@@ -1,60 +1,99 @@
 require "thor"
-require "drb"
 
 module Saber
   class CLI < Thor
     include Thor::Actions
 
-    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
+    class_option "no-color",               banner: "Disable colorization in output", type: :boolean
+    class_option "verbose", aliases: "-V", banner: "Enable verbose output mode", type: :boolean
+    class_option "log",                    banner: "Log file", type: :string
+    class_option "force",   aliases: "-f", banner: "Fore writing even if file exists", type: :boolean
+    class_option "tracker", aliases: "-t", banner: "tracker name", 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 = if o["log"] then
+        require "logger"
+        UI::Logger.new(::Logger.new(o["log"]))
+      else
+        the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
+        UI::Shell.new(the_shell)
+      end
+
       Saber.ui.debug! if o["verbose"]
+
+      # Initialize environment in first time
+      unless Rc.p.home.exists?
+        Pa.mkdir Rc.p.home
+      end
     end
 
     desc "clean", "clean up files doesn't in rtorrent client"
     def clean
-      Task.clean
-    end
+      require "saber/task/clean"
 
-    desc "add <file ..>", "begin download file or directory via aria2 daemon."
-    def add(*names)
-      Downloader.new.add_names(*names)
+      Task["clean"].invoke(:clean, [], o)
     end
 
     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
+      AutoFetcher::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
+      AutoFetcher::Client.start
     end
 
-    desc "drb_add <ids> [label]", "add a file to saber-server daemon via drb"
-    # drb_add "id1,id2", "foo"
-    def drb_add(ids_str, label=Rc.label)
-      return if label != Rc.label
+    desc "drb_add [options] <id,...> <label>", "add a file to saber-server daemon via drb."
+    def drb_add(ids_str, label="")
+      return if label != "saber"
+
+      require "drb"
+      require "retort"
+      Retort::Service.configure { |c| c.url = Rc.scgi_server }
 
       names = ids_str.split(",").map{|v| Retort::Torrent.action("name", v)}
 
-      DRbClient.new.add(*names)
+      AutoFetcher::DRbClient.new.add(*names)
+    end
+
+    desc "upload [options] <torrent_file/file ...>", "[make a torrent file and] upoad a torrent file to the site"
+    def upload(*files)
+      require "saber/task/upload"
+
+      Task["upload"].invoke(:upload, [options["tracker"] || ENV["SABER_TRACKER"], *files], o)
+    end
+
+    desc "generate [options] <type> <filename> [arg ...]", %~generate a meta data file (alias: "g")~
+    def generate(type, filename, *args)
+      require "saber/task/generate"
+
+      Task["generate"].invoke(:generate, [options["tracker"] || ENV["SABER_TRACKER"], type, filename, *args], o)
+    end
+    map "g" => "generate"
+
+    desc "fetch [options] <file ..>", "fetch files from seedbox."
+    def fetch(*names)
+      Fetcher.new.add_names(*names)
+    end
+
+    desc "send1 <src ..> <dest>", "send files to seedbox"
+    def send1(*names)
+      require "saber/task/send"
+
+      Task["send"].invoke(:send1, names, o)
+    end
+
+    desc "make [options] <file ..>", "make a torent file and send it to local and/or remote watch directory"
+    def make(*files)
+      require "saber/task/make"
+
+      Task["make"].invoke(:make, [options["tracker"] || ENV["SABER_TRACKER"], *files], o)
     end
   end
 end

data/lib/saber/{downloader.rb → fetcher.rb}

@@ -2,35 +2,33 @@ require "xmlrpc/client"
 require "net/ssh"
 
 module Saber
-  class Downloader
-    def initialize
-      @aria2 = XMLRPC::Client.new2(Rc.aria2.rpc)
+  class Fetcher
+
+    def add_names(*names)
+      files = retrive_files(*names)
+      add(*files)
     end
 
     def aria2_add(uris, o={}, &blk)
+      @aria2 = XMLRPC::Client.new2(Rc.aria2.rpc)
       @aria2.call("aria2.addUri", uris, o, &blk)
     end
 
     def add(*files)
       files.each { |file|
         uri = "#{Rc.server.ftp}/#{file}"
-        gid = aria2_add([uri], :dir => Pa.dir2("#{Rc.p.download}/#{file}"))
-        $log.debug "\nDOWNLOAD #{gid} #{uri}"
+        gid = aria2_add([uri], :dir => Pa.dir2("#{Rc.p.fetcher_download}/#{file}"))
+        Saber.ui.debug "DOWNLOAD #{gid} #{uri}"
       }
     end
 
-    def add_names(*names)
-      files = retrive_files(*names)
-      add(*files)
-    end
-
   private
 
     def retrive_files(*names)
       files = []
       Net::SSH.start(Rc.server.host, Rc.server.user) do |s|
         name = "'#{names.join("' '")}'"
-        cmd = "cd #{Rc.server.download.p} && find #{name} -type f"
+        cmd = "cd #{Rc.p.remote_download} && find #{name} -type f"
 
         rst = s.exec!(cmd)
         if rst =~ /^find: `|^cd:cd:/