svn_wc_tree 0.0.3 → 0.0.5

data/ChangeLog

@@ -1,3 +1,15 @@
+version 0.0.5
+* bug fix: default svn_status uses filter if set
+
+version 0.0.4
+* dir entries now grouped togther
+* added filter(s): regex and amount. (amount filter is very beta)
+* can filter svn_status and svn_list (set field use right click js menu)
+  (for instance,  use filter with svn_list to delete unneeded files)
+
+version 0.0.3
+* added (installer unit tests)
+
 version 0.0.2
 * initial release
 * run as PHP app (Ruby installation still required)

data/Manifest

@@ -3,6 +3,7 @@ cgi/svn_wc_broker.cgi
 ChangeLog
 lib/svn_wc_broker.rb
 lib/svn_wc_client.rb
+tests/test_installer_bin.rb
 LICENSE
 Manifest
 README.rdoc
@@ -11,7 +12,6 @@ svn_wc_tree/css/swt.css
 svn_wc_tree/img/swt_spinner.gif
 svn_wc_tree/index.html
 svn_wc_tree/index.php
-svn_wc_tree.conf
 svn_wc_tree/js/swt.js
 svn_wc_tree/js/jquery-1.3.2.js
 svn_wc_tree/js/jquery.blockUI-2.31.js

data/README.rdoc

@@ -1,12 +1,12 @@
 = svn_wc_tree
 
 A Web application front end that operates on the working copy of an
-Subversion (SVN) repository.
+Subversion (SVN) repository. (See Requirements)
 
 
 == VERSION:
 
-Version 0.0.3
+Version 0.0.5
 
 NOTE: THIS IS ALPHA QUALITY SOFTWARE, use at your own risk!
 
@@ -293,7 +293,7 @@ See the ChangeLog file for details.
 Copyright 2010 David Wright (david_v_wright@yahoo.com), all rights reserved.
 
 
-svn_wc_tree 0.0.3 is released under the LGPL license.
+svn_wc_tree 0.0.5 is released under the LGPL license.
 
 
 == AUTHOR:

data/bin/svn_wc_tree

@@ -31,29 +31,53 @@
 #    location (filesystem path) of your svn_wc.conf file (readable by 'httpd
 #    runs as' owner)
 #
-# --move_conf_from, -f [move_conf_from]:
-#    move your conf file (svn_wc_tree.conf) from filesystem path to 
-#    (move_conf_to)
+# --copy_conf_from, -f [copy_conf_from]:
+#    copy your conf file (svn_conf.yaml) from filesystem path to 
+#    (copy_conf_to)
 #
-# --move_conf_to, -t [move_conf_to]:
-#    move your conf file (svn_wc_tree.conf) to filesystem path from
-#    (move_conf_from)
+# --copy_conf_to, -t [copy_conf_to]:
+#    copy your conf file (svn_conf.yaml) to filesystem path from
+#    (copy_conf_from)
 #
 #
 # Example: 
-#   svn_wc_tree --html /var/htdocs --cgi /var/cgi-bin \ 
-#                   --post_to_url 'http://example.com/cgi-bin/ \
-#                   --conf_location /opt/conf/svn_conf.yaml
-#
-#   sudo svn_wc_tree --html /var/htdocs --post_to_url 'cgi-bin/cgi.rb'
 #
+#   # install into /var/htdocs, post to PHP, use conf file already at location
 #   sudo svn_wc_tree --html /var/htdocs --php true \
 #                    --conf_location /opt/svn_wc_tree/svn_conf.yaml
 #
+#   # install (app/html/js) into /var/htdocs
+#   # install CGI into /var/cgi-bin
+#   # post to CGI script at 'http://example.com/cgi-bin/svn_wc_broker.cgi' 
+#   # (install at path: /var/cgi-bin)
+#   # use conf file already at location
+#   svn_wc_tree --html /var/htdocs --cgi /var/cgi-bin \ 
+#               --post_to_url 'http://example.com/cgi-bin/svn_wc_broker.cgi' \
+#               --conf_location /opt/conf/svn_conf.yaml
+#
+#   # install (app/html/js) into /var/htdocs
+#   # install CGI into /var/cgi-bin
+#   # post to CGI (pre existing script) at 'cgi-bin/cgi.rb' (must be relative
+#   #   to the app html dir, or fully qualified path)
+#   # conf file path already added to the pre existing cgi you wrote
+#   sudo svn_wc_tree --html /var/htdocs --post_to_url 'cgi-bin/cgi.rb'
+#
+#   # install app into /var/www
+#   # install CGI into /usr/lib/cgi-bin
+#   # post to CGI (use apps provided cgi script - installed with --cgi)
+#   #       using fully qualified path)
+#   # copy conf file from /tmp/svn_conf.yaml to /usr/local/svn_wc_tree dir/)
 #   sudo svn_wc_tree --html /var/www --cgi /usr/lib/cgi-bin \
-#    --post_to_url 'http://localhost/cgi-bin/' --move_conf_from \
-#    /tmp/svn_conf.yaml --move_conf_to /usr/local/svn_wc_tree
-
+#    --post_to_url 'http://localhost/cgi-bin/svn_wc_broker.cgi' \
+#    --copy_conf_from  /tmp/svn_conf.yaml \
+#    --copy_conf_to /usr/local/svn_wc_tree
+#
+#   # install app into `$HOME`/public_html
+#   # post to PHP (resource provided by this app)
+#   # copy conf file from, to
+#   sudo svn_wc_tree --html ~/public_html --php true \
+#    --copy_conf_from `pwd`/svn_conf.yaml \
+#    --copy_conf_to /home/dwright/test_svn/wc
 
 require 'getoptlong'
 require 'rdoc/usage'
