cuco 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce231276ed05e26b295e643409792ab5e4260b80f44642438b70ab8f1d94b63e
-  data.tar.gz: 83e9536002c04ffcd28f21b14a14816a0c8347f46214bcacf78ea05a26e2369f
+  metadata.gz: 5342bb409b3bd1e9febe557662bf308acc1ae727911401b4be2a0d0d8fb06c07
+  data.tar.gz: 4948f0decd177693378761e046875a2808d4af80cfd0b17d5166aedfa4fb326c
 SHA512:
-  metadata.gz: 3fad6b87f9ca62c99e4f65c6b69b388facaf9edfcc32ec58814bf5d1a666de597696f1106ac63a11b3a1534609da9b4efb32beead6c3c6140a299e58e7d6d6ef
-  data.tar.gz: 2fdee124e0b0930c5b31b231af0b9b77e27523651504cc35a7eba752f6dd8592018fd3ed8769829e762c1f95dba90fa9838eacc29cd45f0459cf0dcc9096e100
+  metadata.gz: 6d0c34c445d0ac41e63589a8e240f2bf3b6fcdc3414b6f060009004b14bd720428a2c331637c8df9554ba73d824e76f25f54a52a9f245ca2f844abcf7a67e71e
+  data.tar.gz: 9a9a183c7ee4aff77eb749797792cb7b686d490453ab92c72b6a3f03ecc2c331c723c69e4fd74f1f6f3bac40e556267d848eaf57a6c1761d4b7352c94c5aa8bc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cuco (0.1.0)
+    cuco (0.1.1)
       listen
       micro-optparse
 
@@ -85,7 +85,7 @@ GEM
     psych (5.1.2)
       stringio
     racc (1.7.3)
-    rack (3.0.9.1)
+    rack (3.0.10)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -113,7 +113,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
     regexp_parser (2.9.0)
     reline (0.4.3)

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.

data/cuco.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
     .split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "micro-optparse"
-  s.add_dependency "listen"
+  s.add_runtime_dependency "micro-optparse"
+  s.add_runtime_dependency "listen"
 
   s.add_development_dependency "minitest"
   s.add_development_dependency "rake"

data/lib/controller.rb

@@ -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

@@ -1,5 +1,6 @@
 module Cuco
-  VERSION = "0.1.0" # 2024-03-18
+  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

data/test/controller2_test.rb

@@ -0,0 +1,59 @@
+require "test_helper"
+
+class R
+  class << self
+    attr_accessor :acc
+  end
+end
+
+describe Controller do
+  let(:cntrl) { Controller.instance }
+
+  def setup
+    R.acc = ""
+    G.init({}, [])
+    G.script = Script.new <<~EOS
+      watch('file')            { R.acc << "n" }
+      watch('file', :added)    { R.acc << "a" }
+      watch('file', :modified) { R.acc << "m" }
+    EOS
+  end
+
+  def teardown
+    cntrl.stop
+  end
+
+  it "fails with unknown what pattern" do
+    cntrl.file_run("fail", nil)
+    assert_equal "", R.acc
+  end
+
+  it "considers event_type nil" do
+    check nil, "n"
+  end
+
+  it "considers event_type :added" do
+    check :added, "an"
+  end
+
+  it "considers event_type :modified" do
+    check :modified, "mn"
+  end
+
+  it "receives a matchdata" do
+    G.script = Script.new "watch('ab(.)') { |m|
+      R.acc << m[0]
+      R.acc << m[1]
+    }"
+
+    cntrl.file_run("abc", nil)
+    assert_equal "abcc", R.acc
+  end
+
+  private
+
+  def check(type, expected)
+    cntrl.file_run("file", type)
+    assert_equal expected, R.acc
+  end
+end

data/test/controller_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Controller do
-  let(:cuco) { Controller.instance }
+  let(:cntrl) { Controller.instance }
   let(:regexp) { '.*\.rb' }
 
   def setup
@@ -9,44 +9,37 @@ describe Controller do
   end
 
   def teardown
-    cuco.stop
+    cntrl.stop
   end
 
   it "stops" do
-    cuco.stop
-    assert_nil cuco.listener
+    cntrl.stop
+    assert_nil cntrl.listener
   end
 
   it "runs" do
     assert_raises(Timeout::Error) do
-      Timeout.timeout(0.1) { cuco.run }
+      Timeout.timeout(0.1) { cntrl.run }
     end
 
-    assert cuco.listener
+    assert cntrl.listener
   end
 
   it "read .watchr" do
     assert_raises(Timeout::Error) do
-      Timeout.timeout(0.1) { cuco.run }
+      Timeout.timeout(0.1) { cntrl.run }
     end
   end
 
   it "run" do
     G.script = Script.new "watch('#{regexp}') { raise IOError }"
 
-    assert_raises(IOError) { cuco.file_run "a.rb" }
+    assert_raises(IOError) { cntrl.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")
+    cntrl.file_run "a.no"
   end
 end

data/test/coverage_test.rb

@@ -0,0 +1,19 @@
+require "test_helper"
+
+describe "Coverage" do
+  let(:cntrl) { Controller.instance }
+
+  def setup
+    G.init({}, [])
+  end
+
+  it "coverage run files" do
+    names = []
+    cntrl.run_files(names, nil)
+  end
+
+  it "coverage run files script" do
+    names = [G.scriptname]
+    cntrl.run_files(names, nil)
+  end
+end

data/test/cuco_test.rb

@@ -1,6 +1,10 @@
 require "test_helper"
 
 describe Cuco do
+  def setup
+    G.init({}, [])
+  end
+
   it "usage" do
     out, _err = capture_io do
       puts `bin/cuco -h`
@@ -9,21 +13,22 @@ describe Cuco do
     assert_match(/Usage/, out)
   end
 
+  it "coverage G.print " do
+    out, err = capture_io do
+      G.print
+    end
+
+    assert out
+    assert_equal "", err
+    assert_match(/scriptname/, out)
+    assert_match(/.watchr/, out)
+    assert_match(/pwd/, 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/test_helper.rb

@@ -1,5 +1,6 @@
 if ENV["COVERAGE"]
   require "simplecov"
+
   SimpleCov.start do
     add_filter "/test/"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuco
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micro-optparse
@@ -88,7 +88,9 @@ files:
 - lib/cuco.rb
 - lib/script.rb
 - lib/version.rb
+- test/controller2_test.rb
 - test/controller_test.rb
+- test/coverage_test.rb
 - test/cuco_test.rb
 - test/script_test.rb
 - test/test_helper.rb