xmlconv 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65dc4312e497e7913235d679653bef98f3c8ce5f
-  data.tar.gz: 32da75b558aa0c515084969d3bb446f63e89696c
+  metadata.gz: 928d1958cca3ce3b7b88389d014dcfe7f647b655
+  data.tar.gz: a8ef051d1bb10a4cc410432d413cfacbdce2011e
 SHA512:
-  metadata.gz: 76edc95f8256913e3e5cf0c82ea9cba3053d01cd0db50ff00c844c868c532caff52486784be40678203acada7e9b81f5bf013aa6adca9128545859ddf00b8cfa
-  data.tar.gz: 324b07ce91080ca3d6cf0ec2e7eea93e8351f7d9e515299c7ac38660951ec34885fa2f727c3504b5cc41a7612ca4dbe37e784b38e4f2d71541951a7a85b2b3d1
+  metadata.gz: 074360a0275a7f343b92765b8e5963262321ea576762d9df1352000b69eec4e834451381aaaf6134bbc89f81f8d568ef95dfb147d629b0472c27afb702ee3846
+  data.tar.gz: c3cb6d0ec48291cad2e94c4adbcced859589891b330d16b1ac36d907641b344cb2e4e0fb525cd6c0051450dfe40fb6769193247503bc2020fd8f14b4cf68a7c5

data/Gemfile

@@ -2,10 +2,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :debugger do
-	if RUBY_VERSION.match(/^1/)
-		gem 'pry-debugger'
-	else
-		gem 'pry-byebug'
+  if RUBY_VERSION.match(/^2/)
+    gem 'pry-byebug'
     gem 'pry-doc'
-	end
+  end
 end

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.7 / 21.06.2016
+
+* Made it work running via mod_ruby with Ruby 1.8.6
+
 === 1.0.6 / 21.06.2016
 
 * Commented out debug message which was emitted every minute

data/lib/xmlconv/util/mail.rb

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 # Util::Mail -- XmlConv -- 23.04.2009 -- hwyss@ywesee.com
 
-require 'mail'
+require 'net/smtp'
+unless /^1\.8/.match(RUBY_VERSION)
+  require 'mail'
+end
+
 require 'xmlconv/config'
 
 module XmlConv
@@ -9,6 +13,11 @@ module XmlConv
 module Mail
   SMTP_HANDLER = Net::SMTP
   def Mail.notify recipients, my_subject, my_body
+    unless /^1\.8/.match(RUBY_VERSION)
+      puts "XmlConv::Util::Mail.notify #{ XmlConv::CONFIG.mail_from} -> #{recipients} subject: #{my_subject}"
+      puts "Skipping as RUBY_VERSON is #{RUBY_VERSION}"
+      return
+    end
     recipients.flatten!
     recipients.compact!
     recipients.uniq!

data/lib/xmlconv/util/polling_manager.rb

@@ -8,7 +8,6 @@ require 'xmlconv/util/destination'
 require 'xmlconv/util/mail'
 require 'xmlconv/util/transaction'
 require 'net/pop'
-require 'mail'
 
 module XmlConv
 	module Util

data/lib/xmlconv/version.rb

@@ -1,3 +1,3 @@
 module XmlConv
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/test/test_util/polling_manager.rb

@@ -5,7 +5,6 @@ $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
 require 'xmlconv/util/polling_manager'
 require 'config'
-require 'mail'
 require 'minitest/autorun'
 require 'flexmock/minitest'
 

data/xmlconv.gemspec

@@ -21,25 +21,35 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ydbd-pg", '>= 0.5.1'
   spec.add_dependency "ydbi",    '>= 0.5.1'
   spec.add_dependency "json"
-  spec.add_dependency "sbsm"
-  spec.add_dependency "htmlgrid"
-  spec.add_dependency "ydim",    '>= 0.5.1'
-  spec.add_dependency "syck"
-  spec.add_dependency "mail"
+  # Must not include mail and use specific old version of some gems to
+  # allow mod_ruby compiled against Ruby 1.8.6 as on fastpower
+  if /^1\./.match(RUBY_VERSION)
+    spec.add_dependency "sbsm", '1.2.6'
+    spec.add_dependency "htmlgrid", '1.0.7'
+    spec.add_dependency "ydim",    '1.0.0'
+    spec.add_dependency "hpricot", '0.8.2'
+  else
+    spec.add_dependency "sbsm"
+    spec.add_dependency "htmlgrid"
+    spec.add_dependency "ydim"
+    spec.add_dependency "syck"
+    spec.add_dependency "mail" # avoid it to make it run
+  end
   spec.add_dependency "rclconf"
   spec.add_dependency "needle"
   spec.add_dependency "ypdf-writer"
-  spec.add_dependency "hpricot"
   spec.add_runtime_dependency 'deprecated', '= 2.0.1'
 
   spec.add_runtime_dependency "yus"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "flexmock"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "minitest-should_syntax"
-  spec.add_development_dependency "rspec"
+  unless /^1\.8/.match(RUBY_VERSION)
+    spec.add_development_dependency "simplecov"
+    spec.add_development_dependency "rake"
+    spec.add_development_dependency "flexmock"
+    spec.add_development_dependency "minitest"
+    spec.add_development_dependency "minitest-should_syntax"
+    spec.add_development_dependency "rspec"
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlconv
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: syck
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hpricot
-  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: deprecated
   requirement: !ruby/object:Gem::Requirement