neocities-red 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd71b524510995f4ec9cf3e946aab60f7de911341097dd9dce5bb2d74764e879
-  data.tar.gz: 3d34a694215c982f08aa6bc23bb86e313e909a1986bbdaebffe8de7bccedc626
+  metadata.gz: '009505183f0da2cfdae7b870a198f2a6c098ef819c0c1a160a1bb68f00e99b4a'
+  data.tar.gz: be6aee25e383c296051b564f4875943a98c27131af34d396dd411d3bc6f9e413
 SHA512:
-  metadata.gz: 77402864a0cff4d47206f2bd7939969178017f6bc7478663d0b7f2f9b0a6702ed3c16db338f22463fa5aeee8b66fbea908e94cc6bb25be9b257cbcbf7fc7fd0e
-  data.tar.gz: 989c1691bd1a8ad11396c88be7458bc3c8b1005f83fe9015ff1463de6e5e3ca3565d62ad3820d74fe7c87869eed153e436e1d6d536f7371483f3246072a022cd
+  metadata.gz: ce0fa6ce425276dfc280a48ce3d47c7f1729df40258877b4d0f6372cce09d7729577344f73318c8bad866f1dad619ede32fdad7e99507752c0627927a8ac8a05
+  data.tar.gz: 1791b52b7bc01f5b7e58b18a728a009cc06659d321dfa68d00be8e150e875ab4f9e167fea578d7a122ff0eeb62d152f0a080e6911afd20f45c9e5805378cb9d8

data/.github/workflows/ci.yml

@@ -0,0 +1,51 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby 4.0.0
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 4.0.0
+
+      - name: Install dependencies
+        run: |
+          bundle config set frozen true
+          bundle install
+
+      - name: Debug versions
+        run: |
+          ruby -v
+          bundle exec rubocop -V
+
+      - name: Run linter
+        run: bundle exec rubocop
+
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby 4.0.0
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 4.0.0
+
+      - name: Install dependencies
+        run: |
+          bundle config set frozen true
+          bundle install
+
+      - name: Run tests
+        run: bundle exec rspec

data/.gitignore

@@ -1,4 +1,3 @@
-Gemfile.lock
 test.rb
 *.gem
 

data/.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-rspec
 
 AllCops:
@@ -11,7 +11,7 @@ AllCops:
     - "spec/fixtures/**/*"
 
 Layout/LineLength:
-  Max: 100
+  Max: 150
 
 Metrics:
   Enabled: false
@@ -39,3 +39,6 @@ RSpec/NestedGroups:
 
 Gemspec/DevelopmentDependencies:
   Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false

data/Gemfile.lock

