neocities 0.0.19 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5baf997b1c58eaf0d7b2c7487623ab49966d72f0a637b0bbf32111a0608ad12
-  data.tar.gz: 16b8cf7786e0cf714f41f00e49bb97038ffaf1de1c72ba656e0223b9a3c9aa15
+  metadata.gz: 9ac38f5fc9a0d5bf480367a54323224847b2158de7083103300f91d64983013b
+  data.tar.gz: 1b14f63fde6e7d30a658c64425a89dbc95c22cb6cb833c636baaca84fa5797c8
 SHA512:
-  metadata.gz: b1459d3bff5633233a3968a4fab5033df7b8048435786e5c2642aa5fe4123061ed69f957e186cff1c0f9ba45b0249e188c21a96a56b80df87bacd1cd3532727c
-  data.tar.gz: 64eeed0bbf5fe5381d2eb8d9641cd00832a4be0369e32ad3da4a4ab9544976c4f8574c40274a6a3f64b1146259939fd21e71533628143c0562241735e0bce112
+  metadata.gz: 3aa57d7f75f4b7e1f5c5bb0206d17fee295b84d9f173a40e76b63203d17764525a4abe1035e428e21ef9c6150f5d23006cae284bc57ec0c56c3a9e498e88dc49
+  data.tar.gz: 3d2b4e379531d71f1303c1b57786b8da7921b21a02ffb9b6752807fc481e680cd4fa99a12be43b22854e5b0308e5752b5a5f78509fb8c9b66db44fc97ec144e0

data/Gemfile

@@ -1,6 +1,3 @@
 source 'https://rubygems.org'
-gemspec
 
-# cursor whirlies (for loading)
-gem 'whirly'
-gem 'paint'
+gemspec

data/lib/neocities/cli.rb

@@ -200,8 +200,9 @@ module Neocities
         end
       end
 
-      if @dry_run
-        puts @pastel.green.bold("Doing a dry run, not actually pushing anything")
+      if @subargs[0].nil?
+        display_response result: 'error', message: "no local path provided"
+        display_push_help_and_exit
       end
 
       root_path = Pathname @subargs[0]
@@ -216,6 +217,10 @@ module Neocities
         display_push_help_and_exit
       end
 
+      if @dry_run
+        puts @pastel.green.bold("Doing a dry run, not actually pushing anything")
+      end
+
       if @prune
         pruned_dirs = []
         resp = @client.list
@@ -319,7 +324,7 @@ module Neocities
 
     def pull
       begin
-        quiet = !(['--log', '-l'].include? @subargs[0])
+        quiet = (['--quiet', '-q'].include? @subargs[0])
 
         file = File.read @app_config_path
         data = JSON.load file
@@ -351,7 +356,84 @@ module Neocities
     end
 
     def display_pizza_help_and_exit
-      puts "Sorry, we're fresh out of dough today. Try again tomorrow."
+      excuses = [
+        "Sorry, we're fresh out of pineapple today.",
+        "All the toppings just went rogue and are currently answering to no god.",
+        "Our bicycle delivery guy is out today for ska band practice.",
+        "Doughpocalypse now. Pizza's off until further notice.",
+        "Mamma mia! We're outta the cheesa.",
+        "The sauce of our youth ran dry. Pizza is off the menu for now.",
+        "There was this pizza place in Portland called Lonesomes that taped burned CDs of local bands to the pizza box. It was pretty dope.",
+        "No dough, no go, sorry joe.",
+        "I'll be right with you after I figure out how to center a div in CSS.",
+        "The pizza gods demand rest. Are the hunger pangs interrupting your game?",
+        "Our pizza chef currently has the high score on the Road Kings pinball machine, you dare disturb him?",
+        "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.”
+
+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.
+
+All her invitations without exception, written in French, and delivered by a scarlet-liveried footman that morning, ran as follows:
+
+“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.”
+
+“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.
+
+“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.
+
+“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?”
+
+“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.”
+
+“I thought today’s fete had been canceled. I confess all these festivities and fireworks are becoming wearisome.”
+
+“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.
+
+“Don’t tease! Well, and what has been decided about Novosíltsev’s dispatch? You know everything.”
+
+“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.”
+
+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.
+
+In the midst of a conversation on political matters Anna Pávlovna burst out:
+
+“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!”
+
+She suddenly paused, smiling at her own impetuosity.
+
+“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?”
+
+“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?”
+
+“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.”
+
+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."
+      ]
+      puts @pastel.bright_red(excuses.sample)
       exit
     end
 
@@ -411,7 +493,7 @@ HERE
       display_banner
 
       puts <<HERE
-  #{@pastel.magenta.bold 'pull'} - Get the most recent version of files from your site
+  #{@pastel.magenta.bold 'pull'} - Get the most recent version of files from your site, does not download if files haven't changed
 
 HERE
       exit

data/lib/neocities/client.rb

@@ -7,10 +7,9 @@ require 'json'
 require 'pathname'
 require 'uri'
 require 'digest'
