oddb2xml 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8da655dd712cff69591fb63c97ad9f0e61d1bf085fd03b4cc1af409c140fe31
-  data.tar.gz: ff287b7a4104e8a446a33d12d0f4a64e0741d390329a2fb2446647fb1b99014b
+  metadata.gz: 5dc59cd0f8ed09f2416f4ba77030ab3549618c3cbe90b3e0496e91808e51fa95
+  data.tar.gz: 3fdbf0803a5b92b4b3af6950c0021db33ade825de3bb768ca34c54c90e0e659a
 SHA512:
-  metadata.gz: 13a5bf2653004efe4365ac0f869b329a0d23e94ef11c5501f03bab1253fa69170a7df0bb78f976dc9c946a4a5f2b5bad21e38f3b5bc24d1e566f5a303eb0bb2f
-  data.tar.gz: 5483ac6d5eaeaddf7800e7c1bad5245155b61c7025a2d1325790ebf3ed76e70b8b5b1bd262d35e81011109ccb59d304740d7954ee1bef06b61711012eb1f703c
+  metadata.gz: b742461c737d8409d8a6f79eba36d4a3d87458e6f211086ff8c828264d76b5c6b3216cdb9b8ce216c3bbb3caa3a38dae2a430e9dd97faa624e8c3b15ceb0a749
+  data.tar.gz: 1b825d705594c244f34a9ff4df06e158f8fd63ebabd1bdf7c760ea52a50b816d8781eacd5b0627df394a39de62dc3572afd07261358df66e6d6f0b7cfa0846bf

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.7.3 / 29.03.2021
+* Do not delete swissmedic_package.xlsx and swissmedic_orphan.xlsx
+* Save swissmedic_package.xlsx and swissmedic_orphan.xlsx under downloads
+* Log removing files
+
 === 2.7.2 / 18.03.2021
 * Added https://github.com/testdouble/standard and fixed all useful warnings
 * Added standard to rake tasks

data/README.md

@@ -106,8 +106,8 @@ FR
 
 ## Supported ruby version
 
-We run tests on travis-ci.org for the Ruby versions mentioned in the .travis.yml file. You will need ruby > 2.4 to work correctly.
-Ruby 2.2/2.3 have problems with i18n encoding and fail a spec test for Naropin
+We run tests on travis-ci.org for the Ruby versions mentioned in the .travis.yml file. You will need ruby > 2.5 to work correctly.
+Look at the github actions to see the spec test results. We ignore errors against ruby head, as it is sometimes unstable.
 
 
 ## XSD files

data/lib/oddb2xml/builder.rb

@@ -709,7 +709,7 @@ module Oddb2xml
 
     def prepare_calc_items(suppress_composition_parsing: false)
       @calc_items = {}
-      packungen_xlsx = File.join(Oddb2xml::WORK_DIR, "swissmedic_package.xlsx")
+      packungen_xlsx = File.join(Oddb2xml::DOWNLOADS, "swissmedic_package.xlsx")
       return unless File.exist?(packungen_xlsx)
       workbook = RubyXL::Parser.parse(packungen_xlsx)
       row_nr = 0

data/lib/oddb2xml/cli.rb

@@ -38,7 +38,7 @@ module Oddb2xml
       threads = []
       start_time = Time.now
       files2rm = Dir.glob(File.join(DOWNLOADS, "*"))
-      FileUtils.rm_f(files2rm, verbose: @options[:log]) if (files2rm.size > 0) && !Oddb2xml.skip_download?
+      FileUtils.rm_f(files2rm, verbose: true) if (files2rm.size > 0) && !Oddb2xml.skip_download?
       if @options[:calc] && !(@options[:extended])
         threads << download(:package) # swissmedic
       elsif @options[:address]
@@ -211,7 +211,7 @@ module Oddb2xml
           "@#{var}",
           items = SwissmedicExtractor.new(bin, what).to_arry
         )
-        Oddb2xml.log("SwissmedicExtractor added #{items.size}")
+        Oddb2xml.log("SwissmedicExtractor added #{items.size} from #{bin}")
         items
 
       when :interaction

data/lib/oddb2xml/compressor.rb

@@ -39,7 +39,7 @@ module Oddb2xml
           @contents.each do |file|
             @tmpfile = file
             puts "#{__LINE__}: @tmpfile"
-            FileUtils.rm(file) if file && File.exist?(file)
+            FileUtils.rm(file, verbose: true) if file && File.exist?(file)
           end
         end
       rescue Errno::ENOENT

data/lib/oddb2xml/downloader.rb

@@ -151,7 +151,7 @@ module Oddb2xml
       @url ||= "https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/interactions_de_utf8.csv"
       file = "epha_interactions.csv"
       content = download_as(file, "w+")
-      FileUtils.rm_f(file, verbose: false)
+      FileUtils.rm_f(file, verbose: true)
       content
     end
   end
@@ -181,7 +181,7 @@ module Oddb2xml
       # read file and convert it to utf-8
       File.open(dest, "r:iso-8859-1:utf-8").read
     ensure
-      FileUtils.rm(zipfile) if File.exist?(dest) && File.exist?(zipfile)
+      FileUtils.rm(zipfile, verbose: true) if File.exist?(dest) && File.exist?(zipfile)
     end
   end
 
@@ -205,7 +205,7 @@ module Oddb2xml
       file = "medregbm_#{@type}.txt"
       download_as(file, "w+:iso-8859-1:utf-8")
       report_download(@url, file)
-      FileUtils.rm_f(file, verbose: false) # we need it only in the download
+      FileUtils.rm_f(file, verbose: true) # we need it only in the download
       file
     end
   end
@@ -233,7 +233,7 @@ module Oddb2xml
         Oddb2xml.log(cmd)
         system(cmd)
       end
-      FileUtils.rm_f(file, verbose: false) unless defined?(RSpec)
+      FileUtils.rm_f(file, verbose: true) unless defined?(RSpec)
       content
     end
   end
@@ -270,7 +270,7 @@ module Oddb2xml
 )
         report_download(@url, @file2save)
         return IO.read(@file2save) if Oddb2xml.skip_download? && File.exist?(@file2save)
-        FileUtils.rm_f(@file2save, verbose: false)
+        FileUtils.rm_f(@file2save, verbose: true)
         response = @client.call(:download, xml: soap)
         if response.success?
           if (xml = response.to_xml)
@@ -316,17 +316,17 @@ module Oddb2xml
     end
 
     def download
-      @file2save = File.join(Oddb2xml::WORK_DIR, "swissmedic_#{@type}.xlsx")
+      @file2save = File.join(DOWNLOADS, "swissmedic_#{@type}.xlsx")
       report_download(@url, @file2save)
       if @options[:calc] && @options[:skip_download] && File.exist?(@file2save) && ((Time.now - File.ctime(@file2save)).to_i < 24 * 60 * 60)
         Oddb2xml.log "SwissmedicDownloader #{__LINE__}: Skip downloading #{@file2save} #{File.size(@file2save)} bytes"
         return File.expand_path(@file2save)
       end
       begin
-        FileUtils.rm(File.expand_path(@file2save), verbose: !defined?(RSpec)) if File.exist?(File.expand_path(@file2save))
         @url = @direct_url_link
         download_as(@file2save, "w+")
         if @options[:artikelstamm]
+          # ssconvert is in the package gnumeric (Debian)
           cmd = "ssconvert '#{@file2save}' '#{File.join(DOWNLOADS, File.basename(@file2save).sub(/\.xls.*/, ".csv"))}' 2> /dev/null"
           Oddb2xml.log(cmd)
           system(cmd)
@@ -351,7 +351,7 @@ module Oddb2xml
     def download
       file = File.join(DOWNLOADS, "swissmedic_info.zip")
       report_download(@url, file)
-      FileUtils.rm_f(file, verbose: false) unless Oddb2xml.skip_download?
+      FileUtils.rm_f(file, verbose: true) unless Oddb2xml.skip_download?
       unless File.exist?(file)
         begin
           response = nil

data/lib/oddb2xml/extractor.rb

@@ -257,7 +257,6 @@ module Oddb2xml
           end
         end
       end
-      cleanup_file
       # puts "found #{data.uniq.size} entities for type #{@type}"
       data.uniq
     end
@@ -339,20 +338,8 @@ module Oddb2xml
           end
         end
       end
-      cleanup_file
       data
     end
-
-    private
-
-    def cleanup_file
-      unless defined?(RSpec)
-        begin
-          File.unlink(@filename) if File.exist?(@filename)
-        rescue Errno::EACCES # Permission Denied on Windows
-        end
-      end
-    end
   end
 
   class MigelExtractor < Extractor

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.7.2"
+  VERSION = "2.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip