svnx 1.0.1 → 2.0.6

data/lib/system/command/caching.rb

@@ -4,33 +4,20 @@
 require 'system/command/line'
 require 'system/command/cachefile'
 
-module System
-  class CachingCommandLine < CommandLine
-    # caches its input and values.
+class System::CachingCommandLine < System::CommandLine
+  # caches its input and values.
 
-    @@cache_dir = '/tmp' + Pathname.new($0).expand_path.to_s
-
-    class << self
-      def cache_dir
-        @@cache_dir
-      end
-
-      def cache_dir= dir
-        @@cache_dir = dir
-      end
-    end
-
-    def cache_dir
-      @@cache_dir
-    end
+  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 cache_file
+    System::CacheFile.new cache_dir, @args
+  end
 
-    def execute
-      cachefile = cache_file
-      @output = cachefile.readlines
-    end
+  def execute
+    cachefile = cache_file
+    @output = cachefile.readlines
   end
 end

data/lib/system/command/line.rb

@@ -1,47 +1,58 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'system/command/arg'
 require 'logue/loggable'
 require 'open3'
-require 'rainbow/ext/string'
 
 module System
-  class CommandLine
-    include Logue::Loggable
+end
 
-    attr_reader :args
-    attr_reader :output
-    attr_reader :error
-    attr_reader :status
+class System::CommandLine
+  include Logue::Loggable
 
-    def initialize args = Array.new
-      @args = args.dup
-    end
+  attr_reader :args
+  attr_reader :output
+  attr_reader :error
+  attr_reader :status
 
-    def << arg
-      @args << arg
-    end
+  def initialize args = Array.new
+    @args = args.dup
+  end
 
-    def execute
-      cmd = to_command
-      debug "cmd: #{cmd}".color("8A8A43")
-      
-      Open3.popen3(cmd) do |stdin, stdout, stderr, wthr|
-        @output = stdout.readlines
-        @error = stderr.readlines
-        @status = wthr.value
-      end
+  def << arg
+    @args << arg
+  end
 
-      debug "@output: #{@output}"
-      debug "@error: #{@error}"
-      debug "@status: #{@status}"
-      
-      @output
+  def execute
+    cmd = to_command
+    $stderr.puts "cmd: #{cmd}"
+    
+    Open3.popen3(cmd) do |stdin, stdout, stderr, wthr|
+      @output = stdout.readlines
+      @error = stderr.readlines
+      @status = wthr.value
     end
 
-    def to_command
-      @args.join ' '
+    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

data/svnx.gemspec

@@ -0,0 +1,34 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'svnx/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "svnx"
+  spec.version       = Svnx::VERSION
+  spec.authors       = ["Jeff Pace"]
+  spec.email         = ["jeugenepace@gmail.com"]
+
+  spec.summary       = %q{Ruby objects from the Subversion command line}
+  spec.description   = %q{Bridges the Subversion command line, returning Ruby objects.}
+  spec.homepage      = "https://github.com/jpace/svnx"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "logue", "~> 1.0.6"
+  spec.add_development_dependency "test-unit", "~> 3.1.5"
+end

metadata

@@ -1,102 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.6
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: logue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: 1.0.6
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
+        version: 3.1.5
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-description: A bridge between Subversion functionality, via the command line, and
-  Ruby.
-email: jeugenepace@gmail.com
+        version: 3.1.5
+description: Bridges the Subversion command line, returning Ruby objects.
+email:
+- jeugenepace@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/svnx.rb
+- ".gitignore"
+- ".glarkrc"
+- Features.txt
+- Gemfile
+- History.txt
+- LICENSE
+- Manifest.txt
+- README.md
+- Rakefile
 - lib/svnx/base/action.rb
-- lib/svnx/base/args.rb
+- lib/svnx/base/cmdline.rb
 - lib/svnx/base/command.rb
 - lib/svnx/base/entries.rb
 - lib/svnx/base/entry.rb
+- lib/svnx/base/env.rb
+- lib/svnx/base/options.rb
 - lib/svnx/cat/command.rb
+- lib/svnx/cat/options.rb
+- lib/svnx/commit/command.rb
+- lib/svnx/commit/options.rb
+- lib/svnx/diff/command.rb
+- lib/svnx/diff/elements.rb
+- lib/svnx/diff/options.rb
+- lib/svnx/diff/parser.rb
 - lib/svnx/info/command.rb
 - lib/svnx/info/entries.rb
 - lib/svnx/info/entry.rb
+- lib/svnx/info/options.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
-- lib/svnx/log/exec.rb
-- lib/svnx/log/line.rb
+- lib/svnx/log/options.rb
+- lib/svnx/merge/command.rb
+- lib/svnx/merge/options.rb
+- lib/svnx/project.rb
+- lib/svnx/propget/command.rb
+- lib/svnx/propget/entries.rb
+- lib/svnx/propget/entry.rb
+- lib/svnx/propget/options.rb
+- lib/svnx/propset/command.rb
+- lib/svnx/propset/options.rb
 - lib/svnx/revision/argfactory.rb
 - lib/svnx/revision/argument.rb
+- lib/svnx/revision/date.rb
 - lib/svnx/revision/error.rb
 - lib/svnx/revision/range.rb
 - lib/svnx/status/command.rb
 - lib/svnx/status/entries.rb
 - lib/svnx/status/entry.rb
+- lib/svnx/status/options.rb
+- lib/svnx/update/command.rb
+- lib/svnx/update/options.rb
+- lib/svnx/util/dateutil.rb
+- lib/svnx/util/objutil.rb
+- lib/svnx/version.rb
 - lib/system/command/arg.rb
 - 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/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
-- test/unit/svnx/log/args_test.rb
-- test/unit/svnx/log/entries_test.rb
-- test/unit/svnx/log/entry_test.rb
-- test/unit/svnx/log/exec_test.rb
-- test/unit/svnx/log/line_test.rb
-- test/unit/svnx/revision/argfactory_test.rb
-- test/unit/svnx/revision/argument_test.rb
-- test/unit/svnx/revision/range_test.rb
-- test/unit/svnx/status/entries_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://github.com/jpace/svnx
+- svnx.gemspec
+homepage: https://github.com/jpace/svnx
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -113,27 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 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/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
-- test/unit/svnx/log/args_test.rb
-- test/unit/svnx/log/entries_test.rb
-- test/unit/svnx/log/entry_test.rb
-- test/unit/svnx/log/exec_test.rb
-- test/unit/svnx/log/line_test.rb
-- test/unit/svnx/revision/argfactory_test.rb
-- test/unit/svnx/revision/argument_test.rb
-- test/unit/svnx/revision/range_test.rb
-- test/unit/svnx/status/entries_test.rb
-- test/unit/system/command/cachefile_test.rb
-- test/unit/system/command/caching_test.rb
-- test/unit/system/command/line_test.rb
+summary: Ruby objects from the Subversion command line
+test_files: []

data/lib/svnx/base/args.rb

@@ -1,24 +0,0 @@
-#!/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/log/args.rb

@@ -1,57 +0,0 @@
-#!/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 SvnLog
-  class Args < 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
-
-# the old name and module
-module SVNx
-  module LogCmdLine
-    class LogCommandArgs < SvnLog::Args
-    end
-  end
-end