@@ -66,17 +90,17 @@ opts = GetoptLong.new(
   [ '--cgi',  '-c',           GetoptLong::OPTIONAL_ARGUMENT],
   [ '--php',  '-p',           GetoptLong::OPTIONAL_ARGUMENT],
   [ '--conf_location', '-o',  GetoptLong::OPTIONAL_ARGUMENT],
-  [ '--move_conf_from', '-f', GetoptLong::OPTIONAL_ARGUMENT],
-  [ '--move_conf_to'  , '-t', GetoptLong::OPTIONAL_ARGUMENT]
+  [ '--copy_conf_from', '-f', GetoptLong::OPTIONAL_ARGUMENT],
+  [ '--copy_conf_to'  , '-t', GetoptLong::OPTIONAL_ARGUMENT]
 )
 
 html_dir       = nil
 cgi_dir        = nil
-php            = nil
+@php           = false
 post_to_url    = 'index.php' # assume php mode
 conf_location  = nil
-move_conf_from = nil
-move_conf_to   = nil
+copy_conf_from = nil
+copy_conf_to   = nil
 
 opts.each do |opt, arg|
   case opt
@@ -89,36 +113,36 @@ opts.each do |opt, arg|
     when '--cgi'
       if arg != '' then cgi_dir = arg end
     when '--php'
-      if arg != '' then php = true end
+      if arg != '' then @php = true end
     when '--post_to_url'
       #if php then raise ArgumentError, 'post_to_url, is not used when php'
       if arg != ''  then post_to_url = arg end
     when '--conf_location'
       if arg != '' then conf_location = arg end
-    when '--move_conf_from'
-      if arg != '' then move_conf_from = arg end
-    when '--move_conf_to'
-      if arg != '' then move_conf_to = arg end
+    when '--copy_conf_from'
+      if arg != '' then copy_conf_from = arg end
+    when '--copy_conf_to'
+      if arg != '' then copy_conf_to = arg end
   end
 end
 
 # methods
 
-def handle_conf(move_conf_from, move_conf_to, cgi_dir=nil)
+def handle_conf(copy_conf_from, copy_conf_to, cgi_dir=nil)
+  raise "#{copy_conf_to} is a file!" if File.file? copy_conf_to
+  FileUtils.mkdir copy_conf_to unless File.directory? copy_conf_to
+
   begin
-    FileUtils.mkdir move_conf_to
-    FileUtils.cp move_conf_from, move_conf_to
+    FileUtils.cp copy_conf_from, copy_conf_to
   rescue
-    #puts "Destination conf file exists #{move_conf_to}"
+    #puts "Destination conf file exists #{copy_conf_to}"
   end
   # now edit lib to set conf_file path
-  to_path = File.dirname(move_conf_to) # moved to path
-  to_name = File.basename(move_conf_from) # name of conf file
-  conf_abs_path = File.join(to_path, to_name)
+  conf_abs_path = File.join(copy_conf_to, File.basename(copy_conf_from))
   set_conf_file_in_cgi(cgi_dir, conf_abs_path) if cgi_dir
 end
 
-def set_conf_file_in_cgi(cgi_dir, conf_location, php=nil)
+def set_conf_file_in_cgi(cgi_dir, conf_location)
   cgi_file = File.join(cgi_dir, 'svn_wc_broker.cgi')
   File.open(cgi_file, 'r+') do |cf|
     lines = cf.readlines 
@@ -126,7 +150,7 @@ def set_conf_file_in_cgi(cgi_dir, conf_location, php=nil)
       el.gsub! /CONF_FILE = nil/, 
                "CONF_FILE = '#{conf_location}'"
       # dont print header when run under php
-      el.gsub! /print cgi.header/, '#print cgi.header' if php 
+      el.gsub! /print cgi.header/, '#print cgi.header' if @php 
     end
     cf.pos = 0
     cf.print lines
@@ -171,9 +195,9 @@ rescue Exception => e
 end
 
 # cgi script
-cgi_path = html_dest if php
+cgi_path = html_dest if @php
 # if set, will overwrite php cgi url
-cgi_path = cgi_dir if cgi_dir 
+cgi_path = cgi_dir if cgi_dir
 
 if cgi_path
   begin
@@ -188,7 +212,7 @@ end
 if conf_location
   if cgi_path and conf_location
     begin
-      set_conf_file_in_cgi(cgi_path, conf_location, php)
+      set_conf_file_in_cgi(cgi_path, conf_location)
     rescue Exception => e
       puts "line:#{__LINE__} Exception: #{e.message}"
       exit 1
@@ -206,12 +230,12 @@ end
 
 begin
   # conf file
-  if move_conf_from or move_conf_to
-    if not (move_conf_from and move_conf_to)
-      puts 'if using "move_", both move_conf_to and move_conf_from must be set'
+  if copy_conf_from or copy_conf_to
+    if not (copy_conf_from and copy_conf_to)
+      puts 'if using "copy_", both copy_conf_to and copy_conf_from must be set'
       exit 1
     end
-    handle_conf(move_conf_from, move_conf_to, cgi_dir)
+    handle_conf(copy_conf_from, copy_conf_to, cgi_path)
   end
 rescue Exception => e
   puts "line:#{__LINE__} Exception: #{e.message}"

data/lib/svn_wc_broker.rb

@@ -21,12 +21,11 @@ require 'svn_wc_client'
 #
 # Broker requests between web app (AJAX) to svn_wc_client
 #
-# (this probably totally unnecessary and can be done away with
-# is left over form an early design decision which has
-# already changed)
+# (this script is probably unnecessary and can be done away with
+# it's left over from an early design decision which has changed)
 # 
-# mostly what it does is populate the top level array element with :run_error
-# with any exception that occurs: #repo[0]={:run_error => "Error: #{e.message}"}
+# what it does: populate the top level array element with :run_error
+# set to any exception that occurs: #repo[0]={:run_error => "Error: #{e.message}"}
 #
 module SvnWcBroker
 
@@ -41,7 +40,7 @@ module SvnWcBroker
   # set abs_path to your configuration file
   def set_conf_file(conf) ; @conf_file = conf ; end
 
