kang 0.0.1 → 0.0.2

data/bin/kang

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 #  Created on 2009-1-7.
-#  Copyright (c) 2009. All rights reserved.
+#  Copyright (c) 2011. All rights reserved.
 
 require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/kang")

data/lib/kang/cli.rb

@@ -1,7 +1,7 @@
 module Kang
   class CLI
     def self.execute(stdout, arguments=[])
-      Kang.new.main_loop
+      Kang::Controller.new
     end
   end
 end

data/lib/kang/version.rb

@@ -0,0 +1,3 @@
+module Kang
+  VERSION = "0.0.2"
+end

data/lib/kang.rb

@@ -4,7 +4,7 @@
 # kang.rb - Main executable for GUI interface
 #
 # ====================================================================
-# Copyright (c) 2008 Tony Doan <tdoan@tdoan.com>.  All rights reserved.
+# Copyright (c) 2011 Tony Doan <tdoan@tdoan.com>.  All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.  The terms
@@ -14,102 +14,207 @@
 # ====================================================================
 #
 $:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'wx'
-include Wx
+begin
+  require 'gtk2'
+rescue LoadError => ex
+  $stderr.puts("This is a GUI application that requires the gtk2 gem be installed, which in turn requires that GTK2 be installed.")
+  exit(-1)
+end
 
 module Kang
-  VERSION = '0.0.1'
-class EventFrame < Wx::Frame
-  def message(text, title)
-    m = Wx::MessageDialog.new(self, text, title, Wx::OK | Wx::ICON_INFORMATION)
-    m.show_modal()
-  end
+  class Data
+    def initialize
+      @re = nil
+      @match = nil
+    end
 
-  def initialize()
-    @highlight = Wx::TextAttr.new(Wx::GREEN, Wx::Colour.new(255, 255, 0) )
-    @normal    = Wx::TextAttr.new(Wx::BLACK, Wx::WHITE) #, Wx::Colour.new(255, 255, 0) )
-
-    super(nil, -1, "Kang")
-    set_client_size(Wx::Size.new(640,480))
-    t1_title = Wx::StaticBox.new(self, -1, "Regex", Wx::DEFAULT_POSITION)
-    t2_title = Wx::StaticBox.new(self, -1, "Text", Wx::DEFAULT_POSITION)
-    ls_title = Wx::StaticBox.new(self, -1, "Groups", Wx::DEFAULT_POSITION)
-    grid = Wx::GridSizer.new(2,10,10)
-    sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-    supersizer = Wx::BoxSizer.new(Wx::VERTICAL)
-    @text  = Wx::TextCtrl.new(self,-1,'(Regex)? (in) (here)',Wx::DEFAULT_POSITION,Wx::DEFAULT_SIZE,Wx::TE_MULTILINE|TE_RICH)
-    @text2 = Wx::TextCtrl.new(self,-1,'Text in here',Wx::DEFAULT_POSITION,Wx::DEFAULT_SIZE,Wx::TE_MULTILINE)
-    @list = Wx::ListCtrl.new(self,-1,Wx::DEFAULT_POSITION,Wx::DEFAULT_SIZE,Wx::LC_REPORT)
-    @list.insert_column(0,"Group Num",Wx::LIST_FORMAT_RIGHT, -1)
-    @list.set_column_width(0,85)
-    @list.insert_column(1,"Match Data",Wx::LIST_FORMAT_LEFT, -1)
-    @list.set_column_width(1,180)
-    t1sizer = Wx::StaticBoxSizer.new(t1_title,Wx::VERTICAL)
-    t2sizer = Wx::StaticBoxSizer.new(t2_title,Wx::VERTICAL)
-    lssizer = Wx::StaticBoxSizer.new(ls_title,Wx::VERTICAL)
-    t1sizer.add(@text, 1,Wx::EXPAND|Wx::ALL,2)
-    t2sizer.add(@text2,1,Wx::EXPAND|Wx::ALL,2)
-    lssizer.add(@list,1,Wx::EXPAND|Wx::ALL,2)
-    sizer.add(t1sizer,1,Wx::EXPAND,2)
-    sizer.add(t2sizer,1,Wx::EXPAND,2)
-    @status = StatusBar.new(self,-1)
-    grid.add(sizer,1,Wx::EXPAND)
-    grid.add(lssizer,1,Wx::EXPAND)
-    supersizer.add(grid,1,Wx::EXPAND)
-    supersizer.add(@status)
-    self.set_sizer(supersizer)
-    evt_text(@text.get_id){|event| text_change(event)}
-    evt_text(@text2.get_id){|event| text_change(event)}
-    text_change(nil)
-  end
+    def update_match_string(match_string)
+      @match_string = match_string
+      update_match
+    end
+
+    def update_match
+      if @re
+        @match = @re.match(@match_string)
+      else
+        @match = nil
+      end
+    end
+
+    def match_group_count
+      if @match
+        @match.to_a.size-1
+      else
+        nil
+      end
+    end
+
+    def update_regexp(re_string)
+      begin
+        @re = Regexp.new(re_string)
+      rescue RegexpError
+        @re = nil
+      end
+      update_match
+    end
 
