news2kindle 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2d8583e288f9e37f82d78ae57a839788c7ee2c1
-  data.tar.gz: d4307ac419f022f2e9a3c97f10b10dda3f5f7ea4
+  metadata.gz: 251e39c5b4825a1c4b5f48c00830792afaf6afc0
+  data.tar.gz: 8342bbff08e27c297951a54e7bf940235cdc1e4c
 SHA512:
-  metadata.gz: 70a6b9c437594f652c37e49199819f89cabf712e9ace976e10b2ecb7f1c1ab4fa3988907b7070a5e4ef10431a95f0088b0ef927c270a53e6ba1ca6ffdc2a5203
-  data.tar.gz: e3b99b0404da2bc243229f7a16864d98bf8d8efa082ad904fc81121d7c6022148a01ab4bb9c63671563d7a4bbe3c1022829a6057a9bccc5633008b8ee6d64b85
+  metadata.gz: 42893d4d3dc64b2c1fd98b75a2f542ca7b1244f0d98950d426f64bd03b92da14911e70b3245f3ca85bd06f911a0a581d0ae18df5cf5064362e9e07cd317eb86e
+  data.tar.gz: 1ca795a9dac2540557d69789d1c503855d06afbd9b4130159566887fbed25b891ef570ea33bece0e8f16c8c759fd9a516e43794edc5ecbb18eff88b2c5452165

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    news2kindle (0.1.2)
+    news2kindle (0.1.3)
       dropbox_api
       kindlegen
       mail

data/exe/news2kindle

@@ -10,24 +10,15 @@ require 'news2kindle'
 require 'optparse'
 require 'open-uri'
 require 'yaml'
+require 'mail'
 
 module News2Kindle
-
 	class CLI
 		def run
 			conf, tasks = parse_options
 			News2Kindle.logger.level = Logger::DEBUG if conf[:verbose]
-
-			if conf[:mongodb_uri]
-				unless conf[:mongodb_uri] =~ %r|^mongodb://|
-					conf[:mongodb_uri] = Pit::get('news2kindle', require: {
-						mongodb_uri: 'MongoDB URI for Dupulicate Check starts with "mongodb://".'
-					})[:mongodb_uri]
-				end
-				if conf[:mongodb_uri]
-					DupChecker.setup({clients:{default:{uri:conf[:mongodb_uri]}}})
-				end
-			end
+			setup_mail(conf)
+			setup_dupcheck(conf)
 
 			tasks.each do |name|
 				task = conf[:tasks][name]
@@ -101,6 +92,32 @@ module News2Kindle
 			end
 			[conf, args]
 		end
+
+		def setup_mail(conf)
+			settings = conf[:email]
+			if settings[:user_name] or settings[:password]
+				account = Pit::get('news2kindle', require: {
+					mail_user_name: 'your e-mail id',
+					mail_password: 'your e-mail password'
+				})
+				settings[:user_name] = account[:mail_user_name]
+				settings[:password] = account[:mail_password]
+			end
+			Mail.defaults{delivery_method :smtp, settings}
+		end
+
+		def setup_dupcheck(conf)
+			if conf[:mongodb_uri]
+				unless conf[:mongodb_uri] =~ %r|^mongodb://|
+					conf[:mongodb_uri] = Pit::get('news2kindle', require: {
+						mongodb_uri: 'MongoDB URI for Dupulicate Check starts with "mongodb://".'
+					})[:mongodb_uri]
+				end
+				if conf[:mongodb_uri]
+					DupChecker.setup({clients:{default:{uri:conf[:mongodb_uri]}}})
+				end
+			end
+		end
 	end
 end
 

data/lib/news2kindle/task.rb

@@ -5,7 +5,6 @@
 #
 require 'pit'
 require 'kindlegen'
-require 'mail'
 require 'dropbox_api'
 
 class DropboxApi::Client
@@ -53,16 +52,6 @@ module News2Kindle
 		def deliver_via_mail(to_address, from_address, mobi, opts)
 			return if to_address.empty?
 
-			settings = opts[:email]
-			if settings[:user_name] or settings[:password]
-				account = Pit::get('news2kindle', require: {
-					mail_user_name: 'your e-mail id',
-					mail_password: 'your e-mail password'
-				})
-				settings[:user_name] = account[:mail_user_name]
-				settings[:password] = account[:mail_password]
-			end
-			Mail.defaults{delivery_method :smtp, settings}
 			Mail.deliver do
 				from from_address
 				to  to_address

data/lib/news2kindle/version.rb

@@ -1,3 +1,3 @@
 module News2Kindle
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: news2kindle
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - TADA Tadashi