-  # makes the requests against svn_wc
+  # makes the requests against our lib which, uses the ruby gem lib 'svn_wc'
   include SvnRepoClient
 
   # pass web requests in, handle defined actions, return results
@@ -49,9 +48,11 @@ module SvnWcBroker
   # contains our web POST request
   def handle_responses(params)
 
-      # to debug
+      #--
+      # to debug during devel
       #return svn_results debug_request(params['do_svn_action'])
       #return svn_results debug_request(params.to_s.to_a)
+      #++
       if params['do_svn_action'] \
          && (params['do_svn_action'].to_s == 'Do Svn Action')
       
@@ -59,7 +60,7 @@ module SvnWcBroker
         if params and params['svn_action'].to_s.strip.empty?
           return svn_results 
         else
-          return svn_results send( :do_requested_action, params )
+          return svn_results( send(:do_requested_action, params) )
         end
 
       else 
@@ -93,7 +94,14 @@ module SvnWcBroker
         end
 
       end
-      eval("svn_#{action}") if SUPPORTED_ACTIONS.index(action)
+      # eval known actions only
+      # svn_list takes args # svn_status takes args
+      if action == 'list' || action == 'status' 
+        eval("svn_#{action}('#{params['filter_re']}','#{params['filter_amt']}')")
+      else
+        # danger will robinson, only eval known supported actions
+        eval("svn_#{action}") if SUPPORTED_ACTIONS.index(action)
+      end
     rescue Exception => exn
       resp_data[0] = {:run_error => "Error: #{exn.message}"}
     end
@@ -106,7 +114,7 @@ module SvnWcBroker
     run_error = String.new
   
     begin
-      svn_status_list = svn_status
+      svn_status_list = svn_status(params['filter_re'], params['filter_amt'])
     rescue Exception => e
       run_error <<  e.message
     end

data/lib/svn_wc_client.rb

@@ -18,7 +18,7 @@ require 'svn_wc'
 
 #
 # receives method/action requests from web app (AJAX) returns data in expected format
-# is just a client of svn_wc 
+# is just a 'simple' client of ruby gem lib 'svn_wc'
 #
 # returned data is generally a array of anonymous hashes containing
 # svn entries info, or errors.
@@ -33,6 +33,7 @@ require 'svn_wc'
 #    each_details[:repo_root_local_path]  = File.join(@repo_root, '/')
 #
 module SvnRepoClient
+  STATUS_SPACER = "\t" # swt.js (js/jqtree file uses this)
 
   @@svn_wc = SvnWc::RepoAccess.new
 
@@ -41,53 +42,66 @@ module SvnRepoClient
 
   # if conf file exists and have a working copy of the repo, return the path
   # to it, otherwise create it (do a checkout, not forced)
+  # set force_checkout = true to force a checkout
   # returns svn_repo_working_copy abs_path
   def get_repo
     if File.file? @conf_file
       @@svn_wc.set_conf @conf_file
     else raise ArgumentError, "config file not found! #{@conf_file}" end
 
-    if not File.directory? @@svn_wc.svn_repo_working_copy
-      begin
-        @@svn_wc.do_checkout true
-      rescue SvnWc::RepoAccessError => e
-         raise e.message
+    #if not File.directory? @@svn_wc.svn_repo_working_copy
+    begin
+      if not File.directory? @@svn_wc.svn_repo_working_copy \
+         or @@svn_wc.force_checkout
+        #@@svn_wc.do_checkout(true, @@svn_wc.force_checkout)
+        @@svn_wc.do_checkout(true)
       end
+    rescue SvnWc::RepoAccessError => e
+       raise e.message
     end
     @repo_root = @@svn_wc.svn_repo_working_copy
   end
 
-  # basic status list of entries in repo root
-  # do checkout if not exists at local path
-  def svn_status
+  def svn_status(f_regex=nil, f_amt=nil)
       get_repo
-      st_list = Array.new
-      ent = Array.new
+      repo_entries = Array.new
       begin
-        @@svn_wc.status.each do |ef|
-            each_details = Hash.new
-            each_details[:status] = ef[:status]
-            each_details[:error] = ''
-            each_details[:entry_name]   = ef[:path]
-            each_details[:kind] = 1 # is 'file'
-            if File.directory?(File.join(@repo_root, ef[:path]))
-              each_details[:dir_name] = File.join(@repo_root, el)
-              each_details[:kind] = 2 # is dir
-            end
-            ent.push each_details
-        end
-        add_repo_as_dir = Hash.new
-        add_repo_as_dir[:dir_name] = @repo_root
-        add_repo_as_dir[:kind] = 2
-        ent.push add_repo_as_dir
+        l_svn_list = Array.new
+        @@svn_wc.status.each { |el|
+          status_info = {}
+          #status_info[:last_changed_rev] = el[:last_changed_rev]
+          status_info[:status] = el[:status]
+          status_info[:error] = ''
+          status_info[:entry_name] = el[:path]
+          if File.directory?(File.join(@repo_root, el[:path]))
+            status_info[:kind] = 2 # is dir
+          else
+            status_info[:kind] = 1 # is 'file'
+          end
+          #apply filter - limit result set with filter
+          #f_regex, f_amt = 'cof/htdocs/template', 10
+          if f_regex.nil?
+           l_svn_list.push status_info
+          elsif el[:path].match(f_regex)
+           l_svn_list.push status_info
+          end
+          #l_svn_list.push status_info
+          if f_amt.nil? or f_amt.empty?
+          elsif l_svn_list.size > f_amt.to_i
+            break
+          end
+        }
+
+        @entries_list = _to_expected_json_format(l_svn_list)
+        repo_entries.push info_data
       rescue SvnWc::RepoAccessError => e
+        #@error = e.message
         @error = "#{e.message} #{@@svn_wc}"
-        st_list.push info_data
+        repo_entries.push info_data
       end
-      @entries_list = ent
-      st_list.push info_data if ent.length > 0
-      st_list
+      repo_entries
   end
+
  
   # diff current to previous (HEAD only)
   # returns diff content
