neocities-red 1.1.0 → 1.1.2

data/lib/neocities_red/services/file/folder_uploader.rb

@@ -1,65 +1,65 @@
-# frozen_string_literal: true
-
-require "pathname"
-require "pastel"
-
-module NeocitiesRed
-  module Services
-    module File
-      # warning - the big quantity of working threads could be considered like-a DDOS.
-      # Your ip-address could get banned for a few days.
-      MAX_THREADS = 5
-
-      class FolderUploader
-        def initialize(client, filepath, remote_path)
-          @client = client
-          @filepath = filepath
-          @remote_path = remote_path
-          @pastel = Pastel.new(eachline: "\n")
-        end
-
-        def files
-          path = Pathname.new(::File.expand_path(@filepath))
-
-          raise FileIsNotExists, "#{path} does not exist locally." unless path.exist?
-
-          if path.file?
-            puts @pastel.bold("#{path} is not a directory, skipping")
-            return
-          end
-
-          Dir.chdir(path) do
-            Dir.glob("**/*", ::File::FNM_DOTMATCH)
-               .select { |f| ::File.file?(f) }
-          end
-        end
-
-        def upload(files_list, threads = MAX_THREADS)
-          base = ::File.expand_path(@filepath)
-
-          queue = Queue.new
-          files_list.each { |file| queue << file }
-
-          workers = Array.new(threads) do
-            Thread.new do
-              loop do
-                begin
-                  file = queue.pop(true)
-                rescue ThreadError
-                  break
-                end
-
-                local_path  = ::File.join(base, file)
-                remote_path = ::File.join(@remote_path, file)
-
-                Uploader.new(@client, local_path, remote_path).upload
-              end
-            end
-          end
-
-          workers.each(&:join)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "pathname"
+require "pastel"
+
+module NeocitiesRed
+  module Services
+    module File
+      # warning - the big quantity of working threads could be considered like-a DDOS.
+      # Your ip-address could get banned for a few days.
+      MAX_THREADS = 5
+
+      class FolderUploader
+        def initialize(client, filepath, remote_path)
+          @client = client
+          @filepath = filepath
+          @remote_path = remote_path
+          @pastel = Pastel.new(eachline: "\n")
+        end
+
+        def files
+          path = Pathname.new(::File.expand_path(@filepath))
+
+          raise FileIsNotExists, "#{path} does not exist locally." unless path.exist?
+
+          if path.file?
+            puts @pastel.bold("#{path} is not a directory, skipping")
+            return
+          end
+
+          Dir.chdir(path) do
+            Dir.glob("**/*", ::File::FNM_DOTMATCH)
+               .select { |f| ::File.file?(f) }
+          end
+        end
+
+        def upload(files_list, threads = MAX_THREADS)
+          base = ::File.expand_path(@filepath)
+
+          queue = Queue.new
+          files_list.each { |file| queue << file }
+
+          workers = Array.new(threads) do
+            Thread.new do
+              loop do
+                begin
+                  file = queue.pop(true)
+                rescue ThreadError
+                  break
+                end
+
+                local_path  = ::File.join(base, file)
+                remote_path = ::File.join(@remote_path, file)
+
+                Uploader.new(@client, local_path, remote_path).upload
+              end
+            end
+          end
+
+          workers.each(&:join)
+        end
+      end
+    end
+  end
+end

data/lib/neocities_red/services/file/list.rb

@@ -1,65 +1,65 @@
-# frozen_string_literal: true
-
-require "pastel"
-require "time"
-require "tty/table"
-
-module NeocitiesRed
-  module Services
-    module File
-      class List
-        def initialize(client, path, detail)
-          @client = client
-          @path = path
-          @detail = detail || false
-          @pastel = Pastel.new(eachline: "\n")
-        end
-
-        def list
-          resp = @client.list(@path)
-
-          display_error_and_exit(resp) if resp[:result] == "error"
-
-          resp[:files]
-        end
-
-        def show
-          resp = @client.list(@path)
-
-          display_error_and_exit(resp) if resp[:result] == "error"
-
-          if @detail
-            out = [
-              [@pastel.bold("Path"), @pastel.bold("Size"), @pastel.bold("sha1_Hash"),
-               @pastel.bold("Updated")]
-            ]
-
-            resp[:files].each do |file|
-              out.push([
-                         @pastel.send(file[:is_directory] ? :blue : :green).bold(file[:path]),
-                         file[:size] || "",
-                         file[:sha1_hash],
-                         Time.parse(file[:updated_at]).localtime
-                       ])
-            end
-
-            puts TTY::Table.new(out)
-          end
-
-          resp[:files].map do |file|
-            @pastel.send(file[:is_directory] ? :blue : :green).bold(file[:path])
-          end
-
-          resp[:files]
-        end
-
-        private
-
-        def display_error_and_exit(resp)
-          puts(resp[:message] || resp[:error_type] || resp.inspect)
-          exit
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "pastel"
+require "time"
+require "tty/table"
+
+module NeocitiesRed
+  module Services
+    module File
+      class List
+        def initialize(client, path, detail)
+          @client = client
+          @path = path
+          @detail = detail || false
+          @pastel = Pastel.new(eachline: "\n")
+        end
+
+        def list
+          resp = @client.list(@path)
+
+          display_error_and_exit(resp) if resp[:result] == "error"
+
+          resp[:files]
+        end
+
+        def show
+          resp = @client.list(@path)
+
+          display_error_and_exit(resp) if resp[:result] == "error"
+
+          if @detail
+            out = [
+              [@pastel.bold("Path"), @pastel.bold("Size"), @pastel.bold("sha1_Hash"),
+               @pastel.bold("Updated")]
+            ]
+
+            resp[:files].each do |file|
+              out.push([
+                         @pastel.send(file[:is_directory] ? :blue : :green).bold(file[:path]),
+                         file[:size] || "",
+                         file[:sha1_hash],
+                         Time.parse(file[:updated_at]).localtime
+                       ])
+            end
+
+            puts TTY::Table.new(out)
+          end
+
+          resp[:files].map do |file|
+            @pastel.send(file[:is_directory] ? :blue : :green).bold(file[:path])
+          end
+
+          resp[:files]
+        end
+
+        private
+
+        def display_error_and_exit(resp)
+          puts(resp[:message] || resp[:error_type] || resp.inspect)
+          exit
+        end
+      end
+    end
+  end
+end

data/lib/neocities_red/services/file/remover.rb

@@ -1,35 +1,35 @@
-# frozen_string_literal: true
-
-require "pastel"
-
-module NeocitiesRed
-  module Services
-    module File
-      class Remover
-        attr_accessor :client, :filepath
-
-        def initialize(client, filepath)
-          @client = client
-          @filepath = filepath
-          @pastel = Pastel.new(eachline: "\n")
-        end
-
-        def remove
-          puts @pastel.bold("Deleting #{filepath} ...")
-
-          response = @client.delete(filepath)
-
-          puts @pastel.bold(response[:message]) if response[:result] == "error"
-
-          if response[:result] == "error" && response[:error_type] == "file_exists"
-            print @pastel.yellow.bold("EXISTS")
-          elsif response[:result] == "success"
-            print @pastel.green.bold("SUCCESS")
-          end
-
-          response
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "pastel"
+
+module NeocitiesRed
+  module Services
+    module File
+      class Remover
+        attr_accessor :client, :filepath
+
+        def initialize(client, filepath)
+          @client = client
+          @filepath = filepath
+          @pastel = Pastel.new(eachline: "\n")
+        end
+
+        def remove
+          puts @pastel.bold("Deleting #{filepath} ...")
+
+          response = @client.delete(filepath)
+
+          puts @pastel.bold(response[:message]) if response[:result] == "error"
+
+          if response[:result] == "error" && response[:error_type] == "file_exists"
+            print @pastel.yellow.bold("EXISTS")
+          elsif response[:result] == "success"
+            print @pastel.green.bold("SUCCESS")
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/neocities_red/services/file/uploader.rb

@@ -1,45 +1,45 @@
-# frozen_string_literal: true
-
-require "pathname"
-require "pastel"
-
-module NeocitiesRed
-  module Services
-    module File
-      class FileIsNotExists < StandardError; end
-
-      class Uploader
-        def initialize(client, filepath, remote_path = nil)
-          @client = client
-          @filepath = filepath
-          @remote_path = remote_path
-          @pastel = Pastel.new(eachline: "\n")
-        end
-
-        def upload
-          path = Pathname.new(@filepath)
-
-          raise FileIsNotExists, "#{path} does not exist locally." unless path.exist?
-
-          if path.directory?
-            puts @pastel.bold("#{path} is a directory, skipping")
-            return
-          end
-
-          puts @pastel.bold("Uploading #{path} to #{@remote_path} ...")
-
-          response = @client.upload(path, @remote_path)
-          puts response if response[:result] == "error"
-
-          if response[:result] == "error" && response[:error_type] == "file_exists"
-            puts @pastel.yellow.bold("EXISTS")
-          elsif response[:result] == "success"
-            puts @pastel.green.bold("SUCCESS")
-          end
-
-          response
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "pathname"
+require "pastel"
+
+module NeocitiesRed
+  module Services
+    module File
+      class FileIsNotExists < StandardError; end
+
+      class Uploader
+        def initialize(client, filepath, remote_path = nil)
+          @client = client
+          @filepath = filepath
+          @remote_path = remote_path
+          @pastel = Pastel.new(eachline: "\n")
+        end
+
+        def upload
+          path = Pathname.new(@filepath)
+
+          raise FileIsNotExists, "#{path} does not exist locally." unless path.exist?
+
+          if path.directory?
+            puts @pastel.bold("#{path} is a directory, skipping")
+            return
+          end
+
+          puts @pastel.bold("Uploading #{path} to #{@remote_path} ...")
+
+          response = @client.upload(path, @remote_path)
+          puts response if response[:result] == "error"
+
+          if response[:result] == "error" && response[:error_type] == "file_exists"
+            puts @pastel.yellow.bold("EXISTS")
+          elsif response[:result] == "success"
+            puts @pastel.green.bold("SUCCESS")
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/neocities_red/services/site/differencer.rb

@@ -1,76 +1,76 @@
-# frozen_string_literal: true
-
-require "pastel"
-require "tty/table"
-
-module NeocitiesRed
-  module Services
-    module Site
-      class Differencer
-        def initialize(client, path: ".", detail: false, ignore_dotfiles: false, exclude: [])
-          @client = client
-          @path = path
-          @detail = detail || false
-          @ignore_dotfiles = ignore_dotfiles || false
-          @exclude = exclude || []
-          @pastel = Pastel.new(eachline: "\n")
-        end
-
-        def show
-          server_files = Services::File::List.new(@client, nil, @detail).show
-
-          root_path = Pathname(@path)
-
-          added_paths = []
-          removed_paths = []
-          modified_paths = []
-
-          Dir.chdir(root_path) do
-            paths = Dir.glob(::File.join("**", "*"), ::File::FNM_DOTMATCH)
-
-            local_paths = paths.reject { |path| path.start_with?(".") }
-            local_files = local_paths.select { |path| ::File.file?(path) }.map do |path|
-              {
-                path: path,
-                sha1_hash: Digest::SHA1.file(path).hexdigest
-              }
-            end
-            server_paths = server_files.map { |n| n[:path] }
-
-            server_file_map = server_files.to_h do |file|
-              [file[:path], file[:sha1_hash]]
-            end
-
-            if @ignore_dotfiles
-              server_paths = server_paths.reject { |path| path.start_with?(".") }
-              local_paths = local_paths.reject { |path| path.start_with?(".") }
-            end
-
-            if @exclude.any?
-              server_paths -= @exclude
-              local_paths -= @exclude
-            end
-
-            removed_paths = server_paths - local_paths
-            removed_paths.map! { |file| @pastel.red(file) }
-
-            added_paths = local_paths - server_paths
-            added_paths.map! { |file| @pastel.green(file) }
-
-            modified_paths = local_files.select do |file|
-              server_hash = server_file_map[file[:path]]
-              server_hash && server_hash != file[:sha1_hash]
-            end
-            modified_paths.map! { |file| @pastel.yellow(file[:path]) }
-          end
-
-          [
-            added_paths,
-            modified_paths,
-            removed_paths
-          ]
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "pastel"
+require "tty/table"
+
+module NeocitiesRed
+  module Services
+    module Site
+      class Differencer
+        def initialize(client, path: ".", detail: false, ignore_dotfiles: false, exclude: [])
+          @client = client
+          @path = path
+          @detail = detail || false
+          @ignore_dotfiles = ignore_dotfiles || false
+          @exclude = exclude || []
+          @pastel = Pastel.new(eachline: "\n")
+        end
+
+        def show
+          server_files = Services::File::List.new(@client, nil, @detail).show
+
+          root_path = Pathname(@path)
+
+          added_paths = []
+          removed_paths = []
+          modified_paths = []
+
+          Dir.chdir(root_path) do
+            paths = Dir.glob(::File.join("**", "*"), ::File::FNM_DOTMATCH)
+
+            local_paths = paths.reject { |path| path.start_with?(".") }
+            local_files = local_paths.select { |path| ::File.file?(path) }.map do |path|
+              {
+                path: path,
+                sha1_hash: Digest::SHA1.file(path).hexdigest
+              }
+            end
+            server_paths = server_files.map { |n| n[:path] }
+
+            server_file_map = server_files.to_h do |file|
+              [file[:path], file[:sha1_hash]]
+            end
+
+            if @ignore_dotfiles
+              server_paths = server_paths.reject { |path| path.start_with?(".") }
+              local_paths = local_paths.reject { |path| path.start_with?(".") }
+            end
+
+            if @exclude.any?
+              server_paths -= @exclude
+              local_paths -= @exclude
+            end
+
+            removed_paths = server_paths - local_paths
+            removed_paths.map! { |file| @pastel.red(file) }
+
+            added_paths = local_paths - server_paths
+            added_paths.map! { |file| @pastel.green(file) }
+
+            modified_paths = local_files.select do |file|
+              server_hash = server_file_map[file[:path]]
+              server_hash && server_hash != file[:sha1_hash]
+            end
+            modified_paths.map! { |file| @pastel.yellow(file[:path]) }
+          end
+
+          [
+            added_paths,
+            modified_paths,
+            removed_paths
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/neocities_red/services/site/exporter.rb

@@ -1,43 +1,43 @@
-# frozen_string_literal: true
-
-require "whirly"
-require "pastel"
-
-module NeocitiesRed
-  module Services
-    module Site
-      class Exporter
-        attr_accessor :client, :sitename, :data, :app_config_path
-
-        def initialize(client, sitename, data, app_config_path)
-          @client = client
-          @sitename = sitename
-          @data = data
-          @app_config_path = app_config_path
-          @pastel = Pastel.new(eachline: "\n")
-        end
-
-        def export(quiet: false, last_pull_time: nil, last_pull_loc: nil)
-          if quiet
-            Whirly.start spinner: ["😺", "😸", "😹", "😻", "😼", "😽", "🙀", "😿", "😾"],
-                         status: "Retrieving files for #{@pastel.bold @sitename}"
-          end
-
-          @client.pull(@sitename, last_pull_time, last_pull_loc, quiet: quiet)
-
-          # write last pull data to file (not necessarily the best way to do this, but better than cloning every time)
-          data["LAST_PULL"] = {
-            time: Time.now,
-            loc: Dir.pwd
-          }
-
-          File.write(app_config_path, data.to_json)
-        rescue StandardError => e
-          e
-        ensure
-          Whirly.stop if quiet
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "whirly"
+require "pastel"
+
+module NeocitiesRed
+  module Services
+    module Site
+      class Exporter
+        attr_accessor :client, :sitename, :data, :app_config_path
+
+        def initialize(client, sitename, data, app_config_path)
+          @client = client
+          @sitename = sitename
+          @data = data
+          @app_config_path = app_config_path
+          @pastel = Pastel.new(eachline: "\n")
+        end
+
+        def export(quiet: false, last_pull_time: nil, last_pull_loc: nil)
+          if quiet
+            Whirly.start spinner: ["😺", "😸", "😹", "😻", "😼", "😽", "🙀", "😿", "😾"],
+                         status: "Retrieving files for #{@pastel.bold @sitename}"
+          end
+
+          @client.pull(@sitename, last_pull_time, last_pull_loc, quiet: quiet)
+
+          # write last pull data to file (not necessarily the best way to do this, but better than cloning every time)
+          data["LAST_PULL"] = {
+            time: Time.now,
+            loc: Dir.pwd
+          }
+
+          File.write(app_config_path, data.to_json)
+        rescue StandardError => e
+          e
+        ensure
+          Whirly.stop if quiet
+        end
+      end
+    end
+  end
+end