-require 'httpclient'
+require 'http'
 require 'pastel'
 require 'date'
-
 require 'whirly'
 
 module Neocities
@@ -19,7 +18,6 @@ module Neocities
 
     def initialize(opts={})
       @uri = URI.parse API_URI
-      @http = HTTPClient.new force_basic_auth: true
       @opts = opts
       @pastel = Pastel.new eachline: "\n"
 
@@ -28,9 +26,9 @@ module Neocities
       end
 
       if opts[:api_key]
-        @http.default_header = {'Authorization' => "Bearer #{opts[:api_key]}"}
+        @http = HTTP.auth("Bearer #{opts[:api_key]}")
       else
-        @http.set_auth API_URI, opts[:sitename], opts[:password]
+        @http = HTTP.basic_auth user: opts[:sitename], pass: opts[:password]
       end
     end
 
@@ -65,9 +63,10 @@ module Neocities
       end
       
       # fetch each file
+      uri_parser = URI::Parser.new
       resp[:files].each do |file|
         if !file[:is_directory]
-          print @pastel.bold("Loading #{file[:path]} ... ") if !quiet
+          print @pastel.bold("Pulling #{file[:path]} ... ") if !quiet
           
           if 
             last_pull_time && \
@@ -80,19 +79,10 @@ module Neocities
             next
           end
           
-          pathtotry = domain + file[:path]
-          fileconts = @http.get pathtotry
-          
-          # follow redirects
-          while fileconts.status == 301
-            new_path = fileconts.header['location'][0]
-            print "\n#{@pastel.red "Fetch from #{pathtotry} failed."}\nTrying #{new_path} instead..." if !quiet
+          pathtotry = uri_parser.escape(domain + file[:path])
+          fileconts = @http.follow.get pathtotry
 
-            pathtotry = new_path
-            fileconts = @http.get pathtotry
-          end
-
-          if fileconts.ok?
+          if fileconts.status == 200
             print "#{@pastel.green.bold 'SUCCESS'}\n" if !quiet
             success_loaded += 1
 
@@ -114,7 +104,7 @@ module Neocities
       Whirly.stop if quiet
 
       # display stats
-      puts @pastel.green "\nSuccessfully fetched #{success_loaded} files in #{total_time} seconds"
+      puts @pastel.green "\nSuccessfully fetched #{success_loaded} files in #{total_time.round(2)} seconds"
     end
 
     def key
@@ -134,7 +124,7 @@ module Neocities
 
       rpath = (remote_path || path.basename)
 
-      res = upload_hash rpath, Digest::SHA1.file(path.to_s).hexdigest
+      res = upload_hash rpath.to_s, Digest::SHA1.file(path.to_s).hexdigest
 
       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'}
@@ -143,7 +133,7 @@ module Neocities
           return {result: 'success'}
         else
           File.open(path.to_s) do |file|
-            post 'upload', rpath => file
+            post 'upload', rpath => HTTP::FormData::File.new(file)
           end
         end
       end
@@ -169,13 +159,12 @@ module Neocities
       uri = @uri+path
       uri.query = URI.encode_www_form params
       resp = @http.get uri
-      
       JSON.parse resp.body, symbolize_names: true
     end
 
     def post(path, args={})
       uri = @uri+path
-      resp = @http.post uri, args
+      resp = @http.post uri, form: args
       JSON.parse resp.body, symbolize_names: true
     end
   end

data/lib/neocities/version.rb

@@ -1,3 +1,3 @@
 module Neocities
-  VERSION = '0.0.19'
+  VERSION = '0.1.1'
 end

data/neocities.gemspec

@@ -16,10 +16,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(tests)/})
   spec.require_paths = ["lib"]
   spec.extensions    = ['ext/mkrf_conf.rb']
+  spec.required_ruby_version = '>3.0.0'
 
-  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-fixcerts', '~> 2.8',  '>= 2.8.5'
-  spec.add_dependency 'rake',                '~> 12.3',  '>= 12.3.1'
+  spec.add_dependency 'tty-table',           '~> 0.12', '= 0.12.0'
+  spec.add_dependency 'tty-prompt',          '~> 0.23', '= 0.23.1'
+  spec.add_dependency 'pastel',              '~> 0.8',  '= 0.8.0'
+  spec.add_dependency 'http',                '~> 5.3',  '>= 5.3.1'
+  spec.add_dependency 'rake',                '~> 13',   '>= 13.3.0'
+  spec.add_dependency 'whirly',              '~> 0.3',  '>= 0.3.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: neocities
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.1.1
 platform: ruby
 authors:
 - Kyle Drake
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-table
@@ -16,101 +15,120 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.23'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.23'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: httpclient-fixcerts
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '5.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 5.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '5.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 5.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: 13.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.1
-description: 
+        version: 13.3.0
+- !ruby/object:Gem::Dependency
+  name: whirly
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 email:
 - contact@neocities.org
 executables:
@@ -133,23 +151,21 @@ homepage: https://neocities.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.13
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Neocities.org CLI and API client
 test_files: []