RegexpBench 0.5.0 → 0.5.1

data/bin/regexp-bench

@@ -1,11 +1,31 @@
 #!/bin/env ruby
 require 'regexp-bench/commands'
+require 'yaml'
+
+loaded_strings = []
+
+ARGV.each do |arg|
+  if File.exists?(arg) and File.file?(arg)
+    File::open(arg, "r") do |match_list|
+      loaded_strings += RegexpBench.clean_strings(YAML::load(match_list))
+    end
+  else
+    warn "#{arg} couldn't be opened for loading"
+  end
+end
 
 interpreter = Command::TextInterpreter.new
+
+def interpreter.get_formatter()
+  Command::Results::StrategyFormatter.new(::Command::raw_stdout)
+end
+
 interpreter.command_set = RegexpBench::commands
 
+interpreter.behavior(:debug_commands => true)
+
 subject = interpreter.subject_template
-subject.test_strings = []
+subject.test_strings = loaded_strings
 subject.interpreter = interpreter
 subject.command_set = interpreter.command_set
 

data/doc/README

@@ -1,2 +1,58 @@
-== This is a Really Cool Ruby Thing
-=== ( That deserves better documentation than this. )
+== Welcome to Regexp Bench
+
+Basically, start up 'regexp-bench'  You'll get an interactive command line,
+complete with a help function.
+
+An example exchange with regexp-bench:
+
+    $ bin/regexp-bench
+    > load_matches do
+    do            doc/          dog-cat.yaml
+    > load_matches dog-cat.yaml
+    > list_matches
+    Match: dog
+    Don't Match: cat
+    > test .o.
+    Regexp compiles as: (?-mix:.o.)
+    Matching "dog"
+      Successful match:
+      Before:
+      m[0]: dog
+      After:
+    Matching "cat"
+      Successful null match
+    > test ...
+    Regexp compiles as: (?-mix:...)
+    Matching "dog"
+      Successful match:
+      Before:
+      m[0]: dog
+      After:
+    Matching "cat"
+      ERROR: match:
+      Before:
+      m[0]: cat
+      After:
+    > help
+    clear_matches
+    dont_match <string> [<string>]
+    help <terms> [<terms>]
+    list_matches
+    load_matches <load_from> [<load_from>]
+    match <string> [<string>]
+    quit
+    redo
+    remove <string> [<string>]
+    save_matches <save_to> [<save_to>]
+    test <regex> [<regex>]
+    undo
+    > quit
+
+
+Still not as pretty as I'd like it to be, but we'll get there before 1.0.
+
+== TODO
+
+- Better help documentation!
+- Rspec file output
+- Code generation based on a successful test

data/lib/regexp-bench/arguments.rb

@@ -0,0 +1,20 @@
+
+
+module Command
+  #This is a demonstration of how easy it is to extend arguments.  Probably
+  #this class belongs in the main CommandSet, but 0.8.0 doesn't have it yet,
+  #so it's added here.
+  class RestOfLine < StringArgument
+    register "rest"
+
+    def consume(subject, arguments)
+      term = arguments.join(" ")
+      arguments.clear
+      unless validate(term, subject)
+	raise ArgumentInvalidException, {@name => term}
+      end
+      return {@name => parse(subject, term)}
+    end
+  end
+end
+

data/lib/regexp-bench/commands.rb

@@ -1,6 +1,7 @@
 require 'command-set'
 require 'command-set/standard-commands'
 require 'regexp-bench/regexp-bench'
+require 'regexp-bench/arguments'
 
 module RegexpBench
   def self.commands
@@ -10,33 +11,29 @@ module RegexpBench
       include_commands Command::StandardCommands::Undo
 
       command :test do
-        argument :regex, "The regular expression to be tested"
+        rest_argument :regex, "The regular expression to be tested"
 
         subject_methods :test_strings
 
         doesnt_undo
 
+        format_advice do
+          list do |list|
+            if list.depth == 1
+              {:type => :indent}
+            end
+          end
+        end
+
         action do
           begin
             regex = Regexp.compile(regex().chomp)
-            item regex
+            item "Regexp compiles as: " + regex.to_s
 
             list "tests" do
-              subject.test_strings.each do |match_test_string|
-                test_string = match_test_string.string
-                list test_string do
-                  item "Matching: \"#{test_string}\""
-                  match = regex.match(test_string)
-
-                  if(match.nil?)
-                    puts "Null match"
-                  else
-                    puts "Before: " + match.pre_match
-                    match.to_a.each_index do |idx|
-                      puts "m[#{idx}]: #{match[idx]}"
-                    end
-                    puts "After: " + match.post_match
-                  end
+              subject.test_strings.each do |test_string|
+                list "Matching \"#{test_string.to_s}\"" do
+                  test_string.test_match(regex)
                 end
               end
             end