@@ -218,23 +232,37 @@ module SvnRepoClient
 
   # recursively list entries, provides file or dir info and access to 
   # nice repo/file info
-  def svn_list
+  def svn_list(f_regex=nil, f_amt=nil)
       get_repo
       repo_entries = Array.new
       begin
         l_svn_list = Array.new
         @@svn_wc.list.each { |el|
           status_info = {}
-          status_info[:entry_name] = el[:entry]
-          status_info[:kind] = 1 # is 'file'
+          fqpn = File.join(@repo_root, el[:entry])
           #status_info[:last_changed_rev] = el[:last_changed_rev]
-          if File.directory?(File.join(@repo_root, el[:entry]))
-            status_info[:dir_name] = File.join(@repo_root, el[:entry])
-            status_info[:kind] = 2
+          status_info[:entry_name] = fqpn
+          status_info[:status] = ' '
+          if File.directory? fqpn
+            status_info[:kind] = 2 # is dir
+          else
+            status_info[:kind] = 1 # is 'file'
+          end
+          #apply filter - limit result set with filter
+          #f_regex, f_amt = 'cof/htdocs/template', 10
+          if f_regex.nil?
+           l_svn_list.push status_info
+          elsif el[:entry].match(f_regex)
+           l_svn_list.push status_info
+          end
+          #l_svn_list.push status_info
+          if f_amt.nil? or f_amt.empty?
+          elsif l_svn_list.size > f_amt.to_i
+            break
           end
-          l_svn_list.push status_info
         }
-        @entries_list = l_svn_list
+        #@entries_list = l_svn_list
+        @entries_list = _to_expected_json_format(l_svn_list)
         repo_entries.push info_data
       rescue SvnWc::RepoAccessError => e
         @error = e.message
@@ -243,6 +271,53 @@ module SvnRepoClient
       repo_entries
   end
 
+  def _collect_and_group(file_info_list)
+
+    entries_group_by_dir = {}
+    file_info_list.each do |el|
+      en = el[:entry_name]
+      if el[:kind] == 2
+        entries_group_by_dir[en] = [] unless entries_group_by_dir[en]
+        entries_group_by_dir[en].push en
+      elsif el[:kind] == 1
+        entries_group_by_dir[File.dirname(en)] = [] unless entries_group_by_dir[File.dirname(en)] 
+        entries_group_by_dir[File.dirname(en)].push "#{en}:#{el[:status]}"
+      end
+    end
+
+    entries_group_by_dir
+  end
+
+  def _to_expected_json_format(file_info_list)
+    require 'enumerator' # to_enum :each_with_index
+
+    entries_group_by_dir = _collect_and_group(file_info_list)
+
+    entries_formatted = {}
+    entries_formatted[:children] = []
+    atts = {}
+    atts[:id] = ''
+    c_entries = {}
+    c_entries[:attributes] = atts
+    c_entries[:data] = ''
+    entries = []
+    id = 0
+    entries_group_by_dir.each do |k|
+      entries_formatted[:state] = 'open'
+      entries_formatted[:data] = k[0]
+      entries_formatted[:children] = k[1].to_enum(:each_with_index).collect{|x,i|
+        next unless x and x.split(':')[1]
+        {:attributes => {:id => i}, :data => x.split(':')[1] + STATUS_SPACER + x.split(':')[0]}
+      }
+      entries.push entries_formatted
+      entries_formatted = {}
+      c_entries = {}
+    end
+
+    entries
+    
+  end
+
   def info_data
     each_details           = Hash.new
     each_details[:file]    = @path
@@ -264,3 +339,25 @@ module SvnRepoClient
   end
 
 end
+
+if __FILE__ == $0 
+   @conf_file = '/home/httpd/radmin/config/svn_conf.yaml' 
+   #p SvnRepoClient::svn_list
+   #p svn_list
+   #p svn_list
+   #p Object.new.extend(self).svn_list
+
+   class Object
+   require 'fileutils'
+   require 'svn_wc_client'
+   include SvnRepoClient
+   #svn_list
+   end
+   #p eval("svn_list") 
+   p svn_list
+   #p SvnRepoClient::svn_list
+   #p Tester.new.svn_list
+
+
+end
+

data/svn_conf.yaml

@@ -1,9 +1,14 @@
-#svn_repo_master        : file:///tmp/svn/repo_test
-#svn_repo_master        : svn+ssh:///tmp/svnrepo
-svn_repo_master        : svn+ssh://svn_test_user@localhost/tmp/svnrepo
-#svn_repo_master        : svn+ssh://example.com/tmp/svnrepo
-svn_repo_working_copy  : /tmp/repo_test
-svn_user               : svn_test_user
-svn_pass               : svn_test_pass
-svn_repo_config_path   : /tmp/config
+##svn_repo_master        : file:///tmp/svn/repo_test
+##svn_repo_master        : svn+ssh:///tmp/svnrepo
+#svn_repo_master        : svn+ssh://svn_test_user@localhost/tmp/svnrepo
+##svn_repo_master        : svn+ssh://example.com/tmp/svnrepo
+#svn_repo_working_copy  : /tmp/repo_test
+#svn_user               : svn_test_user
+#svn_pass               : svn_test_pass
+#svn_repo_config_path   : /tmp/config
+
+svn_repo_master        : file:///home/dwright/test_svn/test_repo
+svn_repo_working_copy  : /home/dwright/test_svn/wc
+svn_repo_config_path   : /home/dwright/test_svn/
+force_checkout         : true
 

data/svn_wc_tree/index.html

@@ -124,7 +124,12 @@
  <input type='hidden' id="svn_local_repo_root" value='' />
 
  <a id='disp_repo_info'>~</a><div id="display_repo_info" class="disp_no"></div>
- 
+ <br/> 
+ <br/> 
+ Filter: <input type='text' id='swt_filter_re' size='25'/> [Limit by Terms, Regex Ok]<br/>
+ Filter: <input type='text' id='swt_filter_amt' size='3'/> [Limit by Amount]
+ <br/> 
+ <br/> 
  <!-- start: show results from svn actions -->
  <div id="show_hide_container" class="disp_no">
   <a id="hide_n_show">[-]</a>

data/svn_wc_tree/js/swt.js

@@ -20,6 +20,9 @@ var POST_URL = '';
 ///////////////////////////////////////////////////////////////////////////////
 
 //XXX/TODO this file needs to be refactored
+// TODO upgrade to 1.0.a, or whatever newest of jstree is, unfortunelty
+//      the API does not appear to be backwards compatible, so a rewrite will be
+//      needed
 
 var STATUS_SPACER = "\t"; // " "
 var SVN_ACTION = '';
@@ -47,11 +50,13 @@ $.blockUI.defaults.css =
 //$.blockUI.defaults.applyPlatformOpacityRules = false;
 $(document).ajaxStart($.blockUI).ajaxStop($.unblockUI);
 
-
 $(document).ready(function(){
   var CHECKED_FILE_NAMES = []
   var SVN_ENTRIES = []
 
+  // 'onload' populate 'keep filter' if has been set
+  keep_filter($.cookie('swt_filter_re'));
+
   // the repo tree
   $(function () {
     $("#svn_repo_entries_tree").tree({
@@ -177,6 +182,10 @@ $(document).ready(function(){
             refresh : {
               label     : "refresh tree",
               action    : function (NODE, TREE_OBJ) {
+                var re_filter = $("#swt_filter_re").val();
+                //console.log(re_filter);
+                // set current filter to a cookie 
+                $.cookie('swt_filter_re', re_filter);
                 window.location.reload();
                 //history.go();
               },
@@ -243,24 +252,23 @@ $(document).ready(function(){
           return {
             'do_svn_action': 'Do Svn Action',
             'svn_action'   : SVN_ACTION,
-            'svn_files'    : [gather_selected_files()]
+            'svn_files'    : [gather_selected_files()],
+            'filter_re'    : $("#swt_filter_re").val(),
+            'filter_amt'   : $("#swt_filter_amt").val()
           }
         }
       }
     });
   });
 
+  // XXX this is called for all ajax requests (i.e. 'refresh')
   function on_data(DATA, TREE_OBJ) {
     //console.log('on DATA'); console.log(DATA);
     if (!DATA) document.write('No Data received, possibly your session expired');
 
     var entries_list = new Array
+
     if (DATA && DATA.length) {
-      var f_nodes = {
-                 'state' : 'open',
-                 'data'  : DATA[0].repo_root_local_path,
-                 'children' : new Array
-      };
       $("#svn_local_repo_root").val(DATA[0].repo_root_local_path);
       
       // display high level repo info
@@ -268,49 +276,49 @@ $(document).ready(function(){
 
       if (DATA[0].run_error) return display_error_message(DATA[0].run_error);
       if (DATA[0].error) return display_error_message(DATA[0].error);
+      if (DATA[0].entries == undefined) display_error_message('no result');
 
-
-      var f_node_children = new Array;
-      var has_status = ' ';
-      var repo_initial_state = 'open'; // open|closed
       var amount_of_entries = DATA[0].entries.length;
-      if (amount_of_entries == 1) repo_up_to_date();
-      //if (amount_of_entries < 10) repo_initial_state = 'open';
-      // set hidden text field to repo root fs local path
+      if (amount_of_entries == 0) {
+        if ($("#swt_filter_re").val()) report_no_match_if_filter();
+        else repo_up_to_date();
+
+        // use repo root as default when no results
+        var repo_default = {
+          'state' : 'open',
+          'data'  :  DATA[0].repo_root_local_path
+        }
+        entries_list.push(repo_default);
+      }
       for (i = 0; i<amount_of_entries; i++) {
         ent = DATA[0].entries[i];
         if (ent === undefined) continue;
-        if (ent.kind == 2){ // dir
-          f_nodes = {
-              'state' : repo_initial_state,
-              'data'  : ent.dir_name,
-              'children' : f_node_children
-          };
-          entries_list.push(f_nodes)
-          f_node_children = new Array;
-        } // regular file
-        else if (ent.kind == 1){ // file
-          if (ent.status)  has_status = ent.status
-          var f_node_child = {
-              'attributes' : {'id' : i},
-               data : has_status + STATUS_SPACER  + ent.entry_name
-          };
-          f_node_children.push(f_node_child)
-        }
+        //console.log(ent);
+        entries_list.push(ent);
       }
     }
     //console.log(entries_list);
     return entries_list;
   }
 
-  function repo_up_to_date(f_nodes){
-    var entries_list = new Array
+  function keep_filter(re_filter){
+    //console.log(re_filter);
+    $("#swt_filter_re").val(re_filter);
+  }
+
+  // limit result set with filter
+  function is_filtered(file_name, re_filter){
+    if(!file_name.match(re_filter)) return true;
+    return false;
+  }
+
+  function report_no_match_if_filter(){
+    $("#svn_action_results").prepend('<p style="color:blue">No Match.</p>');
+  }
+
+  function repo_up_to_date(){
     $("#svn_action_results").prepend('<p style="color:blue">'
                                      + 'Repository is up to date.</p>');
-    //if (DATA[0].entries === undefined){
-    //  entries_list.push(f_nodes)
-    //}
-    //return entries_list;
   }
 
   function post_req_non_svn(action) {
@@ -393,7 +401,8 @@ $(document).ready(function(){
     var run_err = undefined;
     if (resp && resp[0] && resp[0].run_error) run_err = resp[0].run_error;
     else if (resp && resp.run_error) run_err = resp.run_error;
-    if (run_err)  return display_error_message(resp.run_error);
+
+    if (run_err) return display_error_message(resp.run_error);
 
     // update tree display post success action
     if (svn_action == 'commit') change_display_selected_files(STATUS_SPACER);
@@ -408,36 +417,36 @@ $(document).ready(function(){
 
       display_svn_results = process_content_and_entries(resp[i], svn_action,
                                                            display_svn_results);
+      //console.log(display_svn_results);
     }
 
     if (show_response_area) $('#show_hide_container').show();
     // populate our div
     $("#svn_action_results").html(display_svn_results);
   }
-
   
-   function process_content_and_entries(jdata, svn_action, display_svn_results){
-      var error = '';
-      var contents = '';
+  function process_content_and_entries(jdata, svn_action, display_svn_results){
+     var error = '';
+     var contents = '';
 
-      if (jdata.error) error = '<p style="color:red">'+jdata.error+'</p>';
+     if (jdata.error) error = '<p style="color:red">'+jdata.error+'</p>';
 
-      // used for 'diff'
-      if (jdata.content) // expand newline to line break, '<' to html entity
-        contents += jdata.content.replace(/</g, '&lt;').replace(/\n/g, '<br/>');
+     // used for 'diff'
+     if (jdata.content) // expand newline to line break, '<' to html entity
+       contents += jdata.content.replace(/</g, '&lt;').replace(/\n/g, '<br/>');
 
-      if (jdata.entries) process_entries(jdata.entries, svn_action);
+     //if (jdata.entries) process_entries(jdata.entries, svn_action);
 
-      if (jdata.repo_root_local_path)
-        $("#svn_local_repo_root").val(jdata.repo_root_local_path);
+     if (jdata.repo_root_local_path)
+       $("#svn_local_repo_root").val(jdata.repo_root_local_path);
 
-      if (contents)
-        display_svn_results += error + '<p style="color:grey">'+contents+'</p>';
-      else
-        display_svn_results += error;
+     if (contents)
+       display_svn_results += error + '<p style="color:grey">'+contents+'</p>';
+     else
+       display_svn_results += error;
 
-      return display_svn_results;
-   }
+     return display_svn_results;
+  }
 
   function process_entries(entries, svn_action){
     SVN_ENTRIES = entries;
@@ -465,8 +474,6 @@ $(document).ready(function(){
   }
 
   function change_display_selected_files(to_show){
-    //console.log(CHECKED_FILE_NAMES);
-
     for(j=0;j<CHECKED_FILE_NAMES.length;j++){
       if(CHECKED_FILE_NAMES[j] !== undefined){
         //remove the status, was committed (i.e 'M', or '?', '!', etc)
@@ -478,7 +485,6 @@ $(document).ready(function(){
         $.tree.focused().remove('#' + j, ent);
       }
     }
-
   }
 
 

data/tests/test_installer_bin.rb

@@ -0,0 +1,430 @@
+require 'test/unit'
+require 'fileutils'
+require 'tempfile'
+
+# unit tests to prove installation of svn_wc_tree
+# just testing the bin/ installer
+
+class TestSvnWcTreeBinInstaller < Test::Unit::TestCase
+
+  INSTALLER = File.join(File.dirname(__FILE__), "..", "bin", 'svn_wc_tree')
+
+# --html, -l [html_dir]:
+#    Move all web files to the directory path specified. 
+#    A directory called svn_wc_tree will be created at this path.
+#
+# --cgi, -c [cgi_dir]:
+#    Move the included CGI script to the path specified.
+#    path/directory must exist and must be able to execute CGI scripts
+#
+# --post_to_url, -u [post_to_url]:
+#    a URL that will receive AJAX requests and return the required JSON.
+#    (see the CGI script provided)
+#
+# --php, -p [php]:
+#    Run as a PHP application. (use only as last choice)
+#    (Ruby is still required; CGI not needed)
+#
+# --conf_location, -u [conf_location]:
+#    location (filesystem path) of your svn_wc.conf file (readable by 'httpd
+#    runs as' owner)
+#
+# --copy_conf_from, -f [copy_conf_from]:
+#    move your conf file (svn_conf.yaml) from filesystem path to 
+#    (copy_conf_to)
+#
+# --copy_conf_to, -t [copy_conf_to]:
+#    move your conf file (svn_conf.yaml) to filesystem path from
+#    (copy_conf_from)
+#
+#
+# Example: 
+#   svn_wc_tree --html /var/htdocs --cgi /var/cgi-bin \ 
+#                   --post_to_url 'http://example.com/cgi-bin/' \
+#                   --conf_location /opt/conf/svn_conf.yaml
+#
+#   sudo svn_wc_tree --html /var/htdocs --php true \
+#                    --conf_location /opt/svn_wc_tree/svn_conf.yaml
+#
+#   sudo svn_wc_tree --html /var/www --cgi /usr/lib/cgi-bin \
+#    --post_to_url 'http://localhost/cgi-bin/' --copy_conf_from \
+#    /tmp/svn_conf.yaml --copy_conf_to /usr/local/svn_wc_tree
+
+  def setup
+    @conf = {
+      #"svn_repo_master"       => "svn+ssh://localhost/home/dwright/svnrepo",
+      "svn_repo_master"        => "file://#{Dir.mktmpdir('R')}",
+      #"svn_user"              => "svn_test_user",
+      #"svn_pass"              => "svn_test_pass",
+      "svn_repo_working_copy" => "#{Dir.mktmpdir('F')}",
+      "svn_repo_config_path"  => Dir.mktmpdir('N')
+    }
+    #@conf_file = new_unique_file_at_path(Dir.mktmpdir('C'))
+    @conf_file = Tempfile.new(%w(conf_ .yaml)).path
+    File.open(@conf_file, 'w') {|fl| fl.write YAML::dump(@conf) }
+  end
+ 
+  def teardown
+    FileUtils.rm_r @html_dir if @html_dir
+    FileUtils.rm_r @cgi_dir  if @cgi_dir
+    #FileUtils.rm_r @conf_file
+  end
+
+  def test_no_arg
+    assert `#{INSTALLER}`.match('Required argument missing')
+  end
+
+  def test_help
+    opt = '--help'
+    #assert `#{INSTALLER} #{opt}`.grep(/Usage\n-----\nsvn_wc_tree \[OPTIONS\]/)[0]
+    assert `#{INSTALLER} #{opt}`.match('svn_wc_tree: install the svn_wc_tree web application.')
+    opt = '-h'
+    assert `#{INSTALLER} #{opt}`.match('svn_wc_tree: install the svn_wc_tree web application.')
+  end
+
+  def test_missing_required_arg
+    opt = '--php true'
+    assert `#{INSTALLER} #{opt}`.match('Required argument missing')
+  end
+
+  def test_required_arg_empty
+    opt = '--html ""'
+    assert `#{INSTALLER} #{opt}`.match('path cannot be empty!')
+  end
+
+  def test_most_basic_install_non_functional__no_php_no_cgi_no_conf
+    @html_dir = Dir.mktmpdir('H')
+
+    assert !File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+
+    opt = "--html #{@html_dir}"
+    # no output, is success
+    assert `#{INSTALLER} #{opt}`.empty?
+
+    # created dir at target location
+    assert File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.html'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'js', 'swt.js'))
+  end
+
+  def test_basic_install_functional__no_php_no_cgi_no_conf_POST_to_other_resource
+    @html_dir = Dir.mktmpdir('H')
+
+    assert !File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+
+    opts = "--html #{@html_dir} --post_to_url '/svn/svn_controller'"
+
+    # no output, is success
+    assert `#{INSTALLER} #{opts}`.empty?
+
+    # created dir at target location
+    assert File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.html'))
+    js_file =  File.join(@html_dir, 'svn_wc_tree', 'js', 'swt.js')
+    assert File.file? js_file
+
+    is_ok = false
+    File.readlines(js_file).each do |line| 
+      if line.grep(/var POST_URL = '\/svn\/svn_controller';/)[0]
+        is_ok = true
+        break
+      end
+    end
+    assert is_ok
+  end
+
+  # works but doesn't make sense,...
+  # conf file must be added by hand to the POST resource
+
+  # why would you want this combination?
+  def test_conf_path_not_written_anywhere__install_no_php_no_cgi
+    @html_dir = Dir.mktmpdir('H')
+
+    assert File.file?(@conf_file)
+    assert !File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+
+    opts = "--html #{@html_dir} --post_to_url '/svn/svn_controller' "
+    opts << "--conf_location #{@conf_file}"
+
+    # no output, is success
+    assert `#{INSTALLER} #{opts}`.empty?
+
+    # created dir at target location
+    assert File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.html'))
+    js_file =  File.join(@html_dir, 'svn_wc_tree', 'js', 'swt.js')
+    assert File.file? js_file
+
+    is_ok = false
+    File.readlines(js_file).each do |line| 
+      if line.grep(/var POST_URL = '\/svn\/svn_controller';/)[0]
+        is_ok = true
+        break
+      end
+    end
+    assert is_ok
+  end
+
+  def test_default_js_file_POST_url_is_empty
+    js_file = File.join(File.dirname(__FILE__), "..", 
+                                      'svn_wc_tree', 'js', 'swt.js')
+    assert File.file? js_file
+
+    is_ok = false
+    File.readlines(js_file).each do |line| 
+      if line.grep(/var POST_URL = '';/)[0]
+        is_ok = true
+        break
+      end
+    end
+    assert is_ok
+  end
+
+  def test_default_cgi_file_POST_url_is_empty
+    cgi_file =  File.join('..', 'cgi', 'svn_wc_broker.cgi')
+    cgi_file = File.join(File.dirname(__FILE__), "..", 'cgi', 
+                                                 'svn_wc_broker.cgi')
+    assert File.file? cgi_file
+
+    is_ok = false
+    is_ok2 = false
+    File.readlines(cgi_file).each do |line| 
+      if line.grep(/CONF_FILE = nil/)[0]
+        is_ok = true
+        next
+      end
+
+      if line.grep(/print cgi.header/)[0] 
+        is_ok2 = true 
+        break 
+      end
+
+    end
+    assert is_ok
+    assert is_ok2
+  end
+
+  # conf file must be added by hand to the POST resource (wherever that is)
+  def test_install_functional__php_no_conf
+    @html_dir = Dir.mktmpdir('H')
+
+    assert !File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+
+    opts = "--html #{@html_dir} --php true"
+
+    # no output, is success
+    assert `#{INSTALLER} #{opts}`.empty?
+
+    # created dir at target location
+    assert File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.html'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.php'))
+    js_file =  File.join(@html_dir, 'svn_wc_tree', 'js', 'swt.js')
+    assert File.file? js_file
+
+    is_ok = false
+    File.readlines(js_file).each do |line| 
+      if line.grep(/var POST_URL = 'index.php';/)[0]
+        is_ok = true
+        break
+      end
+    end
+    assert is_ok
+  end
+
+  def test_install_functional__php_w_conf
+    @html_dir = Dir.mktmpdir('H')
+
+    assert !File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+
+    opts = "--html #{@html_dir} --php true "
+    opts << "--conf_location #{@conf_file}"
+
+    # no output, is success
+    assert `#{INSTALLER} #{opts}`.empty?
+
+    # created dir at target location
+    assert File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.html'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.php'))
+    js_file  =  File.join(@html_dir, 'svn_wc_tree', 'js', 'swt.js')
+    cgi_file =  File.join(@html_dir, 'svn_wc_tree', 'svn_wc_broker.cgi')
+    assert File.file? js_file
+    assert File.file? cgi_file
+
+    is_ok = false
+    File.readlines(js_file).each do |line| 
+      if line.grep(/var POST_URL = 'index.php';/)[0]
+        is_ok = true
+        break
+      end
+    end
+    assert is_ok
+
+    is_ok  = false
+    is_ok2 = false
+    File.readlines(cgi_file).each do |line| 
+      if line.grep(/CONF_FILE = '#{@conf_file}'/)[0]
+        is_ok = true
+        next
+      end
+      if line.grep(/#print cgi.header/)[0]
+        is_ok2 = true
+        break
+      end
+    end
+    assert is_ok
+    assert is_ok2
+  end
+
+  def test_install_functional__cgi_w_conf
+    @html_dir = Dir.mktmpdir('H')
+    @cgi_dir  = Dir.mktmpdir('C')
+
+    assert !File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+
+    opts = "--html #{@html_dir} --cgi #{@cgi_dir} --conf_location #{@conf_file} "
+    opts << "--post_to_url 'http://example.com/cgi-bin/'"
+
+    # no output, is success
+    assert `#{INSTALLER} #{opts}`.empty?
+
+    # created dir at target location
+    assert File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.html'))
+    # is still copied over, do we want that, if not needed?
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.php'))
+    # not php mode, so not copied to html/php dir
+    assert !File.file?(File.join(@html_dir, 'svn_wc_tree', 'svn_wc_broker.cgi'))
+
+    js_file  =  File.join(@html_dir, 'svn_wc_tree', 'js', 'swt.js')
+    cgi_file =  File.join(@cgi_dir, 'svn_wc_broker.cgi')
+    assert File.file? js_file
+    assert File.file? cgi_file
+
+    is_ok = false
+    File.readlines(js_file).each do |line| 
+      if line.grep(/var POST_URL = 'http:\/\/example.com\/cgi-bin\/';/)[0]
+        is_ok = true
+        break
+      end
+    end
+    assert is_ok
+
+    is_ok = false
+    File.readlines(cgi_file).each do |line| 
+      if line.grep(/CONF_FILE = '#{@conf_file}'/)[0]
+        is_ok = true
+        break
+      end
+    end
+    assert is_ok
+  end
+
+  # TODO
+  #def test_cgi_precendence_over_php_if_both_set
+  # try mis-matched opts
+
+  def test_install_functional_cgi_all_opts
+    @html_dir = Dir.mktmpdir('H')
+    @cgi_dir  = Dir.mktmpdir('C')
+    @conf_to  = Dir.mktmpdir('F')
+
+    @new_conf = File.join(@conf_to, File.basename(@conf_file))
+
+    assert !File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+    assert File.file?(@conf_file)
+    assert !File.file?(@new_conf)
+
+    opts = "--html #{@html_dir} --cgi #{@cgi_dir} "
+    opts << "--post_to_url 'http://example.com/cgi-bin/' "
+    opts << "--copy_conf_from #{@conf_file} "
+    opts << "--copy_conf_to #{@conf_to} "
+    opts << "--conf_location #{@new_conf} "
+ 
+    # no output, is success
+    assert `#{INSTALLER} #{opts}`.empty?
+
+    # created dir at target location
+    assert File.directory?(File.join(@html_dir, 'svn_wc_tree'))
+    assert File.file?(File.join(@html_dir, 'svn_wc_tree', 'index.html'))
+    assert File.directory?(@conf_to)
+
+    js_file  =  File.join(@html_dir, 'svn_wc_tree', 'js', 'swt.js')
+    cgi_file =  File.join(@cgi_dir, 'svn_wc_broker.cgi')
+    assert File.file? js_file
+    assert File.file? cgi_file
+
+    assert File.file?(@conf_file)
+    assert File.file?(@new_conf)
+
+    is_ok = false
+    File.readlines(js_file).each do |line| 
+      if line.grep(/var POST_URL = 'http:\/\/example.com\/cgi-bin\/';/)[0]
+        is_ok = true
+        break
+      end
+    end
+    assert is_ok
+
+    is_ok = false
+    File.readlines(cgi_file).each do |line| 
+      if line.grep(/CONF_FILE = '#{@new_conf}'/)[0]
+        is_ok = true
+        break
+      end
+
+      if line.grep(/print cgi.header/)[0]
+        is_ok = true
+        break
+      end
+    end
+    assert is_ok
+  end
+
+
+end
+
+
+if VERSION < '1.8.7'
+  # File lib/tmpdir.rb, line 99
+  def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
+    case prefix_suffix
+    when nil
+      prefix = "d"
+      suffix = ""
+    when String
+      prefix = prefix_suffix
+      suffix = ""
+    when Array
+      prefix = prefix_suffix[0]
+      suffix = prefix_suffix[1]
+    else
+      raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+    end
+    tmpdir ||= Dir.tmpdir
+    t = Time.now.strftime("%Y%m%d")
+    n = nil
+    begin
+      path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+      path << "-#{n}" if n
+      path << suffix
+      Dir.mkdir(path, 0700)
+    rescue Errno::EEXIST
+      n ||= 0
+      n += 1
+      retry
+    end
+
+    if block_given?
+      begin
+        yield path
+      ensure
+        FileUtils.rm_r path
+      end
+    else
+      path
+    end
+  end
+end
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svn_wc_tree
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - David Wright
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -08:00
+date: 2010-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +35,7 @@ files:
 - ChangeLog
 - lib/svn_wc_broker.rb
 - lib/svn_wc_client.rb
+- tests/test_installer_bin.rb
 - LICENSE
 - Manifest
 - README.rdoc
@@ -42,7 +44,6 @@ files:
 - svn_wc_tree/img/swt_spinner.gif
 - svn_wc_tree/index.html
 - svn_wc_tree/index.php
-- svn_wc_tree.conf
 - svn_wc_tree/js/swt.js
 - svn_wc_tree/js/jquery-1.3.2.js
 - svn_wc_tree/js/jquery.blockUI-2.31.js
@@ -96,23 +97,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: svn_wc_tree is a web application (GUI) that enables  basic operations on a working copy of a Subversion repository.

data/svn_wc_tree.conf

@@ -1,9 +0,0 @@
-
-mkdir PUBLIC_HTML/svn_wc_tree/
-rsync -avz js  PUBLIC_HTML/svn_wc_tree/
-rsync -avz css PUBLIC_HTML/svn_wc_tree/
-rsync -avz img PUBLIC_HTML/svn_wc_tree/
-cp svn_wc_tree.html PUBLIC_HTML/svn_wc_tree/
-
-
-