sidekiq 8.1.1 → 8.1.3

data/lib/sidekiq/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "8.1.1"
+  VERSION = "8.1.3"
   MAJOR = 8
 
   def self.gem_version

data/lib/sidekiq/web/helpers.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "uri"
-require "yaml"
 require "cgi/escape"
 
 module Sidekiq
@@ -73,12 +72,42 @@ module Sidekiq
       # so extensions can be localized
       @@strings[lang] ||= config.locales.each_with_object({}) do |path, global|
         find_locale_files(lang).each do |file|
-          strs = YAML.safe_load_file(file)
+          strs = parse_yaml_new(file)
           global.merge!(strs[lang])
         end
       end
     end
 
+    def parse_yaml_old(path)
+      require "yaml"
+      YAML.safe_load_file(path)
+    end
+
+    def parse_yaml_new(path)
+      locale = nil
+      map = {}
+      IO.readlines(path, chomp: true).each do |line|
+        case line
+        when /\A\s*\#.*/
+          # line comment
+        when !locale && /\A([a-zA-Z\-_]+):/
+          locale = $1
+          map[locale] = {}
+        when /\A\s+(\w+):\s+(.+)\z/
+          # A few values have double quotes to include special characters in YAML.
+          # Strip them off manually as our greedy match will include them.
+          key = $1
+          s = $2
+          s = s[1..] if s[0] == "\""
+          s = s[0..-2] if s[-1] == "\""
+          map[locale][key] = s
+        else
+          raise ArgumentError, "unable to parse #{path}: #{line}"
+        end
+      end
+      map
+    end
+
     def to_json(x)
       Sidekiq.dump_json(x)
     end
@@ -294,7 +323,7 @@ module Sidekiq
       else
         # DEPRECATED Backwards compatibility with older processes.
         # 'capsules' element added in v8.0.9
-        process.queues.join(", ")
+        pro.queues.join(", ")
       end
     end
 

data/lib/sidekiq.rb

@@ -48,7 +48,7 @@ module Sidekiq
   end
 
   def self.testing!(mode = :fake, &block)
-    raise "Unknown testing mode: #{mode}" unless %i[fake disabled inline].include?(mode)
+    raise "Unknown testing mode: #{mode}" unless %i[fake disable inline].include?(mode)
 
     require "sidekiq/test_api"
     Sidekiq::Testing.__set_test_mode(mode, &block)

data/sidekiq.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.homepage = "https://sidekiq.org"
   gem.license = "LGPL-3.0"
 
-  gem.executables = ["sidekiq", "sidekiqmon"]
+  gem.executables = ["sidekiq", "sidekiqmon", "kiq"]
   gem.files = %w[sidekiq.gemspec README.md Changes.md LICENSE.txt] + `git ls-files | grep -E '^(bin|lib|web)'`.split("\n")
   gem.name = "sidekiq"
   gem.version = Sidekiq::VERSION

data/web/assets/stylesheets/style.css

@@ -534,6 +534,8 @@ input[type="checkbox"] { accent-color: var(--color-primary); }
 
 .pagination a { text-decoration: none; }
 
+.pagination .active a { color: var(--color-primary); font-weight: 700; }
+
 .pagination .disabled { opacity: 0.3; }
 
 div:has(.pagination.pull-right) { margin-left: auto; }

data/web/locales/ar.yml

@@ -74,7 +74,7 @@ ar:
   Stop: إيقاف
   StopAll: إيقاف الكل
   StopPolling: إيقاف الاستعلامات
-  TextDirection: 'rtl'
+  TextDirection: rtl
   Thread: نيسب
   Threads: نياسب
   ThreeMonths: ثلاثة أشهر

data/web/locales/fa.yml

@@ -69,7 +69,7 @@ fa:
   Stop: توقف
   StopAll: توقف همه
   StopPolling: Stop Polling
-  TextDirection: 'rtl'
+  TextDirection: rtl
   Thread: رشته
   Threads: رشته ها
   ThreeMonths: ۳ ماه

