oddb2xml 1.8.1 → 1.8.2

data/lib/oddb2xml/extractor.rb

@@ -186,7 +186,6 @@ module Oddb2xml
       data = {}
       result = PharmaEntry.parse(@xml.sub(Strip_For_Sax_Machine, ''), :lazy => true)
       items = result.PHARMA.ITEM
-      $stderr.puts "SwissIndexExtractor #{__LINE__}: #{@type} with #{items.size} items"; $stderr.flush
       items.each do |pac|
         item = {}
         item[:_type]           = @type.downcase.intern
@@ -216,10 +215,11 @@ module Oddb2xml
   end
   class SwissmedicExtractor < Extractor
     def initialize(filename, type)
-      @filename = filename
+      @filename = File.join(Downloads, File.basename(filename))
+      @filename = File.join(SpecData, File.basename(filename)) if defined?(RSpec) and not File.exists?(@filename)
       @type  = type
-      return unless File.exists?(filename)
-      @sheet = RubyXL::Parser.parse(File.expand_path(filename)).worksheets[0]
+      return unless File.exists?(@filename)
+      @sheet = RubyXL::Parser.parse(File.expand_path(@filename)).worksheets[0]
     end
     def to_arry
       data = []
@@ -366,20 +366,25 @@ module Oddb2xml
       ixno = 0
       inhalt = @io.read
       inhalt.split("\n").each do |line|
-        next if line =~ /ATC1.*Name1.*ATC2.*Name2/
-        line = '"'+line unless /^"/.match(line)
-        row = CSV.parse_line(line)
         ixno += 1
-        action = {}
-        action[:ixno]      = ixno
-        action[:title]     = row[4]
-        action[:atc1]      = row[0]
-        action[:atc2]      = row[2]
-        action[:mechanism] = row[5]
-        action[:effect]    = row[6]
-        action[:measures]  = row[7]
-        action[:grad]      = row[8]
-        data << action
+        next if /ATC1.*Name1.*ATC2.*Name2/.match(line)
+        #line = '"'+line unless /^"/.match(line)
+        begin
+          row = CSV.parse_line(line.gsub('""','"'))
+          action = {}
+          next unless row.size > 8
+          action[:ixno]      = ixno
+          action[:title]     = row[4]
+          action[:atc1]      = row[0]
+          action[:atc2]      = row[2]
+          action[:mechanism] = row[5]
+          action[:effect]    = row[6]
+          action[:measures]  = row[7]
+          action[:grad]      = row[8]
+          data << action
+        rescue CSV::MalformedCSVError
+          puts "CSV::MalformedCSVError in line #{ixno}: #{line}"
+        end
       end
       data
     end
@@ -435,7 +440,7 @@ module Oddb2xml
     # see http://dev.ywesee.com/Bbmb/TransferDat
     def initialize(dat, extended = false)
       @@extended = extended
-      @@error_file ||= File.open("duplicate_ean13_from_zur_rose.txt", 'w+')
+      @@error_file ||= File.open(File.join(WorkDir, "duplicate_ean13_from_zur_rose.txt"), 'w+')
       @@items_without_ean13s ||= 0
       @@duplicated_ean13s ||= 0
       @@zur_rose_items ||= 0
@@ -444,10 +449,11 @@ module Oddb2xml
     def to_hash
       data = {}
       while line = @io.gets
+        line = line.chomp
         if @@extended
-          next unless line =~ /(\d{13})(\d{1})\r\n$/
+          next unless line =~ /(\d{13})(\d{1})$/
         else
-          next unless line =~ /(7680\d{9})(\d{1})\r\n$/
+          next unless line =~ /(7680\d{9})(\d{1})$/
         end
         pharma_code = line[3..9]
         if $1.to_s == '0000000000000'
@@ -462,10 +468,11 @@ module Oddb2xml
           @@duplicated_ean13s += 1
           next
         end
+
         data[ean13] = {
           :line   => line.chomp,
           :ean   => ean13,
-          :vat   => $2.to_s,
+          :vat   => line[96],
           :description => line[10..59], # .sub(/\s+$/, ''),
           :additional_desc => '',
           :pharmacode => pharma_code,
@@ -473,6 +480,9 @@ module Oddb2xml
           :pub_price => sprintf("%.2f", line[66,6].gsub(/(\d{2})$/, '.\1').to_f),
           :type => :nonpharma,
         }
+        if /5366964/.match(ean13) then
+          Oddb2xml.log "found 5366964 data is now #{data[ean13].inspect}"
+        end
         @@zur_rose_items += 1
       end if @io
       data

data/lib/oddb2xml/util.rb

@@ -1,5 +1,8 @@
 module Oddb2xml
-  Backup = "#{Dir.pwd}/data/download"
+  unless defined?(RSpec)
+    WorkDir       = Dir.pwd
+    Downloads     = "#{Dir.pwd}/downloads"
+  end
   @options = {}
 
   def Oddb2xml.log(msg)
@@ -11,26 +14,28 @@ module Oddb2xml
   def Oddb2xml.save_options(options)
     @options = options
   end
+
+  def Oddb2xml.skip_download?
+    @options[:skip_download]
+  end
   
   def Oddb2xml.skip_download(file)
-    dest = "#{Backup}/#{File.basename(file)}"
-    return false unless @options[:skip_download]
+    dest = "#{Downloads}/#{File.basename(file)}"
     if File.exists?(dest)
-      FileUtils.cp(dest, file, :verbose => false, :preserve => true)
+      FileUtils.cp(dest, file, :verbose => false, :preserve => true) unless File.expand_path(file).eql?(dest)
       return true
     end
     false
   end
   
   def Oddb2xml.download_finished(file, remove_file = true)
-    dest = "#{Backup}/#{File.basename(file)}"
-    if @options[:skip_download]
-      FileUtils.makedirs(Backup)
-      FileUtils.cp(file, dest, :verbose => false)
-    end
-    begin
-      File.unlink(file) if File.exists?(file) and remove_file
-    rescue Errno::EACCES # Permission Denied on Windows      
-    end
+    src  = "#{WorkDir}/#{File.basename(file)}"
+    dest = "#{Downloads}/#{File.basename(file)}"
+    FileUtils.makedirs(Downloads)
+    #return unless File.exists?(file)
+    return unless file and File.exists?(file)
+    return if File.expand_path(file).eql?(dest)
+    FileUtils.cp(src, dest, :verbose => false)
+    Oddb2xml.log("download_finished saved as #{dest} #{File.size(dest)} bytes.")
   end                            
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.8.1"
+  VERSION = "1.8.2"
 end

data/oddb2xml.gemspec

@@ -17,14 +17,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rubyzip', '~> 1.0'
-  spec.add_dependency 'archive-tar-minitar'
+  # We fix the version of the spec to newer versions only in the third position
+  # hoping that these version fix only security/severe bugs
+  # Consulted the Gemfile.lock to get 
+  spec.add_dependency 'rubyzip', '~> 1.1.3'
+  spec.add_dependency 'archive-tar-minitar', '~> 0.5.2'
   spec.add_dependency 'mechanize', '~> 2.5.1'
   spec.add_dependency 'nokogiri', '~> 1.5.10'
-  spec.add_dependency 'savon', '~> 2.0'
-  spec.add_dependency 'spreadsheet'
+  spec.add_dependency 'savon', '~> 2.4.0'
+  spec.add_dependency 'spreadsheet', '~> 0.9.7'
   spec.add_dependency 'rubyXL', '~> 2.5'
-  spec.add_dependency 'sax-machine'
+  spec.add_dependency 'sax-machine',  '~> 0.1.0'
   
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/spec/builder_spec.rb

@@ -5,7 +5,7 @@ require "rexml/document"
 include REXML
 
 module Kernel
-  def capture(stream)
+  def buildr_capture(stream)
     begin
       stream = stream.to_s
       eval "$#{stream} = StringIO.new"
@@ -19,38 +19,44 @@ module Kernel
 end
 
 describe Oddb2xml::Builder do
+  NrExtendedArticles = 71
+  NrPharmaAndNonPharmaArticles = 61
+  NrPharmaArticles = 4
   include ServerMockHelper
-  before(:all) do
-    files = (Dir.glob('oddb_*.tar.gz')+ Dir.glob('oddb_*.zip')+ Dir.glob('oddb_*.xml'))# +Dir.glob('data/download/*'))
-    files.each{ |file| FileUtils.rm(file) }
-  end
-
   before(:each) do
+    @savedDir = Dir.pwd
+    cleanup_directories_before_run
     setup_server_mocks
     setup_swiss_index_server_mock(types =  ['NonPharma', 'Pharma'])
+    Dir.chdir Oddb2xml::WorkDir
   end
+  after(:each) do
+    Dir.chdir @savedDir if @savedDir and File.directory?(@savedDir)
+  end
+
   context 'should handle BAG-articles with and without pharmacode' do
     it {
-      dat = File.read(File.expand_path('../data/Preparation.xml', __FILE__))
+      dat = File.read(File.expand_path('../data/Preparations.xml', __FILE__))
       @items = Oddb2xml::BagXmlExtractor.new(dat).to_hash
       saved =  @items.clone
       expect(@items.size).to eq(5)
       expect(saved).to eq(@items)
     }
   end
-  
+
   context 'when no option is given' do
     let(:cli) do
       opts = {}
       Oddb2xml::Cli.new(opts)
     end
+
     it 'should generate a valid oddb_product.xml' do
-      res = capture(:stdout){ cli.run }
+      res = buildr_capture(:stdout){ cli.run }
       res.should match(/products/)
-      article_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_article.xml'))
+      article_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
       File.exists?(article_filename).should be_true
       article_xml = IO.read(article_filename)
-      product_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_product.xml'))
+      product_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_product.xml'))
       File.exists?(product_filename).should be_true
       unless /1\.8\.7/.match(RUBY_VERSION)
         product_xml = IO.read(product_filename)
@@ -73,7 +79,7 @@ describe Oddb2xml::Builder do
 
         product_xml.should match(/3TC/)
         product_xml.should match(/7680620690084/) # Levetiracetam DESITIN
-        article_xml.scan(/<ART DT=/).size.should eq(3) # we should find two articles
+        article_xml.scan(/<ART DT=/).size.should eq(NrPharmaArticles)
         article_xml.should match(/<PHAR>5819012</)
         article_xml.should match(/<DSCRD>LEVETIRACETAM DESITIN Filmtabl 250 mg/)
         article_xml.should match(/<COMPNO>7601001320451</)
@@ -90,9 +96,9 @@ describe Oddb2xml::Builder do
       Oddb2xml::Cli.new(opts)
     end    
     it 'should generate a valid oddb_with_migel.dat' do
-      res = capture(:stdout){ cli.run }
+      res = buildr_capture(:stdout){ cli.run }
       res.should match(/products/)
-      dat_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_with_migel.dat'))
+      dat_filename = File.join(Oddb2xml::WorkDir, 'oddb_with_migel.dat')
       File.exists?(dat_filename).should be_true
       oddb_dat = IO.read(dat_filename)
       oddb_dat.should match(/1115819012LEVETIRACETAM DESITIN Filmtabl 250 mg 30 Stk/), "should have Desitin"
@@ -106,22 +112,49 @@ describe Oddb2xml::Builder do
         :extended    => :true,
         :nonpharma    => :true,
         :price      => :zurrose,
-        }
+        :log      => true,
+        :skip_download => true,
+      }
       Oddb2xml::Cli.new(opts)
     end
 
+    it 'should handle not duplicate pharmacode 5366964'  do
+      res = buildr_capture(:stdout){ cli.run }
+      res.should match(/NonPharma/i)
+      res.should match(/NonPharma products: #{NrPharmaAndNonPharmaArticles}/)
+      article_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      File.exists?(article_filename).should be_true
+      article_xml = IO.read(article_filename)
+      doc = REXML::Document.new File.new(article_filename)
+      dscrds = XPath.match( doc, "//ART" )
+      XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('5366964') }.size.should == 1
+      dscrds.size.should == NrExtendedArticles
+      XPath.match( doc, "//PRODNO" ).find_all{|x| true}.size.should == 1
+      XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('620691') }.size.should == 1
+    end
+
     it 'should load correct number of nonpharma' do
-      res = capture(:stdout){ cli.run }
+      res = buildr_capture(:stdout){ cli.run }
       res.should match(/NonPharma/i)
-      res.should match(/NonPharma products: 60/)
+      res.should match(/NonPharma products: #{NrPharmaAndNonPharmaArticles}/)
+      article_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      File.exists?(article_filename).should be_true 
+      article_xml = IO.read(article_filename)
+      doc = REXML::Document.new File.new(article_filename)
+      dscrds = XPath.match( doc, "//ART" )
+      dscrds.size.should == NrExtendedArticles
+      XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('1699947') }.size.should == 1 # swissmedic_packages Cardio-Pulmo-Rénal Sérocytol, suppositoire
+      XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('2465312') }.size.should == 1 # from swissindex_pharma.xml"
+      XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('0000000') }.size.should == 1 # from swissindex_pharma.xml
     end
 
     it 'should emit a correct oddb_limitation.xml' do
-      res = capture(:stdout){ cli.run }
+      res = buildr_capture(:stdout){ cli.run }
       # check limitations
-      limitation_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_limitation.xml'))
+      limitation_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_limitation.xml'))
       File.exists?(limitation_filename).should be_true
       limitation_xml = IO.read(limitation_filename)
+      limitation_xml.should match(/Die aufgeführten Präparat/)
       doc = REXML::Document.new File.new(limitation_filename)
       limitations = XPath.match( doc, "//LIM" )
       limitations.size.should == 4
@@ -132,8 +165,8 @@ describe Oddb2xml::Builder do
     end
 
     it 'should emit a correct oddb_article.xml' do
-      res = capture(:stdout){ cli.run }
-      article_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_article.xml'))
+      res = buildr_capture(:stdout){ cli.run }
+      article_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
       File.exists?(article_filename).should be_true
       article_xml = IO.read(article_filename)
       doc = REXML::Document.new File.new(article_filename)
@@ -154,7 +187,7 @@ describe Oddb2xml::Builder do
         article_xml.should match(/7680536620137/) # Pharmacode
         article_xml.should match(/<PRICE>13.49</)
         article_xml.should match(/<PRICE>27.8</)
-        article_xml.scan(/<ART DT=/).size.should eq(60) # we should find some articles
+        article_xml.scan(/<ART DT=/).size.should eq(NrExtendedArticles) # we should find some articles
         article_xml.should match(/<PHAR>5819012</)
         article_xml.should match(/<DSCRD>LEVETIRACETAM DESITIN Filmtabl 250 mg/)
         article_xml.should match(/<COMPNO>7601001320451</)
@@ -167,30 +200,30 @@ describe Oddb2xml::Builder do
         dscrds.find_all{|x| x.text.match('ZYVOXID Filmtabl 600 mg') }.size.should == 1
         
       end
-      pending 'Checking for LIMPTS' # XPath.match( doc, "//LIMPTS" ).size.should == 1
+      #pending 'Checking for LIMPTS' # XPath.match( doc, "//LIMPTS" ).size.should == 1
     end
+
     it 'should emit a correct oddb_substance.xml' do
-      res = capture(:stdout){ cli.run }
-      doc = REXML::Document.new File.new(File.join(File.dirname(__FILE__), '..', 'oddb_substance.xml'))
+      res = buildr_capture(:stdout){ cli.run }
+      doc = REXML::Document.new File.new(File.join(Oddb2xml::WorkDir, 'oddb_substance.xml'))
       names = XPath.match( doc, "//NAML" )
       names.size.should == 10
       names.find_all{|x| x.text.match('Lamivudinum') }.size.should == 1
     end
 
     it 'should emit a correct oddb_interaction.xml' do
-      res = capture(:stdout){ cli.run }
-      doc = REXML::Document.new File.new(File.join(File.dirname(__FILE__), '..', 'oddb_interaction.xml'))
+      res = buildr_capture(:stdout){ cli.run }
+      doc = REXML::Document.new File.new(File.join(Oddb2xml::WorkDir, 'oddb_interaction.xml'))
       titles = XPath.match( doc, "//TITD" )
       titles.size.should == 2
       titles.find_all{|x| x.text.match('Keine Interaktion') }.size.should == 1
-      titles.find_all{|x| x.text.match('Erhöhtes Risiko für Myopathie und Rhabdomyolyse') }.size.should == 1      
+      titles.find_all{|x| x.text.match('Erhöhtes Risiko für Myopathie und Rhabdomyolyse') }.size.should == 1
     end
 
     it 'should emit a correct oddb_product.xml' do
-      res = capture(:stdout){ cli.run }
-      
+      res = buildr_capture(:stdout){ cli.run }
       res.should match(/products/)
-      product_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_product.xml'))
+      product_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_product.xml'))
       File.exists?(product_filename).should be_true
 
       unless /1\.8\.7/.match(RUBY_VERSION)
@@ -204,6 +237,10 @@ describe Oddb2xml::Builder do
         product_xml.should match(/7680555580054/) # ZYVOXID
         product_xml.should_not match(/ZYVOXID/i)
       end
+      doc = REXML::Document.new File.new(product_filename)
+      XPath.match( doc, "//PRD" ).find_all{|x| true}.size.should == 3
+      XPath.match( doc, "//GTIN" ).find_all{|x| true}.size.should == 3
+      XPath.match( doc, "//PRODNO" ).find_all{|x| true}.size.should == 1
     end
   end
 end

data/spec/cli_spec.rb

@@ -2,10 +2,8 @@
 
 require 'spec_helper'
 
-# for stdout/stderr on ruby 1.8.7
-# $stdout.should_receive(:puts).with() does not work
 module Kernel
-  def capture(stream)
+  def cli_capture(stream)
     begin
       stream = stream.to_s
       eval "$#{stream} = StringIO.new"
@@ -31,27 +29,32 @@ RSpec::Matchers.define :have_option do |option|
 end
 
 shared_examples_for 'any interface for product' do
-  it { capture(:stdout) { cli.should respond_to(:run) } }
+  it { cli_capture(:stdout) { cli.should respond_to(:run) } }
   it 'should run successfully' do
-    capture(:stdout){ cli.run }.should match(/products/)
+    cli_capture(:stdout){ cli.run }.should match(/products/)
   end
 end
 
 shared_examples_for 'any interface for address' do
-  it { capture(:stdout) { cli.should respond_to(:run) } }
+  it { cli_capture(:stdout) { cli.should respond_to(:run) } }
   it 'should run successfully' do
-    capture(:stdout){ cli.run }.should match(/addresses/)
+    cli_capture(:stdout){ cli.run }.should match(/addresses/)
   end
 end
 
 describe Oddb2xml::Cli do
+  # Setting ShouldRun to false and changing one -> if true allows you
+  # to run easily the failing test
   include ServerMockHelper
-  before(:all) do
-    files = (Dir.glob('oddb_*.tar.gz')+ Dir.glob('oddb_*.zip')+ Dir.glob('oddb_*.xml'))# +Dir.glob('data/download/*'))
-    files.each{ |file| FileUtils.rm(file) }
-  end
   before(:each) do
+    @savedDir = Dir.pwd
+    cleanup_directories_before_run
     setup_server_mocks
+    Dir.chdir(Oddb2xml::WorkDir)
+  end
+  after(:each) do
+    Dir.chdir(@savedDir) if @savedDir and File.directory?(@savedDir)
+    cleanup_compressor
   end
   context 'when -c tar.gz option is given' do
     let(:cli) do
@@ -69,21 +72,16 @@ describe Oddb2xml::Cli do
       cli.should have_option(:compress_ext => 'tar.gz')
     end
     it 'should create tar.gz file' do
-      capture(:stdout) { cli.run }.should match(/Pharma/)
-      file = Dir.glob('oddb_*.tar.gz').first
+      cli_capture(:stdout) { cli.run }.should match(/Pharma/)
+      file = Dir.glob(File.join(Dir.pwd, 'oddb_*.tar.gz')).first
       File.exists?(file).should be_true
     end
     it 'should not create any xml file' do
-      capture(:stdout) { cli.run }.should match(/Pharma/)
-      Dir.glob('oddb_*.xml').each do |file|
+      cli_capture(:stdout) { cli.run }.should match(/Pharma/)
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.xml')).each do |file|
         File.exists?(file).should be_false
       end
     end
-    after(:each) do
-      Dir.glob('oddb_*.tar.gz').each do |file|
-        File.unlink(file) if File.exists?(file)
-      end
-    end
   end
   context 'when -c zip option is given' do
     let(:cli) do
@@ -101,21 +99,17 @@ describe Oddb2xml::Cli do
       cli.should have_option(:compress_ext => 'zip')
     end
     it 'should create zip file' do
-      capture(:stdout) { cli.run }.should match(/Pharma/)
-      file = Dir.glob('oddb_*.zip').first
+      cli_capture(:stdout) { cli.run }.should match(/Pharma/)
+      file = Dir.glob(File.join(Dir.pwd, 'oddb_*.zip')).first
       File.exists?(file).should be_true
     end
     it 'should not create any xml file' do
-      capture(:stdout) { cli.run }.should match(/Pharma/)
-      Dir.glob('oddb_*.xml').each do |file|
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.xml')).each do |file| FileUtil.rm_f(file) end
+      cli_capture(:stdout) { cli.run }.should match(/Pharma/)
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.xml')).each do |file|
         File.exists?(file).should be_false
       end
     end
-    after(:each) do
-      Dir.glob('oddb_*.zip').each do |file|
-        File.unlink(file) if File.exists?(file)
-      end
-    end
   end
   context 'when -a nonpharma option is given' do
     let(:cli) do
@@ -133,12 +127,12 @@ describe Oddb2xml::Cli do
       cli.should have_option(:nonpharma => true)
     end
     it 'should not create any compressed file' do
-      capture(:stdout) { cli.run }.should match(/NonPharma/)
-      Dir.glob('oddb_*.tar.gz').first.should be_nil
-      Dir.glob('oddb_*.zip').first.should be_nil
+      cli_capture(:stdout) { cli.run }.should match(/NonPharma/)
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.tar.gz')).first.should be_nil
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.zip')).first.should be_nil
     end
     it 'should create xml files' do
-      capture(:stdout) { cli.run }.should match(/NonPharma/)
+      cli_capture(:stdout) { cli.run }.should match(/NonPharma/)
       expected = [
         'oddb_product.xml',
         'oddb_article.xml',
@@ -147,15 +141,10 @@ describe Oddb2xml::Cli do
         'oddb_interaction.xml',
         'oddb_code.xml'
       ].length
-      Dir.glob('oddb_*.xml').each do |file|
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.xml')).each do |file|
         File.exists?(file).should be_true
       end.to_a.length.should equal expected
     end
-    after(:each) do
-      Dir.glob('oddb_*.xml').each do |file|
-        File.unlink(file) if File.exists?(file)
-      end
-    end
   end
   context 'when -t _swiss option is given' do
     let(:cli) do
@@ -173,12 +162,12 @@ describe Oddb2xml::Cli do
       cli.should have_option(:tag_suffix=> '_SWISS')
     end
     it 'should not create any compressed file' do
-      capture(:stdout) { cli.run }.should match(/Pharma/)
-      Dir.glob('oddb_*.tar.gz').first.should be_nil
-      Dir.glob('oddb_*.zip').first.should be_nil
+      cli_capture(:stdout) { cli.run }.should match(/Pharma/)
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.tar.gz')).first.should be_nil
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.zip')).first.should be_nil
     end
     it 'should create xml files with prefix swiss_' do
-      capture(:stdout) { cli.run }.should match(/Pharma/)
+      cli_capture(:stdout) { cli.run }.should match(/Pharma/)
       expected = [
         'swiss_product.xml',
         'swiss_article.xml',
@@ -187,15 +176,10 @@ describe Oddb2xml::Cli do
         'swiss_interaction.xml',
         'swiss_code.xml'
       ].length
-      Dir.glob('swiss_*.xml').each do |file|
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'swiss_*.xml')).each do |file|
         File.exists?(file).should be_true
       end.to_a.length.should equal expected
     end
-    after(:each) do
-      Dir.glob('swiss_*.xml').each do |file|
-        File.unlink(file) if File.exists?(file)
-      end
-    end
   end
   context 'when -o fi option is given' do
     let(:cli) do
@@ -213,12 +197,12 @@ describe Oddb2xml::Cli do
       cli.should have_option(:fi => true)
     end
     it 'should not create any compressed file' do
-      capture(:stdout) { cli.run }.should match(/Pharma/)
-      Dir.glob('oddb_*.tar.gz').first.should be_nil
-      Dir.glob('oddb_*.zip').first.should be_nil
+      cli_capture(:stdout) { cli.run }.should match(/Pharma/)
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.tar.gz')).first.should be_nil
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.zip')).first.should be_nil
     end
     it 'should create xml files' do
-      capture(:stdout) { cli.run }.should match(/Pharma/)
+      cli_capture(:stdout) { cli.run }.should match(/Pharma/)
       expected = [
         'oddb_fi.xml',
         'oddb_fi_product.xml',
@@ -229,15 +213,10 @@ describe Oddb2xml::Cli do
         'oddb_interaction.xml',
         'oddb_code.xml'
       ].length
-      Dir.glob('oddb_*.xml').each do |file|
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.xml')).each do |file|
         File.exists?(file).should be_true
       end.to_a.length.should equal expected
     end
-    after(:each) do
-      Dir.glob('oddb_*.xml').each do |file|
-        File.unlink(file) if File.exists?(file)
-      end
-    end
   end
   context 'when -x address option is given' do
     let(:cli) do
@@ -255,24 +234,19 @@ describe Oddb2xml::Cli do
       cli.should have_option(:address=> true)
     end
     it 'should not create any compressed file' do
-      capture(:stdout) { cli.run }.should match(/addresses/)
-      Dir.glob('oddb_*.tar.gz').first.should be_nil
-      Dir.glob('oddb_*.zip').first.should be_nil
+      cli_capture(:stdout) { cli.run }.should match(/addresses/)
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.tar.gz')).first.should be_nil
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.zip')).first.should be_nil
     end
     it 'should create xml files' do
-      capture(:stdout) { cli.run }.should match(/addresses/)
+      cli_capture(:stdout) { cli.run }.should match(/addresses/)
       expected = [
         'oddb_betrieb.xml',
         'oddb_medizinalperson.xml',
       ].length
-      Dir.glob('oddb_*.xml').each do |file|
+      Dir.glob(File.join(Oddb2xml::WorkDir, 'oddb_*.xml')).each do |file|
         File.exists?(file).should be_true
       end.to_a.length.should equal expected
     end
-    after(:each) do
-      Dir.glob('oddb_*.xml').each do |file|
-        File.unlink(file) if File.exists?(file)
-      end
-    end
   end
 end