neocities-red 1.1.2 → 1.2.0

data/spec/neocities_red/services/common/exclusions_spec.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "fileutils"
+require "tmpdir"
+
+RSpec.describe NeocitiesRed::Services::Common::Exclusions do
+  let(:tmp_root) { Dir.mktmpdir("exclusions_spec") }
+
+  before do
+    FileUtils.mkdir_p(File.join(tmp_root, "node_modules"))
+    File.write(File.join(tmp_root, "node_modules", "dep.js"), "x")
+    File.write(File.join(tmp_root, "secret.txt"), "x")
+    File.write(File.join(tmp_root, "keep.txt"), "x")
+  end
+
+  after do
+    FileUtils.rm_rf(tmp_root)
+  end
+
+  describe ".build" do
+    it "returns an empty list for entries that do not exist" do
+      expect(described_class.build([File.join(tmp_root, "nope")])).to eq([])
+    end
+
+    it "returns the path for an existing file" do
+      expect(described_class.build([File.join(tmp_root, "secret.txt")]))
+        .to eq([File.join(tmp_root, "secret.txt")])
+    end
+
+    it "returns the directory and all of its children for an existing directory" do
+      entries = described_class.build([File.join(tmp_root, "node_modules")])
+
+      expect(entries).to include(File.join(tmp_root, "node_modules"))
+      expect(entries).to include(File.join(tmp_root, "node_modules", "dep.js"))
+    end
+
+    it "normalizes paths relative to base_path when given" do
+      entries = described_class.build(
+        [File.join(tmp_root, "secret.txt"), File.join(tmp_root, "node_modules")],
+        base_path: tmp_root
+      )
+
+      expect(entries).to contain_exactly("secret.txt", "node_modules", "node_modules/dep.js")
+    end
+  end
+end

data/spec/neocities_red/services/common/worker_pool_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe NeocitiesRed::Services::Common::WorkerPool do
+  let(:result) { [] }
+  let(:mutex) { Mutex.new }
+
+  def pool_of(size)
+    described_class.new(size) do |item|
+      mutex.synchronize { result << item }
+    end
+  end
+
+  describe "#process" do
+    it "calls the block for each item" do
+      pool_of(3).process([1, 2, 3, 4, 5])
+
+      expect(result.sort).to eq([1, 2, 3, 4, 5])
+    end
+
+    it "processes items across multiple threads" do
+      threads_seen = []
+      pool = described_class.new(4) do |item|
+        sleep 0.002
+        threads_seen << Thread.current.object_id
+        result << item
+      end
+
+      pool.process(Array.new(20, :work))
+
+      expect(threads_seen.uniq.size).to be > 1
+      expect(result.size).to eq(20)
+    end
+
+    it "works with a single worker" do
+      pool_of(1).process(%w[a b c])
+
+      expect(result).to eq(%w[a b c])
+    end
+
+    it "returns immediately for an empty list" do
+      expect { pool_of(2).process([]) }.not_to raise_error
+
+      expect(result).to be_empty
+    end
+  end
+end

data/spec/neocities_red/services/file/folder_uploader_spec.rb

@@ -6,6 +6,7 @@ require "fileutils"
 RSpec.describe NeocitiesRed::Services::File::FolderUploader do
   let(:client) { instance_double(NeocitiesRed::Client) }
   let(:remote_path) { "ext/" }
+  let(:display) { instance_double(NeocitiesRed::CliDisplay, display_skip_file: nil) }
 
   let(:spec_root) { File.expand_path("..", __dir__) } # => ./spec
   let(:tmp_root)  { File.join(spec_root, "tmp", "folder_uploader_spec") }
@@ -26,9 +27,9 @@ RSpec.describe NeocitiesRed::Services::File::FolderUploader do
   end
 
   describe "#files" do
-    it "raises FileIsNotExists when the path does not exist" do
-      uploader = described_class.new(client, File.join(tmp_root, "nope"), remote_path)
-      expect { uploader.files }.to raise_error(NeocitiesRed::Services::File::FileIsNotExists)
+    it "raises FileNotFoundError when the path does not exist" do
+      uploader = described_class.new(client, File.join(tmp_root, "nope"), remote_path, display: display)
+      expect { uploader.files }.to raise_error(NeocitiesRed::FileNotFoundError)
     end
 
     it "returns all files under the directory as relative paths, including dotfiles, excluding directories" do
