svnx 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a992a704932883d96a27188971922a847807eb1
-  data.tar.gz: 9a6f8f859120f59241006a8957a74d2977253d0d
+  metadata.gz: fd37aad9c296bc3739eced16136fc73f1e8831ba
+  data.tar.gz: 2b829bf99dad72f3ec1bdc3a4913ff5a7e30879f
 SHA512:
-  metadata.gz: 3052dbdc201d00d88abb2ed4e239b5479a1f713642362eab1ae0294c79657f5a843bca6640c3a57e0c9b2646b635899b76e509832e14c82e15713b967d40d4f0
-  data.tar.gz: 208eb47bd7e0e1379a773b53aaf577ceeae16376eec4093f3fe4898ef1781d2154abef54fed00672b9190360f1402eeaa0b2609edc9c05ba7410237ee69fd388
+  metadata.gz: 840ed6cfcd13332ffbcf8413adcc06fc9d18d7bf3d382f88e788297d776ca16f77b5650de4da706f9d8d63ee0bc5f3cb5ba7f64e44af0c2018febe41c964d64a
+  data.tar.gz: 637d08aa4258d2e044b01a8c9957a2d93f76eaed0755d5f605546b6dccc8436a167eef16a73f39b38ddf33828a66938ecc9ce22186773e272fe6b81f8e510756

data/.gitignore

@@ -1,2 +1,3 @@
 pkg
 Gemfile.lock
+.raketasks

data/.zshrc

@@ -0,0 +1,2 @@
+alias tt='rake test'
+alias t='ruby -Itest -Itest/unit -Ilib `ecf`'

data/Rakefile

@@ -1,10 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'rubygems/package_task'
 
 task :default => :test
 
-Rake::TestTask.new("test") do |t|
+Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.warning = true

data/lib/cmdline/arg.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module CmdLine
+  class Argument < String
+    # just a string, but quotes itself
+
+    def to_s
+      '"' + super + '"'
+    end
+  end
+end

data/lib/cmdline/cachefile.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'cmdline/line'
+require 'cmdline/filename'
+require 'cmdline/gzpathname'
+
+# A file that has a pathname and output
+module CmdLine
+  class CacheFile
+    attr_reader :output
+    attr_reader :pathname
+    
+    def initialize cache_dir, args
+      @args     = args
+      basename  = FileName.new(args).name
+      fullname  = Pathname(cache_dir) + basename
+      @pathname = GzipPathname.new fullname
+      @output   = nil
+    end
+    
+    def readlines
+      if @pathname.exist?
+        @output = @pathname.read_file
+      else
+        cl = CommandLine.new @args
+        @output = cl.execute
+        @pathname.save_file @output
+        @output
+      end
+    end
+
+    def to_s
+      @pathname.to_s
+    end
+  end
+end

data/lib/cmdline/caching.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'cmdline/line'
+require 'cmdline/cachefile'
+
+module CmdLine
+  class CachingCommandLine < CommandLine
+    # caches its input and values.
+
+    def cache_dir
+      @cache_dir ||= '/tmp' + Pathname.new($0).expand_path.to_s
+      @cache_dir
+    end
+
+    def cache_file
+      CacheFile.new cache_dir, @args
+    end
+
+    def execute
+      cachefile = cache_file
+      @output = cachefile.readlines
+    end
+  end
+end

data/lib/cmdline/filename.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module CmdLine
+  class FileName
+    attr_reader :name
+
+    def initialize args
+      @name = args.join('-').gsub('/', '_slash_') + '.gz'
+    end
+
+    def to_s
+      @name
+    end
+  end
+end

data/lib/cmdline/gzpathname.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'zlib'
+require 'pathname'
+
+module CmdLine
+  # A pathname that reads and writes itself as gzipped
+  class GzipPathname < Pathname
+    def save_file content
+      parent.mkpath unless parent.exist?
+      unlink if exist?
+      Zlib::GzipWriter.open(to_s) do |gz|
+        gz.puts content
+      end
+    end
+
+    def read_file
+      Array.new.tap do |content|
+        Zlib::GzipReader.open(to_s) do |gz|
+          content.concat gz.readlines
+        end
+      end
+    end
+  end
+end

