dir-to-xml 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fd07741c205b9a10af1d80c5f9a298b36337acbe4fa6e3bfc15e53164eee0b8
-  data.tar.gz: 51f7acd3e7bc86fed507088781e576478ef846828ac050d35fbd30b0111aa738
+  metadata.gz: 95f3f9304511ed382a219b2a65296302d9bea293d775fd051ba6d3f6eb426d2d
+  data.tar.gz: 2736fc013064b22e0f51977b1ad1471390d9fd0b786585e58ecef31a3ff8d97d
 SHA512:
-  metadata.gz: a226d2e9028066bca47aee5b9dee85ef21531d6d947fb725f8ab09295bd41cf889378637c811c6eb3a6db8889339bc8f9fedbaa0316422f437515bc1ecb02e0a
-  data.tar.gz: 596a4e62fa36e4930151b7d2ee2c17b11d45e1c0606fa2e4783f24c80ff824940144d66c63004e4750de2cf88702c7be47553a8729c19496f2e6713198d48849
+  metadata.gz: 3932719c3963587b52bb82edd0475badab68675c46c0f0d8e01a73b1f24d2890630486982dd13918efafb1ddb9af12a70724f83c85b618c8b619370975874665
+  data.tar.gz: 286e1826d10993011a9d565a89c214257504d6a1629362417a9d94936bb9ceeb81ac68a4fd3e534021b52e195c0e6342df3236a3738714e7fbbb05f9aee08624

data/lib/dir-to-xml.rb

@@ -31,6 +31,7 @@ require 'dxlite'
 
 class DirToXML
   using ColouredText
+  include RXFReadWriteModule
 
   attr_reader :new_files, :deleted_files, :dx, :latest_files, :latest_file
 
@@ -101,7 +102,7 @@ class DirToXML
 
     a = records.map {|x| x[:name]}
 
-    if File.exists? File.join(@path, @index) then
+    if FileX.exists? File.join(@path, @index) then
 
       @dx = read()
 
@@ -127,10 +128,13 @@ class DirToXML
       dtx_last_modified = Time.parse(@dx.last_modified)
 
       select_records = records.select do |file|
-        file[:mtime] > dtx_last_modified
+
+        file[:mtime] > dtx_last_modified or file[:type] == 'directory'
+
       end
 
-      find_latest(select_records)
+      puts 'select_records: ' + select_records.inspect if @debug
+      find_latest(select_records) if select_records.any?
 
       # Add any new files
       #
@@ -179,6 +183,7 @@ class DirToXML
     puts '@latest_files:  ' + @latest_files.inspect if @debug
 
     @latest_file = @latest_files[-1]
+    @latest_file[:path] = @path
     puts ':@latest_file: ' + @latest_file.inspect if @debug
 
     dir_list = directories()
@@ -201,12 +206,12 @@ class DirToXML
                                      or latest_file.nil? \
                                      or latest_file[:type] == 'directory') then
 
-        dir_latest.last[:path] = File.join(@path, dir_latest.first)
+        dir_latest.last[:path] = File.expand_path(File.join(@path, dir_latest.first))
         dir_latest.last
 
       elsif latest_file and latest_file[:type] == 'file'
 
-        latest_file[:path] = @path
+        latest_file[:path] = File.expand_path(@path)
         latest_file
 
       end
@@ -252,7 +257,7 @@ class DirToXML
 
   def scan_dir(path)
 
-    a = Dir.glob(File.join(path, "*")).map {|x| File.basename(x) }
+    a = DirX.glob(File.join(path, "*")).map {|x| File.basename(x) }
     a.delete @index
     a.map {|filename| getfile_info(filename) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,48 +35,48 @@ cert_chain:
   m7hEq9GAsvYejQNMhcxlvi+e70d3QiEg+2SVsBHaUGURzv0LjycCOjOaUxQA5swC
   JKGINad8xoEL7XIDoO6EnBcY
   -----END CERTIFICATE-----
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: dxlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Dir-to-xml saves a directory listing in the Dynarex XML format