-  def set_status(text)
-    @status.set_status_text(text)
+    def regexp_valid?
+      @re.nil? ? false : true
+    end
+
+    def match?
+      @match ? true : false
+    end
+
+    def match_begin
+      if @match
+        @match.begin(0)
+      else
+        nil
+      end
+    end
+
+    def match_end
+      if @match
+        @match.end(0)
+      else
+        nil
+      end
+    end
+
+    def matches
+      if @match and (@match.length > 1)
+        @match[1..-1]
+      else
+        []
+      end
+    end
   end
 
-  def text_change(event)
-    ip = @text2.get_insertion_point
-    size = @text2.get_value.size
-    begin 
-      r = Regexp.new(@text.get_value)
-      set_status("")
-    rescue
-      set_status("Invalid Regex")
-      @list.delete_all_items
-    end
-    unless r.nil?
-      md = r.match(@text2.get_value)
-      unless md.nil?
-        b = md.begin(0)
-        e = md.end(0)
-        ret= @text2.set_style(0,size,@normal)
-        @text2.append_text("")
-        @text2.set_style(b,e,@highlight)
-        @text2.append_text("")
-        @list.delete_all_items
-        md.to_a[1..-1].each_with_index do |s,i|
-          @list.insert_item(i,"#{i+1}")
-          @list.set_item(i,1,s) unless s.nil?
-        end
+  class Controller
+    def initialize
+      @view = View.new(self)
+      @data = Data.new
+      @view.start
+    end
+
+    def key_up_match(view,event,match_string)
+      @view.update_status("")
+      @data.update_match_string(match_string)
+      key_up
+    end
+
+    def key_up_reg(view,event,text)
+      @view.update_status("")
+      @data.update_regexp(text)
+      key_up
+    end
+
+    private
+    def key_up
+      unless @data.regexp_valid?
+        @view.remove_tag
+        @view.update_status("Invalid Regexp")
       else
-        ret = @text2.set_style(0,size,@normal)
-        @text2.append_text("")
-        @list.delete_all_items
+        count = @data.match_group_count ? @data.match_group_count : "no"
+        @view.update_status("Matched with #{@data.match_group_count} grouping(s)")
+        if @data.match?
+          @view.update_tag(@data.match_begin,@data.match_end)
+        else
+          @view.remove_tag
+          @view.update_status("no match")
+        end
       end
-    else
-      ret = @text2.set_style(0,size,@normal)
-      @text2.append_text("")
+      @view.update_match_groups(@data.matches)
     end
-    @text2.set_insertion_point(ip)
   end
-end
 
-class Kang < App
+  class View
+    def initialize(controller)
+      @controller = controller
+      @window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
+      @window.set_title  "Kang"
+      @window.border_width = 10
+      @window.set_size_request(600, 400)
+      @window.signal_connect('delete_event') { Gtk.main_quit }
+
+      wintop = Gtk::ScrolledWindow.new
+      wintop.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS)
+
+      winbottom = Gtk::ScrolledWindow.new
+      winbottom.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS)
+
+      @statusbar = Gtk::Statusbar.new
+      @statusbar.push(0,"")
+
+      @regview = Gtk::TextView.new
+      @regview.buffer.text = "RegExp here"
+
+      @matchview = Gtk::TextView.new
+      @matchview.buffer.text = "Match Text Here"
+
+      @matchview.buffer.create_tag("colors",{ "foreground" => "green", "background" => "#000000" })
+
+      wintop.add(@regview)
+      winbottom.add(@matchview)
 
-  def on_init
-    EventFrame.new.show
+      @list_store = Gtk::ListStore.new(Integer, String)
+      treeview = Gtk::TreeView.new(@list_store)
+      column0 = Gtk::TreeViewColumn.new("#",Gtk::CellRendererText.new, {:text => 0})
+      column1 = Gtk::TreeViewColumn.new("Match",Gtk::CellRendererText.new, {:text => 1})
+      treeview.append_column(column0)
+      treeview.append_column(column1)
+      treeview.selection.mode = Gtk::SELECTION_NONE
+
+      vpaned = Gtk::VPaned.new
+      vpaned.add1(wintop)
+      vpaned.add2(winbottom)
+      vpaned.set_size_request(400,400)
+      hpaned = Gtk::HPaned.new
+      hpaned.add1(vpaned)
+      hpaned.add2(treeview)
+      vbox = Gtk::VBox.new(false,0)
+      vbox.pack_start(hpaned,true,true,0)
+      vbox.pack_start(@statusbar,false,false,0)
+      @window.add(vbox)
+
+      @regview.signal_connect("key-release-event") {|view,event| @controller.key_up_reg(view,event,view.buffer.text)}
+      @matchview.signal_connect("key-release-event") {|view,event| @controller.key_up_match(view,event,view.buffer.text)}
+    end
+
+    def start
+      @window.show_all
+      begin
+        Gtk.main
+      rescue SystemExit, Interrupt
+        exit(0)
+      end
+    end
+
+    def update_tag(tag_begin,tag_end)
+      remove_tag
+      b = @matchview.buffer.get_iter_at_offset(tag_begin)
+      e = @matchview.buffer.get_iter_at_offset(tag_end)
+      @matchview.buffer.apply_tag("colors",b,e)
+    end
+
+    def update_status(message)
+      @statusbar.pop(0)
+      @statusbar.push(0,message)
+    end
+
+    def update_match_groups(groups)
+      @list_store.clear
+      groups.each_with_index{|item,i| iter = @list_store.append; iter[0]=i;iter[1]=item}
+    end
+
+    def remove_tag
+      buffer = @matchview.buffer
+      bstart = buffer.get_iter_at_offset(0)
+      bend = buffer.get_iter_at_offset(buffer.text.size)
+      @matchview.buffer.remove_tag("colors",bstart,bend)
+    end
   end
 end
-end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: kang
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tony Doan
@@ -9,88 +10,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-07 00:00:00 -08:00
-default_executable: 
+date: 2011-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: wxruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.9.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: gtk2
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-description: "* KANG - The Ruby Regex Debugger"
-email: 
-- tdoan@tdoan.com
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+description: The Ruby Regex Debugger. Put your regex in the top pane, and your match text in the bottom pane. Kang will highlight the match text that matches and show you any match groups you have created down the right hand side.
+email: tdoan@tdoan.com
 executables: 
 - kang
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- bin/kang
 - lib/kang.rb
 - lib/kang/cli.rb
-- test/test_helper.rb
-- test/test_kang.rb
-has_rdoc: true
-homepage: http://kang.rubyforge.org/
+- lib/kang/version.rb
+- bin/kang
+homepage: http://github.com/tdoan/kang
+licenses: []
+
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: kang
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.8.5
 signing_key: 
-specification_version: 2
-summary: "* KANG - The Ruby Regex Debugger"
-test_files: 
-- test/test_helper.rb
-- test/test_kang.rb
-- test/test_kang_cli.rb
+specification_version: 3
+summary: A visual regex debugger
+test_files: []
+

data/History.txt

@@ -1,4 +0,0 @@
-== 0.0.1 2009-01-07
-
-* 1 major enhancement:
-  * Initial release

data/Manifest.txt

@@ -1,9 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/kang
-lib/kang.rb
-lib/kang/cli.rb
-test/test_helper.rb
-test/test_kang.rb

data/README.txt

@@ -1,36 +0,0 @@
-= kang
-
-* http://kang.rubyforge.org/
-
-== DESCRIPTION:
-
-* KANG - The Ruby Regex Debugger
-
-== FEATURES/PROBLEMS:
-
-* This is a cross-platform GUI application. To run it you'll need Ruby (I've only tested with 1.8.7 so far) and the wxruby gem (I've only tested with 1.9.8).
-
-== SYNOPSIS:
-
-  FIX (code sample of usage)
-
-== REQUIREMENTS:
-
-* ruby
-* rubygems
-* wxruby
-
-== INSTALL:
-
-* sudo gem install kang
-
-== LICENSE:
-
-====================================================================
-Copyright (c) 2008 Tony Doan <tdoan@tdoan.com>.  All rights reserved.
-This software is licensed as described in the file COPYING, which
-you should have received as part of this distribution.  The terms
-are also available at http://github.com/tdoan/kang/tree/master/COPYING.
-If newer versions of this license are posted there, you may use a
-newer version instead, at your option.
-====================================================================

data/Rakefile

@@ -1,28 +0,0 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/kang'
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('kang', Kang::VERSION) do |p|
-  p.developer('Tony Doan', 'tdoan@tdoan.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  p.rubyforge_name       = p.name # TODO this is default value
-  p.extra_deps         = [
-   ['wxruby','>= 1.9.8'],
-  ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
-end
-
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]

data/test/test_helper.rb

@@ -1,3 +0,0 @@
-require 'stringio'
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/kang'

data/test/test_kang.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestKang < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end

data/test/test_kang_cli.rb

@@ -1,14 +0,0 @@
-require File.join(File.dirname(__FILE__), "test_helper.rb")
-require 'kang/cli'
-
-class TestKangCli < Test::Unit::TestCase
-  def setup
-    Kang::CLI.execute(@stdout_io = StringIO.new, [])
-    @stdout_io.rewind
-    @stdout = @stdout_io.read
-  end
-  
-  def test_not_print_default_output
-    assert_no_match(/To update this executable/, @stdout)
-  end
-end