rrimm 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c42c07425e1b028e898d4c64689e6fa2ec799d09
-  data.tar.gz: 0013f94a2a64982c3cf6dd21c0566b2561a1da8c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2UwODJmOTk2M2IwMzljZDg3NTc3NmJkZGNkNjRmMWNhNjRjZTM1Mg==
+  data.tar.gz: !binary |-
+    MDEyNWQ3NDgzN2ZjM2VmZWVlNDI0ZDZiNTg3YjYxYmFkMjg4YWMwYQ==
 SHA512:
-  metadata.gz: a4e8d1fc6cb0e9ffbc6263011bb32dd635f42bd15b926dcc819946789c4b7cfe75f4a0fe9ed11337175a28df6029e33f0ad534111b88548b8ed7f14a9ef723ff
-  data.tar.gz: 3f2a69c9f8c8fa8b9598270db124cadc71701ad147c914baee7e1b8f67c3ffe7a98bb0d3e9e2e3f18ae33de2952bb85be2f28e6d0631916dbaf8880df4580f41
+  metadata.gz: !binary |-
+    NDQyMDk4MWJkZTQ3MjAxOWVlZTgzY2ZiZjAxZTZlODQzMjI0ZGFmMjMyNmZj
+    NDJiOTIzZDY2NzYzNzE1OWQzYzc0NTk4MDdhNDRkNjQ5MGJhZDFlNmVlMmEz
+    NWIxMGU1ZTA4NTY3Mjc3YmViOGRhZmQ5NDk5OGQxZWZlYzA2ODA=
+  data.tar.gz: !binary |-
+    NTc2NmEwNmE4Y2FiNjljYmM2YzNiNDllOWYxNjZlYzA0NDBjYTRlYzI4MjFj
+    YmVjY2Y1NDVkYjljNThlYjQ0YmE3ZjgwZmI5NzI5MTg2NDFiYjgzYTVmNWYx
+    ZDQ4YjQ3YzIwNzYwYjFiYWNmNjNiM2YxYWNkMmQyODkxYjg5YzQ=

data/.gitignore

@@ -1,2 +1,3 @@
 coverage/
 *gem
+Gemfile.lock

data/README.md

@@ -73,4 +73,9 @@ Getting started
 To get started, please fill the configuration file at ``~/.config/rrimm/rrimm.rb`` with your feeds list and settings. An example configuration file is provided with the package. Configuring *rrimm* requires virtually no knowledge of *Ruby* language.
 
 
+One step further
+-----
+
+To streamline the process of adding feeds, one can use columbus or feedbag gems in his `rrimm.rb` config file. It would help keeping it very simple.
+
 .. _rubygems: https://rubygems.org/gems/rrimm

data/bin/rrimm

@@ -30,6 +30,11 @@ OptionParser.new do |opts|
     options['quiet'] = true
   end
 
+  opts.on('--category CATEGORY',
+          'Run action only on one category"') do |cat|
+    options['category'] = cat
+  end
+
   opts.on('-a', '--action [action]', [:sync, :show, :status],
           'Specify what to do: "sync" feeds, "show" config, display feed "status"') do |action|
     options['action'] = action
@@ -50,14 +55,14 @@ fetcher = RRImm::Fetcher.new(conf)
 IO.open STDOUT.fileno do |ios|
   case options['action']
   when :sync
-    fetcher.fetch(options['concurrency'], options['quiet'])
+    fetcher.fetch(options['concurrency'], options['quiet'], options['category'])
   when :show
-    conf.show(ios)
+    conf.show(ios, options['category'])
   when :status
     one_month = 30 * 86400
     one_month_ago = Time.now.to_i - one_month
     six_months_ago = Time.now.to_i - 6 * one_month
 
-    conf.status(ios, one_month_ago, six_months_ago, false)
+    conf.status(ios, one_month_ago, six_months_ago, false, options['category'])
   end
 end

data/lib/rrimm/config.rb

@@ -22,14 +22,17 @@ module RRImm
       @cache
     end
 
-    def show(ios)
+    def show(ios, category=nil)
       ios.write "Cache: #{@cache.name}\n"
       ios.write "  path: #{@cache.path}\n" unless @cache.path.eql? @cache.name
 
       ios.write "Default formatter: #{default_formatter}\n" if default_formatter
       
       ios.write "Feeds:\n"
-      @feeds.values.group_by { |f| f.category }.map do |cat, feeds|
+      @feeds.values.
+        group_by { |f| f.category }.
+        select { |cat, feeds| category.nil? || cat == category }.
+        map do |cat, feeds|
         ios.write "#{cat || "unamed category"}:\n"
         feeds.each do |feed|
           fqdn = [feed.name, feed.uri].uniq
@@ -38,18 +41,22 @@ module RRImm
       end
     end
 
-    def status(ios, old_timestamp, very_old_timestamp, display_old_only)
-      @feeds.values.map { |f| [ Time.at(get_cache.read(f)), f] }.sort_by { |el| el.first }.each do |el|
-        date, f = el
-        case date.to_i
-        when 0..very_old_timestamp
-          ios.write "#{date} #{f.name}\n".red
-        when very_old_timestamp..old_timestamp
-          ios.write "#{date} #{f.name}\n".yellow
-        else
-          ios.write "#{date} #{f.name}\n".green unless display_old_only
+    def status(ios, old_timestamp, very_old_timestamp, display_old_only, category=nil)
+      @feeds.values.
+        select { |f| category.nil? || f.category == category }.
+        map { |f| [ Time.at(get_cache.read(f)), f] }.
+        sort_by { |el| el.first }.
+        each do |el|
+          date, f = el
+          case date.to_i
+          when 0..very_old_timestamp
+            ios.write "#{date} #{f.name}\n".red
+          when very_old_timestamp..old_timestamp
+            ios.write "#{date} #{f.name}\n".yellow
+          else
+            ios.write "#{date} #{f.name}\n".green unless display_old_only
+          end
         end