@@ -0,0 +1,161 @@
+PATH
+  remote: .
+  specs:
+    neocities-red (1.0.5)
+      faraday (~> 2.3, >= 2.14.0)
+      faraday-follow_redirects
+      faraday-multipart
+      pastel (~> 0.8, = 0.8.0)
+      rake (~> 13, >= 13.3.0)
+      tty-prompt (~> 0.23, = 0.23.1)
+      tty-table (~> 0.12, = 0.12.0)
+      whirly (~> 0.3, >= 0.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.3)
+    diff-lcs (1.6.2)
+    faraday (2.14.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-follow_redirects (0.5.0)
+      faraday (>= 1, < 3)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    json (2.18.1)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    multipart-post (2.4.1)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    parallel (1.27.0)
+    parser (3.3.10.1)
+      ast (~> 2.4.1)
+      racc
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    prism (1.9.0)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.7)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.84.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-rspec (3.9.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
+    ruby-progressbar (1.13.0)
+    strings (0.2.1)
+      strings-ansi (~> 0.2)
+      unicode-display_width (>= 1.5, < 3.0)
+      unicode_utils (~> 1.4)
+    strings-ansi (0.2.0)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.2)
+    tty-table (0.12.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-screen (~> 0.8)
+    unicode-display_width (2.6.0)
+    unicode_utils (1.4.0)
+    uri (1.1.1)
+    whirly (0.4.0)
+      json
+      unicode-display_width (>= 1.1)
+    wisper (2.0.1)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  neocities-red!
+  rspec
+  rubocop (~> 1.82)
+  rubocop-rspec (~> 3.8)
+
+CHECKSUMS
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  faraday (2.14.1) sha256=a43cceedc1e39d188f4d2cdd360a8aaa6a11da0c407052e426ba8d3fb42ef61c
+  faraday-follow_redirects (0.5.0) sha256=5cde93c894b30943a5d2b93c2fe9284216a6b756f7af406a1e55f211d97d10ad
+  faraday-multipart (1.2.0) sha256=7d89a949693714176f612323ca13746a2ded204031a6ba528adee788694ef757
+  faraday-net_http (3.4.2) sha256=f147758260d3526939bf57ecf911682f94926a3666502e24c69992765875906c
+  json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
+  language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  multipart-post (2.4.1) sha256=9872d03a8e552020ca096adadbf5e3cb1cd1cdd6acd3c161136b8a5737cdb4a8
+  neocities-red (1.0.5)
+  net-http (0.9.1) sha256=25ba0b67c63e89df626ed8fac771d0ad24ad151a858af2cc8e6a716ca4336996
+  parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
+  parser (3.3.10.1) sha256=06f6a725d2cd91e5e7f2b7c32ba143631e1f7c8ae2fb918fc4cebec187e6a688
+  pastel (0.8.0) sha256=481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
+  regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4
+  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
+  rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-mocks (3.13.7) sha256=0979034e64b1d7a838aaaddf12bf065ea4dc40ef3d4c39f01f93ae2c66c62b1c
+  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  rubocop (1.84.1) sha256=14cc626f355141f5a2ef53c10a68d66b13bb30639b26370a76559096cc6bcc1a
+  rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
+  rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
+  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  strings (0.2.1) sha256=933293b3c95cf85b81eb44b3cf673e3087661ba739bbadfeadf442083158d6fb
+  strings-ansi (0.2.0) sha256=90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88
+  tty-color (0.6.0) sha256=6f9c37ca3a4e2367fb2e6d09722762647d6f455c111f05b59f35730eeb24332a
+  tty-cursor (0.7.1) sha256=79534185e6a777888d88628b14b6a1fdf5154a603f285f80b1753e1908e0bf48
+  tty-prompt (0.23.1) sha256=fcdbce905238993f27eecfdf67597a636bc839d92192f6a0eef22b8166449ec8
+  tty-reader (0.9.0) sha256=c62972c985c0b1566f0e56743b6a7882f979d3dc32ff491ed490a076f899c2b1
+  tty-screen (0.8.2) sha256=c090652115beae764336c28802d633f204fb84da93c6a968aa5d8e319e819b50
+  tty-table (0.12.0) sha256=fdc27a4750835c1a16efe19a0b857e3ced3652cc7aceafe6dca94908965b9939
+  unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a
+  unicode_utils (1.4.0) sha256=b922d0cf2313b6b7136ada6645ce7154ffc86418ca07d53b058efe9eb72f2a40
+  uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
+  whirly (0.4.0) sha256=3ffdf9097e711097442f6d83c91b8fc431d73224863f75b48f06fb850b3e596e
+  wisper (2.0.1) sha256=ce17bc5c3a166f241a2e6613848b025c8146fce2defba505920c1d1f3f88fae6
+
+BUNDLED WITH
+  4.0.6

data/README.md

@@ -51,6 +51,10 @@ Now, that command is great for users, which uses static site generators (like Je
 - `neocities push --ignore-dotfiles .` is ignores all files/directories with '.' at the beginning.
 - `neocities push -e <folder> .` is ignores folders recursively (Ignoring the content that is inside of the target directory).
 
+### 3) diff
+
+You can compare your local version of website with remote version.
+
 ## TODO'S:
 
 1) Refactor `cli.rb` or use `rails/thor` gem instead.

data/ext/mkrf_conf.rb

@@ -5,7 +5,8 @@ require "rubygems/command"
 require "rubygems/dependency_installer"
 begin
   Gem::Command.build_args = ARGV
-rescue NoMethodError
+rescue NoMethodError => e
+  warn "Gem::Command.build_args= not available: #{e.message}"
 end
 inst = Gem::DependencyInstaller.new
 begin

data/lib/neocities_red/cli.rb

@@ -16,7 +16,7 @@ MAX_THREADS = 5
 
 module NeocitiesRed
   class CLI
-    SUBCOMMANDS = %w[upload delete list info push logout pizza pull purge].freeze
+    SUBCOMMANDS = %w[upload delete list info push logout pizza pull purge diff].freeze
     HELP_SUBCOMMANDS = ["-h", "--help", "help"].freeze
     PENELOPE_MOUTHS = %w[^ o ~ - v U].freeze
     PENELOPE_EYES = %w[o ~ O].freeze
@@ -113,6 +113,75 @@ module NeocitiesRed
       send @subcmd
     end
 
+    def diff
+      display_diff_help_and_exit if @subargs.empty?
+
+      @ignore_dotfiles = false
+      @path = "."
+      @exclude = []
+
+      loop do
+        arg = @subargs[0]
+        break if arg.nil?
+
+        if arg == "--ignore-dotfiles"
+          @subargs.shift
+          @ignore_dotfiles = true
+
+        elsif arg == "-e"
+          @subargs.shift
+
+          base = Pathname.new(@path).expand_path
+          target = Pathname.new(@subargs[0]).expand_path
+          filepath = target.relative_path_from(base).to_s
+
+          if File.file?(target)
+            @exclude << filepath
+          elsif File.directory?(target)
+            @exclude += Dir.glob(
+              File.join(target, "**", "*"),
+              File::FNM_DOTMATCH
+            ).map do |path|
+              Pathname.new(path).expand_path.relative_path_from(base).to_s
+            end
+
+            @exclude << filepath
+          end
+
+          @subargs.shift
+
+        elsif File.directory?(arg)
+          @path = arg
+          @subargs.shift
+        end
+      end
+
+      added, modified, removed = Services::SiteDifference.new(
+        @client,
+        path: @path,
+        detail: false,
+        ignore_dotfiles: @ignore_dotfiles,
+        exclude: @exclude
+      ).show
+
+      # rubocop:disable Style/GuardClause
+      if removed.any?
+        puts @pastel.bold.red("Removed files")
+        puts removed
+      end
+
+      if modified.any?
+        puts @pastel.bold.yellow("Modified files")
+        puts modified
+      end
+
+      if added.any?
+        puts @pastel.bold.green("New files")
+        puts added
+      end
+      # rubocop:enable Style/GuardClause
+    end
+
     def delete
       display_delete_help_and_exit if @subargs.empty?
 
@@ -148,7 +217,7 @@ module NeocitiesRed
     def info
       profile_info = Services::ProfileInfo.new(@client, @subargs, @sitename).pretty_print
       puts TTY::Table.new(profile_info)
-    rescue Exception => e
+    rescue StandardError => e
       display_response(e)
     end
 
@@ -161,7 +230,7 @@ module NeocitiesRed
 
       path = @subargs[0]
 
-      Services::FileList.new(@client, path, @detail).show
+      puts Services::FileList.new(@client, path, @detail).show
     end
 
     def push
@@ -252,24 +321,17 @@ module NeocitiesRed
       Dir.chdir(root_path) do
         paths = Dir.glob(File.join("**", "*"), File::FNM_DOTMATCH)
 
-        if @no_gitignore == false
-          begin
-            ignores = File.readlines(".gitignore").collect! do |ignore|
-              ignore.strip!
-              File.directory?(ignore) ? "#{ignore}**" : ignore
-            end
-            paths.select! do |path|
-              res = true
-              ignores.each do |ignore|
-                if File.fnmatch?(ignore.strip, path)
-                  res = false
-                  break
-                end
-              end
-            end
-            puts "Not pushing .gitignore entries (--no-gitignore to disable)"
-          rescue Errno::ENOENT
+        if @no_gitignore == false && File.exist?(".gitignore")
+          ignores = File.readlines(".gitignore").map do |ignore|
+            ignore = ignore.strip
+            File.directory?(ignore) ? "#{ignore}**" : ignore
+          end
+
+          paths.select! do |path|
+            ignores.none? { |ignore| File.fnmatch?(ignore, path) }
           end
+
+          puts "Not pushing .gitignore entries (--no-gitignore to disable)"
         end
 
         @excluded_files += paths.select { |path| path.start_with?(".") } if @ignore_dotfiles
@@ -322,7 +384,7 @@ module NeocitiesRed
         Services::FileUploader.new(@client, @subargs[0], @subargs[1]).upload
       elsif File.directory?(@subargs[0])
         folder_uploader = Services::FolderUploader.new(@client, @subargs[0], @subargs[1])
-        files_list = folder_uploader.get_files
+        files_list = folder_uploader.files
         folder_uploader.upload(files_list)
       end
     end
@@ -370,11 +432,11 @@ module NeocitiesRed
 
   #{@pastel.dim 'Examples:'}
 
-  #{@pastel.green '$ neocities list /'}           List files in your root directory
+  #{@pastel.green '$ neocities-red list /'}           List files in your root directory
 
-  #{@pastel.green '$ neocities list -a'}          Recursively display all files and directories
+  #{@pastel.green '$ neocities-red list -a'}          Recursively display all files and directories
 
-  #{@pastel.green '$ neocities list -d /mydir'}   Show detailed information on /mydir
+  #{@pastel.green '$ neocities-red list -d /mydir'}   Show detailed information on /mydir
 
 HERE
       exit
@@ -388,11 +450,11 @@ HERE
 
   #{@pastel.dim 'Examples:'}
 
-  #{@pastel.green '$ neocities delete myfile.jpg'}               Delete myfile.jpg
+  #{@pastel.green '$ neocities-red delete myfile.jpg'}               Delete myfile.jpg
 
-  #{@pastel.green '$ neocities delete myfile.jpg myfile2.jpg'}   Delete myfile.jpg and myfile2.jpg
+  #{@pastel.green '$ neocities-red delete myfile.jpg myfile2.jpg'}   Delete myfile.jpg and myfile2.jpg
 
-  #{@pastel.green '$ neocities delete mydir'}                    Deletes mydir and everything inside it (be careful!)
+  #{@pastel.green '$ neocities-red delete mydir'}                    Deletes mydir and everything inside it (be careful!)
 
 HERE
       exit
@@ -406,9 +468,9 @@ HERE
 
   #{@pastel.dim 'Examples:'}
 
-  #{@pastel.green '$ neocities upload ./img.jpg ./images/img2.jpg'} Upload img.jpg to /images folder and with img2.jpg name
+  #{@pastel.green '$ neocities-red upload ./img.jpg ./images/img2.jpg'} Upload img.jpg to /images folder and with img2.jpg name
 
-  #{@pastel.green '$ neocities upload images/ images/'} Upload images folder with their content to /images folder
+  #{@pastel.green '$ neocities-red upload images/ images/'} Upload images folder with their content to /images folder
 
 HERE
       exit
@@ -432,20 +494,39 @@ HERE
 
   #{@pastel.dim 'Examples:'}
 
-  #{@pastel.green '$ neocities push .'}                                 Recursively upload current directory.
+  #{@pastel.green '$ neocities-red push .'}                                 Recursively upload current directory.
+
+  #{@pastel.green '$ neocities-red push -e node_modules -e secret.txt .'}   Exclude certain files from push
+
+  #{@pastel.green '$ neocities-red push --no-gitignore .'}                  Don't use .gitignore to exclude files
 
-  #{@pastel.green '$ neocities push -e node_modules -e secret.txt .'}   Exclude certain files from push
+  #{@pastel.green '$ neocities-red push --ignore-dotfiles .'}               Ignore files with '.' at the beginning (for example, '.git/')
 
-  #{@pastel.green '$ neocities push --no-gitignore .'}                  Don't use .gitignore to exclude files
+  #{@pastel.green '$ neocities-red push --dry-run .'}                       Just show what would be uploaded
 
-  #{@pastel.green '$ neocities push --ignore-dotfiles .'}               Ignore files with '.' at the beginning (for example, '.git/')
+  #{@pastel.green '$ neocities-red push --optimized .'}                     Do not upload unchanged files.#{' '}
+
+  #{@pastel.green '$ neocities-red push --prune .'}                         Delete site files not in dir (be careful!)
+
+HERE
+      exit
+    end
+
+    def display_diff_help_and_exit
+      display_banner
+
+      puts <<HERE
+  #{@pastel.green.bold 'diff'} - Compare local files with remote and show differences.
+
+  #{@pastel.dim 'Examples:'}
 
-  #{@pastel.green '$ neocities push --dry-run .'}                       Just show what would be uploaded
+  #{@pastel.green '$ neocities-red diff .'}                             Compare your current path with remote
 
-  #{@pastel.green '$ neocities push --optimized .'}                     Do not upload unchanged files.#{' '}
+  #{@pastel.green '$ neocities-red diff ./my-website'}                  Compare ./my-website folder with remote
 
-  #{@pastel.green '$ neocities push --prune .'}                         Delete site files not in dir (be careful!)
+  #{@pastel.green '$ neocities-red diff . --ignore-dotfile'}            Compare your current path with remote without any files starts with '.'
 
+  #{@pastel.green '$ neocities-red diff . -e file.png'}                 Compare your current path with remote without file.png
 HERE
       exit
     end
@@ -458,7 +539,7 @@ HERE
 
   #{@pastel.dim 'Examples:'}
 
-  #{@pastel.green '$ neocities info fauux'}   Gets info for 'fauux' site
+  #{@pastel.green '$ neocities-red info fauux'}   Gets info for 'fauux' site
 
 HERE
       exit
@@ -472,7 +553,7 @@ HERE
 
   #{@pastel.dim 'Examples:'}
 
-  #{@pastel.green '$ neocities logout -y'}
+  #{@pastel.green '$ neocities-red logout -y'}
 
 HERE
       exit
@@ -495,6 +576,7 @@ HERE
     push        Recursively upload a local directory to your site
     upload      Upload individual files to your Neocities site
     delete      Delete files from your Neocities site
+    diff        Compare your local directory with your Neocities siteя
     list        List files from your Neocities site
     info        Information and stats for your site
     logout      Remove the site api key from the config

data/lib/neocities_red/client.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-begin
-  require "openssl/win/root" if Gem.win_platform?
-rescue StandardError
-end
-
+require "openssl/win/root" if Gem.win_platform?
 require "json"
 require "pathname"
 require "uri"
@@ -32,9 +28,7 @@ module NeocitiesRed
         conn.response :follow_redirects
       end
 
-      unless opts[:api_key] || (opts[:sitename] && opts[:password])
-        raise ArgumentError, "client requires a login (sitename/password) or an api_key"
-      end
+      raise ArgumentError, "client requires a login (sitename/password) or an api_key" unless opts[:api_key] || (opts[:sitename] && opts[:password])
 
       if opts[:api_key]
         @conn.request(:authorization, "Bearer", opts[:api_key])
@@ -47,7 +41,7 @@ module NeocitiesRed
       get "list", path: path
     end
 
-    def pull(sitename, last_pull_time = nil, last_pull_loc = nil, quiet = true)
+    def pull(sitename, last_pull_time = nil, last_pull_loc = nil, quiet: true)
       site_info = get "info", sitename: sitename
 
       raise ArgumentError, site_info[:message] if site_info[:result] == "error"
@@ -121,7 +115,7 @@ module NeocitiesRed
       post "upload_hash", remote_path => sha1_hash
     end
 
-    def upload(path, remote_path = nil, dry_run = false)
+    def upload(path, remote_path = nil, dry_run: false)
       path = Pathname path
       raise ArgumentError, "#{path} does not exist." unless path.exist?
 
@@ -143,7 +137,7 @@ module NeocitiesRed
       end
     end
 
-    def delete_wrapper_with_dry_run(paths, dry_run = false)
+    def delete_wrapper_with_dry_run(paths, dry_run: false)
       return { result: "success" } if dry_run
 
       delete(paths)

data/lib/neocities_red/services/file_list.rb

@@ -13,6 +13,17 @@ module NeocitiesRed
         @pastel = Pastel.new(eachline: "\n")
       end
 
+      def list
+        resp = @client.list(@path)
+
+        if resp[:result] == "error"
+          display_response resp
+          exit
+        end
+
+        resp[:files]
+      end
+
       def show
         resp = @client.list(@path)
 
@@ -39,9 +50,11 @@ module NeocitiesRed
           puts TTY::Table.new(out)
         end
 
-        resp[:files].each do |file|
-          puts @pastel.send(file[:is_directory] ? :blue : :green).bold(file[:path])
+        resp[:files].map do |file|
+          @pastel.send(file[:is_directory] ? :blue : :green).bold(file[:path])
         end
+
+        resp[:files]
       end
     end
   end

data/lib/neocities_red/services/folder_uploader.rb

@@ -19,7 +19,7 @@ module NeocitiesRed
         @pastel = Pastel.new(eachline: "\n")
       end
 
-      def get_files
+      def files
         path = Pathname.new(File.expand_path(@filepath))
 
         raise FileIsNotExists, "#{path} does not exist locally." unless path.exist?

data/lib/neocities_red/services/pizza.rb

@@ -20,71 +20,85 @@ module NeocitiesRed
         "Today's special: disappointment. Pizza unavailable.",
         "Our last pizza became a perpetual motion machine, left the atmosphere and is flying through the heavens.",
         "Ran out of oregano and optimism. See you next time.",
-        "WAR AND PEACE, BY LEO TOLSTOY, BOOK ONE: 1805, CHAPTER I  “Well, Prince, so Genoa and Lucca are now just family estates of the Buonapartes. But I warn you, if you don’t tell me that this means war, if you still try to defend the infamies and horrors perpetrated by that Antichrist—I really believe he is Antichrist—I will have nothing more to do with you and you are no longer my friend, no longer my ‘faithful slave,’ as you call yourself! But how do you do? I see I have frightened you—sit down and tell me all the news.”
+        <<~TEXT
+          WAR AND PEACE, BY LEO TOLSTOY, BOOK ONE: 1805, CHAPTER I
 
-  It was in July, 1805, and the speaker was the well-known Anna Pávlovna Schérer, maid of honor and favorite of the Empress Márya Fëdorovna. With these words she greeted Prince Vasíli Kurágin, a man of high rank and importance, who was the first to arrive at her reception. Anna Pávlovna had had a cough for some days. She was, as she said, suffering from la grippe; grippe being then a new word in St. Petersburg, used only by the elite.
+          “Well, Prince, so Genoa and Lucca are now just family estates of the Buonapartes.
+          But I warn you, if you don’t tell me that this means war, if you still try to defend
+          the infamies and horrors perpetrated by that Antichrist—I really believe he is
+          Antichrist—I will have nothing more to do with you and you are no longer my friend,
+          no longer my ‘faithful slave,’ as you call yourself! But how do you do? I see I have
+          frightened you—sit down and tell me all the news.”
 
-  All her invitations without exception, written in French, and delivered by a scarlet-liveried footman that morning, ran as follows:
+          It was in July, 1805, and the speaker was the well-known Anna Pávlovna Schérer,
+          maid of honor and favorite of the Empress Márya Fëdorovna. With these words she
+          greeted Prince Vasíli Kurágin, a man of high rank and importance, who was the first
+          to arrive at her reception.
 
-  “If you have nothing better to do, Count (or Prince), and if the prospect of spending an evening with a poor invalid is not too terrible, I shall be very charmed to see you tonight between 7 and 10—Annette Schérer.”
+          Anna Pávlovna had had a cough for some days. She was, as she said, suffering from
+          la grippe; grippe being then a new word in St. Petersburg, used only by the elite.
 
-  “Heavens! what a virulent attack!” replied the prince, not in the least disconcerted by this reception. He had just entered, wearing an embroidered court uniform, knee breeches, and shoes, and had stars on his breast and a serene expression on his flat face. He spoke in that refined French in which our grandfathers not only spoke but thought, and with the gentle, patronizing intonation natural to a man of importance who had grown old in society and at court. He went up to Anna Pávlovna, kissed her hand, presenting to her his bald, scented, and shining head, and complacently seated himself on the sofa.
+          All her invitations without exception, written in French, and delivered by a
+          scarlet-liveried footman that morning, ran as follows:
 
-  “First of all, dear friend, tell me how you are. Set your friend’s mind at rest,” said he without altering his tone, beneath the politeness and affected sympathy of which indifference and even irony could be discerned.
+          “If you have nothing better to do, Count (or Prince), and if the prospect of
+          spending an evening with a poor invalid is not too terrible, I shall be very
+          charmed to see you tonight between 7 and 10—Annette Schérer.”
 
-  “Can one be well while suffering morally? Can one be calm in times like these if one has any feeling?” said Anna Pávlovna. “You are staying the whole evening, I hope?”
+          “Heavens! what a virulent attack!” replied the prince, not in the least disconcerted
+          by this reception.
 
-  “And the fete at the English ambassador’s? Today is Wednesday. I must put in an appearance there,” said the prince. “My daughter is coming for me to take me there.”
+          He had just entered, wearing an embroidered court uniform, knee breeches, and
+          shoes, and had stars on his breast and a serene expression on his flat face.
 
-  “I thought today’s fete had been canceled. I confess all these festivities and fireworks are becoming wearisome.”
+          He spoke in that refined French in which our grandfathers not only spoke but
+          thought, and with the gentle, patronizing intonation natural to a man of importance
+          who had grown old in society and at court.
 
-  “If they had known that you wished it, the entertainment would have been put off,” said the prince, who, like a wound-up clock, by force of habit said things he did not even wish to be believed.
+          He went up to Anna Pávlovna, kissed her hand, presenting to her his bald, scented,
+          and shining head, and complacently seated himself on the sofa.
 
-  “Don’t tease! Well, and what has been decided about Novosíltsev’s dispatch? You know everything.”
+          “First of all, dear friend, tell me how you are. Set your friend’s mind at rest,”
+          said he without altering his tone, beneath the politeness and affected sympathy of
+          which indifference and even irony could be discerned.
 
-  “What can one say about it?” replied the prince in a cold, listless tone. “What has been decided? They have decided that Buonaparte has burnt his boats, and I believe that we are ready to burn ours.”
+          “Can one be well while suffering morally? Can one be calm in times like these if
+          one has any feeling?” said Anna Pávlovna. “You are staying the whole evening, I hope?”
 
-  Prince Vasíli always spoke languidly, like an actor repeating a stale part. Anna Pávlovna Schérer on the contrary, despite her forty years, overflowed with animation and impulsiveness. To be an enthusiast had become her social vocation and, sometimes even when she did not feel like it, she became enthusiastic in order not to disappoint the expectations of those who knew her. The subdued smile which, though it did not suit her faded features, always played round her lips expressed, as in a spoiled child, a continual consciousness of her charming defect, which she neither wished, nor could, nor considered it necessary, to correct.
+          “And the fete at the English ambassador’s? Today is Wednesday. I must put in an
+          appearance there,” said the prince. “My daughter is coming for me to take me there.”
 
-  In the midst of a conversation on political matters Anna Pávlovna burst out:
+          “I thought today’s fete had been canceled. I confess all these festivities and
+          fireworks are becoming wearisome.”
 
-  “Oh, don’t speak to me of Austria. Perhaps I don’t understand things, but Austria never has wished, and does not wish, for war. She is betraying us! Russia alone must save Europe. Our gracious sovereign recognizes his high vocation and will be true to it. That is the one thing I have faith in! Our good and wonderful sovereign has to perform the noblest role on earth, and he is so virtuous and noble that God will not forsake him. He will fulfill his vocation and crush the hydra of revolution, which has become more terrible than ever in the person of this murderer and villain! We alone must avenge the blood of the just one.... Whom, I ask you, can we rely on?... England with her commercial spirit will not and cannot understand the Emperor Alexander’s loftiness of soul. She has refused to evacuate Malta. She wanted to find, and still seeks, some secret motive in our actions. What answer did Novosíltsev get? None. The English have not understood and cannot understand the self-abnegation of our Emperor who wants nothing for himself, but only desires the good of mankind. And what have they promised? Nothing! And what little they have promised they will not perform! Prussia has always declared that Buonaparte is invincible, and that all Europe is powerless before him.... And I don’t believe a word that Hardenburg says, or Haugwitz either. This famous Prussian neutrality is just a trap. I have faith only in God and the lofty destiny of our adored monarch. He will save Europe!”
+          “If they had known that you wished it, the entertainment would have been put off,”
+          said the prince, who, like a wound-up clock, by force of habit said things he did
+          not even wish to be believed.
 
-  She suddenly paused, smiling at her own impetuosity.
+          “Don’t tease! Well, and what has been decided about Novosíltsev’s dispatch?
+          You know everything.”
 
-  “I think,” said the prince with a smile, “that if you had been sent instead of our dear Wintzingerode you would have captured the King of Prussia’s consent by assault. You are so eloquent. Will you give me a cup of tea?”
+          “What can one say about it?” replied the prince in a cold, listless tone.
+          “What has been decided? They have decided that Buonaparte has burnt his boats,
+          and I believe that we are ready to burn ours.”
 
-  “In a moment. À propos,” she added, becoming calm again, “I am expecting two very interesting men tonight, le Vicomte de Mortemart, who is connected with the Montmorencys through the Rohans, one of the best French families. He is one of the genuine émigrés, the good ones. And also the Abbé Morio. Do you know that profound thinker? He has been received by the Emperor. Had you heard?”
+          Prince Vasíli always spoke languidly, like an actor repeating a stale part.
+          Anna Pávlovna Schérer on the contrary, despite her forty years, overflowed with
+          animation and impulsiveness.
 
-  “I shall be delighted to meet them,” said the prince. “But tell me,” he added with studied carelessness as if it had only just occurred to him, though the question he was about to ask was the chief motive of his visit, “is it true that the Dowager Empress wants Baron Funke to be appointed first secretary at Vienna? The baron by all accounts is a poor creature.”
+          To be an enthusiast had become her social vocation and, sometimes even when she
+          did not feel like it, she became enthusiastic in order not to disappoint the
+          expectations of those who knew her.
 
-  Prince Vasíli wished to obtain this post for his son, but others were trying through the Dowager Empress Márya Fëdorovna to secure it for the baron.
-
-  Anna Pávlovna almost closed her eyes to indicate that neither she nor anyone else had a right to criticize what the Empress desired or was pleased with.
-
-  “Baron Funke has been recommended to the Dowager Empress by her sister,” was all she said, in a dry and mournful tone.
-
-  As she named the Empress, Anna Pávlovna’s face suddenly assumed an expression of profound and sincere devotion and respect mingled with sadness, and this occurred every time she mentioned her illustrious patroness. She added that Her Majesty had deigned to show Baron Funke beaucoup d’estime, and again her face clouded over with sadness.
-
-  The prince was silent and looked indifferent. But, with the womanly and courtierlike quickness and tact habitual to her, Anna Pávlovna wished both to rebuke him (for daring to speak as he had done of a man recommended to the Empress) and at the same time to console him, so she said:
-
-  “Now about your family. Do you know that since your daughter came out everyone has been enraptured by her? They say she is amazingly beautiful.”
-
-  The prince bowed to signify his respect and gratitude.
-
-  “I often think,” she continued after a short pause, drawing nearer to the prince and smiling amiably at him as if to show that political and social topics were ended and the time had come for intimate conversation—“I often think how unfairly sometimes the joys of life are distributed. Why has fate given you two such splendid children? I don’t speak of Anatole, your youngest. I don’t like him,” she added in a tone admitting of no rejoinder and raising her eyebrows. “Two such charming children. And really you appreciate them less than anyone, and so you don’t deserve to have them.”
-
-  And she smiled her ecstatic smile.
-
-  “I can’t help it,” said the prince. “Lavater would have said I lack the bump of paternity.”
-
-  “Don’t joke; I mean to have a serious talk with you. Do you know I am dissatisfied with your younger son? Between ourselves” (and her face assumed its melancholy expression), “he was mentioned at Her Majesty’s and you were pitied....”
-
-  The prince answered nothing, but she looked at him significantly, awaiting a reply. He frowned."
+          The subdued smile which, though it did not suit her faded features, always played
+          round her lips expressed, as in a spoiled child, a continual consciousness of her
+          charming defect, which she neither wished, nor could, nor considered it necessary,
+          to correct.
+        TEXT
       ].freeze
 
       def make_order
-        Pastel.new.bright_red(EXCUSES.sample)
+        Pastel.new(enabled: true).bright_red(EXCUSES.sample)
       end
     end
   end

data/lib/neocities_red/services/profile_info.rb

@@ -17,7 +17,7 @@ module NeocitiesRed
         @pastel = Pastel.new(eachline: "\n")
       end
 
-      def get_stats
+      def stats
         response = @client.info(@subargs[0] || @sitename)
 
         raise NeocitiesRed::Services::ClientError, response if response[:result] == "error"
@@ -28,7 +28,7 @@ module NeocitiesRed
       def pretty_print
         out = []
 
-        get_stats[:info].each do |k, v|
+        stats[:info].each do |k, v|
           v = Time.parse(v).localtime if v && %i[created_at last_updated].include?(k)
 
           out << [@pastel.bold(k.to_s), v]

data/lib/neocities_red/services/site_difference.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "pastel"
+require "tty/table"
+
+module NeocitiesRed
+  module Services
+    class SiteDifference
+      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::FileList.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.each_with_object({}) do |file, hash|
+            hash[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

data/lib/neocities_red/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NeocitiesRed
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/neocities_red.rb

@@ -9,6 +9,7 @@ require File.join(File.dirname(__FILE__), "neocities_red", "services", "folder_u
 require File.join(File.dirname(__FILE__), "neocities_red", "services", "file_remover")
 require File.join(File.dirname(__FILE__), "neocities_red", "services", "file_list")
 
+require File.join(File.dirname(__FILE__), "neocities_red", "services", "site_difference")
 require File.join(File.dirname(__FILE__), "neocities_red", "services", "profile_info")
 require File.join(File.dirname(__FILE__), "neocities_red", "services", "site_exporter")
 require File.join(File.dirname(__FILE__), "neocities_red", "services", "pizza")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neocities-red
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kyle Drake
@@ -167,12 +167,14 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - SECURITY.md
@@ -187,6 +189,7 @@ files:
 - lib/neocities_red/services/folder_uploader.rb
 - lib/neocities_red/services/pizza.rb
 - lib/neocities_red/services/profile_info.rb
+- lib/neocities_red/services/site_difference.rb
 - lib/neocities_red/services/site_exporter.rb
 - lib/neocities_red/version.rb
 - neocities-red.gemspec