thecore_ftp_helpers 2.0.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d56ac25275f502a29e707b7b5b61ae04c08cd1ca2c9a2381b36cef86e3425ef8
-  data.tar.gz: fc2ac8cbaf047d70b4688420c44807b659d6b9fba04421abffc0f71535ff4657
+  metadata.gz: 191e64ce1ad125e28d8048ab0eb2e48aad46eed966b6997a85725798c41a7829
+  data.tar.gz: c94b6751008ee7c995a3c41358707cbb3a0afe12a7b3d6c80b8d13bba0624537
 SHA512:
-  metadata.gz: 627294d678c45e82694d4ff4aa68224bc03dca8088681abc1e9df73577ed1bfc1cf2a6acac35b9219387760430769acfba61fdad51084bddcddc6e6b3d24a605
-  data.tar.gz: ba44f7334d3720214c3186e6747958553f68ee44bfb2746cab5900c2cb653d27e31532ba79b59205781feb6a6237f168c6fb7eafba1721a23f1ee56e6b50963e
+  metadata.gz: c3d9e5ea9d63a9974ca857b9bfea69ee057fe7c90adb73ab1852fb3089c8eb0f6cb434578b68049b4ddc42f6c5bb70ce26051d26e896000ec6234bc4a0f75665
+  data.tar.gz: f78df11c7aa112c675a6fb5779a0abafe15c94d61be3b2d52b997ca208380915484c37a50c451a36660a56d448f8d8338040b24b4a314b7b82005a7ea166deb9

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/engine.rb

@@ -1,4 +1,3 @@
-require 'thecore'
 module ThecoreFtpHelpers
   class Engine < ::Rails::Engine
 

data/lib/thecore_ftp_helpers/version.rb

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

metadata

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