svn_command_helper 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2822279fd1a71b8b300daeaf421dec21d765aad
-  data.tar.gz: 49e95dcf1ff01a848ed92905f61f2eb6e07b92f4
+  metadata.gz: 59081bc6e3dc4a9dd6ea552f99923714a875c4cb
+  data.tar.gz: 1a9e7d17a23e855f54c4c25f61138a93f4144949
 SHA512:
-  metadata.gz: c67b3b38d64c8ff2baf92b3c9d5a327a28b6055d62d437cecdddedb87b0856a62f545e2efeb7942a75b9850bf8350d8e4a54b36fdbfda771fa1c49d47279e674
-  data.tar.gz: a163415a147810858a1730da95e198a4f7342c2fa993347c627379439ebe0bdef532b1a99f544bf803be2a976b0d6d239a29f847e66139739915a82f2a79ae05
+  metadata.gz: 19d200ce20613cc3e9bf8ae0653a5956f489a7bd3f14c4dd464be8b7ee7230f3a5d2404b5e4dd40dc1ec5d6abc2b2ecf7801657d35ca9f018971d38a8c02a743
+  data.tar.gz: 38b2e7071caf9f4c9cbedc7b7e2570a783c0b137f14adda9bbd60b45f1473715c712c9db1527d1d89ec9053aac1b6b20fc3a7f4b7b9237d215c9406a870572e9

data/lib/svn_command_helper.rb

@@ -3,7 +3,6 @@ require 'pathname'
 require 'yaml'
 require 'time'
 require 'tmpdir'
-require 'ostruct'
 require 'libxml'
 require "system_command_helper"
 
@@ -31,7 +30,7 @@ module SvnCommandHelper
       # svn list
       # @param [uri string like] uri target uri
       # @param [Boolean] recursive --recursive
-      # @return [Array<String>] paths
+      # @return [Array<ListItem>] paths
       def list(uri, recursive = false)
         if @list_cache && @list_cache[recursive][uri]
           @list_cache[recursive][uri]
@@ -39,19 +38,30 @@ module SvnCommandHelper
           list_str = cap("svn list --xml #{recursive ? '-R' : ''} #{uri}")
           list = LibXML::XML::Document.string(list_str).find("//lists/list/entry").map do |entry|
             commit = entry.find_first("commit")
-            OpenStruct.new({
+            ListItem.new(
               kind: entry["kind"],
               path: entry.find_first("name").content,
               revision: commit["revision"].to_i,
               author: commit.find_first("author").content,
-              date: Time.iso8601(commit.find_first("date").content),
-            })
+              date: Time.iso8601(commit.find_first("date").content)
+            )
           end
           @list_cache[recursive][uri] = list if @list_cache
           list
         end
       end
 
+      class ListItem
+        attr_reader :kind, :path, :revision, :author, :date
+        def initialize(kind:, path:, revision:, author:, date:)
+          @kind = kind
+          @path = path
+          @revision = revision
+          @author = author
+          @date = date
+        end
+      end
+
       # svn list --recursive
       # @param [uri string like] uri target uri
       # @return [Array<String>] paths
@@ -108,19 +118,29 @@ module SvnCommandHelper
       # @param [uri string like] uri target uri
       # @param [Integer] limit --limit
       # @param [Boolean] stop_on_copy --stop-on-copy
-      # @return [Array<OpenStruct>] log (old to new order)
+      # @return [Array<LogItem>] log (old to new order)
       def log(uri = ".", limit: nil, stop_on_copy: false)
         log = cap "svn log --xml #{limit ? "--limit #{limit}" : ""} #{stop_on_copy ? "--stop-on-copy" : ""} #{uri}"
         LibXML::XML::Document.string(log).find("//log/logentry").map do |entry|
-          OpenStruct.new({
+          LogItem.new(
             revision: entry["revision"].to_i,
             author: entry.find_first("author").content,
             date: Time.iso8601(entry.find_first("date").content),
-            msg: entry.find_first("msg").content,
-          })
+            msg: entry.find_first("msg").content
+          )
         end.reverse
       end
 
+      class LogItem
+        attr_reader :revision, :author, :date, :msg
+        def initialize(revision:, author:, date:, msg:)
+          @revision = revision
+          @author = author
+          @date = date
+          @msg = msg
+        end
+      end
+
       # head revision of uri
       # @param [uri string like] uri target uri
       # return [Integer] revision number
@@ -208,7 +228,15 @@ module SvnCommandHelper
       def merge_dry_run(command)
         cap("#{command} --dry-run")
           .each_line.map(&:chomp).reject {|line| line[4] != " "}
-          .map {|line| OpenStruct.new({status: line[0...4], path: line[5..-1]})}
+          .map {|line| MergeStatusItem.new(status: line[0...4], path: line[5..-1])}
+      end
+
+      class MergeStatusItem
+        attr_reader :status, :path
+        def initialize(status:, path:)
+          @status = status
+          @path = path
+        end
       end
 
       # svn merge branch to trunk with detecting revision range
@@ -298,12 +326,12 @@ module SvnCommandHelper
 
         diff_str = cap("svn diff --xml --summarize #{from_uri} #{to_uri} #{options.join(' ')}")
         diff_list = LibXML::XML::Document.string(diff_str).find("//diff/paths/path").map do |path|
-          OpenStruct.new({
+          DiffItem.new(
             kind: path["kind"],
             item: path["item"],
             props: path["props"],
-            path: path.content,
-          })
+            path: path.content
+          )
         end
         if ignore_properties
           diff_list.reject! {|diff| diff.item == "none"}
@@ -323,6 +351,17 @@ module SvnCommandHelper
         diff_list
       end
 
+      class DiffItem
+        attr_reader :kind, :item, :props, :path
+        attr_accessor :from, :to
+        def initialize(kind:, item:, props:, path:)
+          @kind = kind
+          @item = item
+          @props = props
+          @path = path
+        end
+      end
+
       # copy single transaction
       # @param [SvnFileCopyTransaction] transaction from and to info
       # @param [String] message commit message

data/lib/svn_command_helper/version.rb

@@ -1,4 +1,4 @@
 module SvnCommandHelper
   # version
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn_command_helper
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Narazaka