svnx 0.6.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b1abb67560bed80480390d27d41acd6d3ffe838
-  data.tar.gz: ab058e1531e2de8655d3e3d7c846e5bb7a4cd7b5
+  metadata.gz: 07670d8b843e714ca4bd3a0c8849eb19567191ee
+  data.tar.gz: 43c39c05b0ff27a68578e31f376494cbcfafd5db
 SHA512:
-  metadata.gz: 5128b57a2815eb69da54105dd058e88222701870e6c789f38fc9c0c57b32927524051c59bf0567f512b867fb538db0beda94893c1f3ad1737bac8d05ed524f7c
-  data.tar.gz: 317c11e6d1270022c10c8817b86f60413c933c39359a7a65e421a895457406f9aa85215d593be701566b974e18865891f046651325ab5f0cdba63b487c74bdf9
+  metadata.gz: afb1a70c67312ec8f952c0877521bdae844cb58bb8d105076dd4f2a4aa8148473668262bec0d596ab2192e738cf34ccfc345d243a5bee2f77802a2a63666f1f2
+  data.tar.gz: 822f61fe3bba8e331466502f60524cfe1ccd58454480a7409e7c2ff37523d5a1db20e17618f775410f4f33062b0809200f5196b95d65ae3e64ccf9db650b5de4

data/lib/svnx/base/args.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'system/command/line'
+require 'logue/loggable'
+require 'system/command/caching'
+
+# this replaces svnx/lib/command/svncommand.
+
+module SVNx
+  class CommandArgs
+    include Logue::Loggable
+    
+    attr_accessor :path
+
+    def initialize args = Hash.new
+      @path = args[:path]
+    end
+
+    def to_a
+      [ @path ].compact
+    end
+  end  
+end

data/lib/svnx/base/command.rb

@@ -4,6 +4,7 @@
 require 'system/command/line'
 require 'logue/loggable'
 require 'system/command/caching'
+require 'svnx/base/args'
 
 # this replaces svnx/lib/command/svncommand.
 
@@ -41,20 +42,6 @@ module SVNx
     include CmdLine
   end
 
-  class CommandArgs
-    include Logue::Loggable
-    
-    attr_accessor :path
-
-    def initialize args = Hash.new
-      @path = args[:path]
-    end
-
-    def to_a
-      [ @path ].compact
-    end
-  end  
-
   class Command
     include Logue::Loggable
 

data/lib/svnx/log/args.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'system/command/line'
+require 'system/command/caching'
+require 'svnx/base/command'
+require 'logue/loggable'
+require 'svnx/base/args'
+
+module SVNx
+  module LogCmdLine
+  end
+end
+
+module SVNx::LogCmdLine
+  class LogCommandArgs < SVNx::CommandArgs
+    include Logue::Loggable
+    
+    attr_reader :limit
+    attr_reader :verbose
+    attr_reader :revision
+    attr_reader :use_cache
+
+    def initialize args
+      @limit = args[:limit]
+      @verbose = args[:verbose]
+      @use_cache = args.key?(:use_cache) ? args[:use_cache] : false
+      @revision = args[:revision]
+      super
+    end
+
+    def to_a
+      ary = Array.new
+      if @limit
+        ary << '--limit' << @limit
+      end
+      if @verbose
+        ary << '-v'
+      end
+
+      if @revision
+        [ @revision ].flatten.each do |rev|
+          ary << "-r#{rev}"
+        end
+      end
+
+      if @path
+        ary << @path
+      end
+      
+      ary.compact
+    end
+  end
+end

data/lib/svnx/log/command.rb

@@ -5,6 +5,7 @@ require 'system/command/line'
 require 'system/command/caching'
 require 'svnx/base/command'
 require 'logue/loggable'
+require 'svnx/log/args'
 
 module SVNx
   module LogCmdLine
@@ -22,45 +23,6 @@ module SVNx
   class LogCommandLineCaching < CachingCommandLine
     include LogCmdLine
   end
-
-  class LogCommandArgs < CommandArgs
-    include Logue::Loggable
-    
-    attr_reader :limit
-    attr_reader :verbose
-    attr_reader :revision
-    attr_reader :use_cache
-
-    def initialize args
-      @limit = args[:limit]
-      @verbose = args[:verbose]
-      @use_cache = args.key?(:use_cache) ? args[:use_cache] : false
-      @revision = args[:revision]
-      super
-    end
-
-    def to_a
-      ary = Array.new
-      if @limit
-        ary << '--limit' << @limit
-      end
-      if @verbose
-        ary << '-v'
-      end
-
-      if @revision
-        [ @revision ].flatten.each do |rev|
-          ary << "-r#{rev}"
-        end
-      end
-
-      if @path
-        ary << @path
-      end
-      
-      ary.compact
-    end
-  end
   
   class LogCommand < Command
     def initialize args

data/lib/svnx.rb

@@ -3,5 +3,5 @@
 
 module SVNx
   NAME = 'svnx'
-  VERSION = '0.6.2'
+  VERSION = '1.0.0'
 end

data/lib/system/command/line.rb

@@ -4,43 +4,39 @@
 require 'system/command/arg'
 require 'logue/loggable'
 require 'open3'
-require 'rainbow'
+require 'rainbow/ext/string'
 
 module System
   class CommandLine
     include Logue::Loggable
 
+    attr_reader :args
     attr_reader :output
+    attr_reader :error
+    attr_reader :status
 
     def initialize args = Array.new
       @args = args.dup
     end
 
     def << arg
-      # @args << Argument.new(arg)
       @args << arg
     end
 
     def execute
       cmd = to_command
-
-      info "cmd: #{cmd}".color("8A8A43")
-
-      # cmd << " 2>&1"
-
-      # I want to use popen3, but the version that works (sets $?) is in 1.9.x,
-      # not 1.8.x:
-      IO.popen(cmd + " 2>&1") do |io|
-        @output = io.readlines
-      end
-
-      if $? && $?.exitstatus != 0
-        info "cmd: #{cmd}".color(:red)
-        info "$?: #{$?.inspect}".color(:red)
-        info "$?.exitstatus: #{$? && $?.exitstatus}".color(:red)
-        raise "ERROR running command '#{cmd}': #{@output[-1]}"
+      debug "cmd: #{cmd}".color("8A8A43")
+      
+      Open3.popen3(cmd) do |stdin, stdout, stderr, wthr|
+        @output = stdout.readlines
+        @error = stderr.readlines
+        @status = wthr.value
       end
 
+      debug "@output: #{@output}"
+      debug "@error: #{@error}"
+      debug "@status: #{@status}"
+      
       @output
     end
 

data/test/unit/system/command/line_test.rb

@@ -4,31 +4,60 @@
 require 'tc'
 require 'system/command/line'
 
+Logue::Log.level = Logue::Log::DEBUG
+
 module System
   class CommandLineTestCase < SVNx::TestCase
-    def test_ctor
-      cl = System::CommandLine.new [ "ls" ]
-      assert_equal "ls", cl.to_command
+    # init
+
+    def assert_init expecetd, initargs
+      cl = System::CommandLine.new initargs
+      assert_equal expected, cl.args
+    
+      def test_init
+        assert_init [ "ls" ], [ "ls" ]
+      end
+    end
+
+    # <<
+
+    def assert_lshift expected, initargs, add
+      info "self: #{self}"
+      cl = System::CommandLine.new initargs
+      cl << add
+      assert_equal expected, cl.args
     end
 
     def test_lshift
-      cl = System::CommandLine.new [ "ls" ]
-      cl << "/tmp"
-      assert_equal "ls /tmp", cl.to_command
-    end
-
-    def test_execute
-      cl = System::CommandLine.new [ "ls" ]
-      cl << "/tmp"
-      assert_equal "ls /tmp", cl.to_command
-      output = cl.execute
-      
-      syslines = nil
-      IO.popen("ls /tmp") do |io|
-        syslines = io.readlines
-      end
+      assert_lshift [ "ls", "/tmp" ], [ "ls" ], "/tmp"
+    end
+
+    # to_command
+
+    def assert_to_command expect, args
+      cl = System::CommandLine.new args
+      assert_equal expect, cl.to_command
+    end
+
+    def test_to_command_init
+      assert_to_command "ls", [ "ls" ]
+    end
+
+    # execute/status
+
+    def assert_execute_status expect_success, args
+      info "self: #{self}"
+      cl = System::CommandLine.new args
+      cl.execute
+      assert_equal expect_success, cl.status.success?, "args: #{args}"
+    end
+
+    def test_execute_status_success
+      assert_execute_status true, [ "ls", "/tmp" ]
+    end
 
-      assert_equal syslines, output
+    def test_execute_status_failure
+      assert_execute_status false, [ "ls", "/tmpx" ]
     end
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '2.1'
 description: A bridge between Subversion functionality, via the command line, and
   Ruby.
 email: jeugenepace@gmail.com
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - lib/svnx.rb
 - lib/svnx/base/action.rb
+- lib/svnx/base/args.rb
 - lib/svnx/base/command.rb
 - lib/svnx/base/entries.rb
 - lib/svnx/base/entry.rb
@@ -56,6 +57,7 @@ files:
 - lib/svnx/info/entry.rb
 - lib/svnx/io/directory.rb
 - lib/svnx/io/element.rb
+- lib/svnx/log/args.rb
 - lib/svnx/log/command.rb
 - lib/svnx/log/entries.rb
 - lib/svnx/log/entry.rb
@@ -96,17 +98,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Wrapper around Subversion command line.