neocities-red 1.1.0 → 1.1.2

data/lib/neocities_red/client.rb

@@ -1,200 +1,200 @@
-# frozen_string_literal: true
-
-if Gem.win_platform?
-  begin
-    require "openssl/win/root"
-  rescue LoadError
-    # Optional dependency that helps Windows trust store integration.
-  end
-end
-require "json"
-require "pathname"
-require "uri"
-require "digest"
-require "pastel"
-require "date"
-require "whirly"
-
-require "faraday"
-require "faraday/retry"
-require "faraday/multipart"
-require "faraday/follow_redirects"
-
-module NeocitiesRed
-  class Client
-    API_URI = "https://neocities.org/api/"
-
-    def initialize(opts = {})
-      @uri = URI.parse API_URI
-      @opts = opts
-      @pastel = Pastel.new eachline: "\n"
-      @conn = Faraday.new(@uri) do |conn|
-        conn.options.timeout = 30
-        conn.options.open_timeout = 10
-        conn.adapter :net_http
-
-        conn.request :multipart
-        conn.request :url_encoded
-
-        conn.request :retry,
-                     max: 3,
-                     interval: 0.3,
-                     backoff_factor: 2,
-                     retry_statuses: [429, 500, 502, 503, 504],
-                     exceptions: [
-                       Faraday::TimeoutError,
-                       Faraday::ConnectionFailed,
-                       Faraday::SSLError
-                     ]
-
-        conn.response :follow_redirects
-      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])
-      else
-        @conn.request(:authorization, :basic, opts[:sitename], opts[:password])
-      end
-    end
-
-    def list(path = nil)
-      get "list", path: path
-    end
-
-    # TODO: refactor
-    def pull(sitename, last_pull_time = nil, last_pull_loc = nil, quiet: true)
-      site_info = info(sitename)
-
-      raise ArgumentError, site_info[:message] if site_info[:result] == "error"
-
-      info_data = site_info[:info]
-
-      domain =
-        if info_data[:domain].to_s.empty?
-          "https://#{sitename}.neocities.org/"
-        else
-          "https://#{info_data[:domain]}/"
-        end
-
-      # start stats
-      success_loaded = 0
-      start_time = Time.now
-      curr_dir = Dir.pwd
-
-      # get list of files
-      resp = list
-
-      raise ArgumentError, resp[:message] if resp[:result] == "error"
-
-      # fetch each file
-      uri_parser = URI::Parser.new
-      resp[:files].each do |file|
-        if file[:is_directory]
-          FileUtils.mkdir_p file[:path].to_s
-        else
-          print @pastel.bold("Pulling #{file[:path]} ... ") unless quiet
-
-          if last_pull_time &&
-             last_pull_loc &&
-             Time.parse(file[:updated_at]) <= Time.parse(last_pull_time) &&
-             last_pull_loc == curr_dir &&
-             File.exist?(file[:path]) # case when user deletes file
-
-            # case when file hasn't been updated since last
-            print "#{@pastel.yellow.bold 'NO NEW UPDATES'}\n" unless quiet
-
-            next
-          end
-
-          pathtotry = uri_parser.escape(domain + file[:path])
-          fileconts = @conn.get pathtotry
-
-          if fileconts.status == 200
-            print "#{@pastel.green.bold 'SUCCESS'}\n" unless quiet
-            success_loaded += 1
-
-            File.write(file[:path].to_s, fileconts.body)
-          elsif !quiet
-            print "#{@pastel.red.bold 'FAIL'}\n"
-          end
-        end
-      end
-
-      # calculate time command took
-      total_time = Time.now - start_time
-
-      # stop the spinner, if there is one
-      Whirly.stop if quiet
-
-      # display stats
-      puts @pastel.green "\nSuccessfully fetched #{success_loaded} files in #{total_time.round(2)} seconds"
-    end
-
-    def key
-      get "key"
-    end
-
-    def upload_hash(remote_path, sha1_hash)
-      post "upload_hash", remote_path => sha1_hash
-    end
-
-    def upload(path, remote_path = nil, dry_run: false)
-      path = Pathname path
-      raise ArgumentError, "#{path} does not exist." unless path.exist?
-
-      rpath = remote_path || path.basename
-      res = upload_hash(rpath.to_s, Digest::SHA1.file(path.to_s).hexdigest)
-
-      file_exists_remotely = if res[:files]
-                               res[:files][rpath.to_s.to_sym] == true || res[:files][rpath.to_s] == true
-                             else
-                               false
-                             end
-
-      if file_exists_remotely
-        {
-          result: "error",
-          error_type: "file_exists",
-          message: "file already exists and matches local file, not uploading"
-        }
-      else
-        return { result: "success" } if dry_run
-
-        File.open(path.to_s) do |file|
-          post "upload", rpath.to_s => Faraday::Multipart::FilePart.new(file, "text/html")
-        end
-      end
-    end
-
-    def delete_wrapper_with_dry_run(paths, dry_run: false)
-      return { result: "success" } if dry_run
-
-      delete(paths)
-    end
-
-    def delete(*paths)
-      post "delete", "filenames" => paths
-    end
-
-    def info(sitename)
-      get "info", sitename: sitename
-    end
-
-    def get(path, params = {})
-      uri = @uri + path
-      uri.query = URI.encode_www_form params
-      resp = @conn.get(uri)
-
-      JSON.parse resp.body, symbolize_names: true
-    end
-
-    def post(path, args = {})
-      uri = @uri + path
-      resp = @conn.post(uri, args)
-
-      JSON.parse resp.body, symbolize_names: true
-    end
-  end
-end
+# frozen_string_literal: true
+
+if Gem.win_platform?
+  begin
+    require "openssl/win/root"
+  rescue LoadError
+    # Optional dependency that helps Windows trust store integration.
+  end
+end
+require "json"
+require "pathname"
+require "uri"
+require "digest"
+require "pastel"
+require "date"
+require "whirly"
+
+require "faraday"
+require "faraday/retry"
+require "faraday/multipart"
+require "faraday/follow_redirects"
+
+module NeocitiesRed
+  class Client
+    API_URI = "https://neocities.org/api/"
+
+    def initialize(opts = {})
+      @uri = URI.parse API_URI
+      @opts = opts
+      @pastel = Pastel.new eachline: "\n"
+      @conn = Faraday.new(@uri) do |conn|
+        conn.options.timeout = 30
+        conn.options.open_timeout = 10
+        conn.adapter :net_http
+
+        conn.request :multipart
+        conn.request :url_encoded
+
+        conn.request :retry,
+                     max: 3,
+                     interval: 0.3,
+                     backoff_factor: 2,
+                     retry_statuses: [429, 500, 502, 503, 504],
+                     exceptions: [
+                       Faraday::TimeoutError,
+                       Faraday::ConnectionFailed,
+                       Faraday::SSLError
+                     ]
+
+        conn.response :follow_redirects
+      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])
+      else
+        @conn.request(:authorization, :basic, opts[:sitename], opts[:password])
+      end
+    end
+
+    def list(path = nil)
+      get "list", path: path
+    end
+
+    # TODO: refactor
+    def pull(sitename, last_pull_time = nil, last_pull_loc = nil, quiet: true)
+      site_info = info(sitename)
+
+      raise ArgumentError, site_info[:message] if site_info[:result] == "error"
+
+      info_data = site_info[:info]
+
+      domain =
+        if info_data[:domain].to_s.empty?
+          "https://#{sitename}.neocities.org/"
+        else
+          "https://#{info_data[:domain]}/"
+        end
+
+      # start stats
+      success_loaded = 0
+      start_time = Time.now
+      curr_dir = Dir.pwd
+
+      # get list of files
+      resp = list
+
+      raise ArgumentError, resp[:message] if resp[:result] == "error"
+
+      # fetch each file
+      uri_parser = URI::Parser.new
+      resp[:files].each do |file|
+        if file[:is_directory]
+          FileUtils.mkdir_p file[:path].to_s
+        else
+          print @pastel.bold("Pulling #{file[:path]} ... ") unless quiet
+
+          if last_pull_time &&
+             last_pull_loc &&
+             Time.parse(file[:updated_at]) <= Time.parse(last_pull_time) &&
+             last_pull_loc == curr_dir &&
+             File.exist?(file[:path]) # case when user deletes file
+
+            # case when file hasn't been updated since last
+            print "#{@pastel.yellow.bold 'NO NEW UPDATES'}\n" unless quiet
+
+            next
+          end
+
+          pathtotry = uri_parser.escape(domain + file[:path])
+          fileconts = @conn.get pathtotry
+
+          if fileconts.status == 200
+            print "#{@pastel.green.bold 'SUCCESS'}\n" unless quiet
+            success_loaded += 1
+
+            File.write(file[:path].to_s, fileconts.body)
+          elsif !quiet
+            print "#{@pastel.red.bold 'FAIL'}\n"
+          end
+        end
+      end
+
+      # calculate time command took
+      total_time = Time.now - start_time
+
+      # stop the spinner, if there is one
+      Whirly.stop if quiet
+
+      # display stats
+      puts @pastel.green "\nSuccessfully fetched #{success_loaded} files in #{total_time.round(2)} seconds"
+    end
+
+    def key
+      get "key"
+    end
+
+    def upload_hash(remote_path, sha1_hash)
+      post "upload_hash", remote_path => sha1_hash
+    end
+
+    def upload(path, remote_path = nil, dry_run: false)
+      path = Pathname path
+      raise ArgumentError, "#{path} does not exist." unless path.exist?
+
+      rpath = remote_path || path.basename
+      res = upload_hash(rpath.to_s, Digest::SHA1.file(path.to_s).hexdigest)
+
+      file_exists_remotely = if res[:files]
+                               res[:files][rpath.to_s.to_sym] == true || res[:files][rpath.to_s] == true
+                             else
+                               false
+                             end
+
+      if file_exists_remotely
+        {
+          result: "error",
+          error_type: "file_exists",
+          message: "file already exists and matches local file, not uploading"
+        }
+      else
+        return { result: "success" } if dry_run
+
+        File.open(path.to_s) do |file|
+          post "upload", rpath.to_s => Faraday::Multipart::FilePart.new(file, "text/html")
+        end
+      end
+    end
+
+    def delete_wrapper_with_dry_run(paths, dry_run: false)
+      return { result: "success" } if dry_run
+
+      delete(paths)
+    end
+
+    def delete(*paths)
+      post "delete", "filenames" => paths
+    end
+
+    def info(sitename)
+      get "info", sitename: sitename
+    end
+
+    def get(path, params = {})
+      uri = @uri + path
+      uri.query = URI.encode_www_form params
+      resp = @conn.get(uri)
+
+      JSON.parse resp.body, symbolize_names: true
+    end
+
+    def post(path, args = {})
+      uri = @uri + path
+      resp = @conn.post(uri, args)
+
+      JSON.parse resp.body, symbolize_names: true
+    end
+  end
+end

data/lib/neocities_red/services/common/pizza.rb

@@ -1,107 +1,107 @@
-# frozen_string_literal: true
-
-require "pastel"
-
-module NeocitiesRed
-  module Services
-    module Common
-      class Pizza
-        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.",
-          <<~TEXT
-            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.
-          TEXT
-        ].freeze
-
-        def make_order
-          Pastel.new(enabled: true).bright_red(EXCUSES.sample)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "pastel"
+
+module NeocitiesRed
+  module Services
+    module Common
+      class Pizza
+        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.",
+          <<~TEXT
+            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.
+          TEXT
+        ].freeze
+
+        def make_order
+          Pastel.new(enabled: true).bright_red(EXCUSES.sample)
+        end
+      end
+    end
+  end
+end