neocities-red 1.1.2 → 1.2.0

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

@@ -3,6 +3,7 @@
 require "spec_helper"
 require "json"
 require "fileutils"
+require "time"
 
 RSpec.describe NeocitiesRed::Services::Site::Exporter do
   let(:client) { instance_double(NeocitiesRed::Client) }
@@ -11,29 +12,42 @@ RSpec.describe NeocitiesRed::Services::Site::Exporter do
   let(:tmp_root) { File.join(spec_root, "tmp", "site_exporter_spec") }
   let(:config_path) { File.join(tmp_root, "config.json") }
   let(:data) { { "LAST_PULL" => { "time" => nil, "loc" => nil } } }
+  let(:display) do
+    instance_double(
+      NeocitiesRed::CliDisplay,
+      display_pull_progress: nil,
+      display_pull_no_updates: nil,
+      display_pull_success: nil,
+      display_pull_failure: nil,
+      display_pull_stats: nil
+    )
+  end
+  let(:exporter) { described_class.new(client, sitename, data, config_path, display: display) }
+  let(:info_response) { { result: "success", info: { domain: nil } } }
+  let(:list_response) { { result: "success", files: [] } }
 
-  before do
+  around do |example|
     FileUtils.rm_rf(tmp_root)
     FileUtils.mkdir_p(tmp_root)
     File.write(config_path, data.to_json)
-  end
 
-  after do
+    original_dir = Dir.pwd
+    Dir.chdir(tmp_root)
+    example.run
+  ensure
+    Dir.chdir(original_dir)
     FileUtils.rm_rf(tmp_root)
   end
 
-  describe "#export" do
-    context "when pull is successful" do
-      let(:exporter) { described_class.new(client, sitename, data, config_path) }
-
-      before do
-        allow(client).to receive(:pull).and_return(nil)
-      end
+  before do
+    allow(client).to receive_messages(info: info_response, list: list_response)
+  end
 
-      it "pulls files from the site and updates the config file" do
+  describe "#export" do
+    context "when the site has no files" do
+      it "updates the config file with last pull data" do
         expect { exporter.export(quiet: true, last_pull_time: nil, last_pull_loc: nil) }.not_to raise_error
 
-        expect(File.exist?(config_path)).to be(true)
         updated_data = JSON.parse(File.read(config_path))
         expect(updated_data["LAST_PULL"]).to have_key("time")
         expect(updated_data["LAST_PULL"]).to have_key("loc")
@@ -62,51 +76,104 @@ RSpec.describe NeocitiesRed::Services::Site::Exporter do
         expect(Whirly).not_to have_received(:stop)
       end
 
-      context "with last_pull_time and last_pull_loc" do
-        let(:last_pull_time) { "2024-01-01T00:00:00Z" }
-        let(:last_pull_loc) { tmp_root }
+      it "displays pull stats" do
+        exporter.export(quiet: false, last_pull_time: nil, last_pull_loc: nil)
+
+        expect(display).to have_received(:display_pull_stats).with(0, anything)
+      end
+    end
+
+    context "when the site has files" do
+      let(:list_response) do
+        {
+          result: "success",
+          files: [
+            { path: "index.html", is_directory: false, updated_at: "2024-01-01T00:00:00Z" },
+            { path: "assets/", is_directory: true, updated_at: "2024-01-01T00:00:00Z" }
+          ]
+        }
+      end
+      let(:file_response) { instance_double(Faraday::Response, status: 200, body: "<h1>Hello</h1>") }
+
+      it "downloads files and writes them locally" do
+        allow(client).to receive(:download).with("https://test-site.neocities.org/index.html").and_return(file_response)
+
+        exporter.export(quiet: false, last_pull_time: nil, last_pull_loc: nil)
+
+        expect(File.read(File.join(tmp_root, "index.html"))).to eq("<h1>Hello</h1>")
+        expect(File.directory?(File.join(tmp_root, "assets"))).to be(true)
+        expect(display).to have_received(:display_pull_success)
+      end
+
+      it "uses the custom domain when present" do
+        allow(client).to receive(:info).and_return(result: "success", info: { domain: "example.com" })
+        allow(client).to receive(:download).with("https://example.com/index.html").and_return(file_response)
+
+        exporter.export(quiet: false, last_pull_time: nil, last_pull_loc: nil)
+
+        expect(client).to have_received(:download).with("https://example.com/index.html")
+      end
+
+      it "skips download when the file has not changed since last pull" do
+        allow(client).to receive(:download)
+        File.write(File.join(tmp_root, "index.html"), "existing content")
+
+        last_pull_time = Time.now.iso8601
+        exporter.export(quiet: false, last_pull_time: last_pull_time, last_pull_loc: Dir.pwd)
+
+        expect(display).to have_received(:display_pull_no_updates)
+        expect(client).not_to have_received(:download)
+        expect(File.read(File.join(tmp_root, "index.html"))).to eq("existing content")
+      end
+
+      it "reports failure when the download fails" do
+        allow(client).to receive(:download).with("https://test-site.neocities.org/index.html").and_return(
+          instance_double(Faraday::Response, status: 500, body: "")
+        )
 
-        it "passes last_pull parameters to client.pull" do
-          expect { exporter.export(quiet: true, last_pull_time: last_pull_time, last_pull_loc: last_pull_loc) }.not_to raise_error
+        exporter.export(quiet: false, last_pull_time: nil, last_pull_loc: nil)
 
-          expect(client).to have_received(:pull).with(
-            sitename, last_pull_time, last_pull_loc, quiet: true
-          )
-        end
+        expect(display).to have_received(:display_pull_failure)
+        expect(File.exist?(File.join(tmp_root, "index.html"))).to be(false)
       end
     end
 
