rss2mail 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdea9e96f8edf94d5ee97696867166ba486f9782
-  data.tar.gz: 8ed7b8c15cb8efe8b3fbb7faca729801b77e81e8
+  metadata.gz: 017417bfb43b6f08d3d3c796a060ea0acf87f5de
+  data.tar.gz: 7f7368f9f3d2bf056d4252fbf79cf1c24b4f27ef
 SHA512:
-  metadata.gz: 469f61866f232d6f8112f5d858e872931015f6c77fb859aac281f83f55a35fe714901fc63f37033ef0cd005cfba0e1730a2507746ba058d7da9beca08175abe7
-  data.tar.gz: 4d69774ae5c80083fdb056079ffcc4e6f058854af32284e99df3086a19d973355aebaff2377449591b80fd22903f7810568b9a2e78ba22cdb6ad1bb1077cca1f
+  metadata.gz: 437ecbd3b9f6bb2fb5a1087f0ee8f3bc0371531216c3e5bcd9d6725d0690fc22da8447215de6b2d6adfa89b6bd7c2629ef923bef8b2b4a65866fb2fc117600f5
+  data.tar.gz: c896efbe7131abe1ba37a88a1ec9af9cd6c9fb4bac427aea5a4a483953f8cccc953a6926474b2ed4b18b742ac7f0e89b5b87d1e837935b7b6d91c649afc9bd5d

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.4.0
+This documentation refers to rss2mail version 0.4.1
 
 
 == DESCRIPTION
@@ -13,10 +13,9 @@ recipients. See <tt>example/</tt> directory for a sample configuration file.
 
 == LINKS
 
-<b></b>
-Documentation:: http://blackwinter.github.com/rss2mail
-Source code::   http://github.com/blackwinter/rss2mail
-RubyGem::       http://rubygems.org/gems/rss2mail
+Documentation:: https://blackwinter.github.io/rss2mail/
+Source code::   https://github.com/blackwinter/rss2mail
+RubyGem::       https://rubygems.org/gems/rss2mail
 
 
 == AUTHORS

data/Rakefile

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

data/lib/rss2mail/app.rb

@@ -26,14 +26,14 @@
 ###############################################################################
 #++
 
-require 'yaml'
 require 'sinatra'
 require 'rss2mail/util'
+require 'safe_yaml/load'
 
 use Rack::Auth::Basic do |user, pass|
   @auth ||= begin
     file = File.join(settings.root, 'auth.yaml')
-    File.readable?(file) ? YAML.load_file(file) : {}
+    File.readable?(file) ? SafeYAML.load_file(file) : {}
   end
 
   @auth[user] == pass
@@ -74,7 +74,8 @@ def prepare
   user = request.env['REMOTE_USER'] or error(400)
 
   @feeds_file = File.join(settings.root, 'feeds.d', "#{user}.yaml")
-  @feeds      = File.readable?(@feeds_file) ? YAML.load_file(@feeds_file) : {}
+  @feeds      = File.readable?(@feeds_file) ?
+    SafeYAML.load_file(@feeds_file, :deserialize_symbols => true) : {}
   @targets    = @feeds.keys.sort_by { |t, _| t.to_s }
 end
 

data/lib/rss2mail/cli.rb

@@ -24,24 +24,23 @@
 ###############################################################################
 #++
 
-require 'nuggets/cli'
-
+require 'cyclops'
 require 'rss2mail'
 
 module RSS2Mail
 
-  class CLI < Nuggets::CLI
+  class CLI < Cyclops
 
     class << self
 
       def defaults
         super.merge(
-          :files   => nil,
-          :smtp    => nil,
-          :lmtp    => nil,
-          :reload  => false,
-          :verbose => false,
-          :debug   => false
+          files:   nil,
+          smtp:    nil,
+          lmtp:    nil,
+          reload:  false,
+          verbose: false,
+          debug:   false
         )
       end
 
@@ -70,7 +69,7 @@ module RSS2Mail
 
       (options.delete(:files) || default_files).each { |feeds_file|
         feeds = begin
-          YAML.load_file(feeds_file)
+          SafeYAML.load_file(feeds_file, deserialize_symbols: true)
         rescue Errno::ENOENT
           warn "Feeds file not found: #{feeds_file}"
           next
@@ -94,44 +93,27 @@ module RSS2Mail
     private
 
     def opts(opts)
-      opts.on('-d', '--directory DIRECTORY', 'Process all feeds in directory') { |dir|
+      opts.option(: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 ''
+      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",
+        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 ''
+      opts.separator
 
-      super
+      opts.switch(:reload, 'Reload feeds')
     end
 
     def default_files

data/lib/rss2mail/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rss2mail
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cyclops
+  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: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-nuggets
+  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: safe_yaml
+  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: simple-rss
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-nuggets
+  name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.6
-  type: :runtime
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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.9.6
+        version: '0'
 description: Send RSS feeds as e-mail
 email: jens.wille@gmail.com
 executables:
@@ -114,7 +170,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--title"
-- rss2mail Application documentation (v0.4.0)
+- rss2mail Application documentation (v0.4.1)
 - "--charset"
 - UTF-8
 - "--line-numbers"