neocities 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62c435913de9ee21adbc536807d56153b4c5ec3987e069e6fd7ffbca9ff16c46
-  data.tar.gz: '069354d31728a5d4fbbc6007c1cf1133e2dec90ed8fbffbf3e5789aa210ffe83'
+  metadata.gz: 322b624aea971dd7a650eac8a9b6011e0f3d13ff8e4a5bb2f1a423b87bb446ac
+  data.tar.gz: c28f4d3296f36bb8a556fa210cc79a19a765e511fbf3b45111f93738b26014d4
 SHA512:
-  metadata.gz: 1dab02d7cd419ffdec02a00b69a40e0661801e9b0b27c48ed3c2c44974a8b3437a99691ec3b7907a49a6812f2531aa85ae21a7d6f3737dbc1e21e471173c2697
-  data.tar.gz: aabbe5d7fbdcae12410510dd5b26e0e37c02e879abfc544d639d0c5aeaa9628f1578530b8f47646ab589be5f811a632f4579d157891f47b9a0ef56a8705fc643
+  metadata.gz: ec195af25579bd74b8763ec1bc2d997ede505157fb2e6da9e27bfc4854a03526c57d8d05c593e9a10bfa8c0597649f75be03962d338933cbf763c9c75be9e110
+  data.tar.gz: 45ea7e5ff1bc0addafe30ca5bb9a8e3b23dabd168b01b0169ab254895d8041bb098687cfb982c5161d2d5a9d4ed2634937064c87b1f3b0bcb76b8ea1d944d031

data/ext/mkrf_conf.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
-require 'rubygems/dependency_installer.rb'
+require 'rubygems/command'
+require 'rubygems/dependency_installer'
 begin
   Gem::Command.build_args = ARGV
   rescue NoMethodError

data/lib/neocities/cli.rb

@@ -48,6 +48,8 @@ module Neocities
       if !@api_key
         begin
           @api_key = File.read @app_config_path
+          # Remove any trailing whitespace causing HTTP requests to fail
+          @api_key = @api_key.strip
         rescue Errno::ENOENT
           @api_key = nil
         end
@@ -162,11 +164,13 @@ module Neocities
       @no_gitignore = false
       @excluded_files = []
       @dry_run = false
+      @prune = false
       loop {
         case @subargs[0]
         when '--no-gitignore' then @subargs.shift; @no_gitignore = true
         when '-e' then @subargs.shift; @excluded_files.push(@subargs.shift)
         when '--dry-run' then @subargs.shift; @dry_run = true
+        when '--prune' then @subargs.shift; @prune = true
         when /^-/ then puts(@pastel.red.bold("Unknown option: #{@subargs[0].inspect}")); display_push_help_and_exit
         else break
         end
@@ -188,8 +192,30 @@ module Neocities
         display_push_help_and_exit
       end
 
+      if @prune
+        pruned_dirs = []
+        resp = @client.list
+        resp[:files].each do |file|
+          path = Pathname(File.join(@subargs[0], file[:path]))
+
+          pruned_dirs << path if !path.exist? && (file[:is_directory])
+
+          if !path.exist? && !pruned_dirs.include?(path.dirname)
+            print @pastel.bold("Deleting #{file[:path]} ... ")
+            resp = @client.delete_wrapper_with_dry_run file[:path], @dry_run
+
+            if resp[:result] == 'success'
+              print @pastel.green.bold("SUCCESS") + "\n"
+            else
+              print "\n"
+              display_response resp
+            end
+          end
+        end
+      end
+
       Dir.chdir(root_path) do
-        paths = Dir.glob(File.join('**', '*'))
+        paths = Dir.glob(File.join('**', '*'), File::FNM_DOTMATCH)
 
         if @no_gitignore == false
           begin
@@ -341,6 +367,8 @@ HERE
   #{@pastel.green '$ neocities push --no-gitignore .'}                  Don't use .gitignore to exclude files
 
   #{@pastel.green '$ neocities push --dry-run .'}                       Just show what would be uploaded
+      
+  #{@pastel.green '$ neocities push --prune .'}                         Delete site files not in dir (be careful!)
 
 HERE
       exit

data/lib/neocities/client.rb

@@ -66,6 +66,14 @@ module Neocities
       end
     end
 
+    def delete_wrapper_with_dry_run(paths, dry_run=false)
+      if dry_run
+        return {result: 'success'}
+      else
+        delete(paths)
+      end
+    end
+
     def delete(*paths)
       post 'delete', 'filenames[]' => paths
     end

data/lib/neocities/version.rb

@@ -1,3 +1,3 @@
 module Neocities
-  VERSION = '0.0.16'
+  VERSION = '0.0.18'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: neocities
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - Kyle Drake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Neocities.org CLI and API client