svnx 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbdd26ffd7b7edf9512843b4f7778a450cdde451
-  data.tar.gz: c46ef32d2f4529da8c51e279c201bd1613ae4e82
+  metadata.gz: cf3407b885d82f3046303ab8ceb10ec94bc06d30
+  data.tar.gz: 2ae00cd95c6a21110d762a2fb1dd51b35febd2d7
 SHA512:
-  metadata.gz: 88b05a25927acdcf0cf9d3be6d093c1414325f95c3ea00f5227bd4876bdf9faa8f47a3028ca93d98445bd9a6431c55f39acd89d2f4774847240d51b5cfe61e86
-  data.tar.gz: 1c6c9d7ed975d7bbf443db9abd859100ad0a3ef25eca55e36fed674b377aeaa95acde581922f6b58b0364dcafd73f79cac59136bc8cc77f3f87fa1504a122f05
+  metadata.gz: e9e60a7fd8ac963f7b992bc65cddf9fc8863e58c0c118a44406ee24854b933598d3ae90a6d629bb4649703d3ea7dbfc35120913166712ff33dafc31ea172aca1
+  data.tar.gz: 5ad12585bda46174f3313f065e44e9e5b904e8690668b623ee5d4cd0eca7e653c6fd0a24199d7248df424bfd16851d5b86fbff1f5b3dfcefcf2a3a3c2a897e99

data/lib/svnx.rb

@@ -2,6 +2,6 @@
 # -*- ruby -*-
 
 module SVNx
-  NAME = "svnx"
-  VERSION = "0.5.0"
+  NAME = 'svnx'
+  VERSION = '0.6.0'
 end

data/lib/svnx/base/action.rb

@@ -10,37 +10,58 @@ module SVNx
     attr_reader :type
 
     STATUS_TO_TYPE = Hash.new
+    STATUS_TO_ACTION = Hash.new
 
-    def self.add_type sym, str, char
-      [ sym, str, char ].each do |key|
-        STATUS_TO_TYPE[key] = sym
-      end
+    def initialize type
+      @type = type
     end
 
-    add_type :added, 'added', 'A'
-    add_type :deleted, 'deleted', 'D'
-    add_type :modified, 'modified', 'M'
-    add_type :unversioned, 'unversioned', '?'
+    class << self
+      alias_method :orig_new, :new
+      
+      def new arg
+        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
+        end
+      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]
+      def add_type str, char
+        sym = str.to_sym
+        STATUS_TO_TYPE[sym] = sym
+        action = SVNx::Action.new(sym)
+        SVNx::Action.const_set str.upcase, action
+        [ sym, str, char ].each do |key|
+          STATUS_TO_ACTION[key] = action
         end
       end
     end
-    
-    def initialize str
-      @type = STATUS_TO_TYPE[str]
-    end
 
     def <=> other
-      @type.to_s <=> other.type.to_s
+      @type <=> other.type
     end
 
     def to_s
       @type.to_s
     end
+
+    add_type 'added', 'A'
+    add_type 'deleted', 'D'
+    add_type 'modified', 'M'
+    add_type 'unversioned', '?'
+
+    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    
   end
 end

data/lib/svnx/info/entry.rb

@@ -12,6 +12,7 @@ module SVNx::Info
     attr_reader :kind
     attr_reader :path
     attr_reader :revision
+    attr_reader :wc_root
 
     def set_from_element elmt
       set_attr_var elmt, 'kind'
@@ -22,6 +23,13 @@ module SVNx::Info
       
       repo = elmt.elements['repository']
       set_elmt_var repo, 'root'
+
+      @wc_root = nil
+      if wcinfo = elmt.elements['wc-info']
+        if wcroot = wcinfo.elements['wcroot-abspath']
+          @wc_root = wcroot.text
+        end
+      end
     end
   end
 end

data/lib/svnx/io/directory.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module SVNx::IO
+  # An element unites an svn element and a file/directory (at least one of
+  # which should exist).
+
+  class Directory < Element
+  end
+end

data/lib/svnx/io/element.rb