-    context "when pull raises an error" do
-      let(:exporter) { described_class.new(client, sitename, data, config_path) }
+    context "when the API returns an error for info" do
+      let(:info_response) { { result: "error", message: "Site not found" } }
 
-      it "stops Whirly and returns the error" do
-        allow(Whirly).to receive(:start)
-        allow(Whirly).to receive(:stop)
-        allow(client).to receive(:pull).and_raise(StandardError.new("network error"))
+      it "raises APIError" do
+        expect do
+          exporter.export(quiet: true, last_pull_time: nil, last_pull_loc: nil)
+        end.to raise_error(NeocitiesRed::APIError, /Site not found/)
+      end
+    end
 
-        result = exporter.export(quiet: true, last_pull_time: nil, last_pull_loc: nil)
+    context "when the API returns an error for list" do
+      let(:list_response) { { result: "error", message: "List failed" } }
 
-        expect(result).to be_a(StandardError)
-        expect(result.message).to eq("network error")
-        expect(Whirly).to have_received(:stop)
+      it "raises APIError" do
+        expect do
+          exporter.export(quiet: true, last_pull_time: nil, last_pull_loc: nil)
+        end.to raise_error(NeocitiesRed::APIError, /List failed/)
       end
+    end
 
-      it "does not raise and returns an error object" do
+    context "when fetching raises an error" do
+      it "propagates the error and stops Whirly" do
+        allow(client).to receive(:info).and_raise(StandardError.new("network error"))
         allow(Whirly).to receive(:start)
         allow(Whirly).to receive(:stop)
-        allow(client).to receive(:pull).and_raise(StandardError.new("network error"))
 
-        result = nil
-        expect { result = exporter.export(quiet: true, last_pull_time: nil, last_pull_loc: nil) }.not_to raise_error
-        expect(result).to be_a(StandardError)
+        expect do
+          exporter.export(quiet: true, last_pull_time: nil, last_pull_loc: nil)
+        end.to raise_error(StandardError, "network error")
+        expect(Whirly).to have_received(:stop)
       end
     end
   end
 
   describe "#initialize" do
     it "stores client, sitename, data, and app_config_path" do
-      exporter = described_class.new(client, sitename, data, config_path)
-
       expect(exporter.client).to eq(client)
       expect(exporter.sitename).to eq(sitename)
       expect(exporter.data).to eq(data)

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

@@ -54,10 +54,10 @@ RSpec.describe NeocitiesRed::Services::Site::Informer do
         allow(client).to receive(:info).and_return(error_response)
       end
 
-      it "raises ClientError" do
+      it "raises APIError with the message" do
         expect { profile_info.stats }.to raise_error(
-          NeocitiesRed::Services::ClientError,
-          /site_not_found/
+          NeocitiesRed::APIError,
+          /could not find site nonexistent/
         )
       end
     end

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

@@ -47,7 +47,7 @@ RSpec.describe NeocitiesRed::Services::Site::Pusher do
   end
 
   before do
-    allow(NeocitiesRed::Services::File::Uploader).to receive(:new) do |_client, filepath, remote_path|
+    allow(NeocitiesRed::Services::File::Uploader).to receive(:new) do |_client, filepath, remote_path, _display|
       upload_calls << [filepath.to_s, remote_path.to_s]
       uploader_instance
     end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@
 
 require "neocities_red"
 require "fileutils"
-require "webmock"
+require "webmock/rspec"
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neocities-red
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Kyle Drake
@@ -84,9 +84,6 @@ dependencies:
   name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.0
@@ -94,9 +91,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.0
@@ -107,9 +101,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,9 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -144,9 +132,6 @@ dependencies:
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.23'
     - - '='
       - !ruby/object:Gem::Version
         version: 0.23.1
@@ -154,9 +139,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.23'
     - - '='
       - !ruby/object:Gem::Version
         version: 0.23.1
@@ -164,9 +146,6 @@ dependencies:
   name: tty-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
     - - '='
       - !ruby/object:Gem::Version
         version: 0.12.0
@@ -174,9 +153,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
     - - '='
       - !ruby/object:Gem::Version
         version: 0.12.0
@@ -213,6 +189,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -226,7 +203,10 @@ files:
 - lib/neocities_red/cli.rb
 - lib/neocities_red/cli_display.rb
 - lib/neocities_red/client.rb
+- lib/neocities_red/errors.rb
+- lib/neocities_red/services/common/exclusions.rb
 - lib/neocities_red/services/common/pizza.rb
+- lib/neocities_red/services/common/worker_pool.rb
 - lib/neocities_red/services/file/folder_uploader.rb
 - lib/neocities_red/services/file/list.rb
 - lib/neocities_red/services/file/remover.rb
@@ -240,7 +220,9 @@ files:
 - spec/neocities_red/cli_display_spec.rb
 - spec/neocities_red/cli_spec.rb
 - spec/neocities_red/client_spec.rb
+- spec/neocities_red/services/common/exclusions_spec.rb
 - spec/neocities_red/services/common/pizza_spec.rb
+- spec/neocities_red/services/common/worker_pool_spec.rb
 - spec/neocities_red/services/file/folder_uploader_spec.rb
 - spec/neocities_red/services/file/list_spec.rb
 - spec/neocities_red/services/file/remover_spec.rb
@@ -255,6 +237,10 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
+  homepage_uri: https://github.com/o-200/neocities-red
+  source_code_uri: https://github.com/o-200/neocities-red
+  changelog_uri: https://github.com/o-200/neocities-red/blob/main/CHANGELOG.md
+  documentation_uri: https://github.com/o-200/neocities-red#readme
 rdoc_options: []
 require_paths:
 - lib