svnx 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7568851539f67dc7fd63364ea9f321cbd2778eb2
-  data.tar.gz: 250ae23ce41faca126887be909434539400b30df
+  metadata.gz: df897af510240d716cdc7c8c3d1a104ab2d6ca6c
+  data.tar.gz: 9124a68c96632f05faeee974e88b5c5551fb82c9
 SHA512:
-  metadata.gz: 7349591f27fcaf6c89152c07cef03928814eb5bceaee3efcf49421396734604f57e8c580927d8ead613321857afa981b999a5b774e592ce0047e8415e49c49e6
-  data.tar.gz: b25d5d269537dc85b929a135a34f0aa49db11ad9c2721a39255b68eb9172a083f9e37ea93f79c89fa0a86fe4c05c3afd56850f334b8f9967f58908550a6b4d4a
+  metadata.gz: fce53366b404dddc37fcbfcaa5b86200df0a829806bf3e9f5fdefa8b5607ae42cb90023b4b643e8cdfd530e1b1021c3d540e7f46d5aefc919c08304d92c33c1f
+  data.tar.gz: d8cd5441dea00c059678e52d3b05582ca9eb38f227589ed96b60c295ab5d66b2994aa3d04701d037f75b4253b99b2f2e835583206db3572b7c168ad8fc2ccf7e

data/lib/svnx.rb

@@ -2,5 +2,5 @@
 # -*- ruby -*-
 
 module SVNx
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/svnx/cat/command.rb

@@ -58,4 +58,13 @@ module SVNx
       cls.new @args
     end
   end
+
+  class CatExec
+    attr_reader :output
+    
+    def initialize args
+      cmd = CatCommand.new CatCommandArgs.new(args)
+      @output = cmd.execute
+    end
+  end
 end

data/lib/svnx/entry.rb

@@ -10,7 +10,7 @@ module SVNx
   class Entry
     include Logue::Loggable
 
-    def initialize args = Hash.new
+    def initialize args
       if xmllines = args[:xmllines]
         if xmllines.kind_of? Array
           xmllines = xmllines.join ''

data/lib/svnx/exec.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubygems'
-require 'riel'
 require 'svnx/cat/command'
 require 'svnx/log/command'
 require 'svnx/info/command'

data/lib/svnx/info/command.rb

@@ -2,12 +2,11 @@
 # -*- ruby -*-
 
 require 'svnx/command'
-require 'rainbow'
+require 'svnx/info/entries'
 
 module SVNx
   class InfoCommandLine < CommandLine
     def initialize args = Array.new
-      info "args.to_a: #{args.to_a}".color(:blue)
       super "info", args.to_a
     end
   end
@@ -41,4 +40,14 @@ module SVNx
       InfoCommandLine.new @args
     end
   end
+
+  class InfoExec
+    attr_reader :entry
+    
+    def initialize args
+      cmd = InfoCommand.new InfoCommandArgs.new(args)
+      # info has only one entry
+      @entry = SVNx::Info::Entries.new(:xmllines => cmd.execute)[0]
+    end
+  end
 end

data/lib/svnx/info/entry.rb

@@ -13,15 +13,11 @@ module SVNx::Info
     attr_reader :path
     attr_reader :revision
 
-    def set_from_xml xmldoc
-      entry = xmldoc.elements['info/entry']
-      set_from_element entry
-    end
-
     def set_from_element elmt
       set_attr_var elmt, 'kind'
       set_attr_var elmt, 'path'
       set_attr_var elmt, 'revision'
+      
       set_elmt_var elmt, 'url'
       
       repo = elmt.elements['repository']

data/lib/svnx/log/command.rb

@@ -31,10 +31,10 @@ module SVNx
     attr_reader :revision
     attr_reader :use_cache
 
-    def initialize args = Hash.new
+    def initialize args
       @limit = args[:limit]
       @verbose = args[:verbose]
-      @use_cache = args[:use_cache].nil? || args[:use_cache]
+      @use_cache = args.key?(:use_cache) ? args[:use_cache] : false
       @revision = args[:revision]
       super
     end