@@ -0,0 +1,123 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'logue/loggable'
+require 'svnx/log/entries'
+require 'svnx/status/entries'
+require 'svnx/status/command'
+require 'svnx/info/entries'
+require 'svnx/info/command'
+require 'svnx/cat/command'
+require 'pathname'
+
+module SVNx; module IO; end; end
+
+module SVNx::IO
+  # An element unites an svn element and a file/directory (at least one of
+  # which should exist).
+
+  class Element
+    include Logue::Loggable, Comparable
+
+    attr_reader :svn
+    attr_reader :path
+    attr_reader :local
+    
+    def initialize args = Hash.new
+      info "args: #{args.inspect}".color("438802")
+      
+      # svnurl = args[:svnurl]
+      # fname  = args[:filename] || args[:file] # legacy
+      # $$$ todo: map svnurl to SVNElement, and fname to FSElement
+
+      @svn   = args[:svn] # || (args[:file] && SVNElement.new(:filename => args[:file]))
+      @local = args[:local] && Pathname.new(args[:local]) # && PVN::FSElement.new(args[:local] || args[:file])
+      @path  = args[:path]
+      
+      info "local: #{@local.inspect}"
+    end
+
+    def exist?
+      @local && @local.exist?
+    end
+
+    def directory?
+      @local && @local.directory?
+    end
+
+    def file?
+      @local && @local.file?
+    end
+
+    def get_info revision = nil
+      return nil unless in_svn?
+      
+      usepath = @local ? @local.to_path : @path
+      inf = SVNx::InfoExec.new path: usepath, revision: revision
+      inf.entry
+    end
+
+    def in_svn?
+      usepath = @local ? @local.to_path : @path
+      st = SVNx::StatusExec.new path: usepath
+      st.entries.size == 0 || st.entries[0].status.to_s != 'unversioned'
+    end
+
+    def find_entries args = Hash.new
+      revision = args[:revision]
+      status = args[:status]
+      
+      if revision.nil?
+        find_by_status status
+      else
+        find_in_log revision, status
+      end
+    end
+
+    def find_in_log revision, action
+      svninfo = get_info
+
+      filter = svninfo.url.dup
+      filter.slice! svninfo.root
+
+      # we can't cache this, because we don't know if there has been an svn
+      # update since the previous run:
+      logexec = SVNx::LogExec.new path: @local, revision: revision, verbose: true, use_cache: false
+      entries = logexec.entries
+      
+      act = action.kind_of?(SVNx::Action) ? action : SVNx::Action.new(action)
+      entries.match act, filter
+    end
+
+    def find_by_status status
+      statexec = SVNx::StatusExec.new path: @local, use_cache: false
+      entries = statexec.entries
+
+      entries.select do |entry|
+        status.nil? || entry.status.to_s == status.to_s
+      end.sort
+    end
+
+    def log_entries args = Hash.new
+      rev = args[:revision]
+      # use_cache should be conditional on revision:
+      logexec = SVNx::LogExec.new :path => @local, :revision => rev && rev.to_s, :verbose => true, :use_cache => false
+      logexec.entries
+    end
+
+    def cat args = Hash.new
+      rev = args[:revision]
+      catexec = SVNx::CatExec.new :path => @local, :revision => rev && rev.to_s, :use_cache => false
+      catexec.output
+    end
+
+    def to_s
+      "svn => " + @svn.to_s + "; local => " + @local.to_s
+    end
+
+    def <=> other
+      @local <=> other.local
+    end
+  end
+end

data/lib/svnx/log/entries.rb

@@ -13,5 +13,13 @@ module SVNx::Log
     def create_entry xmlelement
       Entry.new :xmlelement => xmlelement
     end
+
+    def match action, filter
+      matching = Array.new
+      each do |entry|
+        matching.concat entry.match(action, filter)
+      end
+      matching.sort
+    end
   end
 end

data/lib/svnx/log/entry.rb

@@ -2,12 +2,12 @@
 # -*- ruby -*-
 
 require 'svnx/base/entry'
+require 'svnx/base/action'
 
 module SVNx; module Log; end; end
 
 module SVNx::Log
   class Entry < SVNx::Entry
-
     attr_reader :revision, :author, :date, :paths, :msg
 
     def set_from_element elmt
@@ -24,8 +24,11 @@ module SVNx::Log
         action = get_attribute pe, 'action'
         name = pe.text
 
-        @paths << LogEntryPath.new(:kind => kind, :action => action, :name => name)
+        @paths << LogEntryPath.new(kind: kind, action: SVNx::Action.new(action), name: name)
       end
+      
+      # Svn isn't consistent with the order of paths
+      @paths.sort!
     end
 
     def message
@@ -35,9 +38,17 @@ module SVNx::Log
     def to_s
       [ @revision, @author, @date, @msg, @paths ].collect { |x| x.to_s }.join " "
     end
-  end
 
+    def match action, filter
+      paths.select do |path|
+        path.match? action, filter
+      end
+    end
+  end
+  
   class LogEntryPath