data/lib/cmdline/line.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'logue/loggable'
+require 'open3'
+
+module CmdLine
+  class CommandLine
+    include Logue::Loggable
+
+    attr_reader :args
+    attr_reader :output
+    attr_reader :error
+    attr_reader :status
+
+    def initialize *args, debug: false
+      @args = args.dup
+    end
+
+    def << arg
+      @args << arg
+    end
+
+    def execute
+      cmd = to_command
+      debug "cmd: #{cmd}"
+      
+      Open3.popen3(cmd) do |stdin, stdout, stderr, wthr|
+        @output = stdout.readlines
+        @error = stderr.readlines
+        @status = wthr.value
+      end
+
+      if false && @output
+        puts "output"
+        @output.each_with_index do |line, idx|
+          debug "output[#{idx}]: #{line}"
+        end
+      end
+      
+      if false && @error
+        puts "error"
+        @error.each_with_index do |line, idx|
+          debug "error[#{idx}]: #{line}"
+        end
+      end
+
+      debug "@status: #{@status}"
+      
+      @output
+    end
+
+    def to_command
+      @args.join ' '
+    end
+  end
+end

data/lib/svnx/base/action.rb

@@ -3,72 +3,42 @@
 
 require 'logue/loggable'
 require 'singleton'
+require 'svnx/base/action_status'
 
 module Svnx
-end
-
-class Svnx::ActionStatus
-  include Singleton
-
-  attr_reader :stati
-
-  def initialize 
-    @status_to_symbol = Hash.new
-    @stati = Array.new
-
-    add_type 'added',       'A'
-    add_type 'deleted',     'D'
-    add_type 'modified',    'M'
-    add_type 'replaced',    'R'
-    add_type 'unversioned', '?'
-    add_type 'external',    'X'
-    add_type 'normal',      'q' # actually, X, but in a different column than X for external
-  end
-
-  def symbol_for arg
-    @status_to_symbol[arg]
-  end
-
-  def add_type str, char
-    sym = str.to_sym
-    @stati << str
-    [ sym, str, char ].each do |key|
-      @status_to_symbol[key] = sym
+  class Action
+    include Logue::Loggable
+    include Comparable
+    
+    attr_reader :type
+    
+    def initialize type
+      sas = ActionStatus.instance
+      unless @type = sas.symbol_for(type)
+        raise "not a valid action type: #{type}"
+      end
     end
-  end  
-end
 
-class Svnx::Action
-  include Logue::Loggable, Comparable
-  
-  attr_reader :type
-  
-  def initialize type, char = nil
-    sas = Svnx::ActionStatus.instance
-    unless @type = sas.symbol_for(type)
-      raise "not a valid action type: #{type}"
+    def <=> other
+      @type <=> other.type
     end
-  end
-
-  def <=> other
-    @type <=> other.type
-  end
 
-  def to_s
-    @type.to_s
-  end
-  
-  sas = Svnx::ActionStatus.instance
-  sas.stati.each do |str|
-    action = Svnx::Action.new str
-    Svnx::Action.const_set str.upcase, action
+    def to_s
+      @type.to_s
+    end
     
-    methname = str + '?'
-    define_method methname do
-      instance_eval do
-        sym = Svnx::ActionStatus.instance.symbol_for str
-        @type.to_sym == sym
-      end
-    end      
-  end  
+    sas = ActionStatus.instance
+    sas.stati.each do |str|
+      action = Action.new str
+      Action.const_set str.upcase, action
+      
+      methname = str + '?'
+      define_method methname do
+        instance_eval do
+          sym = ActionStatus.instance.symbol_for str
+          @type.to_sym == sym
+        end
+      end      
+    end  
+  end
 end

