transmission-rss 0.2.6 → 1.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 493cecb752e1c3a5bbb092cdbde8c28cb6f16a42
-  data.tar.gz: a0fc2fefd52f20222de0d2fcb53ec91c8c19e92c
+  metadata.gz: 054764ff1a7340698a20d891b084e2a3763898be
+  data.tar.gz: cd4df944492cfb88e2602be7b02adac5ff3a93e9
 SHA512:
-  metadata.gz: a8fcb2eef302a7682b6897f8e083a1e9cb21e4b5ec4059e678fa710e97c407a70d21bb6f815455147cf5965dba222aa25f97a4f1880d34f0086a7fb5117d9ce9
-  data.tar.gz: a452c783869832ef8c2aa0f24ba05f6a28eef56ae08d03bf5f10c3123e1c211a7fe99a3bac9ec8e315cd7adc1a360e1fcfeb0309716b81f09e5038261ad4db37
+  metadata.gz: 5ca44ab44a99dee02cb406a5a8e537136a95c64fc1193f74b34aa80a248288ad3cc5823367adaa4a2a6af605d3129a45eac14c97fe7178811c7a9b59af4f671b
+  data.tar.gz: a5031c612c6d8b5c8677ab338ed27c48c0095bae7829df1b908b591f4d34b5b8e8c20a70aa7c655d82e7985d4f2cc37e32b0f66b80cfe1a3954b131c1d8bff8b

data/README.md

@@ -4,7 +4,8 @@ transmission-rss
 [![Gem Version](https://img.shields.io/gem/v/transmission-rss.svg)](http://badge.fury.io/rb/transmission-rss)
 [![Build Status](https://img.shields.io/travis/nning/transmission-rss/master.svg)](https://travis-ci.org/nning/transmission-rss)
 [![Coverage Status](https://img.shields.io/coveralls/nning/transmission-rss/master.svg)](https://coveralls.io/r/nning/transmission-rss)
-[![Code Climate](https://img.shields.io/codeclimate/github/nning/transmission-rss.svg)](https://codeclimate.com/github/nning/transmission-rss)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/nning/transmission-rss.svg)](https://codeclimate.com/github/nning/transmission-rss)
+[![Docker Hub Build Status](https://img.shields.io/docker/build/nning2/transmission-rss.svg)](https://hub.docker.com/r/nning2/transmission-rss/)
 
 transmission-rss is basically a workaround for transmission's lack of the
 ability to monitor RSS feeds and automatically add enclosed torrent links.
@@ -19,7 +20,8 @@ torrent files.
 As it's done with poems, I devote this very artful and romantic piece of
 code to the single most delightful human being: Ann.
 
-The minimum supported Ruby version is 1.9.3.
+The minimum supported Ruby version is 2.1. (You will need `rbenv` if your
+os does not support Ruby >= 2.1, e.g. on Debian wheezy.)
 
 Installation
 ------------
@@ -77,8 +79,9 @@ Setting the seed ratio limit is supported per feed:
     feeds:
       - url: http://example.com/feed1
         seed_ratio_limit: 0
-		
-Configurable certificate validation, good for self-signed certificates. Default is true:
+
+Configurable certificate validation, good for self-signed certificates. Default
+is true:
 
     feeds:
       - url: http://example.com/feed1
@@ -136,6 +139,9 @@ transmission is configured for HTTP basic authentication.
       user: nobody
       group: nobody
 
+    client:
+      timeout: 5
+
     fork: false
 
     pid_file: false

data/bin/transmission-add-file

@@ -47,10 +47,6 @@ config = TransmissionRSS::Config.instance
 # Initialize a log instance and configure it.
 log = Log.instance
 log.target = config.log_target
-log.level = Logger::DEBUG
-log.formatter = proc do |sev, time, _, msg|
-  "#{time.to_i}(#{sev.downcase}) #{msg}\n"
-end
 
 # Load config file (default or given by argument).
 begin

data/bin/transmission-rss

@@ -78,10 +78,6 @@ config = TransmissionRSS::Config.instance
 # Initialize a log instance and configure it.
 log = Log.instance
 log.target = config.log_target
-log.level = Logger::DEBUG
-log.formatter = proc do |sev, time, _, msg|
-  "#{time.to_i}(#{sev.downcase}) #{msg}\n"
-end
 
 # Load config file (default or given by argument).
 begin
@@ -147,13 +143,13 @@ if reset_seen_file
 end
 
 # Initialize communication to transmission.
-client = Client.new(config.server, config.login)
+client = Client.new(config.server, config.login, config.client)
 
 # Callback for a new item on one of the feeds.
 aggregator.on_new_item do |torrent_file, feed, download_path|
   client.add_torrent(torrent_file, :url,
     paused: config.add_paused,
-    download_path: download_path,
+    download_dir: download_path,
     seed_ratio_limit: feed.config.seed_ratio_limit)
 end
 

data/lib/transmission-rss/client.rb

@@ -7,10 +7,14 @@ require File.join(File.dirname(__FILE__), 'log')
 module TransmissionRSS
   # Class for communication with transmission utilizing the RPC web interface.
   class Client
+    OPTIONS = [:paused, :download_dir]
+
     class Unauthorized < StandardError
     end
 
     def initialize(server = {}, login = nil, options = {})
+      options ||= {}
+
       @host     = server.host || 'localhost'
       @port     = server.port || 9091
       @rpc_path = server.rpc_path || '/transmission/rpc'
@@ -39,10 +43,7 @@ module TransmissionRSS
 
     # POST json packed torrent add command.
     def add_torrent(file, type = :url, options = {})
-      arguments = {
-        'paused' => options[:paused],
-        'download-dir' => options[:download_path]
-      }
+      arguments = set_arguments_from_options(options)
 
       case type
         when :url
@@ -136,5 +137,17 @@ module TransmissionRSS
 
       raise
     end
+
+    def set_arguments_from_options(options)
+      arguments = {}
+
+      OPTIONS.each do |o|
+        unless options[o].nil?
+          arguments[o.to_s.sub('_', '-')] = options[o]
+        end
+      end
+
+      arguments
+    end
   end
 end

data/lib/transmission-rss/log.rb

@@ -6,21 +6,30 @@ module TransmissionRSS
   class Log
     include Singleton
 
-    # Change log target (IO or path to a file as String).
-    def target=(target)
+    def initialize(target = $stderr)
       old_logger = @logger
-      @logger = Logger.new target
+      @logger ||= Logger.new(target)
 
       if old_logger
         @logger.level = old_logger.level
         @logger.formatter = old_logger.formatter
+      else
+        @logger.level = Logger::DEBUG
+        @logger.formatter = proc do |sev, time, _, msg|
+          time = time.strftime('%Y-%m-%d %H:%M:%S')
+          "#{time} (#{sev.downcase}) #{msg}\n"
+        end
       end
     end
 
+    # Change log target (IO or path to a file as String).
+    def target=(target)
+      initialize(target)
+    end
+
     # If this class misses a method, call it on the encapsulated Logger class.
     def method_missing(sym, *args)
-      @logger ||= Logger.new $stderr
-      @logger.send sym, *args
+      @logger.send(sym, *args)
     end
   end
 end

data/lib/transmission-rss/version.rb

@@ -1,3 +1,3 @@
 module TransmissionRSS
-  VERSION = '0.2.6'
+  VERSION = '1.0.0.alpha1'
 end

data/transmission-rss.conf.example

@@ -58,6 +58,11 @@ feeds:
 #  user: nobody
 #  group: nobody
 
+# Other Transmission client options
+
+#client:
+#  timeout: 5
+
 # Fork?
 
 #fork: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transmission-rss
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 1.0.0.alpha1
 platform: ruby
 authors:
 - henning mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
@@ -86,14 +86,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13