rss2mail 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ab6a446362c67e63d9cb8f6df6c7944ebf57fde
-  data.tar.gz: 26ac3bb913287311660c844bda123d634417ce50
+  metadata.gz: fdea9e96f8edf94d5ee97696867166ba486f9782
+  data.tar.gz: 8ed7b8c15cb8efe8b3fbb7faca729801b77e81e8
 SHA512:
-  metadata.gz: cf4cb4d6742279b979a8ac46c4118599567ec307d6fac41c9908f87762861e396c0f5da9330acf9ee2a719ddb7019028b0aafcb445da841ee6a16323e65c288c
-  data.tar.gz: 5760b2a4d4957335de6eb4ffa32ec4328e9c5f9cdd956320a6aac01d3c2c1dd7b5e47f530692cc17a2ea19b2d057c6173fbcba82942c3fef4771becd97402ec4
+  metadata.gz: 469f61866f232d6f8112f5d858e872931015f6c77fb859aac281f83f55a35fe714901fc63f37033ef0cd005cfba0e1730a2507746ba058d7da9beca08175abe7
+  data.tar.gz: 4d69774ae5c80083fdb056079ffcc4e6f058854af32284e99df3086a19d973355aebaff2377449591b80fd22903f7810568b9a2e78ba22cdb6ad1bb1077cca1f

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.3.0
+This documentation refers to rss2mail version 0.4.0
 
 
 == DESCRIPTION

data/Rakefile

@@ -13,7 +13,7 @@ begin
       :license      => %q{AGPL-3.0},
       :homepage     => :blackwinter,
       :extra_files  => FileList['templates/*'].to_a,
-      :dependencies => %w[nokogiri ruby-nuggets simple-rss sinatra blackwinter-unidecoder]
+      :dependencies => %w[nokogiri simple-rss sinatra unidecoder] << ['ruby-nuggets', '>= 0.9.6']
     }
   }}
 rescue LoadError => err

data/bin/rss2mail

@@ -5,7 +5,7 @@
 #                                                                             #
 # rss2mail -- Send RSS feeds as e-mail                                        #
 #                                                                             #
-# Copyright (C) 2007-2013 Jens Wille                                          #
+# Copyright (C) 2007-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -26,93 +26,5 @@
 ###############################################################################
 #++
 
-require 'yaml'
-require 'optparse'
-require 'nuggets/env/user_home'
-
-require 'rss2mail'
-
-base = File.expand_path('../..', __FILE__)
-
-USAGE = "Usage: #{$0} [options] <target>"
-abort USAGE if ARGV.empty?
-
-options = {
-  :files   => nil,
-  :reload  => false,
-  :verbose => false,
-  :debug   => false
-}
-
-OptionParser.new { |opts|
-  opts.banner = USAGE
-  opts.separator ''
-
-  opts.on('-d', '--directory DIRECTORY', 'Process all feeds in directory') { |d|
-    abort "Not a directory: #{d}"      unless File.directory?(d)
-    abort "Can't read directory: #{d}" unless File.readable?(d)
-
-    options[:files] = Dir[File.join(d, '*.yaml')]
-  }
-
-  opts.on('-r', '--reload', 'Reload feeds') {
-    options[:reload] = true
-  }
-
-  opts.on('-v', '--verbose', 'Be verbose') {
-    options[:verbose] = true
-  }
-
-  opts.on('-D', '--debug', "Print debug output and don't send any mails") {
-    options[:debug] = true
-  }
-
-  opts.on('-h', '--help', 'Print this help message and exit') {
-    abort opts.to_s
-  }
-
-  opts.on('--version', 'Print program version and exit') {
-    abort "#{File.basename($0)} v#{RSS2Mail::VERSION}"
-  }
-}.parse!
-
-if target = ARGV.shift
-  target = target.to_sym
-else
-  abort "No feeds target given\n#{USAGE}"
-end
-
-templates = Hash.new { |h, k|
-  h[k] = begin
-    File.read(File.join(base, 'templates', "#{k}.erb"))
-  rescue Errno::ENOENT
-    # silently ignore
-  end
-}
-
-feeds_files = options.delete(:files) || if File.directory?(d = File.join(ENV.user_home, '.rss2mail'))
-  Dir[File.join(d, '*.yaml')]
-else
-  [File.join(base, 'feeds.yaml')]
-end
-
-feeds_files.each { |feeds_file|
-  feeds = begin
-    YAML.load_file(feeds_file)
-  rescue Errno::ENOENT
-    warn "Feeds file not found: #{feeds_file}"
-    next
-  end
-
-  unless target_feeds = feeds[target]
-    warn "Feeds target not found: #{target} (in #{feeds_file})"
-    next
-  end
-
-  target_feeds.each { |feed|
-    RSS2Mail::Feed.new(feed, options).deliver(templates) unless feed[:skip]
-  }
-
-  # write updated feed information
-  File.open(feeds_file, 'w') { |file| YAML.dump(feeds, file) } unless options[:debug]
-}
+require 'rss2mail/cli'
+RSS2Mail::CLI.execute

