neocities 0.0.13 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241ee95f8330172b0d9d56e82b249e4bae87d23dacc2f14d74036714cfee9328
-  data.tar.gz: 8f8e150736ed822138198213495425b381e655d3ab2e9a5aa25d18cc91feab16
+  metadata.gz: 62c435913de9ee21adbc536807d56153b4c5ec3987e069e6fd7ffbca9ff16c46
+  data.tar.gz: '069354d31728a5d4fbbc6007c1cf1133e2dec90ed8fbffbf3e5789aa210ffe83'
 SHA512:
-  metadata.gz: 4a0345ce430d08488a78f541cef5385b74228b520f1063dbe8bf9da748c4cfab6045e1be5148438bb750e42ed1905798b3dda60d695959bb0b7a17a8a107ad2d
-  data.tar.gz: 6c899930269e1efe2b62d1925bc6da011226ad7a09ba0b2e8056a118034861df3937a6cb5eedb7e2dae74a200a4b3bf70e32555eabd438eec79df20246b5e27e
+  metadata.gz: 1dab02d7cd419ffdec02a00b69a40e0661801e9b0b27c48ed3c2c44974a8b3437a99691ec3b7907a49a6812f2531aa85ae21a7d6f3737dbc1e21e471173c2697
+  data.tar.gz: aabbe5d7fbdcae12410510dd5b26e0e37c02e879abfc544d639d0c5aeaa9628f1578530b8f47646ab589be5f811a632f4579d157891f47b9a0ef56a8705fc643

data/lib/neocities/cli.rb

@@ -161,15 +161,21 @@ module Neocities
     def push
       @no_gitignore = false
       @excluded_files = []
+      @dry_run = 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 /^-/ 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?
@@ -188,7 +194,8 @@ module Neocities
         if @no_gitignore == false
           begin
             ignores = File.readlines('.gitignore').collect! do |ignore|
-              File.directory?(ignore.strip!) ? "#{ignore}**" : ignore
+              ignore.strip!
+              File.directory?(ignore) ? "#{ignore}**" : ignore
             end
             paths.select! do |path|
               res = true
@@ -215,7 +222,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"
@@ -333,6 +340,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,8 +56,12 @@ 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

data/lib/neocities/version.rb

@@ -1,3 +1,3 @@
 module Neocities
-  VERSION = '0.0.13'
+  VERSION = '0.0.16'
 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.13
+  version: 0.0.16
 platform: ruby
 authors:
 - Kyle Drake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2022-05-01 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
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Neocities.org CLI and API client