utils 0.94.0 → 0.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e75e4da900a5682f8be3d521d422a48b201f1ba9868468f703b420d344860e8
-  data.tar.gz: 2f1317551005fd0e0c413a76f790dcfd670c60124a1c88376b4b8d60001861b5
+  metadata.gz: dd3330bad863906079106f503caa40f83af5dd978e5c4cbec9561cfbf22228b8
+  data.tar.gz: 1081b4d918807345b36faa44d13b1c5ec287bdaf8156edfa3090ec909c3570a3
 SHA512:
-  metadata.gz: 7bd6708c73311146fab0a0f14e4dfb5b470b958bee9911630c12cc40468ff359be46680a53f12c48310f058680d89d5693ab7040ff91c1dd778ca6f618f305b5
-  data.tar.gz: 6093657c875f1f276b3e8b95b1f799521200baca5d29568c06e032059b5a5888c01c333028e63adac91d8eeb75a05fba5adf2d2c7e73bf171e4cb53048515480
+  metadata.gz: 2fcaa85ef0d3a75b97d6c019c6ffd824e519505204056760956df512e6a85dd41a44787a9a665331c21ff5477cdebbc6c97607749fcabc7d404bcc18654e7b15
+  data.tar.gz: 2ed4678d7c0b12d96f3d0099ae3563d553e9f571b3e1c6ee12d8d910b22cd0357795fc42ebf3383f34323c00f84c256984f716e25dda4eec91c21ac0b1f8a434

data/README.md

@@ -52,8 +52,7 @@ gem install utils
 ### 🔍 Searching
 
 - **`blameline`** - Show git blame line for a file and line number
-- **`create_cstags`** - Create cscope tags file for current directory
-- **`create_tags`** - Create ctags tags file for current directory  
+- **`code_indexer`** - Create ctags/cscope tags file for current directory  
 - **`discover`** - Find files with specific content patterns
 - **`git-versions`** - Show git versions of files and directories
 - **`long_lines`** - Finds long lines with author attribution

data/bin/code_indexer

@@ -4,11 +4,22 @@ require 'utils'
 config = Utils::ConfigFile.new
 config.configure_from_paths
 
+only_format = ARGV.shift
+
 config.code_indexer.formats.each do |format, output|
+  if only_format
+    format == only_format or next
+  end
   paths = config.code_indexer.paths.grep_v(/Resolving dependencies/)
   puts "Indexing code for #{format}…"
-  cmd = [ 'starscope', '-e', format, '-f', output, '--no-read' ]
-  config.code_indexer.verbose and cmd << '--verbose'
+  case format
+  when 'ctags'
+    cmd = [ 'ctags', '-f', output, '--exclude=pkg', '-R' ]
+    config.code_indexer.verbose and cmd << '--verbose'
+  when 'cscope'
+    cmd = [ 'starscope', '-e', format, '-f', output, '--no-read' ]
+    config.code_indexer.verbose and cmd << '--verbose'
+  end
   cmd.push(*paths)
   system(*cmd)
   puts "Done."

data/bin/on_change

@@ -1,53 +1,118 @@
 #!/usr/bin/env ruby
 #
-# Monitor file for changes and execute command when modified
+# Monitor a set of files (specified by glob patterns) for modifications.
+# When any watched file changes, run an arbitrary shell command,
+# optionally inserting the full path of that file via the placeholder %f.
 #
 # Usage:
-#   on_change filename [command...]    # Watch file and run command on changes
+#   ./on_change [OPTS] [COMMAND]
 #
-# This script monitors a file for modifications and executes a specified
-# command whenever the file is changed. It can be used for auto-reloading,
-# rebuilding, or triggering actions when source files are updated.
+# Options:
+#   -i <glob>   Glob pattern(s) of files to watch.  Can be repeated
+#               – e.g., `-i 'lib/**/*.rb' -i bin/*`.
+#   -d <sec>    Sleep interval (seconds) when no changes are detected.
+#               Must be a positive integer; defaults to 1 if omitted or <=0.
+#   -h          Show this help message and exit.
 #
-# If no command is provided, 'true' is executed by default.
+# If [COMMAND] is not supplied the script defaults to running `true`.
 #
-# Special replacement:
-#   %f in command will be replaced with the filename being monitored
+# Command placeholder:
+#   The string `%f` inside COMMAND will be replaced by the full path of
+#   each file that changed.  Example:
+#       ./on_change -i 'lib/**/*.rb' echo '%f has been modified'
 #
-# Examples:
-#   on_change Gemfile bundle install
-#   on_change tests/utils_test.rb ruby -I lib:tests %f
+#   • It prints each executed command (for debugging) before streaming its
+#     output to STDOUT.
+
+require 'set'
+require 'tins/go'
+include Tins::GO
+require 'shellwords'
 
 # The execute method runs a command by processing its arguments and displaying
 # the output.
 #
 # @param args [ Array ] the command arguments to be executed
 def execute(*args)
-  cmd = args.map(&:inspect) * ' '
-  puts "Executing: #{cmd}"
+  cmd = Shellwords.join(args)
+  puts "Executing: #{cmd.inspect}"
   IO.popen(cmd, 'r') do |io|
     io.each { |l| puts l }
   end
 end
 
+# Computes a set of file paths based on glob patterns specified in the global
+# $opts[?i] option. It iterates over each pattern, expands it with Dir.glob,
+# and merges the results into a Set to eliminate duplicates.
+#
+# @return [Set<String>] a set containing the unique file paths matched by the
+#   provided glob patterns
+def compute_files
+  files = Set[]
+  $opts[?i].to_a.each do |glob|
+    files.merge Dir.glob(glob)
+  end
+  files
+end
+
+# The usage method displays a help message explaining command‑line options and
+# exits the program with the supplied return code.
+#
+# @param rc [ Integer ] the exit status to use when terminating the process
+def usage(rc)
+  puts <<~EOT
+    Usage: #{File.basename($0)} [OPTS] [COMMAND]
+
+    Options are
+
+      -i <glob>   Glob pattern(s) of files to watch.
+                  The option may be repeated; all matching paths will be monitored.
+      -d <sec>    Sleep interval (in seconds) when no file changes are detected.  
+                  Defaults to 1 second if omitted or set to a non‑positive value.
+      -h          Show this help message and exit.
+
+    If [COMMAND] is not supplied the script defaults to running `true`.
+
+    The command may contain the placeholder `%f`, which will be replaced by
+    the full path of each file that changed. For example:
+
+        #{File.basename($0)} -i 'lib/**/*.rb' -i 'bin/*' echo %f has been modified
+
+    EOT
+  exit rc
+end
+
+$opts = go 'i:d:h'
+
+$opts[?h] and usage(0)
+
 argv = ARGV.dup
-filename = argv.shift or fail "require a filename as first argument"
 argv.empty? and argv << 'true'
-argv.map! { |a| a == '%f' ? filename : a }
-warn "Observing #{filename.inspect} for changes now and execute #{argv.inspect}."
-old_mtime = nil
+
+files = compute_files
+files.empty? and fail 'Require files to watch'
+
+old_mtimes = {}
+files.each do |filename|
+  mtime = File.mtime(filename)
+  old_mtimes[filename] = mtime
+end
+
 loop do
-  begin
-    mtime = File.mtime(filename)
-    if old_mtime.nil? || mtime > old_mtime
-      execute(*argv)
-    else
-      sleep 0.1
+  files = compute_files
+
+  files.each do |filename|
+    begin
+      mtime = File.mtime(filename)
+      if !old_mtimes.key?(filename) || mtime > old_mtimes[filename]
+        execute(*argv.map { _1 == '%f' ? filename : _1 })
+      end
+      old_mtimes[filename] = mtime
+    rescue Interrupt
+      exit 0
+    rescue Errno::ENOENT
+      old_mtimes.delete(filename)
     end
-  rescue Interrupt
-    exit 1
-  rescue Errno::ENOENT
-  ensure
-    old_mtime = mtime
   end
+  sleep $opts[?d].to_i.clamp(1..)
 end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.94.0'
+  VERSION         = '0.95.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.94.0 ruby lib
+# stub: utils 0.95.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.94.0".freeze
+  s.version = "0.95.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/flori/utils".freeze
   s.licenses = ["GPL-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "Utils - Some useful command line utilities".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "4.0.4".freeze
+  s.rubygems_version = "4.0.3".freeze
   s.summary = "Some useful command line utilities".freeze
   s.test_files = ["tests/test_helper.rb".freeze, "tests/utils_test.rb".freeze]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 2.8".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.17.0".freeze])
   s.add_development_dependency(%q<test-unit>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.51".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.94.0
+  version: 0.95.0
 platform: ruby
 authors:
 - Florian Frank
@@ -13,16 +13,16 @@ dependencies:
   name: gem_hadar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.17.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Some useful command line utilities
 test_files: