rrimm 0.7.2 → 0.9.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWViZWY1NjQwNTJkZTQ2NjJhM2U1OWUxODg2ZDY0YzNmZWExN2YyMQ==
-  data.tar.gz: !binary |-
-    M2IwMmJjNDAyYTc5ZTgwZGQxZTUzN2UwZjU1OGIxZGQwOTg5OTFjMw==
+SHA1:
+  metadata.gz: c42c07425e1b028e898d4c64689e6fa2ec799d09
+  data.tar.gz: 0013f94a2a64982c3cf6dd21c0566b2561a1da8c
 SHA512:
-  metadata.gz: !binary |-
-    YTQ1OGZhYmE1ZDYyYmVkNjNjOGM2MzdhYzQ5MjAyMGNhOWVkYWU4NTk1OTcx
-    ZjQyODY0YjRkYWUwZTFkZGE4NTU3ZDQ3NDQ3ODZkMjQ2OTk4ZGNkZTk2NjNm
-    NjQ0NGExYmY1YmNhNTU2YTJiNDE1MzQ0NDdhZDE2ZjBmNjhjMTc=
-  data.tar.gz: !binary |-
-    NjY5YTc0YWM3ZGVkMGFiZDQ4NzM4Yzk1MDc2YjRiMjc2YjNkMGRmMTllZTQy
-    NmM4OGU1ZjE2ZTJlZjY2YzA3NWRhNTNjZjUwNjEyMTExM2EwNjE0ZDMxMGEw
-    N2QxOTQxYjdmNGZlMjU3N2UxOGU5MmI0NWE0MTAzZTQwMmRlOGM=
+  metadata.gz: a4e8d1fc6cb0e9ffbc6263011bb32dd635f42bd15b926dcc819946789c4b7cfe75f4a0fe9ed11337175a28df6029e33f0ad534111b88548b8ed7f14a9ef723ff
+  data.tar.gz: 3f2a69c9f8c8fa8b9598270db124cadc71701ad147c914baee7e1b8f67c3ffe7a98bb0d3e9e2e3f18ae33de2952bb85be2f28e6d0631916dbaf8880df4580f41

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-- 1.9.3
-- 2.0.0
 - 2.1.0
 - ruby-head
 addons:
@@ -16,3 +14,6 @@ deploy:
   on:
     tags: true
     repo: kamaradclimber/rrimm
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile.lock

@@ -1,40 +1,41 @@
 PATH
   remote: .
   specs:
-    rrimm (0.7.2)
+    rrimm (0.9.0)
       colorize
       feedjira
       open_uri_redirections
       parallel
+      ruby-progressbar
 
 GEM
   remote: https://rubygems.org/
   specs:
     codeclimate-test-reporter (0.3.0)
       simplecov (>= 0.7.1, < 1.0.0)
-    colorize (0.7.2)
+    colorize (0.7.3)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    curb (0.8.5)
+    curb (0.8.6)
     diff-lcs (1.2.5)
     docile (1.1.3)
-    feedjira (1.2.0)
-      curb (~> 0.8.1)
-      loofah (~> 1.2.1)
-      sax-machine (~> 0.2.1)
-    loofah (1.2.1)
-      nokogiri (>= 1.4.4)
+    feedjira (1.4.0)
+      curb (~> 0.8)
+      loofah (~> 2.0)
+      sax-machine (~> 1.0)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     mime-types (2.1)
-    mini_portile (0.5.3)
+    mini_portile (0.6.0)
     multi_json (1.9.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
     open_uri_redirections (0.1.4)
-    parallel (1.0.0)
+    parallel (1.3.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
@@ -45,8 +46,8 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sax-machine (0.2.1)
-      nokogiri (~> 1.6.0)
+    ruby-progressbar (1.6.0)
+    sax-machine (1.0.2)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json

data/lib/rrimm/fetcher.rb

@@ -2,6 +2,7 @@ require 'feedjira'
 require 'open-uri'
 require 'open_uri_redirections'
 require 'parallel'
+require 'timeout'
 
 module RRImm
   class Fetcher
@@ -22,7 +23,8 @@ module RRImm
     end
 
     def parallel_fetch(concurrency)
-      Parallel.map(@config.feeds, :in_threads => concurrency) do |name,feed_config|
+      Parallel.map(@config.feeds, :in_threads => concurrency, :progress => "fetching") do |name,feed_config|
+        @quiet = true
         fetch_feed(name, feed_config)
       end
     end
@@ -34,8 +36,18 @@ module RRImm
     end
 
     def fetch_feed(name, feed_config)
+      begin
+        Timeout::timeout(30) do
+          fetch_feed_no_timeout(name, feed_config)
+        end
+      rescue Timeout::Error
+        puts "#{name} timeout after 30 seconds"
+      end
+    end
+
+    def fetch_feed_no_timeout(name, feed_config)
       last_read = Time.at(@config.get_cache.read(feed_config))
-      puts name unless @quiet
+      print name unless @quiet
       feed = Feedjira::Feed.fetch_and_parse(feed_config.uri)
       if feed.respond_to? :entries
         items = feed.entries.select { |item| item.published > last_read }
@@ -45,6 +57,7 @@ module RRImm
         end
         @config.get_cache.save(feed_config, last_read.to_i, false)
       end
+      puts " (#{items.size rescue nil})" unless @quiet
     end
   end
 end

data/rrimm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rrimm'
-  s.version     = '0.7.2'
+  s.version     = '0.9.0'
   s.licenses    = ['Apache Licence v2']
   s.summary     = "RSS to email tool"
   s.description = "imm reboot in ruby. Retrieve rss feeds and send them by email"
@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'open_uri_redirections'
   s.add_dependency 'parallel'
+  s.add_dependency 'ruby-progressbar'
   s.add_dependency 'feedjira'
   s.add_dependency 'colorize'
 

metadata

@@ -1,111 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: rrimm
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: feedjira
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: imm reboot in ruby. Retrieve rss feeds and send them by email
@@ -115,9 +129,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -155,12 +169,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []