saber 1.2.0 → 1.2.1

data/Gemfile.lock

@@ -1,9 +1,3 @@
-PATH
-  remote: /home/guten/dev/one/pa
-  specs:
-    pa (1.3.3)
-      pd
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -72,6 +66,8 @@ GEM
     optimism (3.3.1)
       json
       pd
+    pa (1.3.3)
+      pd
     pd (1.1.0)
     pry (0.9.10)
       coderay (~> 1.0.5)
@@ -122,24 +118,24 @@ PLATFORMS
 
 DEPENDENCIES
   blather (~> 0.8.0)
-  faraday
-  faraday_middleware
+  faraday (~> 0.8.4)
+  faraday_middleware (~> 0.8.8)
   guard
   guard-rspec
   highline (~> 1.6.14)
-  isbn
+  isbn (~> 2.0.7)
   mechanize (~> 2.5.1)
   net-ssh (~> 2.5.2)
   optimism (~> 3.3.1)
-  pa!
+  pa (~> 1.3.3)
   pd
   rb-inotify
   retort (~> 0.0.6)
   reverse_markdown (~> 0.3.0)
   rspec
-  sys-filesystem
+  sys-filesystem (~> 1.0.0)
   tagen (~> 2.0.1)
   thor (~> 0.16.0)
   vcr
-  watir
+  watir (~> 4.0.1)
   webmock

data/README.md

@@ -116,7 +116,8 @@ Clean up unseeded files in rtorrent.
 
 	$ saber clean
 
-use `saber help` to list all tasks.
+
+Use `saber help` to list all tasks. use `saber help upload` to find specific task help.
 
 Install
 -------

data/benchmark/a.sh

@@ -0,0 +1,3 @@
+#!/bin/zsh
+
+time ../bin/1saber >/dev/null

data/lib/saber.rb

@@ -1,10 +1,8 @@
 require "pd"
 require "pa"
 require "optimism"
-require "active_support/core_ext/module/attribute_accessors"
-require "active_support/concern"
-require "active_support/core_ext/numeric/bytes"
 require "saber/core_ext"
+require "active_support/core_ext/numeric/bytes"
 
 module Saber
   autoload :VERSION, "saber/version"
@@ -21,7 +19,6 @@ module Saber
   FatalError = Class.new Exception
   Rc = Optimism.require "saber/rc", "~/.saberrc"
 
-
   class << self
     attr_accessor :ui
 

data/lib/saber/task.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/module/attribute_accessors"
+
 module Saber
   # Usage
   # 
@@ -14,12 +16,6 @@ module Saber
   #
   #   Task.hello_world(1, 2)   ->  [1, 2]
   module Task 
-    autoload :Base, "saber/task/base"
-    autoload :Clean, "saber/task/clean"
-    autoload :Make, "saber/task/make"
-    autoload :Upload, "saber/task/upload"
-    autoload :FindUploads, "saber/task/find_uploads"
-
     @@tasks = {}
 
     # a list of all tasks 
@@ -27,10 +23,14 @@ module Saber
 
     class << self
       def [](name)
-        require "saber/task/#{name}"
-
         tasks[name]
       end
     end
   end
 end
+
+require "saber/task/base"
+require "saber/task/clean"
+require "saber/task/make"
+require "saber/task/upload"
+require "saber/task/find_uploads"

data/lib/saber/tracker.rb

@@ -3,6 +3,7 @@ require "saber/mechanize_ext"
 require "highline/import"
 require "reverse_markdown"
 require "json"
+require "active_support/core_ext/module/attribute_accessors"
 
 module Saber
   # Usage

data/lib/saber/tracker/chd.rb

@@ -1,3 +1,5 @@
+require "tagen/core/io"
+
 module Saber
   module Tracker
     class CHD < Base

data/lib/saber/tracker2/bib.rb

@@ -132,7 +132,7 @@ module Saber
         }
       }
       
-      def do_upload(file, info)
+      def new_upload(info)
         info[:complete] = (info[:type] == "Pack")
 
         agent.goto "#{BASE_URL}/upload/#{info[:upload_type2]}"
@@ -148,7 +148,7 @@ module Saber
 
         if agent.url =~ %r~/upload/#{info[:upload_type2]}~
           err = agent.element(xpath: "//*[@id='formerrorlist']")
-          msg = err.exists? ? ReverseMarkdown.parse(err) : agent.text
+          msg = err.exists? ? ReverseMarkdown.parse(err.html) : agent.text
           Saber.ui.error "ERROR: #{msg.to_s.strip}\n"
           return false 
         else

data/lib/saber/tracker2/gazelle.rb

@@ -3,7 +3,7 @@ module Saber
     class Gazelle < Base
       def add_format(info)
         unless info[:groupid]
-          Saber.ui.error "You must provide groupid." 
+          Saber.ui.error "You must provide a groupid -- #{info[:groupid].inspect}" 
           return false 
         end
 
@@ -15,12 +15,9 @@ module Saber
         form.submit() unless options["dry-run"]
 
         if agent.url =~ %r~/upload\.php~
-          begin
-            error = agent.element(xpath: "//*[@id='content']/div[2]/p[2]").html
-          rescue Watir::Exception::UnknownObjectException # unable to locate element
-          end
-          error = ReverseMarkdown.parse(error) if error
-          Saber.ui.error "ERROR: #{error.to_s.strip}\n"
+          err = agent.element(xpath: "//*[@id='content']/div[2]/p[2]")
+          msg = err.exists? ? ReverseMarkdown.parse(err.html).strip : "" 
+          Saber.ui.error "ERROR: #{msg}\n"
           return false 
         else
           return true
@@ -36,12 +33,9 @@ module Saber
         form.submit() unless options["dry-run"]
 
         if agent.url =~ %r~/upload\.php~
-          begin
-            error = agent.element(xpath: "//*[@id='content']/div[2]/p[2]").html
-          rescue Watir::Exception::UnknownObjectException # unable to locate element
-          end
-          error = ReverseMarkdown.parse(error) if error
-          Saber.ui.error "ERROR: #{error.to_s.strip}\n"
+          err = agent.element(xpath: "//*[@id='content']/div[2]/p[2]")
+          msg = err.exists? ? ReverseMarkdown.parse(err.html).strip : "" 
+          Saber.ui.error "ERROR: #{msg}\n"
           return false 
         else
           return true

data/lib/saber/version.rb

@@ -1,3 +1,3 @@
 module Saber
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/saber/tracker2_spec.rb

@@ -0,0 +1,2 @@
+require "spec_helper"
+require "saber/tracker2"

data/spec/saber/tracker_spec.rb

@@ -0,0 +1,2 @@
+require "spec_helper"
+require "saber/tracker"

data/spec/spec_helper.rb

@@ -1,7 +1,16 @@
 require "pd"
-require "saber"
 require "logger"
 
+require "saber"
+require "saber/cli"
+require "saber/ui"
+require "saber/task"
+require "saber/fetcher"
+require "saber/autofetcher"
+require "saber/tracker2"
+require "saber/tracker"
+require "saber/book"
+
 $spec_dir = File.expand_path("..", __FILE__)
 $spec_data = File.join($spec_dir, "data")
 $spec_tmp = File.join($spec_dir, "tmp")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saber
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pd
@@ -289,6 +289,7 @@ files:
 - README.md
 - Ragfile
 - Rakefile
+- benchmark/a.sh
 - bin/1saber
 - bin/saber
 - bin/saber-drb_add
@@ -354,6 +355,8 @@ files:
 - spec/saber/fetcher_spec.rb
 - spec/saber/task_spec.rb
 - spec/saber/tracker/bib_spec.rb
+- spec/saber/tracker2_spec.rb
+- spec/saber/tracker_spec.rb
 - spec/spec_helper.rb
 - systemd/saber-chd@.service
 - systemd/saber-client@.service