cuco 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce231276ed05e26b295e643409792ab5e4260b80f44642438b70ab8f1d94b63e
-  data.tar.gz: 83e9536002c04ffcd28f21b14a14816a0c8347f46214bcacf78ea05a26e2369f
+  metadata.gz: 7caa6f2db505a694828f8617ab2f84cfc8807e859e6a224f85da20c47baa7bf0
+  data.tar.gz: a37b963ca861435eec245de81b4e5f63e5ac3aa7e63f1ae262c96bc7a3471a50
 SHA512:
-  metadata.gz: 3fad6b87f9ca62c99e4f65c6b69b388facaf9edfcc32ec58814bf5d1a666de597696f1106ac63a11b3a1534609da9b4efb32beead6c3c6140a299e58e7d6d6ef
-  data.tar.gz: 2fdee124e0b0930c5b31b231af0b9b77e27523651504cc35a7eba752f6dd8592018fd3ed8769829e762c1f95dba90fa9838eacc29cd45f0459cf0dcc9096e100
+  metadata.gz: 69a8be2228d6913c8f0522d2f67a2053539f87fd786389d814367d77c2d4d99ab36a90f67bfc35b5e122ed0e9333e56a943cfdbb9b82448e37453c57d5b2eebc
+  data.tar.gz: 8a4cb238abdcd19ffbee6af5ebb3ad6e25bb41bb92b29b3cd17c46feb8d1ab1c8a86a72ddfb4cb47a3e8478c63e9a2f4c6bce77ccafb87f0aaebf9737bf4e86d

data/README.md

@@ -2,8 +2,9 @@
 
 [![Gem Version](https://badge.fury.io/rb/cuco.png)](http://badge.fury.io/rb/cuco)
 [![GEM Downloads](https://img.shields.io/gem/dt/cuco?color=168AFE&logo=ruby&logoColor=FE1616)](https://rubygems.org/gems/cuco)
+[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](http://choosealicense.com/licenses/mit/)
 
-*Cuco* watch files in a directory and take an action when they change.
+*Cuco* watches files in a directory and take an action when they change.
 
 *Cuco* is controlled by a user-supplied script file.
 Intermixed "watch" commands specify what to do
@@ -38,7 +39,10 @@ $ cuco path/to/script/file
 will monitor files in the current directory tree
 and react to events on those files in accordance with the script.
 
-## A simple example of a script file (using Minitest):
+## A simple example of a script file
+
+This sample script is intended for testing purposes with Minitest.
+*md* is the match-data (see Ruby regular expressions).
 
 ```ruby
 watch( 'test/.*_test\.rb$' ) { |md| run_it(md[0]) }
@@ -59,7 +63,6 @@ Scripts are pure Ruby.
 Intermixed are "watch" rules that match observed files to an action.
 The matching is achieved by a pattern (a regular expression) parameter.
 The action is specified by a block (see above sample).
-*md* is the match-data.
 
 Updates to script files are picked up on the fly (no need to restart *cuco*)
 so experimenting is painless.
@@ -69,6 +72,8 @@ since the whole command is custom.
 The above actions could just as easily call "jruby", "ruby --rubygems",
 "ruby -I lib", etc. or any combination of these.
 
+See directory _scripts_ for samples.
+
 ## Miscellaneous
 
 *Cuco* is heavily inspired by:

data/bin/cuco

@@ -3,9 +3,9 @@
 lib = File.expand_path("../lib/", __dir__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
-require "version"
-require "cuco"
-require "controller"
+require "cuco/version"
+require "cuco/cuco"
+require "cuco/controller"
 require "micro-optparse"
 
 options = Parser.new do |p|

data/lib/{controller.rb → cuco/controller.rb}

@@ -1,7 +1,7 @@
 require "listen"
 require "singleton"
-require "cuco"
-require "script"
+require "cuco/cuco"
+require "cuco/script"
 
 class Controller
   include Singleton
@@ -40,7 +40,18 @@ class Controller
 
   def file_run(pattern, type = nil)
     puts "*** file_run(#{pattern}, #{type})" if debug
-    G.script.__rules.select { |rule| match_run(rule, pattern) }
+    rules = find_rules(pattern, type)
+    rules.each { |rule| match_run(rule, pattern) }
+  end
+
+  private
+
+  def find_rules(pattern, type)
+    puts "*** find_rules(#{pattern}, #{type})" if debug
+    G.script.__rules.reverse.select { |rule|
+      pattern.match(rule.pattern) &&
+        (rule.event_type.nil? || rule.event_type == type)
+    }
   end
 
   def match_run(rule, pattern)

data/lib/{version.rb → cuco/version.rb}

@@ -1,5 +1,7 @@
 module Cuco
-  VERSION = "0.1.0" # 2024-03-18
+  VERSION = "0.1.2" # 2024-05-21
+  # VERSION = "0.1.1" # 2024-03-23
+  # VERSION = "0.1.0" # 2024-03-18
   # VERSION = "0.0.8" # 2024-03-18
   # VERSION = "0.0.7" # 2024-03-18
   # VERSION = "0.0.3" # 2024-03-12

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuco
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micro-optparse
@@ -71,27 +71,17 @@ email: dittmar.krall@matiq.de
 executables:
 - cuco
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
+- MIT-LICENSE
 files:
-- ".github/workflows/rake.yml"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".watchr"
-- Gemfile
-- Gemfile.lock
-- LICENSE-MIT
+- MIT-LICENSE
 - README.md
-- Rakefile
 - bin/cuco
-- cuco.gemspec
-- lib/controller.rb
-- lib/cuco.rb
-- lib/script.rb
-- lib/version.rb
-- test/controller_test.rb
-- test/cuco_test.rb
-- test/script_test.rb
-- test/test_helper.rb
+- lib/cuco/controller.rb
+- lib/cuco/cuco.rb
+- lib/cuco/script.rb
+- lib/cuco/version.rb
 homepage: http://www.matiq.de
 licenses:
 - MIT
@@ -111,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: A file watcher

data/.github/workflows/rake.yml

@@ -1,31 +0,0 @@
-# see also https://github.com/whitequark/parser/blob/master/.github/workflows/test.yml
-name: Rake
-
-on: [push]
-
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        ruby: ["3.0", 3.3]
-        test_command: ["bundle exec rake"]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby_version }}
-#          bundler-cache: true
-#      - name: Build and test with Rake
-#        run: bundle exec rake
-      - name: Bundle install
-        run: |
-          bundle config path /home/runner/bundle
-          bundle install
-          bundle update
-      - name: test with Rake
-        run: ${{ matrix.test_command }}

data/.ruby-gemset

@@ -1 +0,0 @@
-rails-7.1

data/.ruby-version

@@ -1 +0,0 @@
-ruby-3.3.0

data/.watchr

@@ -1,9 +0,0 @@
-watch('test/.*_test\.rb$') { |md| run_it(md[0]) }
-watch('lib/(.*)\.rb$') { |md| run_it("test/#{md[1]}_test.rb") }
-
-def run_it(file)
-  system %(bundle exec ruby -I test #{file})
-end
-
-Signal.trap("QUIT") { system("bundle exec rake") } # Ctrl-\ or ctrl-4
-Signal.trap("INT") { abort("Interrupted\n") }      # Ctrl-C

data/Gemfile

@@ -1,11 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-group :test do
-  # gem "benchmark-ips"
-  gem "minitest-spec-rails"
-  gem "ricecream"
-  gem "standard", require: false
-  gem "simplecov", require: false
-end

data/Gemfile.lock

@@ -1,184 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cuco (0.1.0)
-      listen
-      micro-optparse
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (7.1.3.2)
-      actionview (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.2)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.7)
-    builder (3.2.4)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    crass (1.0.6)
-    docile (1.4.0)
-    drb (2.2.1)
-    erubi (1.12.0)
-    ffi (1.16.3)
-    i18n (1.14.4)
-      concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
-      reline (>= 0.4.2)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    lint_roller (1.1.0)
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.22.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    micro-optparse (1.2.1)
-    minitest (5.22.3)
-    minitest-spec-rails (7.2.0)
-      minitest (>= 5.0)
-      railties (>= 4.1)
-    mutex_m (0.2.0)
-    nokogiri (1.16.3-aarch64-linux)
-      racc (~> 1.4)
-    nokogiri (1.16.3-arm-linux)
-      racc (~> 1.4)
-    nokogiri (1.16.3-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.16.3-x86-linux)
-      racc (~> 1.4)
-    nokogiri (1.16.3-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.16.3-x86_64-linux)
-      racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.0.5)
-      ast (~> 2.4.1)
-      racc
-    psych (5.1.2)
-      stringio
-    racc (1.7.3)
-    rack (3.0.9.1)
-    rack-session (2.0.0)
-      rack (>= 3.0.0)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rackup (2.1.0)
-      rack (>= 3)
-      webrick (~> 1.8)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
-      irb
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rainbow (3.1.1)
-    rake (13.1.0)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    rdoc (6.6.2)
-      psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.4.3)
-      io-console (~> 0.5)
-    rexml (3.2.6)
-    ricecream (0.2.1)
-    rubocop (1.62.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    rubocop-performance (1.20.2)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    ruby-progressbar (1.13.0)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    standard (1.35.1)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.62.0)
-      standard-custom (~> 1.0.0)
-      standard-performance (~> 1.3)
-    standard-custom (1.0.2)
-      lint_roller (~> 1.0)
-      rubocop (~> 1.50)
-    standard-performance (1.3.1)
-      lint_roller (~> 1.1)
-      rubocop-performance (~> 1.20.2)
-    stringio (3.1.0)
-    thor (1.3.1)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
-    zeitwerk (2.6.13)
-
-PLATFORMS
-  aarch64-linux
-  arm-linux
-  arm64-darwin
-  x86-linux
-  x86_64-darwin
-  x86_64-linux
-
-DEPENDENCIES
-  cuco!
-  minitest
-  minitest-spec-rails
-  rake
-  ricecream
-  simplecov
-  standard
-
-BUNDLED WITH
-   2.5.6

data/Rakefile

@@ -1,11 +0,0 @@
-require "rake"
-require "rake/testtask"
-require "bundler/gem_tasks"
-
-Rake::TestTask.new do |t|
-  t.libs.push "test"
-  t.pattern = "test/*_test.rb"
-end
-
-desc "Default: run unit tests."
-task default: :test

data/cuco.gemspec

@@ -1,24 +0,0 @@
-require File.expand_path("../lib/version", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name = "cuco"
-  s.version = Cuco::VERSION
-  s.summary = "A file watcher"
-  s.description = "A simple and flexible file watcher"
-
-  s.authors = ["Dittmar Krall"]
-  s.email = "dittmar.krall@matiq.de"
-  s.homepage = "http://www.matiq.de"
-  s.license = "MIT"
-
-  s.files = `git ls-files`.split("\n")
-  s.executables = `git ls-files -- bin/*`
-    .split("\n").map { |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency "micro-optparse"
-  s.add_dependency "listen"
-
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "rake"
-end

data/test/controller_test.rb

@@ -1,52 +0,0 @@
-require "test_helper"
-
-describe Controller do
-  let(:cuco) { Controller.instance }
-  let(:regexp) { '.*\.rb' }
-
-  def setup
-    G.init({}, [])
-  end
-
-  def teardown
-    cuco.stop
-  end
-
-  it "stops" do
-    cuco.stop
-    assert_nil cuco.listener
-  end
-
-  it "runs" do
-    assert_raises(Timeout::Error) do
-      Timeout.timeout(0.1) { cuco.run }
-    end
-
-    assert cuco.listener
-  end
-
-  it "read .watchr" do
-    assert_raises(Timeout::Error) do
-      Timeout.timeout(0.1) { cuco.run }
-    end
-  end
-
-  it "run" do
-    G.script = Script.new "watch('#{regexp}') { raise IOError }"
-
-    assert_raises(IOError) { cuco.file_run "a.rb" }
-  end
-
-  it "does not run" do
-    G.script = Script.new "watch('#{regexp}') { raise IOError }"
-
-    cuco.file_run "a.no"
-  end
-
-  it "receives a matchdata" do
-    G.script = Script.new "watch('ab(.)') { |m| [m[0], m[1]] }"
-
-    rule = G.script.__rules.last
-    assert_equal ["abc", "c"], cuco.match_run(rule, "abc")
-  end
-end

data/test/cuco_test.rb

@@ -1,29 +0,0 @@
-require "test_helper"
-
-describe Cuco do
-  it "usage" do
-    out, _err = capture_io do
-      puts `bin/cuco -h`
-    end
-
-    assert_match(/Usage/, out)
-  end
-
-  it "options" do
-    options = {opt: 1234}
-    G.init options, []
-
-    assert_equal options, G.options
-  end
-
-  # it "coverage options debug" do
-  #   out, _err = capture_io do
-  #      puts `bin/cuco -d`
-  #      Timeout::timeout(0.1) { puts `bin/cuco -d` }
-  #   end
-  #
-  #   assert_match(/:debug=>true/, out)
-  #   assert_match(/scriptname <.watchr>/, out)
-  #   assert_match(/pwd/, out)
-  # end
-end

data/test/script_test.rb

@@ -1,29 +0,0 @@
-require "test_helper"
-
-describe Script do
-  it "checks script" do
-    script = Script.new ""
-    assert script.instance_of?(Script)
-    assert_equal %i[watch __rules].sort, script.public_methods(false).sort
-  end
-
-  it "has no watcher" do
-    script = Script.new "n = 123"
-    assert_equal 0, script.__rules.size
-  end
-
-  it "has one watcher" do
-    script = Script.new "n = 456; watch('.rb') { }"
-
-    assert_equal 1, script.__rules.size
-  end
-
-  it "calls a watcher" do
-    pattern = '\.rb'
-    value = 123
-    script = Script.new "n = #{value}; watch('#{pattern}') { n }"
-
-    rule = script.__rules.last
-    assert_equal [pattern, value], [rule.pattern, rule.proc.call]
-  end
-end

data/test/test_helper.rb

@@ -1,14 +0,0 @@
-if ENV["COVERAGE"]
-  require "simplecov"
-  SimpleCov.start do
-    add_filter "/test/"
-  end
-end
-
-require "minitest/autorun"
-require "ricecream"
-
-require "controller"
-require "cuco"
-require "script"
-require "timeout"