feed2email 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e69b799d3cbd8ab553fedc851e4439103379867e
-  data.tar.gz: ec73447b756ec375b735a827c9a843de960829ac
+  metadata.gz: dbcdf4e12f0075c8ecdb50cbbf4e4fdb9fef1959
+  data.tar.gz: f47dae1909bc87274d37eade561c68caa6e5f8b9
 SHA512:
-  metadata.gz: 58ff89046e9cd04c210e9467ff31ccc176dffbe12a537a48d15bd21d857527ce70c55fd4be162fc4bf061942c7b91e54e0944b44baf52c080d273cd0b0f95cd6
-  data.tar.gz: 4c83c6c595369c8a50ff535b18cd00a6b36387c26c4f3b0ccd1620097d57301db68438926e362a772d25629641c06a0f26efd13e13a73c56dbbedd891c92662c
+  metadata.gz: 8e7c27a67e616639c4e1bc9957e6b0189e7f7aaf9f5f55ad7f6f351196852671fa2c6690d0e30a797fcd02aead4adcc6ba0ab210748b4925451d4852f9468d3b
+  data.tar.gz: d063673ffa118876f8e9ec1d5728ec4be95c6688539320868fd96f0f43b274dc51c12ca2edf97466404ebabeb3838fa2262bce4dd53b3ee711d2129140dbdfea

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 0.10.0
+
+* Do not strip `nil` entry title to prevent exceptions
+* Skip entries with missing data
+* Fix relative URI fix mistaking a protocol-relative URI as relative
+* Fix relative URI fix by converting it to String
+* Confirm feed removal
+* Show number of subscribed feeds in list command
+* Print command to fix config file permissions
+
 ### 0.9.1
 
 * Fix feed type detection for secure feed URLs in OPML export

data/README.md

@@ -1,4 +1,4 @@
-# feed2email [![Gem Version](https://badge.fury.io/rb/feed2email.svg)](http://badge.fury.io/rb/feed2email)
+# feed2email [![Gem Version](https://badge.fury.io/rb/feed2email.svg)](http://badge.fury.io/rb/feed2email) [![Build Status](https://travis-ci.org/agorf/feed2email.png?branch=master)](https://travis-ci.org/agorf/feed2email)
 
 feed2email is a [headless][] RSS/Atom feed aggregator that sends feed entries
 via email. It was initially written as a replacement of [rss2email][] and aims
@@ -31,7 +31,7 @@ $ gem install feed2email
 ~~~
 
 If the above command fails due to missing headers, make sure the following
-packages for [curb][] and [sqlite3][] gems are installed:
+packages for [curb][] and [sqlite3][] gems are installed. For Debian, issue:
 
 ~~~ sh
 $ sudo apt-get install libcurl4-openssl-dev libsqlite3-dev

data/lib/feed2email.rb

@@ -1,6 +1,8 @@
+require 'logger'
+require 'net/smtp'
 require 'pathname'
 require 'feed2email/config'
-require 'feed2email/logger'
+require 'feed2email/database'
 
 module Feed2Email
   def self.config
@@ -16,10 +18,42 @@ module Feed2Email
   end
 
   def self.logger
-    @logger ||= Logger.new(
-      config['log_path'], config['log_level'], config['log_shift_age'],
-      config['log_shift_size']
-    ).logger
+    return @logger if @logger
+
+    if config['log_path'] == true
+      logdev = $stdout
+    elsif config['log_path'] # truthy but not true (a path)
+      logdev = File.expand_path(config['log_path'])
+    end
+
+    @logger = Logger.new(logdev, config['log_shift_age'],
+                         config['log_shift_size'].megabytes)
+    @logger.level = Logger.const_get(config['log_level'].upcase)
+    @logger
+  end
+
+  def self.setup_database
+    @db ||= Database.new(
+      adapter:       'sqlite',
+      database:      database_path,
+      loggers:       [logger],
+      sql_log_level: :debug
+    )
+  end
+
+  def self.smtp_connection
+    return @smtp if @smtp
+
+    @smtp = Net::SMTP.new(config['smtp_host'], config['smtp_port'])
+    @smtp.enable_starttls if config['smtp_starttls']
+    @smtp.start('localhost',
+      config['smtp_user'],
+      config['smtp_pass'],
+      config['smtp_auth'].to_sym
+    )
+    at_exit { @smtp.finish }
+
+    @smtp
   end
 
   def self.root

data/lib/feed2email/cli.rb

@@ -1,12 +1,15 @@
 require 'thor'
+require 'feed2email'
+require 'feed2email/feed'
+require 'feed2email/feed_autodiscoverer'
+require 'feed2email/opml_exporter'
+require 'feed2email/opml_importer'
+require 'feed2email/version'
 
 module Feed2Email
   class Cli < Thor
     desc 'add URL', 'Subscribe to feed at URL'
     def add(uri)
-      require 'feed2email/feed'
-      require 'feed2email/feed_autodiscoverer'
-
       uri = autodiscover_feeds(uri)
 
       if feed = Feed[uri: uri]
@@ -24,14 +27,12 @@ module Feed2Email
 
     desc 'backend', 'Open an SQLite console to the database'
     def backend
-      require 'feed2email/database'
       exec('sqlite3', Feed2Email.database_path)
     end
 
     desc 'config', 'Open configuration file with $EDITOR'
     def config
       if ENV['EDITOR']
-        require 'feed2email'
         exec(ENV['EDITOR'], Feed2Email.config_path)
       else
         abort 'EDITOR not set'
@@ -40,15 +41,11 @@ module Feed2Email
 
     desc 'export PATH', 'Export feed subscriptions as OPML to PATH'
     def export(path)
-      require 'feed2email/feed'
-
       if Feed.empty?
         abort 'No feeds to export'
       end
 
       unless File.exist?(path)
-        require 'feed2email/opml_exporter'
-
         puts 'This may take a bit. Please wait...'
 
         if n = OPMLExporter.export(path)
@@ -64,8 +61,6 @@ module Feed2Email
     desc 'import PATH', 'Import feed subscriptions as OPML from PATH'
     def import(path)
       if File.exist?(path)
-        require 'feed2email/opml_importer'
-
         puts 'Importing...'
 
         if n = OPMLImporter.import(path)
@@ -82,10 +77,9 @@ module Feed2Email
 
     desc 'list', 'List feed subscriptions'
     def list
-      require 'feed2email/feed'
-
       if Feed.any?
         puts Feed.by_smallest_id.to_a
+        puts "\nSubscribed to #{'feed'.pluralize(Feed.count)}"
       else
         puts 'No feeds'
       end
@@ -93,27 +87,32 @@ module Feed2Email
 
     desc 'process', 'Process feed subscriptions'
     def process
-      require 'feed2email/feed'
       Feed.enabled.by_smallest_id.each(&:process)
     end
 
     desc 'remove ID', 'Unsubscribe from feed with id ID'
     def remove(id)
-      require 'feed2email/feed'
-
       feed = Feed[id]
 
-      if feed && feed.delete
-        puts "Removed feed: #{feed}"
+      if feed
+        puts "Remove feed: #{feed}"
+
+        if ask('Are you sure? (yes/no)') == 'yes'
+          if feed.delete
+            puts 'Removed'
+          else
+            abort 'Failed to remove feed'
+          end
+        else
+          puts 'Not removed'
+        end
       else
-        abort "Failed to remove feed. Is #{id} a valid id?"
+        abort "Feed not found. Is #{id} a valid id?"
       end
     end
 
     desc 'toggle ID', 'Enable/disable feed with id ID'
     def toggle(id)
-      require 'feed2email/feed'
-
       feed = Feed[id]
 
       if feed && feed.toggle
@@ -125,8 +124,6 @@ module Feed2Email
 
     desc 'uncache ID', 'Clear fetch cache for feed with id ID'
     def uncache(id)
-      require 'feed2email/feed'
-
       feed = Feed[id]
 
       if feed && feed.uncache
@@ -138,7 +135,6 @@ module Feed2Email
 
     desc 'version', 'Show feed2email version'
     def version
-      require 'feed2email/version'
       puts "feed2email #{Feed2Email::VERSION}"
     end
 

data/lib/feed2email/config.rb

@@ -60,7 +60,8 @@ module Feed2Email
     def check_permissions
       if '%o' % (File.stat(path).mode & 0777) != '600'
         raise InvalidConfigPermissionsError,
-          "Invalid permissions for config file #{path}"
+          'Invalid permissions for config file' +
+          "\nTo fix it, issue: chmod 600 #{path}"
       end
     end
 

data/lib/feed2email/database.rb

@@ -1,31 +1,18 @@
 require 'sequel'
-require 'feed2email'
 
 module Feed2Email
   class Database
-    def self.setup
-      new(
-        adapter: 'sqlite',
-        database: Feed2Email.database_path,
-        loggers: [Feed2Email.logger],
-        sql_log_level: :debug
-      )
-    end
-
     def initialize(connect_options)
-      @connect_options = connect_options
-      setup_connection
+      setup_connection(connect_options)
       setup_schema
     end
 
     private
 
-    def connect_options; @connect_options end
-
     def connection; @connection end
 
-    def setup_connection
-      @connection = Sequel::Model.db = Sequel.connect(connect_options)
+    def setup_connection(options)
+      @connection = Sequel::Model.db = Sequel.connect(options)
     end
 
     def setup_schema
@@ -49,7 +36,5 @@ module Feed2Email
         Time :updated_at
       end
     end
-
-    setup
   end
 end

data/lib/feed2email/entry.rb

@@ -4,15 +4,11 @@ require 'uri'
 require 'feed2email'
 require 'feed2email/configurable'
 require 'feed2email/core_ext'
-require 'feed2email/database'
 require 'feed2email/loggable'
 require 'feed2email/version'
 
 module Feed2Email
-  if config['send_method'] == 'smtp'
-    require 'feed2email/smtp_connection'
-    SMTPConnection.setup
-  end
+  setup_database
 
   class Entry < Sequel::Model(:entries)
     plugin :timestamps
