ruby-progress 1.3.4 → 1.3.6

data/lib/ruby-progress/cli/worm_cli.rb

@@ -15,6 +15,11 @@ module WormCLI
   end
 
   def self.run
+    trap('INT') do
+      RubyProgress::Utils.show_cursor
+      exit
+    end
+
     options = WormCLI::Options.parse_cli_options
 
     if options[:status]
@@ -33,13 +38,8 @@ module WormCLI
       )
       exit
     elsif options[:daemon]
-      # Detach (or background without detaching) before starting daemon logic
-      # so the invoking shell/script continues immediately.
-      if options[:no_detach]
-        PrgCLI.backgroundize
-      else
-        PrgCLI.daemonize
-      end
+      # Background without detaching so worm remains visible in current terminal
+      PrgCLI.backgroundize
 
       run_daemon_mode(options)
     else
@@ -61,49 +61,6 @@ module WormCLI
     progress = RubyProgress::Worm.new(options)
 
     begin
-      # Start job processor thread for worm
-      job_dir = RubyProgress::Daemon.job_dir_for_pid(pid_file)
-      job_thread = Thread.new do
-        RubyProgress::Daemon.process_jobs(job_dir) do |job|
-          jid = job['id'] || SecureRandom.uuid
-          log_path = begin
-            File.join(File.dirname(job_dir), "#{jid}.log")
-          rescue StandardError
-            nil
-          end
-
-          oc = RubyProgress::OutputCapture.new(
-            command: job['command'],
-            lines: options[:output_lines] || 3,
-            position: options[:output_position] || :above,
-            log_path: log_path,
-            stream: options[:stdout] || options[:stdout_live]
-          )
-          oc.start
-
-          progress.instance_variable_set(:@output_capture, oc)
-          oc.wait
-          captured = oc.lines.join("\n")
-          exit_status = oc.exit_status
-          progress.instance_variable_set(:@output_capture, nil)
-
-          success = exit_status.to_i.zero?
-          if job['message']
-            RubyProgress::Utils.display_completion(
-              job['message'],
-              success: success,
-              show_checkmark: job['checkmark'] || false,
-              output_stream: :stdout,
-              icons: { success: options[:success_icon], error: options[:error_icon] }
-            )
-          end
-
-          { 'exit_status' => exit_status, 'output' => captured, 'log_path' => log_path }
-        rescue StandardError
-          # ignore per-job errors
-        end
-      end
-
       progress.run_daemon_mode(
         success_message: options[:success],
         show_checkmark: options[:checkmark],
@@ -111,7 +68,6 @@ module WormCLI
         icons: { success: options[:success_icon], error: options[:error_icon] }
       )
     ensure
-      job_thread&.kill
       FileUtils.rm_f(pid_file)
     end
   end

data/lib/ruby-progress/cli/worm_options.rb

@@ -13,7 +13,6 @@ module WormCLI
         output_position: :above,
         output_lines: 3
       }
-      # rubocop:disable Metrics/BlockLength
       begin
         OptionParser.new do |opts|
           opts.banner = 'Usage: prg worm [options]'
@@ -105,10 +104,6 @@ module WormCLI
             options[:daemon_name] = name
           end
 
-          opts.on('--no-detach', 'When used with --daemon/--daemon-as: run background child but do not fully detach from the terminal') do
-            options[:no_detach] = true
-          end
-
           opts.on('--pid-file FILE', 'Write process ID to file (default: /tmp/ruby-progress/progress.pid)') do |file|
             options[:pid_file] = file
           end
@@ -182,7 +177,6 @@ module WormCLI
         puts "Run 'prg worm --help' for more information."
         exit 1
       end
-      # rubocop:enable Metrics/BlockLength
       options
     end
   end

data/lib/ruby-progress/cli/worm_runner.rb

@@ -70,7 +70,13 @@ module WormRunner
                            oc.wait
                          end
                          @output_capture = nil
-                         oc.lines.join("\n")
+                         # For non-live capture, flush_to handles the output directly
+                         if @output_live
+                           oc.lines.join("\n")
+                         else
+                           oc.flush_to($stdout) if @output_stdout
+                           nil # Don't return content since it's already been flushed
+                         end
                        else
                          animate do
                            Open3.popen3(@command) do |_stdin, stdout, stderr, wait_thr|