data/lib/svnx/base/action_status.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'singleton'
+
+module Svnx
+  class ActionStatus
+    include Singleton
+
+    attr_reader :stati
+
+    def initialize 
+      @status_to_symbol = Hash.new
+      @stati = Array.new
+
+      add_type 'added',       'A'
+      add_type 'deleted',     'D'
+      add_type 'modified',    'M'
+      add_type 'replaced',    'R'
+      add_type 'unversioned', '?'
+      add_type 'external',    'X'
+      add_type 'normal',      'q' # actually, X, but in a different column than X for external
+    end
+
+    def symbol_for arg
+      @status_to_symbol[arg]
+    end
+
+    def add_type str, char
+      sym = str.to_sym
+      @stati << str
+      [ sym, str, char ].each do |key|
+        @status_to_symbol[key] = sym
+      end
+    end  
+  end
+end

data/lib/svnx/base/cmd.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rexml/document'
+require 'logue/loggable'
+
+module Svnx
+  class Cmd
+    include Logue::Loggable
+    
+    def initialize xml
+      info "xml: #{xml}"
+
+      @doc = REXML::Document.new xml
+      info "@doc: #{@doc}"
+
+    end
+  end
+end
+  

data/lib/svnx/base/cmdline.rb

@@ -2,8 +2,8 @@
 # -*- ruby -*-
 
 require 'logue/loggable'
-require 'system/command/line'
-require 'system/command/caching'
+require 'cmdline/line'
+require 'cmdline/caching'
 require 'svnx/base/env'
 
 module Svnx
@@ -11,48 +11,54 @@ module Svnx
   end
 end
 
-class Svnx::Base::CachingCommandLine < System::CachingCommandLine
-  def caching?
-    true
-  end
+module Svnx::Base
+  class CachingCommandLine < CmdLine::CachingCommandLine
+    def caching?
+      true
+    end
 
-  def cache_dir
-    Svnx::Env.instance.cache_dir
+    def cache_dir
+      Svnx::Env.instance.cache_dir
+    end
   end
-end
 
-class Svnx::Base::CommandLine
-  include Logue::Loggable
+  class CommandLine
+    include Logue::Loggable
 
-  attr_reader :output
-  attr_reader :error
-  attr_reader :status  
+    attr_reader :output
+    attr_reader :error
+    attr_reader :status  
 
-  def initialize subcommand: nil, xml: true, caching: false, args: Array.new
-    @subcommand = subcommand
-    @xml = xml
-    @caching = caching
-    @args = args
-  end
+    def initialize subcommand: nil, xml: true, caching: false, args: Array.new
+      debug "subcommand: #{subcommand}"
+      debug "args: #{args}"
+      @subcommand = subcommand
+      @xml = xml
+      @caching = caching
+      @args = args
+      debug "@args: #{@args}"
+    end
 
-  def execute
-    cmdargs = [ 'svn', @subcommand ]
-    cmdargs << '--xml' if @xml
-    cmdargs.concat @args
-    debug "cmdargs: #{cmdargs}"
-    
-    cmdline = if @caching
-                Svnx::Base::CachingCommandLine.new cmdargs
-              else
-                System::CommandLine.new cmdargs
-              end
-    cmdline.execute
-    debug "cmdline: #{cmdline}"
+    def execute
+      cmdargs = [ 'svn', @subcommand ]
+      cmdargs << '--xml' if @xml
+      cmdargs.concat @args
+      debug "cmdargs: #{cmdargs}"
       
-    @output = cmdline.output
-    @error = cmdline.error
-    @status = cmdline.status
+      cmdline = command_line cmdargs
+      cmdline.execute
+      debug "cmdline: #{cmdline}"
+      
+      @output = cmdline.output
+      @error = cmdline.error
+      @status = cmdline.status
+
+      @output
+    end
 
-    @output
+    def command_line cmdargs
+      cls = @caching ? CachingCommandLine : CmdLine::CommandLine
+      cls.new cmdargs
+    end
   end
 end