saber 1.1.1 → 1.2.0

data/.gitignore

@@ -1,3 +1,4 @@
 /rfrom/
 /*.gem
 /test
+test.yml

data/CHANGELOG.md

@@ -1,8 +1,15 @@
+## 1.2.0 (xx)
+
+**Improvements**
+
+  - add watir (javascript) support.
+  - add bB, STP
+
 ## 1.1.0 (Sep 12, 2012)
 
 **Improvements**
 
-  - Replace 'xmpp4r' with beeter one 'blather'
+  - Replace 'xmpp4r' with beeter one 'blather' *Guten Ye*
 
 ## 1.0.2 (Sep 12, 2012)
 

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gem "pd"
 gem "tagen", "~>2.0.1"
 gem "optimism", "~>3.3.1"
-gem "pa", "~>1.3.2"
+gem "pa", "~>1.3.3"
 gem "retort", "~>0.0.6"
 gem "thor", "~>0.16.0"
 gem "net-ssh", "~>2.5.2"
@@ -11,6 +11,11 @@ gem "blather", "~>0.8.0"
 gem "mechanize", "~>2.5.1"
 gem "highline", "~>1.6.14"
 gem "reverse_markdown", "~>0.3.0"
+gem "watir", "~>4.0.1"
+gem "faraday", "~>0.8.4"
+gem "faraday_middleware", "~>0.8.8"
+gem "isbn", "~>2.0.7"
+gem "sys-filesystem", "~>1.0.0"
 
 group :development do
 	gem "rspec"

data/Gemfile.lock

@@ -1,3 +1,9 @@
+PATH
+  remote: /home/guten/dev/one/pa
+  specs:
+    pa (1.3.3)
+      pd
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -5,30 +11,45 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
-    blather (0.8.0)
+    blather (0.8.1)
       activesupport (>= 2.3.11)
       eventmachine (>= 0.12.6)
       girl_friday
       niceogiri (~> 1.0)
       nokogiri (~> 1.5.5)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    coderay (1.0.8)
+    commonwatir (4.0.0)
     connection_pool (0.9.2)
     crack (0.3.1)
     diff-lcs (1.1.3)
-    domain_name (0.5.3)
+    domain_name (0.5.4)
       unf (~> 0.0.3)
     eventmachine (1.0.0)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.8.8)
+      faraday (>= 0.7.4, < 0.9)
     ffi (1.1.5)
     girl_friday (0.10.0)
       connection_pool (~> 0.9.0)
-    guard (1.3.2)
+    guard (1.5.0)
       listen (>= 0.4.2)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-rspec (1.2.1)
+    guard-rspec (2.1.0)
       guard (>= 1.1)
-    highline (1.6.14)
+      rspec (~> 2.11)
+    highline (1.6.15)
     i18n (0.6.1)
+    isbn (2.0.7)
     json (1.7.5)
-    listen (0.5.0)
+    libwebsocket (0.1.5)
+      addressable
+    listen (0.5.3)
+    lumberjack (1.0.2)
     mechanize (2.5.1)
       domain_name (~> 0.5, >= 0.5.1)
       mime-types (~> 1.17, >= 1.17.2)
@@ -37,10 +58,12 @@ GEM
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (~> 0.0, >= 0.0.9)
+    method_source (0.8.1)
     mime-types (1.19)
     multi_json (1.3.6)
+    multipart-post (1.1.5)
     net-http-digest_auth (1.2.1)
-    net-http-persistent (2.7)
+    net-http-persistent (2.8)
     net-ssh (2.5.2)
     niceogiri (1.0.2)
       nokogiri (~> 1.4)
@@ -49,9 +72,11 @@ GEM
     optimism (3.3.1)
       json
       pd
-    pa (1.3.2)
-      pd
     pd (1.1.0)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
     retort (0.0.6)
@@ -62,9 +87,18 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.11.3)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.25.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    slop (3.3.3)
+    sys-filesystem (1.0.0)
+      ffi (>= 1.0.0)
     tagen (2.0.1)
       activesupport
       pd
@@ -72,8 +106,13 @@ GEM
     unf (0.0.5)
       unf_ext
     unf_ext (0.0.5)
-    vcr (2.2.4)
-    webmock (1.8.9)
+    vcr (2.2.5)
+    watir (4.0.1)
+      commonwatir (~> 4)
+      watir-webdriver
+    watir-webdriver (0.6.1)
+      selenium-webdriver (>= 2.18.0)
+    webmock (1.8.11)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     webrobots (0.0.13)
@@ -83,19 +122,24 @@ PLATFORMS
 
 DEPENDENCIES
   blather (~> 0.8.0)
+  faraday
+  faraday_middleware
   guard
   guard-rspec
   highline (~> 1.6.14)
+  isbn
   mechanize (~> 2.5.1)
   net-ssh (~> 2.5.2)
   optimism (~> 3.3.1)
-  pa (~> 1.3.2)
+  pa!
   pd
   rb-inotify
   retort (~> 0.0.6)
   reverse_markdown (~> 0.3.0)
   rspec
+  sys-filesystem
   tagen (~> 2.0.1)
   thor (~> 0.16.0)
   vcr
+  watir
   webmock

data/README.md

@@ -1,73 +1,76 @@
 Saber, a complete solution for PT users. [![Build Status](https://secure.travis-ci.org/SaberSalv/saber.png)](http://travis-ci.org/SaberSalv/saber)
 ==========================================
 
-|                |                                         |
-|----------------|-----------------------------------------|
+|                |                                           |
+|----------------|-------------------------------------------|
 | Homepage:      | https://github.com/SaberSalv/saber        |
-| Author:	       | Saber                                   |
-| License:       | MIT-LICENSE                             |
+| Author:	       | Saber                                     |
+| License:       | MIT-LICENSE                               |
 | Documentation: | https://github.com/SaberSalv/saber/wiki   |
 | Issue Tracker: | https://github.com/SaberSalv/saber/issues |
+| Operation Systems: | Linux, Mac OS X                       |
 
 **Features:**
 
-* Add Torrent: send a torrent file from website to rutorrent.
-* Fetch: automatically/manually fetch files from seedbox to home-laptop.
-* Upload: upload a torrent file from command line to the site.
-* Other Tasks:
-	- Make: make a torrent file and copy it to local and remote watch directory.
-	- Send: send files from home-laptop to seedbox.
-	- Clean: remove files which are not seeded in rtorrent.
+* **Add Torrent**: send a torrent file from website to rutorrent.
+* **Upload**: upload a torrent file from command line to the site.
+* **Fetch**: automatically/manually fetch files from seedbox to home-laptop.
+* **Other Tasks**:
+	- **Make**: make a torrent file and copy it to local and remote watch directory.
+	- **Send**: send files from home-laptop to seedbox.
+	- **Clean**: remove files which are not seeded in rtorrent.
 
 you can find more tools at [here](https://github.com/SaberSalv/saber/wiki/Tools).
 
 Getting Started
 ----------------
 
-Create ~/.saberrc configuration file from [template](https://github.com/SaberSalv/saber/blob/master/templates/_saberrc). More detail will be explained below.
+Create `~/.saberrc` configuration file from [template](https://github.com/SaberSalv/saber/blob/master/templates/_saberrc).
 
 ### Add Torrent
 
 See [saber-addtorrent](https://github.com/SaberSalv/saber-addtorrent) project.
 
+### Upload
 
-### Fetch
+Because of lacking APIs in major PT sites, so I write this small script to help uploading a torrent from cmdline. Good news is BTN v2.0 will include API. And BTN already has an official autobot which grabs scene releases. :)
 
-#### AutoFetch
+> Support sites: BIB, bB, STP
+
+> Support upload types: ebook, magazine
+
+Manual fill \<info-data>.yml file and upload it.
 
-Configure ~/.saberrc
+	$ saber.bib g magazine hello.pdf
+	> create hello.yml
+	$ edit hello.yml
 
-	p:
-		fetcher_download = Pa("~/download")
+		type: magazines
+		title: Hello
+		description: Hello World
+		...
 
-	server:
-		ftp = "ftp://seedbox/bt"
+	$ saber.bib upload pdf hello.yml
+	> it opens a firefox browser
+	> it fills data and submit it
+	> upload complete
 
-		xmpp:
-			jid = "x1@gmail.com"     # need register a gtalk account.
-			password = "y1"
-			host = nil
-			port = nil
+Auto fill \<info-data>.yml file from ISBN.
 
-	client:
-		xmpp:
-			jid = "x2@gmail.com"
-			password = "y2"
-			host = nil
-			port = nil
+	$ saber.bib g ebook hello.epub:1781100055
+	> create hello.yml
 
-Start saber-server at server side.
+### Fetch
 
-	# ~/.rtorrent.rc
+#### AutoFetch
 
-		method.set_key = event.download.finished, saber-fetch, "execute= saber-drb_add, (d.get_hash), (d.get_custom1)"
+Start saber-server at server side.
 
 	$ saber server -V
 
 Start saber-client at client side.
 
 	$ aria2c --enable-rpc --save-session session.lock -i session.lock
-
 	$ saber client -V
 
 Test if it works
@@ -81,115 +84,34 @@ Manually fetch: right click 'Saber Fetch' in rutorrent web ui, then it'll add to
 
 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. 
-
 #### ManualFetch
 
-Configure ~/.saberrc
-
-	p:
-		fetcher_download = Pa("~/download")
-		remote_download = Pa("~/bt")
-
-	server:
-		user = "x"
-		host = "seedbox"
-		ftp = "ftp://seedbox/bt"
-
 Begin fetch a file from seedbox
 
 	$ saber fetch foo
 	> begin to download ftp://seedbox/bt/foo/a.epub via aria2
 	> begin to download ftp://seedbox/bt/foo/b.epub via aria2
 
-### Upload
-
-Because of lacking APIs in major PT sites, so I write this small script to help uploading a torrent from cmdline. Good news is BTN v2.0 will include API. And BTN already has an official autobot which grabs scene releases. :)
-
-> Support sites: BIB
-
-Configure ~/.saberrc
-
-	p:
-		watch = Pa("~/bt/watch")
-		remote_watch = Pa("bt/watch") 
-
-	username = "foo"
-	bib:
-		username = "bar"
-		announce_url = "x"
-
-	server:
-		user = "x"
-		host = "y"
-
-Fill \<info-data>.yml file and upload it.
-
-	$ saber.bib g magazine hello.pdf
-	> create hello.pdf.yml
-	$ vim hello.pdf.yml
-
-		type: magazines
-		Title: Hello
-		Description: Hello World
-		...
-
-	$ saber.bib upload hello.pdf.torrent
-	> Upload Complete
-
-	$ saber.bib upload hello.pdf    # short cut
-	> make hello.pdf.torrent
-	> Upload Complete
-
-Auto fill \<info-data>.yml file from isbn.
-
-	$ saber.bib g ebook hello.epub 1781100055
-	> create hello.epub.yml 
-
 ### Tasks
 
 #### Make
 
-Configure ~/.saberrc
-
-	p:
-		watch = Pa("~/bt/watch")
-		remote_watch = Pa("bt/watch")
-
-	bib: 
-		announce_url = "x" 
-
-	server:
-		user = "x"
-		host = "y"
-
 Make a torrent
 
-	$ saber make hello.epub
-	> mktorrent -p -a x hello.epub
+	$ saber.bib make hello.epub
+	> mktorrent -p -a ANNOUNCE_URL hello.epub
 	> cp hello.epub.torrent ~/bt/watch 
 	> rsync -Phr hello.epub.torrent user@host:bt/watch
 
 #### Send
 
-Configure ~/.saberrc
-
-	server:
-		user = "x"
-		host = "y"
-
 Send files to seedbox
 
 	$ saber send1 hello.epub bt
-	> rsync -Phr hello.epub user@host:bt
+	> rsync -ahP hello.epub user@host:bt
 
 #### Clean
 
-Configure ~/.saberrc
-	
-	p:
-		download = Pa("~/bt")
-
 Clean up unseeded files in rtorrent.
 
 	$ saber clean
@@ -216,13 +138,6 @@ Please see [Contibution Documentation](https://github.com/SaberSalv/saber/blob/m
 
 A list of [Contributors](https://github.com/SaberSalv/saber/contributors).
 
-Resources
----------
-
-* [Archlinux](http://www.archlinux.org): A simple, lightweight linux distribution.
-* [pacaur](https://github.com/Spyhawk/pacaur): An AUR helper for ArchLinux.
-* [YAAW](https://github.com/binux/yaaw): Yet Another Aria2 Web Frontend in pure HTML/CSS/Javascirpt.
-
 Copyright
 ---------
 

data/bin/saber

@@ -4,11 +4,13 @@ require_relative "../lib/saber"
 begin
   Saber::CLI.start
 rescue Interrupt => e
-  Saber.ui.error "\nQuitting..."
+  Saber.ui.say "\nQuitting..."
   Saber.ui.debug e.backtrace.join("\n")
   exit 1
+rescue SyntaxError
+  raise
 rescue Exception => e
   Saber.ui.error "#{e.class.name}: #{e.message}"
-  Saber.ui.debug e.backtrace.join("\n")
+  Saber.ui.say e.backtrace.join("\n")
   exit 1
 end