oddb2xml 1.7.5 → 1.7.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (1.7.4)
+    oddb2xml (1.7.5)
       archive-tar-minitar
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.7.6 / 01.04.2014
+
+* Write duplicated ean13s to duplicate_ean13_from_zur_rose.txt
+* Removed option -ae
+
 === 1.7.5 / 01.04.2014
 
 * Added option -ae

data/bin/oddb2xml

@@ -15,10 +15,8 @@ Usage:
   oddb2xml [option]
     produced files are found under data
     -a T, --append=T     Additional target. T, only 'nonpharma' is available.
-    -ae                  Combine options nonpharma, extended, prices from ZurRose to create a oddb_with_migel.dat file.
     -c F, --compress=F   Compress format F. {tar.gz|zip}
-    -e    --extended     Get also all articles (including prices) from zurrose which have an EAN13 code.
-                         (only valid if -p zurrose given)
+    -e    --extended     pharma, non-pharma plus prices and non-pharma from zurrose. Products without EAN-Code will also be listed.
     -f F, --format=F     File format F, default is xml. {xml|dat}
                          If F is given, -o option is ignored.
     -i I, --include=I    Include target option for 'dat' format. only 'ean14' is available.
@@ -51,13 +49,11 @@ opts = {
 }
 
 parser.on('-a v', '--append v',     /^nonpharma$/)  {|v| opts[:nonpharma] = true }
-parser.on('-ae')                                    {|v| opts[:nonpharma] = true;
-                                                     opts[:extended] = true;
-                                                    opts[:format] = :dat;
-                                                    opts[:price] = :zurrose;
-                                                    }
 parser.on('-c v', '--compress v',   /^tar\.gz|zip$/){|v| opts[:compress_ext] = v }
-parser.on('-e',   '--extended')                     {|v| opts[:extended] = true }
+parser.on('-e',   '--extended')                     {|v| opts[:extended] = true
+                                                     opts[:nonpharma] = :true
+                                                    opts[:price] = :zurrose
+                                                    }
 parser.on('-f v', '--format v',     /^xml|dat$/)    {|v| opts[:format] = v.intern }
 parser.on('-o v', '--option v',     /^fi$/)         {|v| opts[:fi] = true }
 parser.on('-i v', '--include v',    /^ean14$/)      {|v| opts[:ean14] = true }

data/lib/oddb2xml/extractor.rb

@@ -418,6 +418,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+')
       @@items_without_ean13s ||= 0
       @@duplicated_ean13s ||= 0
       @@zur_rose_items ||= 0
@@ -439,7 +440,7 @@ module Oddb2xml
           ean13 = $1.to_s
         end
         if data[ean13]
-          puts "Duplicate ean13 #{ean13} in line \nact: #{line.chomp}\norg: #{data[ean13][:line]}"
+          @@error_file.puts "Duplicate ean13 #{ean13} in line \nact: #{line.chomp}\norg: #{data[ean13][:line]}"
           @@items_without_ean13s -= 1
           @@duplicated_ean13s += 1
           next
@@ -461,8 +462,10 @@ module Oddb2xml
     end
     at_exit do
       if defined?(@@extended) and @@extended
-        puts "Added #{@@items_without_ean13s} via pharmacodes of #{@@zur_rose_items} items when extracting the transfer.dat from \"Zur Rose\"" 
-        puts "  found #{@@duplicated_ean13s} lines with duplicated ean13" if @@duplicated_ean13s > 0
+        msg = "Added #{@@items_without_ean13s} via pharmacodes of #{@@zur_rose_items} items when extracting the transfer.dat from \"Zur Rose\""
+        msg += "\n  found #{@@duplicated_ean13s} lines with duplicated ean13" if @@duplicated_ean13s > 0
+        puts msg
+        @@error_file.puts msg
       end
     end
   end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.7.5"
+  VERSION = "1.7.6"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
+  prerelease: 
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
@@ -13,6 +14,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -257,26 +282,27 @@ files:
 homepage: https://github.com/zdavatz/oddb2xml
 licenses:
 - GPL-v2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: oddb2xml creates xml files.
 test_files:
 - spec/builder_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjdkN2Q1MWNlY2EzMmNmNTZiNWJmYWM3N2Q1ZWM5N2NlNjU5MDhkMw==
-  data.tar.gz: !binary |-
-    OTRiMzM1OTUyN2ZhYjhiNTg2NzQ3Mzg3MzhkMjk5NDgxNzNmZmJmMQ==
-SHA512:
-  metadata.gz: !binary |-
-    ZmU3MzM1ZDY3M2VlZGRiMjJmNDQ3OTBkM2FhNmMwOTZiNDkyODY2ODgzNTEx
-    NDlkNTc1OTc2MzZhZTY2YTc3NzZhZWNlNjMyYzk1Njg4NmI1N2EyZjE2MTkz
-    NWVlMDhkYjBkMDQ3ZmNhNmVkZjViMzhkMDZkYzM2NzUzZmQxM2U=
-  data.tar.gz: !binary |-
-    YTk3ZGY1M2MyZWMyODBmNmYyOGNiNGUyNmU0MWExMDA2ODMyZGNhNzAwYmM2
-    OTRiN2UwOTM3NDU4ZjAzNWZmYjI0MmU4NGM5NzcxNDA2YjQzMjNmMTRkMjc2
-    MTcyM2MzNjcyMGYwYzkxNGQwYzQzMWZhNjFhYWFhZjgzOTFiOWY=