xmlconv 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e04eacd57c18034b0a9635332c08f78d02f4c16
-  data.tar.gz: 89dec346bf68e809ef68b75b87d43db8df8c7356
+  metadata.gz: d4976e15c3eb44fd7e1e31c9503a49d929a83b79
+  data.tar.gz: 251ef9c9450150f7a548c2525adc3f7ce214846b
 SHA512:
-  metadata.gz: 179f49cf4fc1ccd42c41b52eafa7b23123123f549743082571478cd941347cf3f59fc6c3f81733f116db4d25ebdd1d1882c817c1b827c96ae9da6df0b69d1695
-  data.tar.gz: 3a74403af4a1e440c32cd09006960013fa5b2054c0205e287c31cae3ab859acea6a88dfd44186ba3f1c772a0c096ac72da4152a696072b83e6f74f7ea3799de7
+  metadata.gz: 0d7658887226d0ab9454fa2c58cf30188c40d5e75fdadbce8c34bef8bfa1053c9600550f595c5e0283dcb0a1ce7efdd0b0afa87566eadbc804c3a84ce5b04ffa
+  data.tar.gz: 14df94d39537bae76704a80ea4b11c8d5315815186d3736a16a28c82e6e2288e9fbfa4386e674eda1a7a7c641d4b70fffa6f551888ba6078d37ee09c86a89a31

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.4 / 20.06.2016
+
+* setup correct smtp delivery if config.smtp_server is given. Works with smtp.gmail.com
+
 === 1.0.3 / 20.06.2016
 
 * Remove some fields from config.rb

data/bin/xmlconvd

@@ -19,11 +19,22 @@ if(log_file.is_a?(String))
 end
 logger = Logger.new(log_file)
 logger.level = Logger.const_get(config.log_level)
-logger.info(config.program_name) do
-  require 'pp'
-  config.pretty_inspect
-end
 XmlConv::LOGGER = logger
+if config.respond_to? :mail_suppress_sending
+  ::Mail.defaults do  delivery_method :test end
+  puts "Mail.mail_suppress_sending"
+elsif config.respond_to?(:smtp_server)
+  options = {}
+  options[:address] = config.smtp_server
+  options[:port] = config.smtp_port
+  options[:domain] = config.smtp_domain
+  options[:user_name] = config.smtp_user
+  options[:password] = config.smtp_pass
+  options[:authentication] = 'plain'
+  options[:enable_starttls_auto] = true
+  puts "Mail.defaults set to :smpt #{options}"
+  ::Mail.defaults do  delivery_method :smtp, options end
+end
 
 XmlConv::Util.autoload(config.plugin_dir, 'plugin')
 XmlConv::Util.autoload(config.postproc_dir, 'postproc')

data/lib/xmlconv/util/mail.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 # Util::Mail -- XmlConv -- 23.04.2009 -- hwyss@ywesee.com
 
 require 'mail'
@@ -10,29 +9,13 @@ module XmlConv
 module Mail
   SMTP_HANDLER = Net::SMTP
   def Mail.notify recipients, my_subject, my_body
-    config = XmlConv::CONFIG
-    if config.mail_suppress_sending
-      puts "#{__FILE__}:#{__LINE__} Suppress sending mail with subject: #{my_subject}"
-      ::Mail.defaults do  delivery_method :test end
-    else
-      puts "Mail.sendmail #{config.smtp_server} #{config.smtp_port} smtp_user: #{config.smtp_user} subject #{my_subject}"
-      ::Mail.defaults do
-      options = { :address              => config.smtp_server,
-                  :port                 => config.smtp_port,
-                  :domain               => config.smtp_domain,
-                  :user_name            => config.smtp_user,
-                  :password             => config.smtp_pass,
-                  :authentication       => 'plain',
-                  :enable_starttls_auto => true  }
-        delivery_method :smtp, options
-      end
-    end
     recipients.flatten!
     recipients.compact!
     recipients.uniq!
     return if(recipients.empty?)
+    puts "XmlConv::Util::Mail.notify #{ XmlConv::CONFIG.mail_from} -> #{recipients} subject: #{my_subject}"
     mail = ::Mail.deliver do
-      from  config.mail_from
+      from XmlConv::CONFIG.mail_from
       to recipients
       subject my_subject
       body my_body

data/lib/xmlconv/version.rb

@@ -1,3 +1,3 @@
 module XmlConv
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/readme.md

@@ -14,11 +14,23 @@ xmlconverter, convert XML to flat files.
 
 * sudo gem install xmlconv
 
+
+## DEVELOPERS:
+
+* Zeno R.R. Davatz
+* Masaomi Hatakeyama
+* Hannes Wyss (up to Version 1.0)
+* Niklaus Giger (Ported to Ruby 2.3.1)
+
+## LICENSE:
+
+GPLv2.0
+
 ## Debugging
 
 Use the `bin/xmlconv_admin config=/path/to/your/config.yml`. There you may call stuff like
 
-```transactions.size
+````transactions.size
 transactions.last.status
 transactions.last.output[0..120]
 transactions.last.uri
@@ -31,16 +43,5 @@ transactions.last.response
 transactions.last.output_model
 transactions.last.partner
 transactions.last.reader
-transactions.last.writer```
+transactions.last.writer````
 
-
-## DEVELOPERS:
-
-* Zeno R.R. Davatz
-* Masaomi Hatakeyama
-* Hannes Wyss (up to Version 1.0)
-* Niklaus Giger (Ported to Ruby 2.3.1)
-
-## LICENSE:
-
-GPLv2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlconv
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba