Lbnl processed

Author: Dave Zuckerman

lib/berkeley_library/sftp_handler/downloader/base.rb

@@ -41,11 +41,6 @@ def ssh_options
           end
         end
 
-        def assert_file_not_processed!(processed_path)
-          raise "File was already processed: #{processed_path}" \
-            if Pathname.new(processed_path).exist?
-        end
-
         def assert_not_exists!(local_path)
           raise "Local file already exists: #{local_path}" \
             if Pathname.new(local_path).exist?

lib/berkeley_library/sftp_handler/downloader/lbnl.rb

@@ -15,7 +15,7 @@ def download!(filename: nil, local_dir: '/opt/app/data')
           filename ||= default_filename
           remote_path = Pathname.new(filename)
           local_path = Pathname.new(local_dir) + filename
-          assert_file_not_processed! local_path + '.old'
+          assert_file_not_processed! local_path
           assert_not_exists! local_path
 
           connect do |sftp|
@@ -25,6 +25,11 @@ def download!(filename: nil, local_dir: '/opt/app/data')
           end
         end
 
+        def assert_file_not_processed!(filepath)
+          raise "File was already processed: #{filepath}" \
+            if Pathname.glob("#{filepath}*.old").any?
+        end
+
         def default_host
           'ncc-1701.lbl.gov'
         end

spec/downloader/base_spec.rb

@@ -9,18 +9,6 @@
     end
   end
 
-  describe '#assert_file_not_processed!' do
-    it 'proceeds if processed file is absent' do
-      expect { subject.assert_file_not_processed! '/path/to/non-existent-file' }.not_to raise_error
-    end
-
-    it 'raises if processed file exists' do
-      Tempfile.open do |f|
-        expect { subject.assert_file_not_processed! f.path }.to raise_error RuntimeError
-      end
-    end
-  end
-
   describe '#assert_not_exists!' do
     it 'proceeds if file is absent' do
       expect { subject.assert_not_exists! '/path/to/non-existent-file' }.not_to raise_error

spec/downloader/lbnl_spec.rb

@@ -1,6 +1,7 @@
 require 'berkeley_library/sftp_handler/downloader/lbnl'
 require 'net/sftp'
 require 'spec_helper'
+require 'tempfile'
 
 describe BerkeleyLibrary::SftpHandler::Downloader::Lbnl do
   its(:default_host) { is_expected.to eq 'ncc-1701.lbl.gov' }
@@ -55,6 +56,17 @@
     end
   end
 
+  describe '#assert_file_not_processed!' do
+    it 'proceeds if processed file is absent' do
+      expect { subject.assert_file_not_processed!('/path/to/non-existent-file') }.not_to raise_error
+    end
+
+    it 'raises if processed file exists' do
+      f = Tempfile.new(['temp_file38348', '.old'])
+      expect { subject.assert_file_not_processed! f.path.gsub('.old', '') }.to raise_error RuntimeError
+    end
+  end
+
   describe '#default_filename' do
     context 'on Sunday May 29, 2022' do
       its(:default_filename) do