sparoid 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12dad3dbab45bb38650465dab2b26f356c051569b06d20ba1bcfd6af11eb9701
-  data.tar.gz: 0b17fe457b36978f1b682153cb14578192cb657a846fadcbb3abb2cf82e07bb6
+  metadata.gz: 1f5904f6b6c520213811268420efad5fd5a387942352d8def32b722cd14420da
+  data.tar.gz: 6f7e19f1515979078635ff1e862bc9bcbb6fb2172ac631d94b986dd1b95984fb
 SHA512:
-  metadata.gz: 1c31f7b1fa30e2d064b0e92e79b2b567bdfa4021995d7f52c25b6b4373d08062ed091aab8187aeb42051c11e0c7c1b994d158878e64311eed28e68d1e3fe4008
-  data.tar.gz: cacd2adf45ed9fa8e31b063809e01cf0371c6d13670e24b5bdb17f7c2623c2f9592c7e38b6df18a5f529db9628d4197baf323a9d58124b8eb6ea75762c3a6d78
+  metadata.gz: 6043c439103ae404d9dfc6855b0273777b3e1e505d768e36b7d5bf514abc6c2a0498ecda76ddf89994d4d3fb426394fc3994566e659842e377bab643b8edfcfd
+  data.tar.gz: d95a3908952eb8134f1c68bd22a6f13f05ca99a8f1bda888c0adf6cbc77e882f65e4097a12b3db8a28ec74c624d8cee0821827ee12e54953da567606605f1e96

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.0.13] - 2021-06-30
+
+- Do not warn on empty public ip cache file
+- The public ip cache file path can be controlled using the `SPAROID_CACHE_PATH` environment variable
+
 ## [1.0.12] - 2021-06-14
 
 - Use file locking to prevent multiple processes/threads to write to the public ip cache file
@@ -8,7 +13,7 @@
 
 ## [1.0.10] - 2021-06-09
 
-- Cache public IP in /tmp/.sparoid_public_ip for 1 min
+- Cache public IP in `/tmp/.sparoid_public_ip` for 1 min
 
 ## [1.0.9] - 2021-05-23
 

data/Gemfile

@@ -5,12 +5,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in sparoid.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-
 gem "minitest", "~> 5.0"
-
+gem "minitest-stub-const"
+gem "rake", "~> 13.0"
 gem "rubocop", "~> 1.7"
-
 gem "rubocop-minitest", require: false
-
 gem "rubocop-rake", require: false

data/lib/sparoid.rb

@@ -9,6 +9,8 @@ require "resolv"
 module Sparoid
   extend self
 
+  SPAROID_CACHE_PATH = ENV.fetch("SPAROID_CACHE_PATH", "/tmp/.sparoid_public_ip")
+
   # Send an authorization packet
   def auth(key, hmac_key, host, port)
     msg = message(cached_public_ip)
@@ -87,21 +89,25 @@ module Sparoid
   end
 
   def up_to_date_cache?
-    mtime = File.mtime("/tmp/.sparoid_public_ip")
+    mtime = File.mtime(SPAROID_CACHE_PATH)
     (Time.now - mtime) <= 60 # cache is valid for 1 min
   rescue Errno::ENOENT
     false
   end
 
   def read_cache
-    File.open("/tmp/.sparoid_public_ip", "r") do |f|
+    File.open(SPAROID_CACHE_PATH, "r") do |f|
       f.flock(File::LOCK_SH)
       Resolv::IPv4.create f.read
     end
+  rescue ArgumentError => e
+    return write_cache if e.message =~ /cannot interpret as IPv4 address/
+
+    raise e
   end
 
   def write_cache
-    File.open("/tmp/.sparoid_public_ip", File::WRONLY | File::CREAT, 0o0644) do |f|
+    File.open(SPAROID_CACHE_PATH, File::WRONLY | File::CREAT, 0o0644) do |f|
       f.flock(File::LOCK_EX)
       ip = public_ip
       f.truncate(0)

data/lib/sparoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sparoid
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Single Packet Authorisation client