nzbget 0.6.0 → 0.6.2

data/.gitignore

@@ -0,0 +1,4 @@
+pkg
+doc
+Manifest
+*.gem

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in nzbget.gemspec
+gemspec

data/README.rdoc

@@ -10,18 +10,21 @@ From the version 0.4.0 NZBGet has supported XML-RPC and JSON-RPC. It allows to c
 
 == Installation
 
-To install directly from GitHub:
+Either install from Rubygems:
 
-  $ gem sources -a http://gems.github.com # you only need to run this once
-  $ gem install marcbowes-nzbget
+  $ gem install nzbget
+
+or clone from GitHub:
+
+  $ git clone git://github.com/marcbowes/nzbget.git && cd nzbget
+  $ rake install
 
 == Getting started
 
-  require 'rubygems'
   require 'nzbget'
   
-  remote = Nzbget.new :uri => 'http://nzbget-server'
-  puts remote.status
+  remote = NZBGet::RemoteConnection.new
+  remote.status
 
 == License
 

data/Rakefile

@@ -1,14 +1,2 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-
-Echoe.new('nzbget', '0.6.0') do |p|
-  p.description    = "Communicate with NZBGet via RPC."
-  p.url            = "http://github.com/marcbowes/nzbget"
-  p.author         = "Marc Bowes"
-  p.email          = "marcbowes@gmail.com"
-  p.runtime_dependencies = ['httparty']
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
-
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/lib/nzbget.rb

@@ -1,11 +1,12 @@
-require 'rubygems'
-require 'httparty'
-require File.join(File.dirname(__FILE__), 'httparty/request')
-require 'group'
+# -*- coding: utf-8 -*-
 require 'base64'
+require 'httparty'
+require 'httparty/request'
+require 'nzbget/group'
 
 module NZBGet
   class RemoteConnection
