thecore_ftp_helpers 2.0.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dbd641735f5466ed9d98cf051a0a7f3e3f8d33765cf3cf8abc888af9dec458f
-  data.tar.gz: e4fabc772235c4218d17a739b9e6993d88872095abc98b34d69784bb16d44f52
+  metadata.gz: 5fb0b198d8af5221a0226d088e046c9e41c16045acf957a837f5d89f3a5bc019
+  data.tar.gz: 62369b565fc2429d0b3fdb88fbb28e106a71c74eecaccaf5a9c40a45fb45804a
 SHA512:
-  metadata.gz: 2aa188d8d607ee7cf6ca7d3a1c912ed1cfc558097f8a4c4e6f5bc9b968ef263da03b0aac997ad34018957efbf534d062405787b9cf87e37ac57e4465b88e854d
-  data.tar.gz: f66cf310f1ea5a1f00672658d6cca91b0ff081d4b7baca47d3de58861c363d46911a74f8adc22a04ea7408300574f9c1ab0ed95f7e43130173f0648f8461c5c4
+  metadata.gz: dd24970e259d08c2a613c03fbfcee2f6e1cd08152cc619ef8e1dd0c05a2cffa0b745e6443a4ebee0ac2ef8521dcf09989fec199a9515b83bef4128e9fc3a2c6b
+  data.tar.gz: fa320d379830939766f0c1ad9b06803253d00de9e7354de2d4d1977979f68a4fe8ab46f1e8d0ef50ae488ab4c36b904f1e60e09fa1784febdc8a147904d60bac

data/lib/thecore_ftp_helpers.rb

@@ -11,30 +11,39 @@ module ThecoreFtpHelpers
       puts "Connecting to FTP"
       ftp = Net::FTP.open address, username, password
       # ftp.passive = false
-      puts "Entering directory: #{directory}"
-      ftp.chdir(directory)
+      # puts "Entering directory: #{directory}"
+      # ftp.chdir(directory)
       puts "Listing all files which respond to this pattern: #{pattern}"
       begin
-        files = ftp.nlst(pattern)
+        # files = ftp.nlst(pattern)
+        files=ftp.mlsd directory
       rescue => exception
         # If we are here, maybe it's beacause of passive mode and the network too secure
         # let's switch to active mode and try again
         ftp.passive = false
-        files = ftp.nlst(pattern)
+        files=ftp.mlsd directory
       end
       
       puts "Last import time: #{from.strftime('%Y-%m-%d %H:%M:%S.%N')}"
-      files = files.select {|f|
-        puts "For file: #{f}"
-        puts "Filetime: #{ftp.mtime(f).strftime('%Y-%m-%d %H:%M:%S.%N')}"
-        puts "File chosen? #{ftp.mtime(f).to_f > from.to_f}"
-        ftp.mtime(f).to_f > from.to_f
+      most_recent = nil
+      # puts "SELECTING FILES"
+      files = files.select {|f| 
+        f.pathname.starts_with?(pattern) && f.modify.to_f > from.to_f 
       } unless from.blank?
-      puts "Chosen files: #{files.inspect}"
-      most_recent = files.sort_by{|f| ftp.mtime(f).to_f}.last
+      # puts "SELECTED FILES: #{files.inspect}"
+      most_recent = files.sort_by{|f| f.modify.to_f}.last.pathname
+      # puts "MOST RECENT IS: #{most_recent}"
+      # files.select {|f|
+      #   puts "For file: #{f}"
+      #   puts "Filetime: #{ftp.mtime(f).strftime('%Y-%m-%d %H:%M:%S.%N')}"
+      #   puts "File chosen? #{ftp.mtime(f).to_f > from.to_f}"
+      #   ftp.mtime(f).to_f > from.to_f
+      # } unless from.blank?
+      # puts "Chosen files: #{files.inspect}"
+      # most_recent = files.sort_by{|f| ftp.mtime(f).to_f}.last
       puts "Opening File: #{most_recent || "No file has been chosen."}"
       ftp.close if close
-      [most_recent, ftp]
+      ["#{directory}/#{most_recent}", ftp]
     end
 
     # If destination is nil, the file will just be downloaded to RAM

data/lib/thecore_ftp_helpers/version.rb

@@ -1,3 +1,3 @@
 module ThecoreFtpHelpers
-  VERSION = '2.0.1'.freeze
+  VERSION = "#{`git describe --tags $(git rev-list --tags --max-count=1)`.chomp}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ftp_helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons