svnx 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 520e01a3b50f0db39d0dedcc9af1d4134128a139
-  data.tar.gz: 33eb076b2f6acac9537433c912dc2f1d38002ebb
+  metadata.gz: 7703311a03e657be2fb6172c5b3b7de2f5f9434d
+  data.tar.gz: 80d187db92d50e7a81105cd202649c793b4b1c40
 SHA512:
-  metadata.gz: 578d7cbbfc9624a929d565bc6ac04d4d57fc768456a2058617cde404eb7ec36ef14c774f86effe296bfb90b3bc1a3b958fe726f337034f8e64fc0b14d68fe306
-  data.tar.gz: 065360d70d43f4d3b8f958ceb74f5f0ae9fa2bbd2e73097c5e0aad47f4e61bd4f40949f4d919e75c6381984b5f979ca8910a693888be369137118b685194bfab
+  metadata.gz: 1f26504dbe28a179d7432d6e9ae30a315ab467efd832828b07f3927e7ce7c99815b827ba78df98533dbd67e16c36329da2bc5240d131da412e1d40dda65e8a9b
+  data.tar.gz: 005c59f2e7702a2832aeb104266773810d0ad8c0fb346ab3e274ac4a13d03586815d5ab7588640aaf2d6d448d60b8fa893fa806fd0c56aa2210bdb36e57888fe

data/lib/svnx/base/action.rb

@@ -1,22 +1,34 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'logue/loggable'
-require 'singleton'
-require 'svnx/base/action_status'
-
 module Svnx
   class Action
-    include Logue::Loggable
     include Comparable
-    
+
+    class << self
+      def new *args
+        if args.length == 2
+          super
+        else
+          type = args.first
+          types = constants(false)
+          types.each do |t|
+            tc = const_get t
+            if tc.type == type.to_sym || tc.abbrev == type
+              return tc
+            end
+          end
+          raise "not a valid action type: #{type}"
+        end
+      end
+    end
+
     attr_reader :type
+    attr_reader :abbrev
     
-    def initialize type
-      sas = ActionStatus.instance
-      unless @type = sas.symbol_for(type)
-        raise "not a valid action type: #{type}"
-      end
+    def initialize type, abbrev
+      @type = type.to_sym
+      @abbrev = abbrev
     end
 
     def <=> other
@@ -27,18 +39,24 @@ module Svnx
       @type.to_s
     end
     
-    sas = ActionStatus.instance
-    sas.stati.each do |str|
-      action = Action.new str
+    Hash[
+      :added       => 'A',
+      :deleted     => 'D',
+      :modified    => 'M',
+      :replaced    => 'R',
+      :unversioned => '?',
+      :external    => 'X',
+      :normal      => 'q' # actually, X, but in a different column than X for external
+    ].each do |sym, char|
+      str = sym.to_s
+      action = new str, char
       Action.const_set str.upcase, action
-      
       methname = str + '?'
       define_method methname do
         instance_eval do
-          sym = ActionStatus.instance.symbol_for str
           @type.to_sym == sym
         end
       end      
-    end  
+    end
   end
 end

data/lib/svnx/log/entries.rb

@@ -4,11 +4,6 @@
 require 'svnx/base/entries'
 require 'svnx/log/entry'
 
-module Svnx
-  module Log
-  end
-end
-
 module Svnx::Log
   class Entries < Svnx::Base::Entries
     def get_elements doc

data/lib/svnx/log/entry.rb

@@ -6,11 +6,6 @@ require 'svnx/base/action'
 require 'time'
 require 'svnx/log/entrypath'
 
-module Svnx
-  module Log
-  end
-end
-
 module Svnx::Log
   class Entry < Svnx::Base::Entry
     attr_reader :revision, :reverse_merge, :author, :date, :paths, :msg, :entries
@@ -21,14 +16,13 @@ module Svnx::Log
       
       set_elmt_vars elmt, 'author', 'date', 'msg'
 
-      # sort, because Subversion is not consistent with order
       @paths = elmt.elements.to_a('paths/path').collect do |pe|
         kind = attribute_value pe, 'kind'
         action = attribute_value pe, 'action'
         name = pe.text
 
         EntryPath.new(kind: kind, action: Svnx::Action.new(action), name: name)
-      end.sort
+      end.sort                  # sorted, because svn is not consistent with order
 
       @entries = elmt.elements.to_a('logentry').collect do |le|
         Entry.new le

data/lib/svnx/version.rb

@@ -3,5 +3,5 @@
 
 module Svnx
   NAME = 'svnx'
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command-cacheable
@@ -112,7 +112,6 @@ files:
 - README.md
 - Rakefile
 - lib/svnx/base/action.rb
-- lib/svnx/base/action_status.rb
 - lib/svnx/base/cmdline.rb
 - lib/svnx/base/command.rb
 - lib/svnx/base/command_factory.rb

data/lib/svnx/base/action_status.rb

@@ -1,37 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'singleton'
-
-module Svnx
-  class ActionStatus
-    include Singleton
-
-    attr_reader :stati
-
-    def initialize 
-      @status_to_symbol = Hash.new
-      @stati = Array.new
-
-      add_type 'added',       'A'
-      add_type 'deleted',     'D'
-      add_type 'modified',    'M'
-      add_type 'replaced',    'R'
-      add_type 'unversioned', '?'
-      add_type 'external',    'X'
-      add_type 'normal',      'q' # actually, X, but in a different column than X for external
-    end
-
-    def symbol_for arg
-      @status_to_symbol[arg]
-    end
-
-    def add_type str, char
-      sym = str.to_sym
-      @stati << str
-      [ sym, str, char ].each do |key|
-        @status_to_symbol[key] = sym
-      end
-    end  
-  end
-end