data/web/locales/gd.yml

@@ -1,4 +1,4 @@
-# elements like %{queue} are variables and should not be translated
+# elements like %{queue} are variables and should not be translated
 gd:
   LanguageName: Gaeilge
   Actions: Gnìomhan

data/web/locales/he.yml

@@ -69,7 +69,7 @@ he:
   Stop: עצור
   StopAll: עצור הכל
   StopPolling: עצור תשאול
-  TextDirection: 'rtl'
+  TextDirection: rtl
   Thread: חוט
   Threads: חוטים
   ThreeMonths: 3 חדשים

data/web/locales/pt-BR.yml

@@ -1,4 +1,4 @@
-"pt-BR":
+pt-BR:
   LanguageName: Português (Brasil)
   Actions: Ações
   AddToQueue: Adicionar à fila

data/web/locales/ur.yml

@@ -69,7 +69,7 @@ ur:
   Stop: بند کرو
   StopAll: ﺗﻤﺎﻡ ﺑﻨﺪ کﺭﻭ
   StopPolling: ﺑﺮاﮦ ﺭاﺳﺖ روکيے
-  TextDirection: 'rtl'
+  TextDirection: rtl
   Thread: موضوع
   Threads: موضوع
   ThreeMonths: تین ماہ

data/web/locales/zh-TW.yml

@@ -1,6 +1,6 @@
 # elements like %{queue} are variables and should not be translated
 zh-TW: # <---- change this to your locale code
-  LanguageName: 臺灣話
+  LanguageName: 繁體中文
   Dashboard: 資訊主頁
   Status: 狀態
   Time: 時間

data/web/views/_paging.html.erb

@@ -10,7 +10,7 @@
           <a href="<%= url %>?<%= qparams(page: @current_page - 1) %>"><%= @current_page - 1 %></a>
         </li>
       <% end %>
-      <li class="disabled">
+      <li class="active">
         <a href="<%= url %>?<%= qparams(page: @current_page) %>"><%= @current_page %></a>
       </li>
       <% if @total_size > @current_page * @count %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.3
 platform: ruby
 authors:
 - Mike Perham
@@ -83,6 +83,7 @@ description: Simple, efficient background processing for Ruby.
 email:
 - info@contribsys.com
 executables:
+- kiq
 - sidekiq
 - sidekiqmon
 extensions: []
@@ -91,12 +92,12 @@ files:
 - Changes.md
 - LICENSE.txt
 - README.md
+- bin/kiq
 - bin/lint-herb
 - bin/multi_queue_bench
 - bin/sidekiq
 - bin/sidekiqload
 - bin/sidekiqmon
-- bin/tui
 - bin/webload
 - lib/active_job/queue_adapters/sidekiq_adapter.rb
 - lib/generators/sidekiq/job_generator.rb
@@ -150,6 +151,18 @@ files:
 - lib/sidekiq/testing/inline.rb
 - lib/sidekiq/transaction_aware_client.rb
 - lib/sidekiq/tui.rb
+- lib/sidekiq/tui/controls.rb
+- lib/sidekiq/tui/filtering.rb
+- lib/sidekiq/tui/tabs.rb
+- lib/sidekiq/tui/tabs/base_tab.rb
+- lib/sidekiq/tui/tabs/busy.rb
+- lib/sidekiq/tui/tabs/dead.rb
+- lib/sidekiq/tui/tabs/home.rb
+- lib/sidekiq/tui/tabs/metrics.rb
+- lib/sidekiq/tui/tabs/queues.rb
+- lib/sidekiq/tui/tabs/retries.rb
+- lib/sidekiq/tui/tabs/scheduled.rb
+- lib/sidekiq/tui/tabs/set_tab.rb
 - lib/sidekiq/version.rb
 - lib/sidekiq/web.rb
 - lib/sidekiq/web/action.rb

data/bin/tui

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative "../lib/sidekiq/tui"
-
-Sidekiq::TUI.new.run