-      end
     end
 
     def evaluate_feed_definition(feed_name, &block)

data/lib/rrimm/feed.rb

@@ -1,3 +1,6 @@
+require 'mixlib/shellout'
+require 'stringio'
+
 module RRImm
   class Feed
  
@@ -16,12 +19,14 @@ module RRImm
 
     def format(feed, item)
       @formatter ||= @formatter_class.new
-      cmd = %Q<#{pipe}>
-      IO.popen(cmd,'w+') do |pipe|
-        @formatter.format(feed, item, self, pipe)
-        pipe.close_write
-        pipe.read.split("\n").each { |l| puts l }
+      s = ""
+      StringIO.open(s) do |str|
+        @formatter.format(feed,item, self, str)
       end
+      cmd = Mixlib::ShellOut.new(pipe, :input => s)
+      cmd.run_command
+      puts cmd.stderr if cmd.error?
+      cmd.error!
     end
 
     def category(arg=nil)

data/lib/rrimm/fetcher.rb

@@ -13,8 +13,9 @@ module RRImm
       @config = config
     end
 
-    def fetch(concurrency=nil, quiet=false)
+    def fetch(concurrency=nil, quiet=false, category=nil)
       @quiet ||= quiet
+      @category ||= category
       if concurrency
         parallel_fetch(concurrency)
       else
@@ -23,18 +24,22 @@ module RRImm
     end
 
     def parallel_fetch(concurrency)
-      Parallel.map(@config.feeds, :in_threads => concurrency, :progress => "fetching") do |name,feed_config|
+      Parallel.map(feeds, :in_threads => concurrency, :progress => "fetching") do |name,feed_config|
         @quiet = true
         fetch_feed(name, feed_config)
       end
     end
 
     def linear_fetch
-      @config.feeds.map do |name,feed_config|
+      feeds.map do |name,feed_config|
         fetch_feed(name, feed_config)
       end
     end
 
+    def feeds
+      @config.feeds.select { |f,conf| @category.nil? || conf.category == @category }
+    end
+
     def fetch_feed(name, feed_config)
       begin
         Timeout::timeout(30) do
@@ -48,7 +53,8 @@ module RRImm
     def fetch_feed_no_timeout(name, feed_config)
       last_read = Time.at(@config.get_cache.read(feed_config))
       print name unless @quiet
-      feed = Feedjira::Feed.fetch_and_parse(feed_config.uri)
+      options = { compress: true }
+      feed = Feedjira::Feed.fetch_and_parse(feed_config.uri, options)
       if feed.respond_to? :entries
         items = feed.entries.select { |item| item.published > last_read }
         last_read = items.collect { |item| item.published }.max unless items.empty?

data/rrimm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rrimm'
-  s.version     = '0.9.0'
+  s.version     = '0.11.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"
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'ruby-progressbar'
   s.add_dependency 'feedjira'
   s.add_dependency 'colorize'
+  s.add_dependency 'mixlib-shellout'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'coveralls'

data/spec/xkcd_spec.rb

@@ -12,13 +12,13 @@ describe RRImm::ItemFormatter::Mail do
     expect(feed.entries.size).to be > 0
     s = StringIO.new
     config = double('config')
-    config.should_receive(:category).twice.and_return nil
-    config.should_receive(:default_name?).and_return(true, false)
+    expect(config).to receive(:category).twice.and_return nil
+    expect(config).to receive(:default_name?).and_return(true, false)
     mail_formatter.format(feed, feed.entries.first, config, s)
     expect(s.string).to eq "From: RRImm <from@example.com>\nTo: to@example.com\nDate: Fri, 07 Mar 2014 05:00:00 -0000\nSubject: When You Assume\nContent-Type: text/html;\n\nhttp://xkcd.com/1339/\n\n<img src=\"http://imgs.xkcd.com/comics/when_you_assume.png\" title=\"You know what happens when you assert--you make an ass out of the emergency response team.\" alt=\"You know what happens when you assert--you make an ass out of the emergency response team.\" />\n"
     s = StringIO.new
 
-    config.should_receive(:name).and_return "Randall Munroe"
+    expect(config).to receive(:name).and_return "Randall Munroe"
     mail_formatter.format(feed, feed.entries.first, config, s)
   end
 end

metadata

@@ -1,125 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: rrimm
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2015-04-25 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: mixlib-shellout
+  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
@@ -129,12 +143,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - bin/rrimm
@@ -169,17 +182,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: RSS to email tool

data/Gemfile.lock

@@ -1,68 +0,0 @@
-PATH
-  remote: .
-  specs:
-    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.3)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    curb (0.8.6)
-    diff-lcs (1.2.5)
-    docile (1.1.3)
-    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.6.0)
-    multi_json (1.9.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    open_uri_redirections (0.1.4)
-    parallel (1.3.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    ruby-progressbar (1.6.0)
-    sax-machine (1.0.2)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.18.1)
-    tins (1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  codeclimate-test-reporter
-  coveralls
-  rrimm!
-  rspec