@@ -40,7 +41,7 @@ RSpec.describe NeocitiesRed::Services::File::FolderUploader do
       FileUtils.mkdir_p(File.join(tmp_root, "ext/empty_dir"))
       FileUtils.mkdir_p(File.join(tmp_root, "ext/.hiddendir"))
 
-      uploader = described_class.new(client, File.join(tmp_root, "ext"), remote_path)
+      uploader = described_class.new(client, File.join(tmp_root, "ext"), remote_path, display: display)
       expect(uploader.files).to contain_exactly("a.txt", "sub/b.txt", ".env", "sub/.keep")
     end
 
@@ -49,16 +50,17 @@ RSpec.describe NeocitiesRed::Services::File::FolderUploader do
       write_file("tmp_ext/sub/nested.rb", content: "puts :ok")
 
       Dir.chdir(tmp_root) do
-        uploader = described_class.new(client, "./tmp_ext/", remote_path)
+        uploader = described_class.new(client, "./tmp_ext/", remote_path, display: display)
         expect(uploader.files).to contain_exactly("root.rb", "sub/nested.rb")
       end
     end
 
     it "returns nil when filepath is a file (not a directory)" do
       file_path = write_file("not_a_dir.txt", content: "hello")
-      uploader = described_class.new(client, file_path, remote_path)
+      uploader = described_class.new(client, file_path, remote_path, display: display)
 
       expect(uploader.files).to be_nil
+      expect(display).to have_received(:display_skip_file)
     end
   end
 end

data/spec/neocities_red/services/file/list_spec.rb

@@ -7,7 +7,8 @@ RSpec.describe NeocitiesRed::Services::File::List do
   let(:client) { instance_double(NeocitiesRed::Client) }
   let(:path) { nil }
   let(:detail) { false }
-  let(:file_list) { described_class.new(client, path, detail) }
+  let(:display) { instance_double(NeocitiesRed::CliDisplay, display_list_table: nil) }
+  let(:file_list) { described_class.new(client, path, detail, display: display) }
 
   describe "#list" do
     context "when successful" do
@@ -58,11 +59,10 @@ RSpec.describe NeocitiesRed::Services::File::List do
 
       before do
         allow(client).to receive(:list).and_return(error_response)
-        allow($stdout).to receive(:puts)
       end
 
-      it "displays the error and exits" do
-        expect { file_list.list }.to raise_error(SystemExit)
+      it "raises APIError with the message" do
+        expect { file_list.list }.to raise_error(NeocitiesRed::APIError, /Invalid path/)
       end
     end
   end
@@ -81,7 +81,6 @@ RSpec.describe NeocitiesRed::Services::File::List do
 
       before do
         allow(client).to receive(:list).with(path).and_return(files_response)
-        allow($stdout).to receive(:puts)
       end
 
       it "returns an array of files" do
@@ -119,7 +118,6 @@ RSpec.describe NeocitiesRed::Services::File::List do
         allow(pastel).to receive_messages(blue: pastel, green: pastel)
         allow(TTY::Table).to receive(:new).and_return(table)
         allow(table).to receive(:to_s).and_return("table output")
-        allow($stdout).to receive(:puts)
       end
 
       it "returns files with detailed information" do
@@ -142,6 +140,12 @@ RSpec.describe NeocitiesRed::Services::File::List do
 
         expect(pastel).to have_received(:green).at_least(:once)
       end
+
+      it "renders the table through the display" do
+        file_list.show
+
+        expect(display).to have_received(:display_list_table).with(table)
+      end
     end
 
     context "when API returns an error" do
@@ -149,11 +153,10 @@ RSpec.describe NeocitiesRed::Services::File::List do
 
       before do
         allow(client).to receive(:list).and_return(error_response)
-        allow($stdout).to receive(:puts)
       end
 
