transmission-rss 0.1.20 → 0.1.21

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: adc5b70e9c7cff82b8db6cabe9fc924b4630cabe
+  data.tar.gz: 51140c286b43766af87b95b121ba992f41f56567
+SHA512:
+  metadata.gz: c3fc99c0f45b4bdd46af4d16561f5143f0930acb1ba42589edb0f6ef415b450fc26e98d44d68c9c79a30a817c17d60ace8ea50924d8a846dce1726ba310b3750
+  data.tar.gz: f118fc0e62173649f464e2524bba2779287feb82ea8cd860aa4d485d6c2f077ded7b0cd3b784a835d5c72a069629abd10e896a2f2f0d2350e31b33dd6e8ab070

data/README.md

@@ -25,7 +25,7 @@ Installation
 
 ### From source
 
-    git clone git://git.orgizm.net/transmission-rss.git
+    git clone https://github.com/nning/transmission-rss
     cd transmission-rss
     gem build transmission-rss.gemspec
     gem install transmission-rss-*.gem
@@ -89,9 +89,3 @@ transmission is configured for HTTP basic authentication.
     fork: false
 
     pid_file: false
-
-TODO
-----
-
-* Option to stop seeding after full download.
-* Configurable log level.

data/bin/transmission-rss

@@ -9,7 +9,8 @@ require 'transmission-rss'
 include TransmissionRSS
 
 # Default config file path.
-config_file = '/etc/transmission-rss.conf'
+config_file   = '/etc/transmission-rss.conf'
+custom_config = false
 
 # Do not fork by default.
 dofork = false
@@ -44,7 +45,8 @@ options = GetoptLong.new \
 options.each do |option, argument|
   case option
     when '-c'
-      config_file = argument
+      config_file   = argument
+      custom_config = true
     when '-f'
       dofork = true
     when '-h'
@@ -77,7 +79,7 @@ defaults = {
   'privileges' => {},
   'seen_file' => nil
 }
-config.load defaults
+config.load(defaults)
 
 # Initialize a log instance and configure it.
 log = Log.instance
@@ -92,9 +94,22 @@ begin
   config.load(config_file)
   log.target = config.log_target
 rescue Errno::ENOENT
-  log.error config_file + ' not found'
+  log.error(config_file + ' not found')
 end
-log.debug config
+
+# Check for user configuration and load if existing.
+unless custom_config
+  prefix = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config')
+  path   = File.join(prefix, 'transmission-rss', 'config.yml')
+
+  if File.exists? path
+    log.debug('loading user config ' + path)
+    config.load(path)
+  end
+end
+
+# Print current config.
+log.debug(config)
 
 # Fork value from command line.
 config.fork = dofork if dofork
@@ -116,15 +131,15 @@ unless config.privileges.empty?
     ':' +
     config.privileges.group
 else
-  log.debug 'no privilege dropping'
+  log.debug('no privilege dropping')
 end
 
 # Warn if no feeds are given.
-log.warn 'no feeds given' if config.feeds.empty?
+log.warn('no feeds given') if config.feeds.empty?
 
 # Connect reload of config file to SIGHUP.
 trap 'HUP' do
-  config.load config_file rescue nil
+  config.load(config_file) rescue nil
 end
 
 # Initialize feed aggregator.
@@ -140,7 +155,7 @@ end
 
 # Save PID.
 if config.pid_file
-  log.debug 'wrote pid to ' + config.pid_file
+  log.debug('wrote pid to ' + config.pid_file)
   File.write(config.pid_file, Process.pid)
 end
 
@@ -148,13 +163,13 @@ end
 begin
   if config.fork
     pid = fork { aggregator.run(config.update_interval) }
-    log.debug 'forked ' + pid.to_s
+    log.debug('forked ' + pid.to_s)
   else
-    log.debug 'pid ' + Process.pid.to_s
+    log.debug('pid ' + Process.pid.to_s)
     aggregator.run(config.update_interval)
   end
 rescue Interrupt
-  log.info 'interrupt caught'
+  log.info('interrupt caught')
 end
 
 log.close

data/lib/transmission-rss/aggregator.rb

@@ -95,7 +95,7 @@ module TransmissionRSS
 
               begin
                 on_new_item(link)
-              rescue Errno::ECONNREFUSED, Client::Unauthorized
+              rescue Client::Unauthorized, Errno::ECONNREFUSED, Timeout::Error
                 # Do not add to seen file.
               else
                 add_seen(link)

data/lib/transmission-rss/client.rb

@@ -84,7 +84,10 @@ module TransmissionRSS
     end
 
     def request(data)
+      c ||= 0
+
       Timeout.timeout(@timeout) do
+        @log.debug("request #@host:#@port")
         Net::HTTP.new(@host, @port).start do |http|
           http.request(data)
         end
@@ -93,7 +96,13 @@ module TransmissionRSS
       @log.debug('connection refused')
       raise
     rescue Timeout::Error
-      @log.debug('connection timeout')
+      s  = 'connection timeout'
+      s += " (retry #{c})" if c > 0
+      @log.debug(s)
+
+      c += 1
+      retry unless c > 2
+
       raise
     end
   end

data/lib/transmission-rss/version.rb

@@ -1,3 +1,3 @@
 module TransmissionRSS
-  VERSION = '0.1.20'
+  VERSION = '0.1.21'
 end

metadata

@@ -1,41 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: transmission-rss
 version: !ruby/object:Gem::Version
-  version: 0.1.20
-  prerelease: 
+  version: 0.1.21
 platform: ruby
 authors:
 - henning mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
-description: ! "transmission-rss is basically a workaround for\n    transmission's
-  lack of the ability to monitor RSS feeds and\n    automatically add enclosed torrent
-  links. Devoted to Ann."
+description: |-
+  transmission-rss is basically a workaround for
+      transmission's lack of the ability to monitor RSS feeds and
+      automatically add enclosed torrent links. Devoted to Ann.
 email: henning@orgizm.net
 executables:
 - transmission-add-file
@@ -43,42 +41,40 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/transmission-add-file
 - bin/transmission-rss
 - lib/transmission-rss.rb
-- lib/transmission-rss/hash.rb
-- lib/transmission-rss/config.rb
 - lib/transmission-rss/aggregator.rb
-- lib/transmission-rss/client.rb
 - lib/transmission-rss/callback.rb
+- lib/transmission-rss/client.rb
+- lib/transmission-rss/config.rb
+- lib/transmission-rss/hash.rb
 - lib/transmission-rss/log.rb
 - lib/transmission-rss/version.rb
-- README.md
 - transmission-rss.conf.example
 homepage: https://rubygems.org/gems/transmission-rss
 licenses:
 - GPL-3.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adds torrents from rss feeds to transmission web frontend.
 test_files: []
-has_rdoc: