oddb2xml 3.0.18 → 3.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4aadf4a537b9f625c491c4609116f6aef44c4f558e0a273a0d2da705ad8bfd0
-  data.tar.gz: 946a8f14539626a383dcab8e73cdc5e89410e8df2721a44d0fca50cc868cf11c
+  metadata.gz: '081c86c751d4c29fa2ce616abdb6043707e50fab79e3b74a67aab568b2084519'
+  data.tar.gz: e3c91770aa8ccd4de0714c45f5a20eb7f87fc989ea84932a8e4cf1a5a3813a7c
 SHA512:
-  metadata.gz: d91d784a98fd256a0ce056c0cfa36959249c7d4cf6b194a2b97c360569ad6f3e503e57c4395722d8a83b5f163ec3b9f5187b8f28ca193de8cc83eff80cf59c2f
-  data.tar.gz: 75f26b3a4559da9776b77c718a916e7ee76715a49475066b8b1e575ba5aa9790b9c6797245784a799af211bb18c86711600ce7ce8cb1794feae4769bb442eaed
+  metadata.gz: b8a928d127496fb06cba79dc630c19bd5edc3b09dd3df0c0dda6ca058cd1897643818d4a8aa9e2ab125023d0ebb319dddee2ab1be0fcdabc8e4708299a136dee
+  data.tar.gz: 27c6ef5bcb9fa0df5b7861496468a88b416209a8b83e7c08e3a995407a75944f0d81849d75399254b7ee404787128ed9e4742ef5f6a78107d90f895845afe707

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (3.0.18)
+    oddb2xml (3.0.19)
       csv
       htmlentities
       httpi

data/History.txt

@@ -1,3 +1,6 @@
+=== 3.0.19 / 09.06.2026
+* New option --proxy-check: probe connectivity/proxy reachability for every host oddb2xml could need, print a full OK/BLOCKED/UNREACHABLE report (honouring http(s)_proxy) and exit without downloading or building. Exits 0 if all hosts are reachable, 1 otherwise — handy for cron/deploy preflight on allow-list proxies (e.g. "oddb2xml --proxy-check"). Reuses the 3.0.18 proxy checker; checks run concurrently.
+
 === 3.0.18 / 09.06.2026
 * Bugfix: stop the FHIR downloader from crashing with "Errno::ENOENT @ rb_file_s_size ... foph-sl-export-latest-de.ndjson" when run with --skip-download (issue #121). FhirDownloader#skip_download? returned true on the bare --skip-download flag and then called File.size on a file that was never downloaded. Each oddb2xml run uses its own ./downloads dir, so deploy scripts that download once and then re-run with --skip-download in a fresh dir hit this every time. skip_download? now requires the target NDJSON to actually exist on disk before honouring the flag; a missing file falls through to a normal download instead of crashing.
 * New: proxy / connectivity preflight check (issue #121). At the very start of a run, oddb2xml now probes the outbound hosts it needs (honouring the http(s)_proxy environment) and prints a loud warning if any host is blocked by the proxy (HTTP 407 on an allow-list proxy such as Aspectra's Skyhigh gateway) or otherwise unreachable — surfacing the cause up front instead of a later empty-output/Errno symptom. The probed host set is option-aware (e.g. id.gs1.ch only with --firstbase, epl.bag.admin.ch only with --fhir). It only warns and never aborts the run; downloads still proceed and fail individually as before. Checks run concurrently (~6s worst case) and are skipped during tests; set ODDB2XML_SKIP_PROXY_CHECK=1 to silence it.

data/lib/oddb2xml/cli.rb

@@ -39,6 +39,11 @@ module Oddb2xml
     def run
       threads = []
       start_time = Time.now
+      if @options[:proxy_check]
+        ok = ProxyCheck.report(@options)
+        exit(ok ? 0 : 1) unless defined?(RSpec)
+        return ok
+      end
       ProxyCheck.run(@options)
       files2rm = Dir.glob(File.join(DOWNLOADS, "*"))
       FileUtils.rm_f(files2rm, verbose: true) if (files2rm.size > 0) && !Oddb2xml.skip_download?

data/lib/oddb2xml/options.rb

@@ -46,6 +46,7 @@ module Oddb2xml
         opt :use_ra11zip, "Use the ra11.zip (a zipped transfer.dat from Galexis)",
           default: File.exist?("ra11.zip") ? "ra11.zip" : nil, type: :string
         opt :firstbase, "Build all NONPHARMA articles on firstbase (GS1 Switzerland CSV from id.gs1.ch)", short: "b", default: false
+        opt :proxy_check, "Only probe connectivity/proxy reachability for every required host, print a report and exit (no download/build). Honours http(s)_proxy. Exits 0 if all reachable, 1 otherwise.", short: :none, default: false
       end
 
       @opts[:percent] = @opts[:increment]

data/lib/oddb2xml/proxy_check.rb

@@ -43,6 +43,46 @@ module Oddb2xml
       hosts
     end
 
+    # Full union of every host any run could need, regardless of options.
+    # Used by --proxy-check so the report covers everything in one go.
+    def all_hosts
+      BASE_HOSTS.merge(
+        "epl.bag.admin.ch" => "BAG FHIR data (--fhir)",
+        "id.gs1.ch" => "GS1 NONPHARMA (--firstbase / -b)",
+        "www.spezialitaetenliste.ch" => "BAG Spezialitätenliste",
+        "www.medregbm.admin.ch" => "Medizinalberuferegister (-x address)"
+      )
+    end
+
+    # Probe every host and print a full OK/BLOCKED/UNREACHABLE table.
+    # Returns true when all hosts are reachable. Used by `oddb2xml --proxy-check`.
+    def report(_options = {})
+      proxy = proxy_uri
+      results = all_hosts.map do |host, desc|
+        Thread.new { [host, desc, check_host(host, proxy)] }
+      end.map(&:value).sort_by { |(host, _desc, _status)| host }
+
+      header = "oddb2xml connectivity check"
+      header += proxy ? " (via proxy #{proxy.host}:#{proxy.port})" : " (no proxy configured)"
+      puts header
+      results.each do |(host, desc, status)|
+        tag = case status
+        when :ok then "OK     "
+        when :blocked then "BLOCKED" # proxy returned 407
+        else "UNREACH"
+        end
+        puts format("  [%s] %-28s %s", tag, host, desc)
+      end
+      unreachable = results.reject { |(_host, _desc, status)| status == :ok }
+      if unreachable.empty?
+        puts "All #{results.size} hosts reachable."
+        true
+      else
+        puts "#{unreachable.size} of #{results.size} host(s) NOT reachable -- downloads using them will fail."
+        false
+      end
+    end
+
     # Returns :ok, :blocked (proxy 407) or :unreachable for a single host.
     def check_host(host, proxy)
       http =
@@ -85,24 +125,24 @@ module Oddb2xml
 
     def warn_about(problems, proxy)
       line = "=" * 72
-      $stderr.puts line
-      $stderr.puts " oddb2xml CONNECTIVITY WARNING"
-      $stderr.puts " The following hosts could not be reached -- the corresponding"
-      $stderr.puts " downloads will FAIL or produce incomplete data:"
+      warn line
+      warn " oddb2xml CONNECTIVITY WARNING"
+      warn " The following hosts could not be reached -- the corresponding"
+      warn " downloads will FAIL or produce incomplete data:"
       problems.each do |(host, desc, status)|
         tag = (status == :blocked) ? "BLOCKED by proxy (407)" : "UNREACHABLE          "
-        $stderr.puts format("   [%s] %-26s %s", tag, host, desc)
+        warn format("   [%s] %-26s %s", tag, host, desc)
       end
       if proxy
-        $stderr.puts ""
-        $stderr.puts " Proxy in use: #{proxy.host}:#{proxy.port}"
+        warn ""
+        warn " Proxy in use: #{proxy.host}:#{proxy.port}"
         if problems.any? { |(_h, _d, s)| s == :blocked }
-          $stderr.puts " This looks like an allow-list proxy. Ask your admin to allow the"
-          $stderr.puts " hosts above (HTTPS/443), or set credentials in http(s)_proxy."
+          warn " This looks like an allow-list proxy. Ask your admin to allow the"
+          warn " hosts above (HTTPS/443), or set credentials in http(s)_proxy."
         end
       end
-      $stderr.puts " (Set ODDB2XML_SKIP_PROXY_CHECK=1 to silence this check.)"
-      $stderr.puts line
+      warn " (Set ODDB2XML_SKIP_PROXY_CHECK=1 to silence this check.)"
+      warn line
     end
   end
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "3.0.18"
+  VERSION = "3.0.19"
 end

data/spec/options_spec.rb

@@ -19,6 +19,7 @@ Oddb2xml::DEFAULT_OPTS = {
   firstbase: false,
   fhir: false,
   fhir_url: nil,
+  proxy_check: false,
 }
 
 describe Oddb2xml::Options do
@@ -75,6 +76,7 @@ describe Oddb2xml::Options do
     expected[:nonpharma] = true
     expected[:calc] = true
     expected[:price] = :zurrose
+    expected[:fhir] = true
     specify { expect(test_opts).to eq expected }
   end
 
@@ -86,6 +88,7 @@ describe Oddb2xml::Options do
     expected[:calc] = true
     expected[:price] = :zurrose
     expected[:percent] = 80
+    expected[:fhir] = true
     specify { expect(test_opts).to eq expected }
   end
 
@@ -165,6 +168,7 @@ describe Oddb2xml::Options do
     expected[:price] = :zurrose
     expected[:extended] = true
     expected[:artikelstamm] = true
+    expected[:fhir] = true
     specify { expect(test_opts).to eq expected }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 3.0.18
+  version: 3.0.19
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger