specwrk 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f5fa0464c4d73ad78593cd2ce5626dac594bb74721d18303f1fee4d33e28615
-  data.tar.gz: 262e478389d7dd07375fc5a864012c992709199838a2f32f7e72e09bbb412759
+  metadata.gz: d642db71c542c4b2dbf17038db546a34f713ffccb010dc903e4e7a96c8071016
+  data.tar.gz: 00fd8258a2441acd31c4a484c2e039ad5e83028e8c10eef509cdca070daab1c8
 SHA512:
-  metadata.gz: 21fda87f804947653887bcd897c45c97ebdc9227a63bc19019b137e01955dc96701f202f1ebe8a472ed3b871e799a52f54ab9b2872f4f76a2ebefc4e411801df
-  data.tar.gz: 7a6a62993e9a1262a50c291021fdb1ec6662ed36453bc0ec3855aa7a01735647943500e354a6705c1b6e1f190e3bd0f297bd2317cc639d9fa576a115c4061e30
+  metadata.gz: 6c88c00baa4d0455e8b928e276e6c66cf66fd881f7e9193a4e19f665a93d7b177b18e5f2cd00a8605ef4613e9607634791527898836f85f99bec0d3faf17e3d7
+  data.tar.gz: 7370d6c27e8b052a17bcc93d84fdbea18efab35792ec6f010cc21d05a45ed8aad4cc29e1c24e4b5e10aca65787f8fb08bc7bf94fa4e928293e41405a300259d6

data/lib/specwrk/cli_reporter.rb

@@ -16,8 +16,8 @@ module Specwrk
         return 1
       end
 
-      puts "\nFinished in #{total_duration} " \
-                          "(total execution time of #{total_run_time})\n"
+      puts "\nFinished in #{Specwrk.human_readable_duration total_duration} " \
+                          "(total execution time of #{Specwrk.human_readable_duration total_run_time})\n"
 
       client.shutdown
 

data/lib/specwrk/store/file_adapter.rb

@@ -60,7 +60,6 @@ module Specwrk
         else
           filename = filename_for_key(key_string)
           write(filename, JSON.generate(value))
-          known_key_pairs[key_string] = filename
         end
       end
 
@@ -71,16 +70,12 @@ module Specwrk
       def clear
         FileUtils.rm_rf(path)
         FileUtils.mkdir_p(path)
-
-        @known_key_pairs = nil
       end
 
       def delete(*keys)
-        filenames = keys.map { |key| known_key_pairs[key] }.compact
+        filenames = keys.map { |key| filename_for_key key }.compact
 
         FileUtils.rm_f(filenames)
-
-        keys.each { |key| known_key_pairs.delete(key) }
       end
 
       def merge!(h2)
@@ -88,8 +83,6 @@ module Specwrk
       end
 
       def multi_read(*read_keys)
-        known_key_pairs # precache before each thread tries to look them up
-
         result_queue = Queue.new
 
         read_keys.each do |key|
@@ -112,8 +105,6 @@ module Specwrk
       end
 
       def multi_write(hash)
-        known_key_pairs # precache before each thread tries to look them up
-
         result_queue = Queue.new
 
         hash_with_filenames = hash.map { |key, value| [key.to_s, [filename_for_key(key.to_s), value]] }.to_h
@@ -126,7 +117,6 @@ module Specwrk
         end
 
         Thread.pass until result_queue.length == hash.length
-        hash_with_filenames.each { |key, (filename, _value)| known_key_pairs[key] = filename }
       end
 
       def empty?
@@ -145,29 +135,19 @@ module Specwrk
       end
 
       def read(key)
-        File.read(known_key_pairs[key]) if known_key_pairs.key? key
+        filename = filename_for_key key
+        File.read(filename)
+      rescue Errno::ENOENT
+        nil
       end
 
       def filename_for_key(key)
         File.join(
           path,
-          [
-            counter_prefix(key),
-            encode_key(key)
-          ].join("_")
+          encode_key(key)
         ) + EXT
       end
 
-      def counter_prefix(key)
-        count = keys.index(key) || counter.tap { @counter += 1 }
-
-        "%012d" % count
-      end
-
-      def counter
-        @counter ||= keys.length
-      end
-
       def path
         @path ||= File.join(uri.path, scope).tap do |full_path|
           FileUtils.mkdir_p(full_path)
@@ -179,14 +159,14 @@ module Specwrk
       end
 
       def decode_key(key)
-        encoded_key_part = File.basename(key).delete_suffix(EXT).split(/\A\d+_/).last
+        encoded_key_part = File.basename(key).delete_suffix(EXT)
         padding_count = (4 - encoded_key_part.length % 4) % 4
 
         Base64.urlsafe_decode64(encoded_key_part + ("=" * padding_count))
       end
 
       def known_key_pairs
-        @known_key_pairs ||= Dir.entries(path).sort.map do |filename|
+        Dir.entries(path).sort.map do |filename|
           next if filename.start_with? "."
           next unless filename.end_with? EXT
 

data/lib/specwrk/store.rb

@@ -98,6 +98,7 @@ module Specwrk
 
   class PendingStore < Store
     RUN_TIME_BUCKET_MAXIMUM_KEY = :____run_time_bucket_maximum
+    ORDER_KEY = :____order
 
     def run_time_bucket_maximum=(val)
       @run_time_bucket_maximum = self[RUN_TIME_BUCKET_MAXIMUM_KEY] = val
@@ -107,6 +108,41 @@ module Specwrk
       @run_time_bucket_maximum ||= self[RUN_TIME_BUCKET_MAXIMUM_KEY]
     end
 
+    def order=(val)
+      @order = nil
+
+      self[ORDER_KEY] = if val.nil? || val.length.zero?
+        nil
+      else
+        val
+      end
+    end
+
+    def order
+      @order ||= self[ORDER_KEY] || []
+    end
+
+    def keys
+      return super if order.length.zero?
+
+      order
+    end
+
+    def merge!(hash)
+      super
+      self.order = hash.keys
+    end
+
+    def clear
+      @order = nil
+      super
+    end
+
+    def reload
+      @order = nil
+      super
+    end
+
     def shift_bucket
       return bucket_by_file unless run_time_bucket_maximum&.positive?
 
@@ -146,6 +182,7 @@ module Specwrk
       end
 
       delete(*consumed_keys)
+      self.order = order - consumed_keys
       bucket
     end
 
@@ -171,6 +208,7 @@ module Specwrk
       end
 
       delete(*consumed_keys)
+      self.order = order - consumed_keys
       bucket
     end
   end

data/lib/specwrk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Specwrk
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/lib/specwrk/web/auth.rb

@@ -11,7 +11,7 @@ module Specwrk
       end
 
       def call(env)
-        env[:request] ||= Rack::Request.new(env)
+        @request = env[:request] ||= Rack::Request.new(env)
 
         return @app.call(env) if [nil, ""].include? ENV["SPECWRK_SRV_KEY"]
         return @app.call(env) if @excluded_paths.include? env[:request].path_info
@@ -28,7 +28,11 @@ module Specwrk
       private
 
       def unauthorized
-        [401, {"content-type" => "application/json"}, ["Unauthorized"]]
+        if @request.head?
+          [401, {}, []]
+        else
+          [401, {"content-type" => "application/json"}, ["Unauthorized"]]
+        end
       end
     end
   end

data/lib/specwrk/web/endpoints.rb

@@ -270,11 +270,6 @@ module Specwrk
 
         private
 
-        def before_lock
-          completed_examples
-          run_time_data
-        end
-
         def completed_examples
           @completed_data ||= payload.map { |example| [example[:id], example] if processing[example[:id]] }.compact.to_h
         end

data/lib/specwrk/worker/executor.rb

@@ -40,6 +40,7 @@ module Specwrk
         completion_formatter.examples.clear
 
         RSpec.clear_examples
+        RSpec.configuration.backtrace_formatter.filter_gem "specwrk"
 
         # see https://github.com/rspec/rspec-core/pull/2723
         if Gem::Version.new(RSpec::Core::Version::STRING) <= Gem::Version.new("3.9.1")

data/lib/specwrk.rb

@@ -38,5 +38,21 @@ module Specwrk
 
       exited_pids
     end
+
+    def human_readable_duration(total_seconds, precision: 2)
+      secs = total_seconds.to_f
+      hours = (secs / 3600).to_i
+      mins = ((secs % 3600) / 60).to_i
+      seconds = secs % 60
+
+      parts = []
+      parts << "#{hours}h" if hours.positive?
+      parts << "#{mins}m" if mins.positive?
+      if seconds.positive?
+        sec_str = format("%0.#{precision}f", seconds).sub(/\.?0+$/, "")
+        parts << "#{sec_str}s"
+      end
+      parts.join(" ")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specwrk
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Daniel Westendorf