thecore_ftp_helpers 2.0.1 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dbd641735f5466ed9d98cf051a0a7f3e3f8d33765cf3cf8abc888af9dec458f
-  data.tar.gz: e4fabc772235c4218d17a739b9e6993d88872095abc98b34d69784bb16d44f52
+  metadata.gz: 236e81e8ccdc89a2c890efb0cd85cc50017b15829bac2ba74449f654171cf176
+  data.tar.gz: 9cffb2f02a9bb90babe8ca03c9b8df4d4ce3097560a5a9430517587ec0be6074
 SHA512:
-  metadata.gz: 2aa188d8d607ee7cf6ca7d3a1c912ed1cfc558097f8a4c4e6f5bc9b968ef263da03b0aac997ad34018957efbf534d062405787b9cf87e37ac57e4465b88e854d
-  data.tar.gz: f66cf310f1ea5a1f00672658d6cca91b0ff081d4b7baca47d3de58861c363d46911a74f8adc22a04ea7408300574f9c1ab0ed95f7e43130173f0648f8461c5c4
+  metadata.gz: f3b8e73c55e8bd677e3370f83d3c6df899531325dbaa8eb0d3a457ba195ff316784cda1ef0585c5ada7d50536d1cfbb57afe3b6f41676dc6b4b68cd1ff6e336e
+  data.tar.gz: fd028abd521cf3f747b48d6b0243f545e07f33e02f5002cacba8a03e72139a683447af299673cb83ca2917d0dc273fb81f2f6b93596b8a0f3916eab576d7e5fc

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 = '2.0.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thecore_ftp_helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.6
 platform: ruby
 authors:
 - Gabriele Tassoni