+    include Comparable
+    
     attr_reader :kind, :action, :name
     
     def initialize args = Hash.new
@@ -49,5 +60,13 @@ module SVNx::Log
     def to_s
       @name
     end
+
+    def <=> other
+      name <=> other.name
+    end
+
+    def match? action, filter
+      @action.to_s == action.to_s && @name.start_with?(filter)
+    end
   end
 end

data/lib/svnx/status/command.rb

@@ -2,6 +2,7 @@
 # -*- ruby -*-
 
 require 'svnx/base/command'
+require 'svnx/info/command'
 
 module SVNx
   class StatusCommandLine < CommandLine
@@ -26,8 +27,22 @@ module SVNx
     attr_reader :entries
     
     def initialize args
+      path = args[:path]
+      rootpath = nil
+      
+      while true
+        begin
+          inf = InfoExec.new(path: path).entry
+          rootpath = inf.wc_root
+          break
+        rescue
+          path = Pathname.new(path).dirname.to_s
+          break if path == '/'
+        end
+      end
+
       cmd = StatusCommand.new StatusCommandArgs.new(args)
-      @entries = SVNx::Status::Entries.new(:xmllines => cmd.execute)
+      @entries = SVNx::Status::Entries.new(xmllines: cmd.execute, rootpath: rootpath)
     end
   end
 end

data/lib/svnx/status/entries.rb

@@ -6,12 +6,17 @@ require 'svnx/base/entries'
 
 module SVNx::Status
   class Entries < SVNx::Entries
+    def initialize args = Hash.new
+      @rootpath = args[:rootpath]
+      super
+    end
+
     def get_elements doc
       doc.elements['status'].elements['target'].elements
     end
 
     def create_entry xmlelement
-      Entry.new :xmlelement => xmlelement
+      Entry.new xmlelement: xmlelement, rootpath: @rootpath
     end
   end
 end

data/lib/svnx/status/entry.rb

@@ -8,13 +8,17 @@ module SVNx; module Status; end; end
 
 module SVNx::Status
   class Entry < SVNx::Entry
+    include Comparable
+    
     attr_reader :status
     attr_reader :path
     attr_reader :status_revision
     attr_reader :action
     attr_reader :commit_revision
+    attr_reader :name
 
     def initialize args
+      @rootpath = args[:rootpath]
       super
       @action = SVNx::Action.new @status
     end
@@ -23,15 +27,23 @@ module SVNx::Status
       set_attr_var elmt, 'path'
 
       wcstatus = elmt.elements['wc-status']
-      @status = wcstatus.attributes['item']
+      @status = SVNx::Action.new(wcstatus.attributes['item'])
       @status_revision = wcstatus.attributes['revision']
       
       commit = wcstatus.elements['commit']
       @commit_revision = commit && commit.attributes['revision']
+      @name = @path.dup
+      if @rootpath
+        @name[Regexp.new('^' + @rootpath)] = ""
+      end
     end
 
     def to_s
       "path: #{@path}; status: #{@status}"
     end
+
+    def <=> other
+      path <=> other.path
+    end
   end
 end

data/test/integration/status/status_test.rb

@@ -13,7 +13,7 @@ module SVNx::Status
 
       assert_equal exp_path, entry.path, msg
       assert_equal exp_cmt_rev, entry.commit_revision, msg
-      assert_equal exp_status, entry.status, msg
+      assert_equal exp_status.to_s, entry.status.to_s, msg
       assert_equal exp_st_rev, entry.status_revision, msg
     end
 

data/test/integration/svnx/io/element_test.rb

@@ -0,0 +1,225 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'integration/tc'
+require 'svnx/io/element'
+
+module SVNx::IO
+  class ElementTestCase < SVNx::IntegrationTestCase
+    PENDING_PATH = '/Programs/pvn/pvntestbed.pending'
+    
+    def test_init
+      el = Element.new local: PENDING_PATH
+      assert_equal PENDING_PATH, el.local.to_path
+    end
+
+    def test_exists
+      el = Element.new local: PENDING_PATH
+      assert el.exist?
+    end
+
+    def test_does_not_exist
+      el = Element.new local: '/Programs/pvn/nosuchdirectory'
+      assert !el.exist?
+    end
+
+    def test_is_directory
+      el = Element.new local: PENDING_PATH + '/text'
+      assert el.directory?
+    end
+
+    def test_is_not_directory
+      el = Element.new local: PENDING_PATH + '/FirstFile.txt'
+      assert !el.directory?
+    end
+
+    def test_get_info_has_info
+      el = Element.new local: PENDING_PATH + '/FirstFile.txt'
+      inf = el.get_info
+      assert_equal 'file', inf.kind
+      assert_equal 'FirstFile.txt', inf.path
+      assert_equal '22', inf.revision
+      assert_equal 'file:///Programs/Subversion/Repositories/pvntestbed.from', inf.root
+      assert_equal 'file:///Programs/Subversion/Repositories/pvntestbed.from/FirstFile.txt', inf.url
+    end
+
+    def test_get_info_no_info
+      el = Element.new local: PENDING_PATH + '/src/java/Charlie.java'
+      assert_nil el.get_info
+    end
+
+    def test_is_in_svn_up_to_date
+      el = Element.new local: PENDING_PATH + '/src/java/Alpha.java'
+      assert el.in_svn?
+    end
+
+    def test_is_in_svn_modified
+      el = Element.new local: PENDING_PATH + '/FirstFile.java'
+      assert el.in_svn?
+    end
+
+    def test_not_in_svn
+      el = Element.new local: PENDING_PATH + '/src/java/Charlie.java'
+      assert !el.in_svn?
+    end
+
+    def assert_status_entry idx, exp, entries
+      entry = entries[idx]
+      msg = "entry \##{idx}"      
+      assert_equal exp[:path], entry.path, msg
+      assert_equal exp[:name], entry.name, msg
+      assert_equal exp[:status], entry.status.to_s, msg
+    end
+
+    def run_local_test expected, status
+      el = Element.new local: PENDING_PATH
+      entries = el.find_entries status: status
+      assert_equal expected.size, entries.size
+      expected.each_with_index do |exp, idx|
+        assert_status_entry idx, exp, entries
+      end
+    end
+
+    def create_status_expected name, status
+      { path: PENDING_PATH + name, name: name, status: status }
+    end
+
+    def test_find_modified_local_entries
+      expected = Array.new
+      expected << create_status_expected('/FirstFile.txt', 'modified')
+      run_local_test expected, :modified
+    end
+
+    def test_find_added_local_entries
+      expected = Array.new
+      expected << create_status_expected('/SeventhFile.txt', 'added')
+      expected << create_status_expected('/src/ruby/dog.rb', 'added')
+      run_local_test expected, :added
+    end
+
+    def test_find_deleted_local_entries
+      expected = Array.new
+      expected << create_status_expected('/dirzero/SixthFile.txt', 'deleted')
+      run_local_test expected, :deleted
+    end
+
+    def test_find_unversioned_local_entries
+      expected = Array.new
+      expected << create_status_expected('/src/java/Charlie.java', 'unversioned')
+      run_local_test expected, :unversioned
+    end
+
+    def assert_log_entry expname, expaction, entry
+      assert_equal expname, entry.name
+      assert_equal expaction, entry.action.to_s
+    end
+
+    def test_find_modified_remote_entries
+      el = Element.new local: PENDING_PATH
+      entries = el.find_entries revision: '20:22', status: :modified
+      assert_equal 3, entries.size
+      assert_log_entry '/SecondFile.txt', 'modified', entries[0]
+      assert_log_entry '/SecondFile.txt', 'modified', entries[1]
+      assert_log_entry '/src/ruby/charlie.rb', 'modified', entries[2]
+    end
+
+    def assert_paths_equal exppath, path
+      assert_equal exppath[:name], path.name
+      assert_equal exppath[:action], path.action.to_s
+      assert_equal exppath[:kind], path.kind
+    end
+
+    def assert_log_entries expected, entries, idx
+      msg = "entry \##{idx}"
+      assert_equal expected[idx][:author], entries[idx].author, msg
+      assert_equal expected[idx][:date], entries[idx].date, msg
+      assert_equal expected[idx][:author], entries[idx].author, msg
+      assert_equal expected[idx][:revision], entries[idx].revision, msg
+      expected[idx][:paths].each_with_index do |exppath, ix|
+        assert_paths_equal exppath, entries[idx].paths[ix]
+      end
+    end
+    
+    def test_log_entries_no_revision
+      el = Element.new local: PENDING_PATH + '/FirstFile.txt'
+      # these are entries of entries
+      entries = el.log_entries 
+      assert_equal 5, entries.size
+
+      expected = Array.new
+      expected << { author: 'Jim', 
+        date: '2012-09-16T13:51:55.741762Z',
+        msg: "We're not sure. Are we...black?",
+        revision: '13',
+        paths: [ 
+                { action: 'modified', kind: 'file', name: '/FirstFile.txt' },
+                { action: 'added',    kind: 'file', name: '/SecondFile.txt' }
+               ]
+      }
+      
+      assert_log_entries expected, entries, 0
+
+      expected << { author: 'Lyle', 
+        date: '2012-09-15T17:30:36.869900Z',
+        msg: 'Send wire, main office, tell them I said "ow". Gotcha!',
+        revision: '5',
+        paths: [ 
+                { action: 'modified', kind: 'file', name: '/FirstFile.txt' },
+                { action: 'modified', kind: 'file', name: '/SecondFile.txt' }
+               ]
+      }
+      
+      assert_log_entries expected, entries, 1
+    end
+
+    def test_cat_no_revision
+      el = Element.new local: PENDING_PATH + '/FirstFile.txt'
+
+      expected = Array.new
+      expected << "this is the second line of the first file.\n"
+      expected << "third line here.\n"
+      expected << "fourth line this is.\n"
+
+      lines = el.cat
+      assert_equal expected, lines
+    end
+
+    def test_cat_valid_revision
+      el = Element.new local: PENDING_PATH + '/FirstFile.txt'
+
+      expected = Array.new
+      expected << "This is the first line of the first file in the testbed.\n"
+      expected << "This is the second line of the first file.\n"
+
+      lines = el.cat revision: 2
+
+      assert_equal expected, lines
+    end
+
+    def test_cat_invalid_revision
+      el = Element.new local: PENDING_PATH + '/FirstFile.txt'
+      assert_raises(RuntimeError) do
+        el.cat revision: 41
+      end
+    end
+
+    def test_to_s
+      el = Element.new local: PENDING_PATH + '/FirstFile.txt'
+      assert_equal "svn => ; local => #{PENDING_PATH}/FirstFile.txt", el.to_s
+    end
+
+    def assert_comparable expected, x, y
+      assert_equal expected, x <=> y
+    end
+
+    def test_comparable
+      a = Element.new local: PENDING_PATH + '/A.txt'
+      b0 = Element.new local: PENDING_PATH + '/B.txt'
+      b1 = Element.new local: PENDING_PATH + '/B.txt'
+
+      assert_comparable -1, a,  b0
+      assert_comparable  1, b0, a
+      assert_comparable  0, b0, b1
+    end
+  end
+end

data/test/unit/svnx/base/action_test.rb

@@ -32,5 +32,18 @@ module SVNx
     def test_unversioned
       assert_action_equals false, false, false, true, 'unversioned', '?'
     end
+
+    def test_constants
+      assert_equal SVNx::Action.new('added'), SVNx::Action::ADDED
+      assert_equal SVNx::Action.new('deleted'), SVNx::Action::DELETED
+      assert_equal SVNx::Action.new('modified'), SVNx::Action::MODIFIED
+      assert_equal SVNx::Action.new('unversioned'), SVNx::Action::UNVERSIONED 
+    end
+    
+    def test_invalid_type
+      assert_raise(RuntimeError) do
+        SVNx::Action.new('dummy')
+      end
+    end
   end
 end

data/test/unit/svnx/revision/range_test.rb

@@ -37,7 +37,6 @@ module SVNx::Revision
     def test_init_takes_arguments
       fa = Argument.new 143
       ta = Argument.new 199
-      rr = Range.new fa, ta
       assert_range '143:199', '143', '199', fa, ta
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logue
@@ -54,6 +54,8 @@ files:
 - lib/svnx/info/command.rb
 - lib/svnx/info/entries.rb
 - lib/svnx/info/entry.rb
+- lib/svnx/io/directory.rb
+- lib/svnx/io/element.rb
 - lib/svnx/log/command.rb
 - lib/svnx/log/entries.rb
 - lib/svnx/log/entry.rb
@@ -71,6 +73,7 @@ files:
 - test/integration/info/info_test.rb
 - test/integration/log/log_test.rb
 - test/integration/status/status_test.rb
+- test/integration/svnx/io/element_test.rb
 - test/unit/svnx/base/action_test.rb
 - test/unit/svnx/cat/command_test.rb
 - test/unit/svnx/info/entries_test.rb
@@ -111,6 +114,7 @@ test_files:
 - test/integration/info/info_test.rb
 - test/integration/log/log_test.rb
 - test/integration/status/status_test.rb
+- test/integration/svnx/io/element_test.rb
 - test/unit/svnx/base/action_test.rb
 - test/unit/svnx/cat/command_test.rb
 - test/unit/svnx/info/entries_test.rb