data/lib/rss2mail/cli.rb

@@ -0,0 +1,144 @@
+#--
+###############################################################################
+#                                                                             #
+# A component of rss2mail, the RSS to e-mail forwarder.                       #
+#                                                                             #
+# Copyright (C) 2007-2014 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# rss2mail is free software; you can redistribute it and/or modify it under   #
+# the terms of the GNU Affero General Public License as published by the Free #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# rss2mail is distributed in the hope that it will be useful, but WITHOUT ANY #
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with rss2mail. If not, see <http://www.gnu.org/licenses/>.            #
+#                                                                             #
+###############################################################################
+#++
+
+require 'nuggets/cli'
+
+require 'rss2mail'
+
+module RSS2Mail
+
+  class CLI < Nuggets::CLI
+
+    class << self
+
+      def defaults
+        super.merge(
+          :files   => nil,
+          :smtp    => nil,
+          :lmtp    => nil,
+          :reload  => false,
+          :verbose => false,
+          :debug   => false
+        )
+      end
+
+    end
+
+    def usage
+      "#{super} <target>"
+    end
+
+    def run(arguments)
+      if target = arguments.shift
+        target = target.to_sym
+      else
+        quit 'Feeds target is required!'
+      end
+
+      quit unless arguments.empty?
+
+      templates = Hash.new { |h, k|
+        h[k] = begin
+          File.read(File.join(TEMPLATE_PATH, "#{k}.erb"))
+        rescue Errno::ENOENT
+          # silently ignore
+        end
+      }
+
+      (options.delete(:files) || default_files).each { |feeds_file|
+        feeds = begin
+          YAML.load_file(feeds_file)
+        rescue Errno::ENOENT
+          warn "Feeds file not found: #{feeds_file}"
+          next
+        end
+
+        unless target_feeds = feeds[target]
+          warn "Feeds target not found in #{feeds_file}: #{target}"
+          next
+        end
+
+        target_feeds.each { |feed|
+          Feed.new(feed, options).deliver(templates) unless feed[:skip]
+        }
+
+        unless options[:debug]
+          File.open(feeds_file, 'w') { |file| YAML.dump(feeds, file) }
+        end
+      }
+    end
+
+    private
+
+    def opts(opts)
+      opts.on('-d', '--directory DIRECTORY', 'Process all feeds in directory') { |dir|
+        quit "#{dir}: No such file or directory" unless File.directory?(dir)
+        quit "#{dir}: Permission denied"         unless File.readable?(dir)
+
+        options[:files] = Dir[File.join(dir, '*.yaml')]
+      }
+
+      opts.separator ''
+
+      %w[smtp lmtp].each { |type|
+        klass = Transport.const_get(type.upcase)
+
+        opts.on("-#{type[0, 1]}", "--#{type} [HOST[:PORT]]",
+                "Send mail through #{type.upcase} server",
+                "[Default host: #{klass::DEFAULT_HOST}, default port: #{klass::DEFAULT_PORT}]") { |host|
+          options[type.to_sym] = host.to_s
+        }
+      }
+
+      opts.separator ''
+
+      opts.on('-r', '--reload', 'Reload feeds') {
+        options[:reload] = true
+      }
+    end
+
+    def generic_opts(opts)
+      opts.on('-v', '--verbose', 'Be verbose') {
+        options[:verbose] = true
+      }
+
+      opts.on('-D', '--debug', "Print debug output; don't send any mails") {
+        options[:debug] = true
+      }
+
+      opts.separator ''
+
+      super
+    end
+
+    def default_files
+      File.directory?(dir = DEFAULT_FEEDS_PATH) ?
+        Dir[File.join(dir, '*.yaml')] : [DEFAULT_FEEDS_FILE]
+    end
+
+  end
+
+end

data/lib/rss2mail/feed.rb

@@ -24,8 +24,6 @@
 ###############################################################################
 #++
 
-require 'erb'
-
 module RSS2Mail
 
   class Feed
@@ -110,12 +108,23 @@ module RSS2Mail
     private
 
     def transport_from(options)
-      if lmtp = options[:lmtp]
-        @lmtp = lmtp.split(':')
-        [Transport::LMTP, lmtp]
-      elsif smtp = options[:smtp]
-        @smtp = smtp.split(':')
-        [Transport::SMTP, smtp]
+      if lmtp = options[:lmtp] or smtp = options[:smtp]
+        klass = smtp ? Transport::SMTP : Transport::LMTP
+
+        case @smtp = lmtp || smtp
+          when Array  # ok
+          when true   then @smtp = []
+          when Fixnum then @smtp = [nil, @smtp]
+          when String then @smtp = @smtp.split(':')
+          else raise TypeError, "Array expected, got #{@smtp.class}"
+        end
+
+        host, port = @smtp.shift, @smtp.shift
+
+        host = klass::DEFAULT_HOST if host.nil? || host.empty?
+        port = klass::DEFAULT_PORT if port.nil?
+
+        [klass, @smtp.unshift(port.to_i).unshift(host)[0, 4].join(':')]
       else
         [klass = Transport::Mail, "#{klass::CMD} = #{klass::BIN.inspect}"]
       end

data/lib/rss2mail/transport.rb

@@ -66,25 +66,34 @@ module RSS2Mail
       require 'net/smtp'
       require 'securerandom'
 
+      DEFAULT_HOST = 'localhost'.freeze
+      DEFAULT_PORT = Net::SMTP.default_port
+
+      MESSAGE_TEMPLATE = <<-EOT
+<%= FROM %>
+To: <%= Array(to).join(', ') %>
+Date: <%= Time.now.rfc822 %>
+Subject: <%= subject %>
+Message-Id: <%= SecureRandom.uuid %>
+<%= type %>
+
+<%= body %>
+      EOT
+
       def deliver_mail(to, *args)
-        deliver_smtp(Net::SMTP, @smtp, [to], *args)
+        deliver_smtp(Net::SMTP, [to], *args)
       end
 
       private
 
-      def deliver_smtp(klass, args, to, subject, body, type)
-        klass.start(*args) { |smtp|
-          to.each { |_to|
-            smtp.send_message(<<-EOT, FROM, *_to)
-#{FROM}
-To: #{Array(_to).join(', ')}
-Date: #{Time.now.rfc822}
-Subject: #{subject}
-Message-Id: #{SecureRandom.uuid}
-#{type}
-
-#{body}
-            EOT
+      def deliver_smtp(klass, tos, subject, body, type)
+        klass.start(*@smtp) { |smtp|
+          tos.each { |to|
+            smtp.send_message(
+              ERB.new(MESSAGE_TEMPLATE).result(binding),
+              FROM,
+              *to
+            )
           }
         }
       end
@@ -95,8 +104,10 @@ Message-Id: #{SecureRandom.uuid}
 
       include SMTP
 
+      DEFAULT_PORT = SMTP::DEFAULT_PORT - 1
+
       def deliver_mail(to, *args)
-        deliver_smtp(Net::LMTP, @lmtp, to, *args)
+        deliver_smtp(Net::LMTP, to, *args)
       end
 
     end

data/lib/rss2mail/version.rb

@@ -3,7 +3,7 @@ module RSS2Mail
   module Version
 
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
 
     class << self

data/lib/rss2mail.rb

@@ -24,12 +24,28 @@
 ###############################################################################
 #++
 
+require 'erb'
+require 'nuggets/env/user_home'
+
 require 'rss2mail/transport'
 require 'rss2mail/util'
 require 'rss2mail/feed'
 require 'rss2mail/rss'
 
 module RSS2Mail
+
+  BASE_PATH          = ENV['RSS2MAIL_BASE_PATH'] ||
+    File.expand_path('../..', __FILE__)
+
+  TEMPLATE_PATH      = ENV['RSS2MAIL_TEMPLATE_PATH'] ||
+    File.join(BASE_PATH, 'templates')
+
+  DEFAULT_FEEDS_PATH = ENV['RSS2MAIL_DEFAULT_FEEDS_PATH'] ||
+    File.join(ENV.user_home, '.rss2mail')
+
+  DEFAULT_FEEDS_FILE = ENV['RSS2MAIL_DEFAULT_FEEDS_FILE'] ||
+    File.join(BASE_PATH, 'feeds.yaml')
+
 end
 
 require 'nuggets/pluggable'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rss2mail
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-nuggets
+  name: simple-rss
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple-rss
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: unidecoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: blackwinter-unidecoder
+  name: ruby-nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.6
 description: Send RSS feeds as e-mail
 email: jens.wille@gmail.com
 executables:
@@ -99,6 +99,7 @@ files:
 - example/feeds.yaml
 - lib/rss2mail.rb
 - lib/rss2mail/app.rb
+- lib/rss2mail/cli.rb
 - lib/rss2mail/feed.rb
 - lib/rss2mail/rss.rb
 - lib/rss2mail/transport.rb
@@ -113,7 +114,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--title"
-- rss2mail Application documentation (v0.3.0)
+- rss2mail Application documentation (v0.4.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"