svnx 1.0.1 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eeffb9336d56a2ec27ae467c19b772407b05efe
-  data.tar.gz: 4665ae1fc141ee1a4bad2808d31fb28ec15e3b99
+  metadata.gz: 2a992a704932883d96a27188971922a847807eb1
+  data.tar.gz: 9a6f8f859120f59241006a8957a74d2977253d0d
 SHA512:
-  metadata.gz: e148e4792f0fb77881cdd968715410378fc50d4542588e5ade9b462873eda6f5694ab1ae581a542354e7f724fc49c7b591f1d40e00d68102de4e34ae0df7f682
-  data.tar.gz: e5d6d3a2e25971b555e7ad7935f01c3dd0dec318c4e5cd6f74d50c9e32468dd835059f3fa22a39f8f399a08a5aef8c0e015fa7b30c6857349263047ca1ce705f
+  metadata.gz: 3052dbdc201d00d88abb2ed4e239b5479a1f713642362eab1ae0294c79657f5a843bca6640c3a57e0c9b2646b635899b76e509832e14c82e15713b967d40d4f0
+  data.tar.gz: 208eb47bd7e0e1379a773b53aaf577ceeae16376eec4093f3fe4898ef1781d2154abef54fed00672b9190360f1402eeaa0b2609edc9c05ba7410237ee69fd388

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+Gemfile.lock

data/.glarkrc

@@ -0,0 +1 @@
+skip-path: pkg

data/Features.txt

@@ -0,0 +1,7 @@
+Wed Aug 28 08:41:00 2013
+
+  Added Argument.create.
+
+Thu Nov  7 10:11:50 2013
+
+  Added char method to Action, to match Svn's status character.

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in svnx.gemspec
+gemspec

data/History.txt

@@ -0,0 +1,4 @@
+0.0.1 @ 2013-01-05
+
+  Initial version. Spun off from PVN.
+

data/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Jeffrey E. Pace
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,12 @@
+svnx(1) - Subversion extensions
+===============================
+
+## DESCRIPTION
+
+Svnx is a module that wraps the `svn` command line.
+
+## AUTHOR
+
+Jeff Pace
+
+http://www.github.com/jpace/svnx

data/Rakefile

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

data/lib/svnx/base/action.rb

@@ -2,68 +2,73 @@
 # -*- ruby -*-
 
 require 'logue/loggable'
+require 'singleton'
 
-module SVNx
-  class Action
-    include Logue::Loggable, Comparable
-    
-    attr_reader :type
-    attr_reader :char
+module Svnx
+end
 
-    STATUS_TO_TYPE = Hash.new
-    STATUS_TO_ACTION = Hash.new
+class Svnx::ActionStatus
+  include Singleton
 
-    def initialize type, char
-      @type = type
-      @char = char
-    end
+  attr_reader :stati
 
-    class << self
-      alias_method :orig_new, :new
-      
-      def new arg, char = nil
-        if arg.kind_of? Action
-          arg
-        elsif act = STATUS_TO_ACTION[arg]
-          act
-        else
-          type = STATUS_TO_TYPE[arg]
-          raise "no such action: #{arg.inspect}" unless type
-          STATUS_TO_ACTION[arg] = orig_new type, char
-        end
-      end
+  def initialize 
+    @status_to_symbol = Hash.new
+    @stati = Array.new
 
-      def add_type str, char
-        sym = str.to_sym
-        STATUS_TO_TYPE[sym] = sym
-        action = SVNx::Action.new sym, char
-        SVNx::Action.const_set str.upcase, action
-        [ sym, str, char ].each do |key|
-          STATUS_TO_ACTION[key] = action
-        end
-      end
-    end
+    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 <=> other
-      @type <=> other.type
+  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
 
-    def to_s
-      @type.to_s
+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}"
     end
+  end
 
-    add_type 'added', 'A'
-    add_type 'deleted', 'D'
-    add_type 'modified', 'M'
-    add_type 'unversioned', '?'
+  def <=> other
+    @type <=> other.type
+  end
 
-    STATUS_TO_TYPE.values.uniq.each do |val|
-      methname = val.to_s + '?'
-      define_method methname do
-        instance_eval do
-          @type == STATUS_TO_TYPE[val]
-        end
-      end
-    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
+    
+    methname = str + '?'
+    define_method methname do
+      instance_eval do
+        sym = Svnx::ActionStatus.instance.symbol_for str
+        @type.to_sym == sym
+      end
+    end      
+  end  
 end

data/lib/svnx/base/cmdline.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'logue/loggable'
+require 'system/command/line'
+require 'system/command/caching'
+require 'svnx/base/env'
+
+module Svnx
+  module Base
+  end
+end
+
+class Svnx::Base::CachingCommandLine < System::CachingCommandLine
+  def caching?
+    true
+  end
+
+  def cache_dir
+    Svnx::Env.instance.cache_dir
+  end
+end
+
+class Svnx::Base::CommandLine
+  include Logue::Loggable
+
+  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 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}"
+      
+    @output = cmdline.output
+    @error = cmdline.error
+    @status = cmdline.status
+
+    @output
+  end
+end

data/lib/svnx/base/command.rb

@@ -1,61 +1,69 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'system/command/line'
 require 'logue/loggable'
 require 'system/command/caching'
-require 'svnx/base/args'
+require 'svnx/base/cmdline'
 
-# this replaces svnx/lib/command/svncommand.
-
-module SVNx
-  DEFAULT_CACHE_DIR = '/tmp/svnx'
-  TMP_DIR_ENV_VARNAME = 'SVNX_TMP_DIR'
-
-  module CmdLine
-    include Logue::Loggable
-
-    def initialize subcmd, args
-      cmdargs = [ 'svn', subcmd ]
-      cmdargs << '--xml' if uses_xml?
-      cmdargs.concat args
-      super cmdargs
+class Svnx::Base::Command
+  include Logue::Loggable
+  
+  class << self
+    def caching
+      define_method :caching? do
+        true
+      end
     end
 