@@ -47,7 +44,7 @@ module RegexpBench
       end
 
       command :match do
-        argument :string, "A string to match"
+        rest_argument :string, "A string to match"
 
         subject_methods :test_strings
 
@@ -62,7 +59,7 @@ module RegexpBench
       end
 
       command :dont_match do
-        argument :string, "A string to match"
+        rest_argument :string, "A string to match"
 
         subject_methods :test_strings
 
@@ -103,12 +100,63 @@ module RegexpBench
         action do
           list "matches" do
             subject.test_strings.each do |string|
-              item string
+              string.list
             end
           end
         end
       end
 
+      command :clear_matches do
+        subject_methods :test_strings
+
+        action do
+          @saved_strings = subject.test_strings.dup
+          subject.test_strings.clear
+        end
+
+        undo do
+          subject.test_strings.replace(@saved_strings)
+        end
+      end
+
+      command :save_matches do
+        file_argument :save_to do |path|
+          not File::exists?(path) or File::file?(path)
+        end
+
+        subject_methods :test_strings
+
+        doesnt_undo
+
+        action do
+          require 'yaml'
+
+          File::open(save_to(), "w") do |save|
+            save.write(YAML.dump(subject.test_strings))
+          end
+        end
+      end
+
+      command :load_matches do
+        file_argument :load_from, {}
+
+        subject_methods :test_strings
+
+        action do
+          require 'yaml'
+
+          @saved_strings = subject.test_strings.dup
+
+          File::open(load_from(), "r") do |file|
+            strings = RegexpBench.clean_strings(YAML.load(file))
+            subject.test_strings.push(*strings)
+          end
+        end
+
+        undo do
+          subject.test_strings.replace(@saved_strings)
+        end
+      end
     end
   end
 end

data/lib/regexp-bench/regexp-bench.rb

@@ -1,13 +1,69 @@
 module RegexpBench
+  def self.clean_strings(array)
+    array.map! do |string|
+      unless MatchString === string
+        string = MatchString.new(string.to_s)
+      end
+
+      string
+    end
+  end
+
   class MatchString
     def initialize(string)
       @string = string
     end
 
     attr_reader :string
+
+    def to_s
+      return @string.dup
+    end
+
+    def list
+      puts "Match: " + string
+    end
+
+    def test_match(regex)
+      match = regex.match(string)
+
+      if(match.nil?)
+        null_match
+      else
+        matched(match)
+      end
+    end
+
+    def null_match
+      puts "ERROR: Null match"
+    end
+
+    def matched(match)
+      puts "Successful match:"
+      puts "Before: " + match.pre_match
+      match.to_a.each_index do |idx|
+        puts "m[#{idx}]: #{match[idx]}"
+      end
+      puts "After: " + match.post_match
+    end
   end
 
   class DontMatchString < MatchString
+    def list
+      puts "Don't Match: " + string
+    end
+
+    def null_match
+      puts "Successful null match"
+    end
 
+    def matched(match)
+      puts "ERROR: match:"
+      puts "Before: " + match.pre_match
+      match.to_a.each_index do |idx|
+        puts "m[#{idx}]: #{match[idx]}"
+      end
+      puts "After: " + match.post_match
+    end
   end
 end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: RegexpBench
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2007-12-06 00:00:00 -08:00
+  version: 0.5.1
+date: 2007-12-10 00:00:00 -08:00
 summary: Regular expression experimental user app.
 require_paths: 
 - lib
 email: nyarly@gmail.com
 homepage: 
 rubyforge_project: 
-description: Interactive testing and experimentation with regular expressions. Ultimately, you can use it to generate RSpec descriptions based on the interactive testing you do.
+description: "Interactive testing and experimentation with regular expressions. To start, type 'regexp-bench'  First command: help. Current nicest feature: saving and restoring test strings from a YAML file. Biggest wishlist item: automatic rspec output."
 autorequire: 
 default_executable: 
 bindir: bin
@@ -25,11 +25,12 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
-post_install_message: Another tidy package brought to you Judson
+post_install_message: To begin, run 'regexp-bench' - try 'help' as your first command
 authors: 
 - Judson Lester
 files: 
 - lib/regexp-bench
+- lib/regexp-bench/arguments.rb
 - lib/regexp-bench/commands.rb
 - lib/regexp-bench/regexp-bench.rb
 - lib/regexp-bench/regex-test.rb
@@ -43,11 +44,11 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- RegexpBench-0.5.0 RDoc
+- RegexpBench-0.5.1 RDoc
 extra_rdoc_files: 
 - doc/README
-executables: []
-
+executables: 
+- regexp-bench
 extensions: []
 
 requirements: []