svnx 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a079b16c8a940b3a4d547cf7181bb598e708134
-  data.tar.gz: 362875ae5402a57065a2c923104f29e27c8e7fa7
+  metadata.gz: 03dc7ad9a32bb28cd8948fbe5921ead0f014fd47
+  data.tar.gz: 16794b57d049be33261365a1537250e6bc4d4833
 SHA512:
-  metadata.gz: 212b6748b84d9298c1b9ff59387a7f5e392fb7829e9487b46801a51472c7f39ff0611f4b820526e1b42091ed5d7e73ea000ddbdfbc5ba7109df0515d9c4e5b1a
-  data.tar.gz: fbfbbf3cc940127e16fa01b7a0ab20e1100a862d6c642a7e7f8e8961c7f35cc7ccc0373d2c061671662ca75aa17fe98f5661c9aa1ae86da9e7ec74694d745fe5
+  metadata.gz: 83ca8614a6553fdc808ceb319fd2aaca159b1c84ad745cb0940cd7565843245c4d24135915d300255c6083b9050ab1e975066aace36e6c398ac53a845d3a29fa
+  data.tar.gz: 8a5b6bcd7040e7655a7547a0d5fd295368522b191554222c2a6f0ab4186783f0c0bdcd696f47b5a41b61908868215f6d41388bfec0ce1d007348a642dd41e1f9

data/lib/svnx/base/cmdline.rb

@@ -2,8 +2,7 @@
 # -*- ruby -*-
 
 require 'logue/loggable'
-require 'cmdline/line'
-require 'cmdline/caching'
+require 'command/cacheable'
 require 'svnx/base/env'
 
 module Svnx
@@ -12,16 +11,6 @@ module Svnx
 end
 
 module Svnx::Base
-  class CachingCommandLine < CmdLine::CachingCommandLine
-    def caching?
-      true
-    end
-
-    def cache_dir
-      Svnx::Env.instance.cache_dir
-    end
-  end
-
   class CommandLine
     include Logue::Loggable
 
@@ -57,8 +46,7 @@ module Svnx::Base
     end
 
     def command_line cmdargs
-      cls = @caching ? CachingCommandLine : CmdLine::CommandLine
-      cls.new cmdargs
+      Command::Cacheable::Command.new cmdargs, caching: @caching, dir: Svnx::Env.instance.cache_dir
     end
   end
 end

data/lib/svnx/base/command.rb

@@ -2,8 +2,8 @@
 # -*- ruby -*-
 
 require 'logue/loggable'
-require 'cmdline/caching'
-require 'svnx/base/cmdline'
+require 'command/cacheable/command'
+# require 'svnx/base/cmdline'
 require 'svnx/util/classutil'
 require 'svnx/base/command_factory'
 
@@ -47,7 +47,7 @@ module Svnx::Base
       debug "@cmdline: #{@cmdline}"
       
       @output = @cmdline.execute
-      debug "@output: #{@output}"
+      debug "@output: #{@output && @output[0 .. 100]}"
       
       @error = @cmdline.error
       debug "@error: #{@error}"
@@ -60,7 +60,7 @@ module Svnx::Base
   class EntriesCommand < Command
     attr_reader :entries
     
-    def initialize options, cls: CommandLine, exec: nil, caching: caching?, xml: true, entries_class: nil
+    def initialize options, cls: Command::Cacheable::Command, exec: nil, caching: caching?, xml: true, entries_class: nil
       super options, cls: cls, exec: exec, xml: xml, caching: caching
       
       if not @output.empty?

data/lib/svnx/version.rb

@@ -3,5 +3,5 @@
 
 module Svnx
   NAME = 'svnx'
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/svnx.gemspec

@@ -27,9 +27,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename f }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "command-cacheable", "~> 0.2"
   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"
-  spec.add_development_dependency "paramesan"
+  spec.add_development_dependency "paramesan", "~> 0.1.1"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-02-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: command-cacheable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +84,16 @@ dependencies:
   name: paramesan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 description: Bridges the Subversion command line, returning Ruby objects.
 email:
 - jeugenepace@gmail.com
@@ -97,15 +111,8 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- lib/cmdline/arg.rb
-- lib/cmdline/cachefile.rb
-- lib/cmdline/caching.rb
-- lib/cmdline/filename.rb
-- lib/cmdline/gzpathname.rb
-- lib/cmdline/line.rb
 - lib/svnx/base/action.rb
 - lib/svnx/base/action_status.rb
-- lib/svnx/base/cmd.rb
 - lib/svnx/base/cmdline.rb
 - lib/svnx/base/command.rb
 - lib/svnx/base/command_factory.rb

data/lib/cmdline/arg.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module CmdLine
-  class Argument < String
-    # just a string, but quotes itself
-
-    def to_s
-      '"' + super + '"'
-    end
-  end
-end

data/lib/cmdline/cachefile.rb

@@ -1,37 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'cmdline/line'
-require 'cmdline/filename'
-require 'cmdline/gzpathname'
-
-# A file that has a pathname and output
-module CmdLine
-  class CacheFile
-    attr_reader :output
-    attr_reader :pathname
-    
-    def initialize cache_dir, args
-      @args     = args
-      basename  = FileName.new(args).name
-      fullname  = Pathname(cache_dir) + basename
-      @pathname = GzipPathname.new fullname
-      @output   = nil
-    end
-    
-    def readlines
-      if @pathname.exist?
-        @output = @pathname.read_file
-      else
-        cl = CommandLine.new @args
-        @output = cl.execute
-        @pathname.save_file @output
-        @output
-      end
-    end
-
-    def to_s
-      @pathname.to_s
-    end
-  end
-end

data/lib/cmdline/caching.rb

@@ -1,25 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'cmdline/line'
-require 'cmdline/cachefile'
-
-module CmdLine
-  class CachingCommandLine < CommandLine
-    # caches its input and values.
-
-    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 execute
-      cachefile = cache_file
-      @output = cachefile.readlines
-    end
-  end
-end

data/lib/cmdline/filename.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module CmdLine
-  class FileName
-    attr_reader :name
-
-    def initialize args
-      @name = args.join('-').gsub('/', '_slash_') + '.gz'
-    end
-
-    def to_s
-      @name
-    end
-  end
-end

data/lib/cmdline/gzpathname.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'zlib'
-require 'pathname'
-
-module CmdLine
-  # A pathname that reads and writes itself as gzipped
-  class GzipPathname < Pathname
-    def save_file content
-      parent.mkpath unless parent.exist?
-      unlink if exist?
-      Zlib::GzipWriter.open(to_s) do |gz|
-        gz.puts content
-      end
-    end
-
-    def read_file
-      Array.new.tap do |content|
-        Zlib::GzipReader.open(to_s) do |gz|
-          content.concat gz.readlines
-        end
-      end
-    end
-  end
-end

data/lib/cmdline/line.rb

@@ -1,57 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'logue/loggable'
-require 'open3'
-
-module CmdLine
-  class CommandLine
-    include Logue::Loggable
-
-    attr_reader :args
-    attr_reader :output
-    attr_reader :error
-    attr_reader :status
-
-    def initialize *args, debug: false
-      @args = args.dup
-    end
-
-    def << arg
-      @args << arg
-    end
-
-    def execute
-      cmd = to_command
-      debug "cmd: #{cmd}"
-      
-      Open3.popen3(cmd) do |stdin, stdout, stderr, wthr|
-        @output = stdout.readlines
-        @error = stderr.readlines
-        @status = wthr.value
-      end
-
-      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
-end

data/lib/svnx/base/cmd.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rexml/document'
-require 'logue/loggable'
-
-module Svnx
-  class Cmd
-    include Logue::Loggable
-    
-    def initialize xml
-      info "xml: #{xml}"
-
-      @doc = REXML::Document.new xml
-      info "@doc: #{@doc}"
-
-    end
-  end
-end
-