sanguinews 0.63 → 0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0cd430280dc8bdcf9ef210aedae895ec0b32f9b
-  data.tar.gz: e70a1baf3e93f2821af269a34a9bb811acb08749
+  metadata.gz: b26b178a10c633dba392219f40f91dbf6f1869a5
+  data.tar.gz: 9f6f39fd2343af67c0c0323529e602a4f33068cf
 SHA512:
-  metadata.gz: a48c27cb9f0eba29f4274ac2f21f6291ba539a1296d6ad29ca9f8bc7c050435e3f59d4755bb3b3af4b4ed2012b468a933faf7da8796cc0ab4995b79dd01b1167
-  data.tar.gz: 0c37a7fd1f2453e89a41818df1aeb935fb4f1c0376328202409ebb07eb40842b81d334773e67513ec2ea976cfc2c1555b512a0a0136e85a9f515a613a13c5d62
+  metadata.gz: afb36351cf44ca9b4254e6855d008b4799b5a9c573b02a756fd0783848ac292e0147b6de80fefd08cdbe3537db942dacc22aabd2d52e337c67ed8d5f5eeb7074
+  data.tar.gz: ae02784a767ac8014925fd4e80d1cddb0f5dc339314a2008a9164ad3b478158f0fd10caf7f6611e26d326a6b458730a1c42a345c5f04c1413a679a2edc337d7c

data/lib/sanguinews/config.rb

@@ -20,8 +20,8 @@ module Sanguinews
     attr_reader :config, :data
 
     %w(username password server port from connections
-       article_size reconnect_delay groups prefix ssl
-       xna nzb header_check verbose debug filemode files directory).each do |meth|
+       article_size reconnect_delay groups prefix ssl xna nzb
+       header_check verbose debug filemode files directory recursive).each do |meth|
       define_method(meth) { @data[meth.to_sym] }
     end
 
@@ -63,7 +63,7 @@ module Sanguinews
         end
         opt.on("-f", "--file FILE", "upload FILE, treat all additional parameters as files") do |file|
           @data[:filemode] = true
-          @data[:files] << file
+          @data[:files] << file if File.file?(File.expand_path(file))
         end
         opt.on("-g", "--groups GROUP_LIST", "use these groups(comma separated) for upload") do |group_list|
           @data[:groups] = group_list
@@ -79,6 +79,9 @@ module Sanguinews
         opt.on("-p", "--password PASSWORD", "use PASSWORD as your password(overwrites config file)") do |password|
           @data[:password] = password
         end
+        opt.on("-r", "--recursive", "process all files under each directory recursively") do
+          @data[:recursive] = true
+        end
         opt.on("-u", "--user USERNAME", "use USERNAME as your username(overwrites config file)") do |username|
           @data[:username] = username
         end
@@ -101,6 +104,7 @@ module Sanguinews
       # in file mode treat every additional parameter as a file
       if !args.empty? && @data[:filemode]
         args.each do |file|
+          next unless File.file?(File.expand_path(file))
           @data[:files] << file.to_s
         end
       end
@@ -130,6 +134,7 @@ module Sanguinews
     def initialize(args)
       @data = {}
       @data[:filemode] = false
+      @data[:recursive] = false
       @data[:files] = []
 
       parse_options!(args)

data/lib/sanguinews/version.rb

@@ -1,3 +1,3 @@
 module Sanguinews
-    VERSION = "0.63"
+    VERSION = "0.64"
 end

data/lib/sanguinews.rb

@@ -145,9 +145,10 @@ module Sanguinews
 
     # skip hidden files
     if !@config.filemode && Dir.exists?(@config.directory)
-      Dir.foreach(@config.directory) do |item|
-        next if item.start_with?('.')
-        files << @config.directory+item
+      @config.recursive ? glob = '**/*' : glob = '*'
+      Dir.glob(@config.directory + glob) do |item|
+        next unless File.file?(item)
+        files << item
       end
     end
 
@@ -159,8 +160,6 @@ module Sanguinews
     max = files.length
 
     files.each do |file|
-      next if !File.file?(file)
-
       informed[file.to_sym] = false
       file = FileToUpload.new(
         name: file, chunk_length: @config.article_size, prefix: @config.prefix,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanguinews
 version: !ruby/object:Gem::Version
-  version: '0.63'
+  version: '0.64'
 platform: ruby
 authors:
 - Tadeus Dobrovolskij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: speedometer