postjob 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65c5b538677925c9fafa3774b5fc372ceaa7954
-  data.tar.gz: abbb379b6126ba5dea3bef0af94de21f560c20d5
+  metadata.gz: e96734197915c9658e20b670186347fa9112a95a
+  data.tar.gz: a607352a5f6675c9bb6ae80fd0f289f7142692d6
 SHA512:
-  metadata.gz: e4aedf8ca25e4219cfb8647ceaa6a77d47619974f6904ed5e011fd3c7be89d9493571efe55ba7ef4354b5b866400f99270c8a86dd97f753bc9a246e6a931afc4
-  data.tar.gz: 5a7ff20629d0a60b478c5d3367ca2c7614c0fa970a7b877afb4a9ca6d4e65cc54c9c71cf0ba95b5c88363b213bd84d82af8d81f4122085e052d7c0bfee84cfe5
+  metadata.gz: f1b8e20e7893ef1fcd3a1d53466714bcf5c106e1dec67a0745f25f29db04185c92bb7ac6e9cdf83dce299bea3f6f20cd3f6aac27c1c36551862157d902d4b1ba
+  data.tar.gz: 0c0fe39302fa99ff9fd8fe03f70a2c81a950276cc0e6b4d86c95b96657e917da3289f176d71273d71736e2c47932aa265e9616a5b37e1df2a87d03d6fffe699d

data/lib/postjob/host.rb

@@ -1,8 +1,11 @@
 require_relative "./record"
+require "tempfile"
 
 class Postjob::Host < Postjob::Record
   class << self
     def clear_storage
+      @host_id = nil
+
       File.unlink(storage_path) if File.exist?(storage_path)
     end
 
@@ -12,13 +15,21 @@ class Postjob::Host < Postjob::Record
 
     private
 
+    # This method returns the path to a file which will hold the host_id. Two runners
+    # with the same host_id should have access to the same part of the file system.
+    # Therefore different system users need to have different host ids.
+    #
+    # In addition the path returned from the method must be readable and writable by
+    # the current user. We choose a tmp location for that reason. (A /var location
+    # would be even better - however, our systems do not have a user-writable /var).
     def storage_path
       env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
-      ".postjob.#{env}.host_id"
+      File.join Dir.tmpdir, "postjob.#{env}.#{Process.uid}.host_id"
     end
 
     def atomic_set_and_get(path)
       value = nil
+
       File.open(path, File::RDWR | File::CREAT, 0644) do |f|
         f.flock(File::LOCK_EX)
 

data/spec/postjob/host_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+RSpec.describe Postjob::Host do
+  describe ".host_id" do
+    UUID_REGEXP = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i
+
+    it "returns a host id UUID string" do
+      expect(Postjob::Host.host_id).to match(UUID_REGEXP)
+    end
+  end
+
+  describe "Storage" do
+    let(:test_file_path) { ".postjob.test.host_id" }
+
+    before do
+      allow(Postjob::Host).to receive(:storage_path).and_return(test_file_path)
+    end
+
+    describe ".clear_storage" do
+      it "removes the host id file" do
+        Postjob::Host.clear_storage
+
+        expect(File).not_to exist(test_file_path)
+      end
+    end
+
+    describe ".host_id" do
+      UUID_REGEXP = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i
+
+      it "writes a file to the tmp directory" do
+        Postjob::Host.host_id
+
+        expect(File).to exist(test_file_path)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -29,6 +29,9 @@ if ENV["VERBOSE"]
   Simple::SQL.logger = Postjob.logger = logger
 end
 
+# Ensure there is a tmp directory for testing host id file ...
+Dir.mkdir("tmp") unless File.exist?("tmp")
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run focus: (ENV["CI"] != "true")
@@ -39,7 +42,7 @@ RSpec.configure do |config|
   config.before(:all) {}
   config.after {}
 
-  config.before(:all) do
+  config.before(:each) do
     ::Postjob::Host.clear_storage
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postjob
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -285,6 +285,7 @@ files:
 - spec/postjob/events/job_event_spec.rb
 - spec/postjob/events/zombie_event_spec.rb
 - spec/postjob/full_workflow_spec.rb
+- spec/postjob/host_spec.rb
 - spec/postjob/job_control/error_status_spec.rb
 - spec/postjob/job_control/manual_spec.rb
 - spec/postjob/job_control/max_attempts_spec.rb