-      it "displays the error and exits" do
-        expect { file_list.show }.to raise_error(SystemExit)
+      it "raises APIError with the message" do
+        expect { file_list.show }.to raise_error(NeocitiesRed::APIError, /Path not found/)
       end
     end
   end
@@ -166,7 +169,7 @@ RSpec.describe NeocitiesRed::Services::File::List do
     end
 
     it "handles nil detail as false" do
-      file_list_nil_detail = described_class.new(client, path, nil)
+      file_list_nil_detail = described_class.new(client, path, nil, display: display)
       expect(file_list_nil_detail.instance_variable_get(:@detail)).to be(false)
     end
 

data/spec/neocities_red/services/file/remover_spec.rb

@@ -1,21 +1,19 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require "stringio"
 
 RSpec.describe NeocitiesRed::Services::File::Remover do
-  subject(:remover) { described_class.new(client, filepath) }
+  subject(:remover) { described_class.new(client, filepath, display: display) }
 
   let(:client) { instance_double(NeocitiesRed::Client) }
   let(:filepath) { "test_file.txt" }
-  let(:io) { StringIO.new }
-  let(:pastel) { object_double(Pastel.new(eachline: "\n")) }
-
-  before do
-    allow(Pastel).to receive(:new).with(eachline: "\n").and_return(pastel)
-    allow(pastel).to receive(:bold) { |msg| msg }
-    allow(pastel).to receive_messages(green: pastel, yellow: pastel)
-    allow($stdout).to receive_messages(puts: nil, print: nil)
+  let(:display) do
+    instance_double(
+      NeocitiesRed::CliDisplay,
+      display_delete_progress: nil,
+      display_delete_success: nil,
+      display_delete_error: nil
+    )
   end
 
   describe "#initialize" do
@@ -46,14 +44,10 @@ RSpec.describe NeocitiesRed::Services::File::Remover do
         expect(client).to have_received(:delete).with(filepath)
       end
 
-      it "prints deletion progress message" do
+      it "displays delete progress and success" do
         remover.remove
-        expect(pastel).to have_received(:bold).with("Deleting #{filepath} ...")
-      end
-
-      it "prints SUCCESS message" do
-        remover.remove
-        expect(pastel).to have_received(:green)
+        expect(display).to have_received(:display_delete_progress).with(filepath)
+        expect(display).to have_received(:display_delete_success)
       end
 
       it "returns the success response" do
@@ -76,9 +70,9 @@ RSpec.describe NeocitiesRed::Services::File::Remover do
         expect(client).to have_received(:delete).with(filepath)
       end
 
-      it "prints error message" do
+      it "displays delete error" do
         remover.remove
-        expect(pastel).to have_received(:bold).with("File not found")
+        expect(display).to have_received(:display_delete_error).with(error_response)
       end
 
       it "returns the error response" do
@@ -96,9 +90,9 @@ RSpec.describe NeocitiesRed::Services::File::Remover do
         allow(client).to receive(:delete).with(filepath).and_return(exists_response)
       end
 
-      it "prints EXISTS message" do
+      it "displays delete error" do
         remover.remove
-        expect(pastel).to have_received(:yellow)
+        expect(display).to have_received(:display_delete_error).with(exists_response)
       end
 
       it "returns the error response" do

data/spec/neocities_red/services/file/uploader_spec.rb

@@ -1,13 +1,22 @@
 # frozen_string_literal: true
 
-require "fileutils"
 require "spec_helper"
 
 RSpec.describe NeocitiesRed::Services::File::Uploader do
   let(:client) { instance_double(NeocitiesRed::Client) }
   let(:filepath) { "/path/to/file.txt" }
   let(:remote_path) { "file.txt" }
-  let(:uploader) { described_class.new(client, filepath, remote_path) }
+  let(:display) do
+    instance_double(
+      NeocitiesRed::CliDisplay,
+      display_skip_directory: nil,
+      display_upload_progress: nil,
+      display_upload_success: nil,
+      display_upload_exists: nil,
+      display_response: nil
+    )
+  end
+  let(:uploader) { described_class.new(client, filepath, remote_path, display: display) }
 
   describe "#upload" do
     context "when the file does not exist" do
@@ -15,9 +24,9 @@ RSpec.describe NeocitiesRed::Services::File::Uploader do
         allow(Pathname).to receive(:new).with(filepath).and_return(instance_double(Pathname, exist?: false))
       end
 
-      it "raises FileIsNotExists error" do
+      it "raises FileNotFoundError" do
         expect { uploader.upload }.to raise_error(
-          NeocitiesRed::Services::File::FileIsNotExists,
+          NeocitiesRed::FileNotFoundError,
           /does not exist locally/
         )
       end
@@ -29,13 +38,12 @@ RSpec.describe NeocitiesRed::Services::File::Uploader do
       before do
         allow(Pathname).to receive(:new).with(filepath).and_return(path_double)
         allow(client).to receive(:upload)
-        allow($stdout).to receive(:puts)
       end
 
-      it "prints a message and returns without uploading" do
+      it "displays a skip message and returns without uploading" do
         uploader.upload
 
-        expect($stdout).to have_received(:puts).with(match(/#{Regexp.escape(filepath)} is a directory, skipping/))
+        expect(display).to have_received(:display_skip_directory).with(path_double)
         expect(client).not_to have_received(:upload)
       end
     end
@@ -46,7 +54,6 @@ RSpec.describe NeocitiesRed::Services::File::Uploader do
 
       before do
         allow(Pathname).to receive(:new).with(filepath).and_return(path_double)
-        allow($stdout).to receive(:puts)
       end
 
       context "when upload is successful" do
@@ -60,10 +67,11 @@ RSpec.describe NeocitiesRed::Services::File::Uploader do
           expect(client).to have_received(:upload).with(path_double, remote_path)
         end
 
-        it "prints success message" do
+        it "displays progress and success" do
           uploader.upload
 
-          expect($stdout).to have_received(:puts).with(/SUCCESS/)
+          expect(display).to have_received(:display_upload_progress).with(path_double, remote_path)
+          expect(display).to have_received(:display_upload_success)
         end
 
         it "returns the success response" do
@@ -86,10 +94,10 @@ RSpec.describe NeocitiesRed::Services::File::Uploader do
           allow(client).to receive(:upload).with(path_double, remote_path).and_return(exists_response)
         end
 
-        it "prints exists message" do
+        it "displays exists message" do
           uploader.upload
 
-          expect($stdout).to have_received(:puts).with(/EXISTS/)
+          expect(display).to have_received(:display_upload_exists)
         end
 
         it "returns the error response" do
@@ -108,12 +116,10 @@ RSpec.describe NeocitiesRed::Services::File::Uploader do
           allow(client).to receive(:upload).with(path_double, remote_path).and_return(error_response)
         end
 
-        it "prints error message" do
+        it "displays the error response" do
           uploader.upload
 
-          expect($stdout).to have_received(:puts).with(
-            hash_including(result: "error", error_type: "upload_failed", message: "Upload failed")
-          )
+          expect(display).to have_received(:display_response).with(error_response)
         end
 
         it "returns the error response" do
@@ -127,13 +133,12 @@ RSpec.describe NeocitiesRed::Services::File::Uploader do
     context "with custom remote path" do
       let(:custom_remote_path) { "custom/path/file.txt" }
       let(:path_double) { instance_double(Pathname, exist?: true, directory?: false, to_s: filepath) }
-      let(:custom_uploader) { described_class.new(client, filepath, custom_remote_path) }
+      let(:custom_uploader) { described_class.new(client, filepath, custom_remote_path, display: display) }
       let(:success_response) { { result: "success", message: "File uploaded successfully" } }
 
       before do
         allow(Pathname).to receive(:new).with(filepath).and_return(path_double)
         allow(client).to receive(:upload).with(path_double, custom_remote_path).and_return(success_response)
-        allow($stdout).to receive(:puts)
       end
 
       it "uses the custom remote path" do
@@ -151,8 +156,8 @@ RSpec.describe NeocitiesRed::Services::File::Uploader do
       expect(uploader.instance_variable_get(:@remote_path)).to eq(remote_path)
     end
 
-    it "creates a Pastel instance" do
-      expect(uploader.instance_variable_get(:@pastel)).to be_a(Pastel::Delegator)
+    it "stores the display" do
+      expect(uploader.instance_variable_get(:@display)).to eq(display)
     end
   end
 end

data/spec/neocities_red/services/site/differencer_spec.rb

@@ -72,6 +72,7 @@ RSpec.describe NeocitiesRed::Services::Site::Differencer do
         .with(File.join("**", "*"), File::FNM_DOTMATCH)
         .and_return(globbed_paths)
 
+      allow(File).to receive(:file?).and_return(false)
       allow(File).to receive(:file?).with("index.html").and_return(true)
       allow(File).to receive(:file?).with("about.html").and_return(true)
       allow(File).to receive(:file?).with("contact.html").and_return(true)
@@ -88,7 +89,7 @@ RSpec.describe NeocitiesRed::Services::Site::Differencer do
     it "returns added, modified and removed paths" do
       added_paths, modified_paths, removed_paths = service.show
 
-      expect(added_paths).to eq(["GREEN(contact.html)", "GREEN(assets)"])
+      expect(added_paths).to eq(["GREEN(contact.html)", "GREEN(assets)", "GREEN(.git)", "GREEN(.env)"])
       expect(modified_paths).to eq(["YELLOW(about.html)"])
       expect(removed_paths).to eq(["RED(old.html)"])
     end
@@ -110,11 +111,11 @@ RSpec.describe NeocitiesRed::Services::Site::Differencer do
       expect(Digest::SHA1).not_to have_received(:file).with("assets")
     end
 
-    it "always excludes dotfiles and dot-directories from local paths" do
+    it "includes dotfiles and dot-directories by default" do
       added_paths, = service.show
 
-      expect(added_paths).not_to include("GREEN(.git)")
-      expect(added_paths).not_to include("GREEN(.env)")
+      expect(added_paths).to include("GREEN(.git)")
+      expect(added_paths).to include("GREEN(.env)")
     end
 
     context "when exclude is provided" do
@@ -123,7 +124,7 @@ RSpec.describe NeocitiesRed::Services::Site::Differencer do
       it "excludes paths from diff" do
         added_paths, modified_paths, removed_paths = service.show
 
-        expect(added_paths).to eq(["GREEN(assets)"])
+        expect(added_paths).to eq(["GREEN(assets)", "GREEN(.git)", "GREEN(.env)"])
         expect(modified_paths).to eq(["YELLOW(about.html)"])
         expect(removed_paths).to eq([])
       end
@@ -132,13 +133,38 @@ RSpec.describe NeocitiesRed::Services::Site::Differencer do
     context "when ignore_dotfiles is true" do
       let(:ignore_dotfiles) { true }
 
-      it "still returns the same result because dotfiles are already filtered earlier" do
+      it "excludes dotfiles and dot-directories" do
         added_paths, modified_paths, removed_paths = service.show
 
         expect(added_paths).to eq(["GREEN(contact.html)", "GREEN(assets)"])
+        expect(added_paths).not_to include("GREEN(.git)")
+        expect(added_paths).not_to include("GREEN(.env)")
         expect(modified_paths).to eq(["YELLOW(about.html)"])
         expect(removed_paths).to eq(["RED(old.html)"])
       end
+
+      it "does not hash dotfiles" do
+        service.show
+
+        expect(Digest::SHA1).not_to have_received(:file).with(".env")
+      end
+    end
+
+    context "when server has directories" do
+      let(:server_files) do
+        [
+          { path: "index.html", sha1_hash: "server-index-sha", is_directory: false },
+          { path: "assets", is_directory: true },
+          { path: "old.html", sha1_hash: "server-old-sha", is_directory: false }
+        ]
+      end
+
+      it "does not list server directories as removed" do
+        _, _, removed_paths = service.show
+
+        expect(removed_paths).to eq(["RED(old.html)"])
+        expect(removed_paths).not_to include("RED(assets)")
+      end
     end
   end