-    def uses_xml?
-      true
-    end
-
-    def cache_dir
-      ENV[TMP_DIR_ENV_VARNAME] || DEFAULT_CACHE_DIR
+    def noncaching
+      define_method :caching? do
+        false
+      end
     end
   end
 
-  class CommandLine < System::CommandLine
-    include CmdLine
+  attr_reader :output
+  attr_reader :error
+  attr_reader :status
+  
+  def initialize options, cls: Svnx::Base::CommandLine, exec: nil, xml: false, caching: caching?
+    melements = module_elements
+    modl = find_module melements    
+    opts = modl::Options.new options
+    cmdargs = opts.to_args
+    subcommand = melements[-1].downcase
+    
+    @cmdline = exec || cls.new(subcommand: subcommand, xml: xml, caching: caching, args: cmdargs)
+    
+    @output = @cmdline.execute
+    @error = @cmdline.error
+    @status = @cmdline.status
   end
 
-  class CachingCommandLine < System::CachingCommandLine
-    include CmdLine
+  def module_elements
+    mods = self.class.name.split "::"
+    mods[0 .. -2]
   end
 
-  class Command
-    include Logue::Loggable
-
-    attr_reader :output
-    
-    def initialize args
-      @args = args
-    end
+  def find_module elements = module_elements
+    mod = elements * "::"
+    Kernel.const_get mod
+  end
+end
 
-    def command_line
-      raise "must be implemented"
-    end
+class Svnx::Base::EntriesCommand < Svnx::Base::Command
+  attr_reader :entries
+  
+  def initialize options, cls: Svnx::Base::CommandLine, exec: nil, caching: caching?, xml: true, entries_class: nil
+    super options, cls: cls, exec: exec, xml: xml, caching: caching
     
-    def execute
-      cmdline = command_line
-      cmdline.execute
-      @output = cmdline.output
+    if not @output.empty?
+      entries_class ||= begin
+                          modl = find_module
+                          modl::Entries
+                        end
+      
+      @entries = entries_class.new lines: @output
     end
   end
 end

data/lib/svnx/base/entries.rb

@@ -4,65 +4,66 @@
 require 'rexml/document'
 require 'logue/loggable'
 
-module SVNx
-  # this is a parse/process on-demand list of entries, acting like an
-  # Enumerable.
+module Svnx
+  module Base
+  end
+end
 
-  class Entries
-    include Logue::Loggable, Enumerable
+# this is a parse/process on-demand list of entries, acting like an
+# Enumerable.
 
-    attr_reader :size
+class Svnx::Base::Entries
+  include Logue::Loggable, Enumerable
 
-    def initialize args = Hash.new
-      # it's a hash, but indexed with integers, for non-sequential access:
-      @entries = Hash.new
+  attr_reader :size
 
-      if xmllines = args[:xmllines]
-        if xmllines.kind_of? Array
-          xmllines = xmllines.join ''
-        end
+  def initialize xmllines: nil, lines: nil
+    # it's a hash, but indexed with integers, for non-sequential access:
+    @entries = Hash.new
 
-        doc = REXML::Document.new xmllines
+    lines ||= xmllines
 
-        @elements = get_elements doc
-        @size = @elements.size
-      elsif args[:xmlentries]
-        raise "argument xmlentries is no longer supported"
-      end
+    if lines.kind_of? Array
+      lines = lines.join ''
     end
 
-    def get_elements doc
-      raise "get_elements must be implemented for: #{self.class}"
-    end
+    doc = REXML::Document.new lines
+    
+    @elements = get_elements doc
+    @size = @elements.size
+  end
 
-    def create_entry xmlelement
-      raise "create_entry must be implemented for: #{self.class}"
-    end
+  def get_elements doc
+    raise "get_elements must be implemented for: #{self.class}"
+  end
 
-    # this doesn't handle negative indices
-    def [] idx
-      if entry = @entries[idx]
-        return entry
-      end
-      if idx < 0 && idx >= size
-        raise "error: index #{idx} is not in range(0 .. #{size})"
-      end
-      @entries[idx] = create_entry(@elements[idx + 1])
-    end
+  def create_entry xmlelement
+    raise "create_entry must be implemented for: #{self.class}"
+  end
 
-    def each(&blk)
-      # all elements must be processed before each can run:
-      if @elements
-        # a little confusing here: REXML does each_with_index with idx
-        # zero-based, but elements[0] is invalid.
-        @elements.each_with_index do |element, idx|
-          @entries[idx] ||= create_entry(element)
-        end
+  # this doesn't handle negative indices
+  def [] idx
+    if entry = @entries[idx]
+      return entry
+    end
+    if idx < 0 || idx >= size
+      raise "error: index #{idx} is not in range(0 .. #{size})"
+    end
+    @entries[idx] = create_entry @elements[idx + 1]
+  end
 
-        @elements = nil
+  def each(&blk)
+    # all elements must be processed before each can run:
+    if @elements
+      # a little confusing here: REXML does each_with_index with idx
+      # zero-based, but elements[0] is invalid.
+      @elements.each_with_index do |element, idx|
+        @entries[idx] ||= create_entry(element)
       end
 
-      @entries.keys.sort.collect { |idx| @entries[idx] }.each(&blk)
+      @elements = nil
     end
+
+    @entries.keys.sort.collect { |idx| @entries[idx] }.each(&blk)
   end
 end