+    
     include HTTParty
     
     DEFAULT_OPTIONS = {
@@ -22,20 +23,21 @@ module NZBGet
       uri = URI.parse(@options[:uri])
       uri.port = @options[:port]
       
-      self.class.base_uri     uri.to_s
-      self.class.basic_auth   @options[:username], @options[:password]
+      self.class.base_uri(uri.to_s)
+      self.class.basic_auth(@options[:username], @options[:password])
       
       case @options[:method]
-        when :json
-          require 'json'
-        when :xml
-          raise ArgumentError
-        else
-          raise ArgumentError
+      when :json
+        require 'json'
+      when :xml
+        raise ArgumentError
+      else
+        raise ArgumentError
       end
-      self.class.format       @options[:method]
+      self.class.format(@options[:method])
     end
     
+    
     def enqueue(path, options = {})
       extname = File.extname(path)
       raise ArgumentError unless extname.downcase == '.nzb'
@@ -53,35 +55,39 @@ module NZBGet
     end
     
     def groups
-      send(:listgroups)['result'].collect { |g| NZBGet::Group.new(self, g) }
+      groups = []
+      send(:listgroups)['result'].each_with_index do |hash, idx|
+        groups << NZBGet::Group.new(self, idx, hash)
+      end
+      groups
     end
     
+    
     protected
     
-      def encode(hash)
-        hash.send("to_#{@options[:method].to_s}".to_sym)
-      end
-      
-      def method_missing(name, *args)
-        invoke name, args
-      end
+    def encode(hash)
+      hash.send("to_#{@options[:method].to_s}".to_sym)
+    end
     
-      def invoke(method, params)
-        #
-        # According to http://json-rpc.org/wd/JSON-RPC-1-1-WD-20060807.html#RequestHeaders:
-        #
-        # Regardless of whether a remote procedure call is made using HTTP GET or POST, the HTTP request message MUST specify the following headers:
-        # * The User-Agent MUST be specified.
-        # * For HTTP POST only, the Content-Type MUST be specified and SHOULD read application/json.
-        # * The Content-Length MUST be specified and correct according to the guidelines and rules laid out in Section 4.4, “Message Length”, of the HTTP specification.
-        # * The Accept MUST be specified and SHOULD read application/json.
-        #
-        # However, NZBGet does not check these headers, so they are not included.
-        #
-        
-        response = self.class.post("/#{@options[:method].to_s}rpc",
-          :body => encode({ :method => method.to_s, :params => params, :version => '1.1' }))
-      end
+    def method_missing(name, *args)
+      invoke name, args
+    end
+    
+    def invoke(method, params)
+      #
+      # According to http://json-rpc.org/wd/JSON-RPC-1-1-WD-20060807.html#RequestHeaders:
+      #
+      # Regardless of whether a remote procedure call is made using HTTP GET or POST, the HTTP request message MUST specify the following headers:
+      # * The User-Agent MUST be specified.
+      # * For HTTP POST only, the Content-Type MUST be specified and SHOULD read application/json.
+      # * The Content-Length MUST be specified and correct according to the guidelines and rules laid out in Section 4.4, “Message Length”, of the HTTP specification.
+      # * The Accept MUST be specified and SHOULD read application/json.
+      #
+      # However, NZBGet does not check these headers, so they are not included.
+      #
       
+      response = self.class.post("/#{@options[:method].to_s}rpc",
+                                 :body => encode({ :method => method.to_s, :params => params, :version => '1.1' }))
+    end
   end
 end

data/lib/{group.rb → nzbget/group.rb}

@@ -1,9 +1,10 @@
 module NZBGet
   class Group
-    attr_accessor :attributes
+    attr_accessor :position, :attributes
     
-    def initialize(nzbget, hash)
+    def initialize(nzbget, position, hash)
       @nzbget     = nzbget
+      @position   = position
       @attributes = hash
     end
     
@@ -16,7 +17,11 @@ module NZBGet
     end
     
     def downloaded(format = :bytes)
-      formatted_response [size - remaining, 0].max, format
+      formatted_response([size - remaining, 0].max, format)
+    end
+    
+    def first?
+      @position == 0
     end
     
     def formatted_response(bytes, format)
@@ -64,11 +69,11 @@ module NZBGet
     end
     
     def paused(format = :bytes)
-      formatted_response @attributes['PausedSizeLo'].to_i, format
+      formatted_response(@attributes['PausedSizeMB'] * 1024, format)
     end
     
     def remaining(format = :bytes)
-      formatted_response @attributes['RemainingSizeLo'].to_i, format
+      formatted_response(@attributes['RemainingSizeMB'] * 1024, format)
     end
     
     def resume
@@ -76,7 +81,7 @@ module NZBGet
     end
     
     def size(format = :bytes)
-      formatted_response @attributes['FileSizeLo'].to_i, format
+      formatted_response(@attributes['FileSizeMB'] * 1024, format)
     end
     
     protected

data/lib/nzbget/version.rb

@@ -0,0 +1,3 @@
+module Nzbget
+  VERSION = "0.6.2"
+end

data/nzbget.gemspec

@@ -1,33 +1,24 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "nzbget/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{nzbget}
-  s.version = "0.6.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marc Bowes"]
-  s.date = %q{2009-10-21}
+  s.name        = "nzbget"
+  s.version     = Nzbget::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Marc Bowes"]
+  s.email       = %q{marcbowes@gmail.com}
+  s.homepage    = ""
+  s.summary     = %q{Communicate with NZBGet via RPC.}
   s.description = %q{Communicate with NZBGet via RPC.}
-  s.email = %q{marcbowes@gmail.com}
-  s.extra_rdoc_files = ["README.rdoc", "lib/group.rb", "lib/httparty/request.rb", "lib/nzbget.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/group.rb", "lib/httparty/request.rb", "lib/nzbget.rb", "nzbget.gemspec"]
-  s.homepage = %q{http://github.com/marcbowes/nzbget}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Nzbget", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{nzbget}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Communicate with NZBGet via RPC.}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "nzbget"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0"])
-  end
+  s.add_dependency("httparty")
+  s.add_dependency("json")
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nzbget
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  hash: 3
+  prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Marc Bowes
@@ -9,68 +15,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 +02:00
+date: 2011-05-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Communicate with NZBGet via RPC.
 email: marcbowes@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
-- lib/group.rb
-- lib/httparty/request.rb
-- lib/nzbget.rb
+extra_rdoc_files: []
+
 files: 
-- Manifest
+- .gitignore
+- Gemfile
 - README.rdoc
 - Rakefile
-- lib/group.rb
 - lib/httparty/request.rb
 - lib/nzbget.rb
+- lib/nzbget/group.rb
+- lib/nzbget/version.rb
 - nzbget.gemspec
 has_rdoc: true
-homepage: http://github.com/marcbowes/nzbget
+homepage: ""
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Nzbget
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: nzbget
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Communicate with NZBGet via RPC.

data/Manifest

@@ -1,7 +0,0 @@
-Manifest
-README.rdoc
-Rakefile
-lib/group.rb
-lib/httparty/request.rb
-lib/nzbget.rb
-nzbget.gemspec