dir-to-xml 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a981066889af6ae5fe3c1b95af1fe1b11847441f0e7be318f394311293bd583
-  data.tar.gz: 3e930b643d528dced500e2352bd778524d481feca645a51a0b79f2057161eea3
+  metadata.gz: d551bade9cfc68eb4cc6181db4642b56fde754f913e579318d9df92009fac23e
+  data.tar.gz: ab750c2c8ad808f974c6d34fe426d58e5e6c7e751dab08b5b79dcf0bbbd0617e
 SHA512:
-  metadata.gz: a215864766564c3e9c3fbf21665933fa2ab6c22a390472b9998a80e069188486292b94dbf596884301d7abc530190bb4ee27a7ffebbab4284999e31aa9abe623
-  data.tar.gz: a452a6224daab6a70a97852e6741d5ea1db20ba5f08b58a55bcff64bb0a5b55abbc974ccc20e026a65577f5ebadd8aaf52c7ccb961908df1f9acd31ed0d70a4a
+  metadata.gz: 0e6ce861e1816744e1ce701519edd3e4b5685bc36d00d2efa2b1e3bac120056095c15d547b92ae0f36a5d3ea4b25729abf8e67d5cf20b5e9976c937c7d02ce0a
+  data.tar.gz: 6e054d864cde8354887f403299da67c8b48abcdd240ce3fc3f643809e06edad4357e8af9698cb421657f5ff4d2b41c1b20571d6130b816bcfa1517e2bae9901c

data/lib/dir-to-xml.rb

@@ -74,11 +74,33 @@ class DirToXML
 
   alias changes activity
 
-  def directories()
+  # Returns a list of directory names
+  #
+  # note: if recursive is true then it will return a 1-dimensional Array 
+  #       object containing all directory paths including nested directories
+  #
+  def directories(recursive: false)
 
     a = @dx.all
     puts 'inside directories() a: ' + a.inspect if @debug
-    a.select {|x| x.type == 'directory'}.map(&:name)
+    
+    if recursive then
+
+      directories.flat_map do |dir_name|
+        
+        #puts 'dir_name: ' + dir_name.inspect
+        #puts 'path+dir: ' + File.join(@path, dir_name).inspect
+        dtx = DirToXML.new(File.join(@path, dir_name), verbose: false, debug: false)
+        list = dtx.directories(recursive: true)
+        r = [File.join(@path, dir_name)]
+        r.concat list if list.any?
+        
+        r
+      end
+      
+    else
+      a.select {|x| x.type == 'directory'}.map(&:name)
+    end
 
   end
 
@@ -107,7 +129,7 @@ class DirToXML
 
     a = records.map {|x| x[:name]}
 
-    if FileX.exists? File.join(@path, @index) then
+    if FileX.exist? File.join(@path, @index) then
 
       @dx = read()
 
@@ -164,7 +186,7 @@ class DirToXML
     else
 
       @dx = new_index(records)
-      find_latest(records)
+      find_latest(records) if records.any?
 
     end
 
@@ -198,6 +220,8 @@ class DirToXML
     @latest_file[:path] = @path
     puts ':@latest_file: ' + @latest_file.inspect if @debug
 
+    return unless @recursive
+
     puts 'before directories()' if @debug
     dir_list = directories()
     puts 'dir_list: ' + dir_list.inspect if @debug
@@ -208,7 +232,7 @@ class DirToXML
 
         puts 'dir: ' + dir.inspect if @debug
         dtx2 = DirToXML.new(File.join(@path, dir), index: @index,
-                            recursive: true, verbose: false, debug: @debug)
+                            recursive: @recursive, verbose: false, debug: @debug)
         [dir, dtx2.latest_file]
 
       end.reject {|_,latest|  latest.nil? }.sort_by {|_, x| x[:mtime]}.last
@@ -262,7 +286,7 @@ class DirToXML
     dx.title = 'Index of ' + @path
     dx.file_path = @path
     dx.last_modified = Time.now
-    dx.import records.reverse
+    dx.import records.reverse if records.any?
     dx.save File.join(@path, @index)
 
     return dx

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - James Robertson
@@ -10,32 +10,33 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjEwMTcwNzMwWhcN
-  MjMwMjEwMTcwNzMwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCjKYHi
-  pAa4sq7iRTV7XB75YoxA+OKNh8nqMnSNeOw3lJ3UYW4ulFKOvD+2LddRH1DD3CrP
-  0AYx2MI56Pu/UgtLZkze5pMf6CqLn8MCvonuSjNTj01bDi+fq8xAKu85LwG3xVP3
-  kqMCppRwlf7wtkc8tkC6vjc+GhggwTda8z7quTtiVpy2r3JJUs4QXDTqzfKNC+la
-  dueojDyI3m6mmaGyoT3k3LpTc0Vjg3JeiYsyWxGvK6R0JWqZiv7uwlxtzvuK/v5h
-  1iMhim2hB/6pFZalAddVfzvPCQiRek7nDKxPgvMDze2GIzvrpOapntu18nC1FYnO
-  kAC8vIStaFxmYzZYMB5h8C5q2xhJ3u6uGdyhpMuwvQOkhq4jdvI8SJ04eBhQH0DI
-  ta8OyiPQoqwegXXhBGU35/yZczB6QFswBaw7jTFcya1YKFDvXmLWOl0g6UOFnl66
-  QXnaC/xwRBh48VGALRPCgHuSf0Ag5LP+rv52s6Fbbs5B6syj059gNLO+DKkCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU/5KH1BIb
-  QxZC8hteME4fAEsveW8wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
-  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAXGQs4E7LZmG5OckxSpsJVhHaRYXp7ZghKTbn/K6X
-  fEtU8x781gphdo4wNOg8XA4MGAmZTBRi+7x9JE/NmxkC8KtqMSR89ynUtlhRldkF
-  +4uiJNtUSn9Ya3RyfUADF7gJ9OM4WpjXbpXBLtHe+GETjwl3EfDGQ6SNiUCRRaH+
-  DXthsMNrME6QFQ+n2IW7E2nn6ElLACWRUA1lqyRSC6doomKS3BIOmMmZ4aBrtIlB
-  3zBEnu2eXHgd2OkfIiFO+DU2wVF2cs01V41lk575rciiWKGfybmDT3+CQu3kTUHz
-  PkegIP3JOdHPhLsfzgycgbjOaNSEX21SDhPwmLmSng0oNn56N9Po1qFKUG0+XxvA
-  qkFeIsspayVS94HDHTs68XQx4XsZJHfV/H9Sw331V1H7QJkXdbmEDVHXa5D+lI4g
-  m7hEq9GAsvYejQNMhcxlvi+e70d3QiEg+2SVsBHaUGURzv0LjycCOjOaUxQA5swC
-  JKGINad8xoEL7XIDoO6EnBcY
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTIzMDQwMjExNDIwOVoXDTI0MDQwMTExNDIwOVowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBAMTjX7u9FdpS8NJxoIwVcXGjgoHs3yO5t2R0GOSYkyl1m30oLXdVVF/6jg69
+  k9NKWFfSzexEe3b9j6isg6bmqfPLHQWdmLmtpNaAlXdxsV1bkhowOmzl5iJ3Sguc
+  vdNLNm1Vy+kA4rlkNTungb54zwP1H7nUM8wMbwQOMTU2a0gZo+B9anF6BHJ5uCyl
+  M4EQ45fRzpm/1HARw3TvTKphTC+GTEbGVNhiAIKHo6lXkrXNTr15AI7gorufGX9+
+  yrEq6dKz+QMMo5fC1FHO6LhkvfNY+La/VAta3BjlCM3WXxUCxrA7d2B2yW7TQZ5p
+  lCTvjgTf87Cb1sz5kLWpjI5ST/B1KiP9dQ29WjWboATY3ngSJUy7VXkPYFjP3RWk
+  raQ2bVpCDDGLEv2fepPxnQ90O+KYU9LGJPfN3ghcNwlq/z+0cJ3vKpUl0IMB4g0o
+  61ZtTs3erPhilFRPOutBrCHD5QURemQWL75+6keCd5QvqRCXBSRaVsPh9Afy3/6Y
+  dooxyQIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBTJMRJaTxVyJ3Ae9SrgdWqpraNJujAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQA8NInmbXscRVXXSfqgqKH+rASFaXnx
+  hAE8TW+fPLxltQlc8+s4L3hYr2zTRKR+SDIaUd9ze1vYJEOkQhwYDBVKXSw+YXtl
+  WsuKIv+CqBmH2EXUmZWTMQAuJnvXcKLAjHk7yoP20Tfk5rEinilkLrMbmmUs3/o+
+  hrsY+OCUJC5h63Np1ztoqBu3mXsezs12dahAPPYSdO8kb/4DHxZNLwwZEbZTjoSh
+  seZClc0Qi54ENaOweJaFH3f9mS5rY1hsACvPJQ0LekuBVtDtURYmHHLq581B3Vij
+  yEX/NYTeFgBlQvOt45Nnf+dtnIACJMguZkWkuFXfTGcKfgZVtemirco4OJvEDVkL
+  LgSLSrbDBCEGQCNhEsNZpN1tpRmoG/S6Cz0ghONvyvGe3oUXg8Tjt2auOeXJ6PB0
+  /4mJzXKb3M5rjD/PyDzU06flVZYZVtaq0G1u/4Gwr/t1x3B6nEal/NNHvYQ8vRyN
+  yu/2dFC/tlJR6wcd8KB/YxGAuDYtPO7zMoU=
   -----END CERTIFICATE-----
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2023-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxlite
@@ -46,7 +47,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +57,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.5
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Dir-to-xml saves a directory listing in the Dynarex XML format