oddb2xml 1.1.8 → 1.1.9

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.9 / 17.01.2013
+
+* Improve SSLv3 Error message output
+
 === 1.1.8 / 17.01.2013
 
 * Improve File reading on Windows

data/lib/oddb2xml/cli.rb

@@ -72,38 +72,42 @@ module Oddb2xml
           @flags = YweseeBMExtractor.new(str).to_hash
         end
       end
-      ssl = true
-      catch :ssl do
+      @_message = false
       LANGUAGES.each do |lang|
-          # swissindex
-          types.each do |type|
+        # swissindex
+        types.each do |type|
+          threads << Thread.new do
+            downloader = SwissIndexDownloader.new(type, lang)
             begin
-              thread = thread.new do
-                downloader = SwissIndexDownloader.new(type, lang)
-                xml = downloader.download
-                @mutex.synchronize do
-                  hsh = SwissIndexExtractor.new(xml, type).to_hash
-                  @index[lang][type] = hsh
+              xml = downloader.download
+            rescue SystemExit
+              @mutex.synchronize do
+                unless @_message # hook only one exit
+                  @_message = true
+                  exit
                 end
               end
-              thread.abort_on_exception = true
-              threads << thread
-            rescue Exception
-              ssl = false
-              throw :ssl
+            end
+            @mutex.synchronize do
+              hsh = SwissIndexExtractor.new(xml, type).to_hash
+              @index[lang][type] = hsh
             end
           end
         end
       end
-      unless ssl
-        puts
-        puts "(Aborted)"
-        puts "Please install SSLv3 CA certificates on your machine."
-        puts "You can check with `ruby -ropenssl -e 'p OpenSSL::X509::DEFAULT_CERT_FILE'`."
-        puts "See README."
+      begin
+        threads.map(&:join)
+      rescue SystemExit
+        @mutex.synchronize do
+          if @_message
+            puts "(Aborted)"
+            puts "Please install SSLv3 CA certificates on your machine."
+            puts "You can check with `ruby -ropenssl -e 'p OpenSSL::X509::DEFAULT_CERT_FILE'`."
+            puts "See README."
+          end
+        end
         exit
       end
-      threads.map(&:join)
       build
       compress if @options[:compress_ext]
       report

data/lib/oddb2xml/downloader.rb

@@ -114,7 +114,7 @@ XML
           raise Timeout::Error
         end
       rescue HTTPI::SSLError
-        raise Exception # catch me in Cli class
+        exit # catch me in Cli class
       rescue Timeout::Error
         retrievable? ? retry : raise
       end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &6695120 !ruby/object:Gem::Requirement
+  requirement: &16175640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6695120
+  version_requirements: *16175640
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &6694480 !ruby/object:Gem::Requirement
+  requirement: &16175000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6694480
+  version_requirements: *16175000
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &6693760 !ruby/object:Gem::Requirement
+  requirement: &16174300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6693760
+  version_requirements: *16174300
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &6693320 !ruby/object:Gem::Requirement
+  requirement: &16173840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6693320
+  version_requirements: *16173840
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &6692740 !ruby/object:Gem::Requirement
+  requirement: &16173260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *6692740
+  version_requirements: *16173260
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &6692260 !ruby/object:Gem::Requirement
+  requirement: &16172800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6692260
+  version_requirements: *16172800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6708000 !ruby/object:Gem::Requirement
+  requirement: &16188540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6708000
+  version_requirements: *16188540
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &6707480 !ruby/object:Gem::Requirement
+  requirement: &16188000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6707480
+  version_requirements: *16188000
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &6707020 !ruby/object:Gem::Requirement
+  requirement: &16187540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6707020
+  version_requirements: *16187540
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &6706140 !ruby/object:Gem::Requirement
+  requirement: &16186660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *6706140
+  version_requirements: *16186660
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &6705360 !ruby/object:Gem::Requirement
+  requirement: &16185900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6705360
+  version_requirements: *16185900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &6704500 !ruby/object:Gem::Requirement
+  requirement: &16185020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *6704500
+  version_requirements: *16185020
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &6703980 !ruby/object:Gem::Requirement
+  requirement: &16184500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *6703980
+  version_requirements: *16184500
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: