neocities 0.0.14 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a86ab831702d89fe136292b63504f9960aaff08badc8b787646b9c77fd7a9a7c
-  data.tar.gz: 8cbfa0f010c1a9f1d8651035f679aac6de9e2e501116eff35830be7ccd64b81f
+  metadata.gz: 2e868d70dd0564036428471413481d66f764cde75087d25a4aef0ec945d5792b
+  data.tar.gz: 9d180d291b6169253110534aef62a48ec3ee8b43a8f50dc6a4635695d1ce525a
 SHA512:
-  metadata.gz: 36fe45489c68d0c3147ad71376487551244304d421b8f688f47114c9cdd8d536d2769e280c1b1df6d942c218eff1b55c55207f0814b87b347753897d34e84e15
-  data.tar.gz: 4e0c825a0326eb3fc0bd43deccaf7a65963ff272c5477eb8aaea0f6329af5fec9611e81f5d9a7a7deeb824f84e92204d83ed23bfa99b70fc837c2e0dd19834f3
+  metadata.gz: d2a884cc70d5ffb3521a472e2f1a582963f44b3e390f171486c6c3d08125041779cf65e562decc6a3aeaafbfa2d7e956efbb22ee77cd7b5cb3e3f096d7d15e11
+  data.tar.gz: aab95d2837cdcdfa49b35cabf4a4b57fae898f2189bcd16f34b16e5729b9f415491fe4c7a024376d0b0e5eb24c98cea2c5743269fa6d21431876bd2b4f58e157

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

@@ -161,15 +161,23 @@ module Neocities
     def push
       @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
       }
 
+      if @dry_run
+        puts @pastel.green.bold("Doing a dry run, not actually pushing anything")
+      end
+
       root_path = Pathname @subargs[0]
 
       if !root_path.exist?
@@ -182,6 +190,28 @@ 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('**', '*'))
 
@@ -216,7 +246,7 @@ module Neocities
         paths.each do |path|
           next if path.directory?
           print @pastel.bold("Uploading #{path} ... ")
-          resp = @client.upload path, path
+          resp = @client.upload path, path, @dry_run
 
           if resp[:result] == 'error' && resp[:error_type] == 'file_exists'
             print @pastel.yellow.bold("EXISTS") + "\n"
@@ -334,6 +364,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
+
 HERE
       exit
     end

data/lib/neocities/client.rb

@@ -42,7 +42,7 @@ module Neocities
       post 'upload_hash', remote_path => sha1_hash
     end
 
-    def upload(path, remote_path=nil)
+    def upload(path, remote_path=nil, dry_run=false)
       path = Pathname path
 
       unless path.exist?
@@ -56,12 +56,24 @@ module Neocities
       if res[:files] && res[:files][remote_path.to_s.to_sym] == true
         return {result: 'error', error_type: 'file_exists', message: 'file already exists and matches local file, not uploading'}
       else
-        File.open(path.to_s) do |file|
-          post 'upload', rpath => file
+        if dry_run
+          return {result: 'success'}
+        else
+          File.open(path.to_s) do |file|
+            post 'upload', rpath => file
+          end
         end
       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.14'
+  VERSION = '0.0.17'
 end

data/neocities.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tty-table',           '~> 0.10', '= 0.10.0'
   spec.add_dependency 'tty-prompt',          '~> 0.12', '= 0.12.0'
   spec.add_dependency 'pastel',              '~> 0.7',  '= 0.7.2'
-  spec.add_dependency 'httpclient',          '~> 2.8',  '>= 2.8.3'
+  spec.add_dependency 'httpclient-fixcerts', '~> 2.8',  '>= 2.8.5'
   spec.add_dependency 'rake',                '~> 12.3',  '>= 12.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neocities
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.17
 platform: ruby
 authors:
 - Kyle Drake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-table
@@ -71,7 +71,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.2
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: httpclient-fixcerts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,7 +79,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 2.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 2.8.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement