Sutto-SABnzbd 0.2.0 → 0.3.0

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 Darcy Laycock
+
+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/README

@@ -0,0 +1,9 @@
+SABnzbd
+=======
+
+Ruby interface / api to SABnzbd
+
+COPYRIGHT
+=========
+
+Copyright (c) 2008 Darcy Laycock. See LICENSE for details.

data/SABnzbd.gemspec

@@ -1,23 +1,42 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{SABnzbd}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2009-01-08}
+  s.date = %q{2009-08-07}
   s.description = %q{Ruby interface to the SABnzbd usenet client}
   s.email = %q{sutto@sutto.net}
-  s.files = ["SABnzbd.gemspec", "VERSION.yml", "example/simple.rb", "lib/sabnzbd.rb", "test/sabnzbd_test.rb", "test/test_helper.rb"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README"
+  ]
+  s.files = [
+    "SABnzbd.gemspec",
+     "VERSION.yml",
+     "example/simple.rb",
+     "lib/sabnzbd.rb",
+     "test/sabnzbd_test.rb",
+     "test/test_helper.rb"
+  ]
   s.homepage = %q{http://github.com/Sutto/SABnzbd}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby interface to the SABnzbd usenet client}
+  s.test_files = [
+    "test/sabnzbd_test.rb",
+     "test/test_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0"])

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 patch: 0
 major: 0
-minor: 2
+minor: 3

data/lib/sabnzbd.rb

@@ -57,15 +57,17 @@ class SABnzbd
   include HTTParty
   base_uri 'localhost:8080'
   
-  def initialize(username = '', password = '')
-    login(username, password)
+  def initialize(auth = {})
+    @auth_params = {}
+    login(auth)
   end
   
-  def login(username, password)
+  def login(auth = {})
     opts = {}
-    opts[:ma_username] = username unless username.blank?
-    opts[:ma_password] = password unless password.blank?
-    self.class.default_params(opts)
+    opts[:ma_username] = auth[:username] if auth.has_key?(:username)
+    opts[:ma_password] = auth[:password] if auth.has_key?(:password)
+    opts[:apikey]      = auth[:api_key]  if auth.has_key?(:api_key)
+    @auth_params = opts
   end
   
   def status
@@ -109,8 +111,9 @@ class SABnzbd
   end
   
   def api_call(mode, opts = {})
-    opts.merge!(:mode => mode.to_s)
-    return self.class.get("/sabnzbd/api", :query => opts)
+    opts = opts.merge(:mode => mode.to_s).merge(@auth_params)
+    result = self.class.get("/sabnzbd/api", :query => opts)
+    return result
   end
   
   def verify(text)
@@ -140,7 +143,13 @@ class SABnzbd
     def local
       s = self.settings
       base_uri "#{s["misc"]["host"]}:#{s["misc"]["port"]}"
-      self.new(s["misc"]["username"], s["misc"]["password"])
+      use_api_key = s["misc"]["disable_api_key"] == "0"
+      opts = {
+        :username => s["misc"]["username"],
+        :password => s["misc"]["password"],
+      }
+      opts.merge!(:api_key => s["misc"]["api_key"]) unless s["misc"]["disable_api_key"] == "1"
+      self.new(opts)
     end
     
     protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Sutto-SABnzbd
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-08 00:00:00 -08:00
+date: 2009-08-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -27,8 +28,9 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- README
 files: 
 - SABnzbd.gemspec
 - VERSION.yml
@@ -36,11 +38,14 @@ files:
 - lib/sabnzbd.rb
 - test/sabnzbd_test.rb
 - test/test_helper.rb
+- LICENSE
+- README
 has_rdoc: false
 homepage: http://github.com/Sutto/SABnzbd
+licenses: 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -58,9 +63,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby interface to the SABnzbd usenet client
-test_files: []
-
+test_files: 
+- test/sabnzbd_test.rb
+- test/test_helper.rb