@@ -31,6 +27,11 @@ module Feed2Email
     attr_accessor :feed_uri
 
     def process
+      if missing_data?
+        logger.warn 'Skipping entry with missing data...'
+        return false
+      end
+
       unless feed.old?
         logger.debug 'Skipping new feed entry...'
         save # record as seen
@@ -130,6 +131,10 @@ module Feed2Email
       Entry.last_email_sent_at = time
     end
 
+    def missing_data?
+      [content, feed_title, title, uri].include?(nil)
+    end
+
     def old?
       feed.entries_dataset.where(uri: uri).any?
     end
@@ -157,7 +162,9 @@ module Feed2Email
     end
 
     def title
-      data.title.strip
+      if data.title
+        data.title.strip
+      end
     end
 
     def uri
@@ -166,8 +173,8 @@ module Feed2Email
       @uri = data.url
 
       # Make relative entry URL absolute by prepending feed URL
-      if @uri && @uri.start_with?('/')
-        @uri = URI.join(feed_uri[%r{https?://[^/]+}], @uri)
+      if @uri && @uri.start_with?('/') && !@uri.start_with?('//')
+        @uri = URI.join(feed_uri[%r{https?://[^/]+}], @uri).to_s
       end
 
       @uri

data/lib/feed2email/feed.rb

@@ -6,7 +6,6 @@ require 'feed2email'
 require 'feed2email/config'
 require 'feed2email/configurable'
 require 'feed2email/core_ext'
-require 'feed2email/database'
 require 'feed2email/entry'
 require 'feed2email/loggable'
 require 'feed2email/open-uri'
@@ -14,6 +13,8 @@ require 'feed2email/redirection_checker'
 require 'feed2email/version'
 
 module Feed2Email
+  setup_database
+
   class Feed < Sequel::Model(:feeds)
     plugin :dirty
     plugin :timestamps

data/lib/feed2email/version.rb

@@ -1,3 +1,3 @@
 module Feed2Email
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feed2email
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Aggelos Orfanakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: feedzirra
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 description: 
 email: me@agorf.gr
 executables:
@@ -217,7 +231,6 @@ files:
 - lib/feed2email/feed.rb
 - lib/feed2email/feed_autodiscoverer.rb
 - lib/feed2email/loggable.rb
-- lib/feed2email/logger.rb
 - lib/feed2email/migrate/convert_feeds_migration.rb
 - lib/feed2email/migrate/feeds_import_migration.rb
 - lib/feed2email/migrate/history_import_migration.rb
@@ -227,7 +240,6 @@ files:
 - lib/feed2email/opml_exporter.rb
 - lib/feed2email/opml_importer.rb
 - lib/feed2email/redirection_checker.rb
-- lib/feed2email/smtp_connection.rb
 - lib/feed2email/version.rb
 homepage: https://github.com/agorf/feed2email
 licenses:

data/lib/feed2email/logger.rb

@@ -1,25 +0,0 @@
-require 'logger'
-require 'feed2email/core_ext'
-
-module Feed2Email
-  class Logger
-    attr_reader :logger
-
-    def initialize(log_path, log_level, log_shift_age, log_shift_size)
-      @log_path = log_path
-      @logger = ::Logger.new(log_to(log_path), log_shift_age,
-                             log_shift_size.megabytes)
-      @logger.level = ::Logger.const_get(log_level.upcase)
-    end
-
-    private
-
-    def log_to(log_path)
-      if log_path == true
-        $stdout
-      elsif log_path # truthy but not true (a path)
-        File.expand_path(log_path)
-      end
-    end
-  end
-end

data/lib/feed2email/smtp_connection.rb

@@ -1,59 +0,0 @@
-require 'net/smtp'
-require 'feed2email/configurable'
-
-module Feed2Email
-  def self.smtp_connection
-    @smtp_connection
-  end
-
-  def self.smtp_connection=(smtp_connection)
-    @smtp_connection = smtp_connection
-  end
-
-  class SMTPConnection
-    extend Configurable
-
-    def self.setup
-      Feed2Email.smtp_connection = new(
-        config.slice(*config.keys.grep(/\Asmtp_/))
-      )
-      at_exit { Feed2Email.smtp_connection.finish }
-    end
-
-    def initialize(options)
-      @options = options
-    end
-
-    def finish
-      smtp.finish if started?
-    end
-
-    def sendmail(*args, &block)
-      start unless started?
-      smtp.sendmail(*args, &block) # delegate
-    end
-
-    private
-
-    def options; @options end
-
-    def smtp
-      return @smtp if @smtp
-      @smtp = Net::SMTP.new(options['smtp_host'], options['smtp_port'])
-      @smtp.enable_starttls if options['smtp_starttls']
-      @smtp
-    end
-
-    def start
-      smtp.start('localhost',
-        options['smtp_user'],
-        options['smtp_pass'],
-        options['smtp_auth'].to_sym
-      )
-    end
-
-    def started?
-      smtp.started? # delegate
-    end
-  end
-end