@@ -73,4 +73,13 @@ module SVNx
       cls.new @args
     end
   end
+
+  class LogExec
+    attr_reader :entries
+    
+    def initialize args
+      cmd = LogCommand.new LogCommandArgs.new(args)
+      @entries = SVNx::Log::Entries.new :xmllines => cmd.execute
+    end
+  end
 end

data/lib/svnx/status/command.rb

@@ -5,18 +5,14 @@ require 'svnx/command'
 
 module SVNx
   class StatusCommandLine < CommandLine
-    def initialize args = Array.new
+    def initialize args
       super "status", args.to_a
     end
   end
 
   class StatusCommandArgs < CommandArgs
     def to_a
-      ary = Array.new
-      if @path
-        ary << @path
-      end
-      ary
+      [ @path ].compact
     end
   end  
 
@@ -25,4 +21,13 @@ module SVNx
       StatusCommandLine.new @args
     end
   end
+
+  class StatusExec
+    attr_reader :entries
+    
+    def initialize args
+      cmd = StatusCommand.new StatusCommandArgs.new(args)
+      @entries = SVNx::Status::Entries.new(:xmllines => cmd.execute)
+    end
+  end
 end

data/lib/svnx/status/entry.rb

@@ -8,30 +8,17 @@ module SVNx; module Status; end; end
 
 module SVNx::Status
   class Entry < SVNx::Entry
-
     attr_reader :status
     attr_reader :path
     attr_reader :status_revision
     attr_reader :action
+    attr_reader :commit_revision
 
-    def initialize args = Hash.new
+    def initialize args
       super
       @action = SVNx::Action.new @status
     end
 
-    def set_from_xml xmldoc
-      stelmt = xmldoc.elements['status']
-      tgt    = stelmt.elements['target']
-      
-      set_attr_var tgt, 'path'
-      
-      if entry = tgt.elements['entry']
-        set_from_element entry
-      else
-        @status = "unchanged"
-      end
-    end
-
     def set_from_element elmt
       set_attr_var elmt, 'path'
 
@@ -39,11 +26,8 @@ module SVNx::Status
       @status = wcstatus.attributes['item']
       @status_revision = wcstatus.attributes['revision']
       
-      if commit = wcstatus.elements['commit']
-        @commit_revision = commit.attributes['revision']
-      else
-        @commit_revision = nil
-      end
+      commit = wcstatus.elements['commit']
+      @commit_revision = commit && commit.attributes['revision']
     end
 
     def to_s

data/test/integration/info/info_test.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'integration/tc'
+require 'svnx/info/command'
+require 'svnx/info/entry'
+
+module SVNx::Info
+  class CommandTestCase < SVNx::IntegrationTestCase
+    def test_specified_args
+      entry = SVNx::InfoExec.new(path: '/Programs/pvn/pvntestbed.from', revision: nil, limit: nil, verbose: true, use_cache: false).entry
+      
+      assert_not_nil entry
+      assert_equal 'dir', entry.kind
+      assert_equal '/Programs/pvn/pvntestbed.from', entry.path
+      assert_equal '22', entry.revision
+      assert_equal 'file:///Programs/Subversion/Repositories/pvntestbed.from', entry.root
+      assert_equal 'file:///Programs/Subversion/Repositories/pvntestbed.from', entry.url
+    end
+  end
+end

data/test/integration/log/log_test.rb

@@ -0,0 +1,61 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'integration/tc'
+require 'svnx/log/command'
+require 'svnx/log/entries'
+
+module SVNx::Log
+  class CommandTestCase < SVNx::IntegrationTestCase
+    def assert_entry exp_revision, exp_author, exp_npaths, entries, idx
+      assert_equal exp_revision, entries[idx].revision
+      assert_equal exp_author, entries[idx].author
+      assert_equal exp_npaths, entries[idx].paths.size
+    end
+
+    def test_specified_args
+      entries = SVNx::LogExec.new(path: '/Programs/pvn/pvntestbed.from', revision: nil, limit: nil, verbose: true, use_cache: false).entries
+
+      assert_equal 22, entries.size
+
+      assert_entry '21', 'Governor William J. Le Petomane', 3, entries, 1
+      assert_entry '1',  'Gabby Johnson', 1, entries, 21
+    end
+
+    def test_default_args
+      entries = SVNx::LogExec.new(path: '/Programs/pvn/pvntestbed.from').entries
+
+      assert_equal 22, entries.size
+
+      assert_entry '21', 'Governor William J. Le Petomane', 0, entries, 1
+      assert_entry '1',  'Gabby Johnson', 0, entries, 21
+    end
+
+    def test_non_verbose
+      entries = SVNx::LogExec.new(path: '/Programs/pvn/pvntestbed.from', verbose: false).entries
+
+      assert_equal 22, entries.size
+
+      assert_entry '21', 'Governor William J. Le Petomane', 0, entries, 1
+      assert_entry '1',  'Gabby Johnson', 0, entries, 21
+    end
+
+    def test_revision
+      entries = SVNx::LogExec.new(path: '/Programs/pvn/pvntestbed.from', revision: '1:15').entries
+
+      assert_equal 15, entries.size
+
+      assert_entry '2', 'Harriet Johnson', 0, entries, 1
+      assert_entry '15','Mongo', 0, entries, 14
+    end
+
+    def test_limit
+      entries = SVNx::LogExec.new(path: '/Programs/pvn/pvntestbed.from', limit: 5).entries
+
+      assert_equal 5, entries.size
+
+      assert_entry '22', 'Lyle', 0, entries, 0
+      assert_entry '18', 'Lili von Shtupp', 0, entries, 4
+    end
+  end
+end

data/test/integration/status/status_test.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'integration/tc'
+require 'svnx/status/command'
+require 'svnx/status/entries'
+require 'svnx/exec'
+
+module SVNx::Status
+  class CommandTestCase < SVNx::IntegrationTestCase
+    def assert_entry exp_cmt_rev, exp_path, exp_status, exp_st_rev, entries, idx
+      entry = entries[idx]
+      msg = "entry[#{idx}]: #{entry.path}"
+
+      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_st_rev, entry.status_revision, msg
+    end
+
+    def test_specified_args
+      entries = SVNx::StatusExec.new(path: '/Programs/pvn/pvntestbed.pending', use_cache: false).entries
+      
+      assert_not_nil entries
+      assert_equal 5, entries.size
+
+      sentries = entries.sort { |a, b| a.path <=> b.path }
+
+      assert_entry '13', '/Programs/pvn/pvntestbed.pending/FirstFile.txt', 'modified', '22', sentries, 0
+      assert_entry nil, '/Programs/pvn/pvntestbed.pending/SeventhFile.txt', 'added', '-1', sentries, 1
+      assert_entry '9', '/Programs/pvn/pvntestbed.pending/dirzero/SixthFile.txt', 'deleted', '22', sentries, 2
+      assert_entry nil, '/Programs/pvn/pvntestbed.pending/src/java/Charlie.java', 'unversioned', nil, sentries, 3
+      assert_entry nil, '/Programs/pvn/pvntestbed.pending/src/ruby/dog.rb', 'added', '-1', sentries, 4
+    end
+  end
+end

data/test/unit/svnx/cat/command_test.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'svnx/cat/command'
+
+module SVNx::Cat
+  class CommandTestCase < PVN::TestCase
+    EXPROOT = 'file:///Programs/Subversion/Repositories/pvntestbed.from'
+
+    def test_cat_default
+      expected = Array.new
+      expected << 'line one of file two.'
+      expected << 'second line'
+      expected << 'third line'
+      expected << 'line four'
+      expected << 'line five'
+      expected << 'line 6, Six, VI'
+      expected << 'line 7'
+      expected.collect! { |x| x + "\n" }
+      
+      cmd = SVNx::CatExec.new path: EXPROOT + "/SecondFile.txt"
+
+      assert_equal expected, cmd.output
+    end
+
+    def test_cat_revision
+      expected = Array.new
+      expected << 'line one of file two.'
+      expected << 'line four'
+      expected << 'line five'
+      expected << 'line 6, Six, VI'
+      expected << 'line 7'
+      expected.collect! { |x| x + "\n" }
+      
+      cmd = SVNx::CatExec.new path: EXPROOT + "/SecondFile.txt", revision: '20'
+
+      assert_equal expected, cmd.output
+    end
+
+    def test_cat_out_of_range
+      expected = Array.new
+      expected << 'line one of file two.'
+      expected << 'line four'
+      expected << 'line five'
+      expected << 'line 6, Six, VI'
+      expected << 'line 7'
+      expected.collect! { |x| x + "\n" }
+
+      assert_raises(RuntimeError) do
+        SVNx::CatExec.new path: EXPROOT + "/SecondFile.txt", revision: '28'
+      end
+    end
+  end
+end

data/test/unit/svnx/log/entries_test.rb

@@ -40,7 +40,6 @@ module SVNx::Log
     
     def test_empty_message_element
       entries = Entries.new :xmllines => Resources::PT_LOG_R19.readlines
-      nentries = entries.size
       
       # empty message here:
       assert_entry_fields_not_nil entries[0]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logue
@@ -65,18 +65,21 @@ files:
 - lib/system/command/cachefile.rb
 - lib/system/command/caching.rb
 - lib/system/command/line.rb
+- test/integration/info/info_test.rb
+- test/integration/log/log_test.rb
+- test/integration/status/status_test.rb
 - test/unit/svnx/action_test.rb
+- test/unit/svnx/cat/command_test.rb
 - test/unit/svnx/info/entries_test.rb
-- test/unit/svnx/info/entry_test.rb
 - test/unit/svnx/log/entries_test.rb
 - test/unit/svnx/log/entry_test.rb
 - test/unit/svnx/status/entries_test.rb
-- test/unit/svnx/status/entry_test.rb
 - test/unit/system/command/cachefile_test.rb
 - test/unit/system/command/caching_test.rb
 - test/unit/system/command/line_test.rb
 homepage: http://www.incava.org/projects/svnx
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -99,13 +102,15 @@ signing_key:
 specification_version: 4
 summary: Wrapper around Subversion command line.
 test_files:
+- test/integration/info/info_test.rb
+- test/integration/log/log_test.rb
+- test/integration/status/status_test.rb
 - test/unit/svnx/action_test.rb
+- test/unit/svnx/cat/command_test.rb
 - test/unit/svnx/info/entries_test.rb
-- test/unit/svnx/info/entry_test.rb
 - test/unit/svnx/log/entries_test.rb
 - test/unit/svnx/log/entry_test.rb
 - test/unit/svnx/status/entries_test.rb
-- test/unit/svnx/status/entry_test.rb
 - test/unit/system/command/cachefile_test.rb
 - test/unit/system/command/caching_test.rb
 - test/unit/system/command/line_test.rb

data/test/unit/svnx/info/entry_test.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'svnx/info/tc'
-require 'svnx/info/entry'
-
-module SVNx::Info
-  class EntryTestCase < SVNx::Info::TestCase
-    def assert_info_entry_equals entry, path, kind, revision
-      assert_entry_equals entry, :path => path, :kind => 'file', :url => EXPROOT + '/' + path, :root => EXPROOT, :revision => revision
-    end
-
-    def test_entry_from_xml
-      xmllines = Resources::PTP_INFO_SIXTH_TXT.readlines
-
-      entry = Entry.new :xmllines => xmllines
-      assert_info_entry_equals entry, 'dirzero/SixthFile.txt', 'file', '22'
-    end
-  end
-end

data/test/unit/svnx/status/entry_test.rb

@@ -1,14 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'svnx/status/tc'
-require 'svnx/status/entry'
-
-module SVNx::Status
-  class EntryTestCase < SVNx::Status::TestCase
-    def test_entry_from_xml
-      entry = Entry.new :xmllines => Resources::PTP_STATUS_DOG_RB.readlines
-      assert_status_entry_equals 'added', 'src/ruby/dog.rb', entry
-    end
-  end
-end