data/lib/ruby-progress/daemon.rb

@@ -4,6 +4,8 @@ require 'json'
 require 'fileutils'
 
 module RubyProgress
+  # Daemon helpers for backgrounding progress indicators.
+  # Provides minimal daemonization, PID file management, and simple control-message signaling.
   module Daemon
     module_function
 
@@ -15,70 +17,6 @@ module RubyProgress
       "#{pid_file}.msg"
     end
 
-    # Resolve a job directory for the daemon based on pid_file or name.
-    # If pid_file is '/tmp/ruby-progress/mytask.pid' -> jobs dir '/tmp/ruby-progress/mytask.jobs'
-    def job_dir_for_pid(pid_file)
-      base = File.basename(pid_file, '.*')
-      File.join(File.dirname(pid_file), "#{base}.jobs")
-    end
-
-    # Process available job files in job_dir. Each job is a JSON file with {"id","command","meta"}.
-    # This method polls the directory and yields each parsed job hash to the provided block.
-    def process_jobs(job_dir, poll_interval: 0.2)
-      FileUtils.mkdir_p(job_dir)
-
-      loop do
-        # Accept any job file ending in .json (UUID filenames are common)
-        # Ignore processed-* archives and temporary files (e.g., .tmp)
-        files = Dir.children(job_dir).select do |f|
-          f.end_with?('.json') && !f.start_with?('processed-')
-        end.sort
-
-        files.each do |f|
-          path = File.join(job_dir, f)
-          processing = "#{path}.processing"
-
-          # Claim the file atomically
-          begin
-            File.rename(path, processing)
-          rescue StandardError
-            next
-          end
-
-          job = begin
-            JSON.parse(File.read(processing))
-          rescue StandardError
-            FileUtils.rm_f(processing)
-            next
-          end
-
-          begin
-            yielded = yield(job)
-
-            # on success, write .result info and merge any returned info
-            result = { 'id' => job['id'], 'status' => 'done', 'time' => Time.now.to_i }
-            if yielded.is_a?(Hash)
-              # ensure string keys
-              extra = yielded.transform_keys(&:to_s)
-              result.merge!(extra)
-            end
-            File.write("#{processing}.result", result.to_json)
-          rescue StandardError => e
-            result = { 'id' => job['id'], 'status' => 'error', 'error' => e.message }
-            File.write("#{processing}.result", result.to_json)
-          ensure
-            begin
-              FileUtils.mv(processing, File.join(job_dir, "processed-#{f}"))
-            rescue StandardError
-              FileUtils.rm_f(processing)
-            end
-          end
-        end
-
-        sleep(poll_interval)
-      end
-    end
-
     def show_status(pid_file)
       if File.exist?(pid_file)
         pid = File.read(pid_file).strip

data/lib/ruby-progress/fill_cli.rb

@@ -58,12 +58,8 @@ module RubyProgress
           pid_file = resolve_pid_file(options, :daemon_name)
           options[:pid_file] = pid_file
 
-          # Detach or background without detaching based on --no-detach
-          if options[:no_detach]
-            PrgCLI.backgroundize
-          else
-            PrgCLI.daemonize
-          end
+          # Background without detaching so progress bar remains visible in current terminal
+          PrgCLI.backgroundize
 
           run_daemon_mode(options, parsed_style)
         elsif options[:current]
@@ -120,72 +116,6 @@ module RubyProgress
         begin
           fill_bar.render # Show initial empty bar
 
-          # Start job processor thread for fill (so daemon can accept jobs)
-          job_dir = RubyProgress::Daemon.job_dir_for_pid(pid_file)
-          Thread.new do
-            RubyProgress::Daemon.process_jobs(job_dir) do |job|
-              jid = job['id'] || SecureRandom.uuid
-              log_path = begin
-                File.join(File.dirname(job_dir), "#{jid}.log")
-              rescue StandardError
-                nil
-              end
-
-              if job['command']
-                oc = RubyProgress::OutputCapture.new(
-                  command: job['command'],
-                  lines: options[:output_lines] || 3,
-                  position: options[:output_position] || :above,
-                  log_path: log_path,
-                  stream: options[:stdout_live]
-                )
-                oc.start
-
-                fill_bar.instance_variable_set(:@output_capture, oc)
-                oc.wait
-                captured = oc.lines.join("\n")
-                exit_status = oc.exit_status
-                fill_bar.instance_variable_set(:@output_capture, nil)
-
-                success = exit_status.to_i.zero?
-                if job['message']
-                  RubyProgress::Utils.display_completion(
-                    job['message'],
-                    success: success,
-                    show_checkmark: job['checkmark'] || false,
-                    output_stream: :stdout,
-                    icons: { success: options[:success_icon], error: options[:error_icon] }
-                  )
-                end
-
-                { 'exit_status' => exit_status, 'output' => captured, 'log_path' => log_path }
-
-              elsif job['action']
-                case job['action']
-                when 'advance'
-                  fill_bar.advance
-                  { 'status' => 'done', 'action' => 'advance' }
-                when 'percent'
-                  val = job['value'] || job['percent'] || 0
-                  fill_bar.percent = val.to_f
-                  { 'status' => 'done', 'action' => 'percent', 'value' => val }
-                when 'complete'
-                  fill_bar.complete
-                  { 'status' => 'done', 'action' => 'complete' }
-                when 'cancel'
-                  fill_bar.cancel
-                  { 'status' => 'done', 'action' => 'cancel' }
-                else
-                  { 'status' => 'error', 'error' => 'unknown action' }
-                end
-              else
-                { 'status' => 'error', 'error' => 'no command or action provided' }
-              end
-            rescue StandardError
-              nil
-            end
-          end
-
           # Set up signal handlers for daemon control
           stop_requested = false
           Signal.trap('INT') { stop_requested = true }

data/lib/ruby-progress/output_capture.rb

@@ -2,7 +2,7 @@
 
 require 'pty'
 require 'io/console'
-require 'english'
+require 'English'
 require 'fileutils'
 
 begin
@@ -176,7 +176,12 @@ module RubyProgress
         debug_log("spawned pid=#{pid} cmd=#{@command}")
 
         until reader.eof? || @stop
-          next unless reader.wait_readable(0.1)
+          ready = if reader.respond_to?(:wait_readable)
+                    reader.wait_readable(0.1)
+                  else
+                    IO.select([reader], nil, nil, 0.1)
+                  end
+          next unless ready
 
           chunk = reader.read_nonblock(4096, exception: false)
           next if chunk.nil? || chunk.empty?

data/lib/ruby-progress/utils.rb

@@ -41,12 +41,17 @@ module RubyProgress
     def self.display_completion(message, success: true, show_checkmark: false, output_stream: :warn, icons: {})
       return unless message
 
-      mark = if show_checkmark
-               icon = success ? (icons[:success] || '✅') : (icons[:error] || '🛑')
-               "#{icon} "
-             else
-               ''
-             end
+      # Determine the mark to show. If checkmarks are enabled, prefer the
+      # default icons but allow overrides via icons hash. If checkmarks are not
+      # enabled, still show a custom icon when provided via CLI options.
+      mark = ''
+      if show_checkmark
+        icon = success ? (icons[:success] || '✅') : (icons[:error] || '🛑')
+        mark = "#{icon} "
+      else
+        custom_icon = success ? icons[:success] : icons[:error]
+        mark = custom_icon ? "#{custom_icon} " : ''
+      end
 
       formatted_message = "#{mark}#{message}"
 

data/lib/ruby-progress/version.rb

@@ -2,11 +2,11 @@
 
 module RubyProgress
   # Main gem version
-  VERSION = '1.3.4'
+  VERSION = '1.3.6'
 
   # Component-specific versions (patch bumps)
-  WORM_VERSION = '1.1.4'
-  TWIRL_VERSION = '1.1.4'
-  RIPPLE_VERSION = '1.1.4'
-  FILL_VERSION = '1.0.4'
+  WORM_VERSION = '1.1.6'
+  TWIRL_VERSION = '1.1.6'
+  RIPPLE_VERSION = '1.1.6'
+  FILL_VERSION = '1.0.6'
 end

data/ruby-progress.gemspec

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'lib/ruby-progress/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'ruby-progress'
+  spec.version = RubyProgress::VERSION
+  spec.authors = ['Brett Terpstra']
+  spec.email = ['me@brettterpstra.com']
+
+  spec.summary = 'Animated terminal progress indicators'
+  spec.description = 'Animated progress indicators for Ruby: Ripple (text ripple effects), Worm (Unicode wave animations), and Twirl (spinner indicators)'
+  spec.homepage = 'https://github.com/ttscoff/ruby-progress'
+  spec.license = 'MIT'
+  spec.required_ruby_version = '>= 2.5.0'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/main/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  spec.bindir = 'bin'
+  spec.executables = %w[prg ripple worm twirl fill]
+  spec.require_paths = ['lib']
+
+  # Runtime dependencies
+  spec.add_dependency 'tty-cursor', '~> 0.7'
+  spec.add_dependency 'tty-screen', '~> 0.8'
+
+  # Development dependencies
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  # rubocop managed in Gemfile with version-specific constraints
+  spec.add_development_dependency 'simplecov', '~> 0.21'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+end

data/scripts/coverage_analysis.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'json'
+
+# Read the SimpleCov results
+data = JSON.parse(File.read('coverage/.resultset.json'))
+files = data['RSpec']['coverage']
+
+results = []
+files.each do |path, coverage|
+  next unless path.include?('lib/ruby-progress') && !path.include?('/bin/')
+
+  lines = coverage['lines'] || []
+  total = lines.compact.count
+  next if total.zero?
+
+  covered = lines.count { |l| l&.positive? }
+  pct = (covered * 100.0 / total).round(1)
+  short_path = path.split('ruby-progress/').last
+  results << { path: short_path, pct: pct, covered: covered, total: total }
+end
+
+puts "\n=== Coverage Analysis by File ===\n\n"
+puts "Files with lowest coverage (need attention):\n\n"
+
+results.sort_by { |r| r[:pct] }.first(10).each do |r|
+  color = if r[:pct] < 30
+            "\e[31m"
+          else
+            r[:pct] < 60 ? "\e[33m" : "\e[32m"
+          end
+  reset = "\e[0m"
+  puts format("#{color}%6.1f%%#{reset} (%4d/%4d) %s", r[:pct], r[:covered], r[:total], r[:path])
+end
+
+puts "\n\nFiles with highest coverage:\n\n"
+results.sort_by { |r| -r[:pct] }.first(10).each do |r|
+  color = "\e[32m"
+  reset = "\e[0m"
+  puts format("#{color}%6.1f%%#{reset} (%4d/%4d) %s", r[:pct], r[:covered], r[:total], r[:path])
+end
+
+total_lines = results.sum { |r| r[:total] }
+total_covered = results.sum { |r| r[:covered] }
+overall_pct = (total_covered * 100.0 / total_lines).round(2)
+
+puts "\n\n=== Overall Coverage ===\n"
+puts format('Total: %.2f%% (%d/%d lines)', overall_pct, total_covered, total_lines)

data/test_daemon.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Test daemon mode
+echo "Starting twirl daemon..."
+./bin/prg twirl --daemon-as test_twirl &
+sleep 2
+
+echo "Checking if daemon is running..."
+ps aux | grep "[p]rg twirl" || echo "No daemon found"
+
+echo "Checking PID files..."
+ls -la ~/.prg/*.pid 2>/dev/null || echo "No PID files found"
+
+echo "Stopping daemon..."
+./bin/prg job send --daemon-name test_twirl
+sleep 1
+
+echo "Checking if daemon stopped..."
+ps aux | grep "[p]rg twirl" || echo "Daemon stopped successfully"
+ls -la ~/.prg/*.pid 2>/dev/null || echo "PID files cleaned up"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-progress
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors:
 - Brett Terpstra
@@ -65,20 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -112,9 +98,11 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - CHANGELOG.md
+- DAEMON_MODE.md
 - DEMO_SCRIPTS.md
 - Gemfile
 - Gemfile.lock
+- JOB_CLI_REFACTOR.md
 - LICENSE
 - README.md
 - Rakefile
@@ -154,9 +142,12 @@ files:
 - lib/ruby-progress/worm.rb
 - quick_demo.rb
 - readme_demo.rb
+- ruby-progress.gemspec
 - screencast
 - screencast.svg
+- scripts/coverage_analysis.rb
 - scripts/run_matrix_mise.fish
+- test_daemon.sh
 - test_daemon_interruption.rb
 - test_daemon_orphan.rb
 - test_worm_flags.rb