neocities 0.0.1 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 66e57f453b9ea7929315daf45943965369a7d9ee
-  data.tar.gz: 1329416d9d7ffde417ba98ba67c0e050fff11fec
+SHA256:
+  metadata.gz: 5031613f2ead49cb8b0d897ba928dca50121afbc65b0f624afd89038c6f97c3e
+  data.tar.gz: 3f6a7813f75c2d0d667700258a5f2a9a60b74176b69cee5c1d26d95892970a91
 SHA512:
-  metadata.gz: c3510f9cb980ffbb3c163ff2698421f2a97318b3dbcc07fb50db7a3774dd5d8b4192aac0db600684852fe234dc0335551f34c1f79d8b74104f486ccbec0f0998
-  data.tar.gz: 67772ce43a82756e3a9ebf91929bf41e9a154885d5f4ccf4bd20a7821fbdca0aa03acd2d0d061a74bb2416ad9261a9f9c86cbedb5f67bcfcdd863ecd4d133afc
+  metadata.gz: b1ae46e13488bbdd244da5e1f3eb005002f6a2e9a687c9682fc2055ccaf054c76de1f9386ed578b7462745acf1c53d7fac81957b41b474b2f0422ab5823d3f09
+  data.tar.gz: a72a64b9bc2ea15a3c7c6ad01f8f405802c5476e96b8975081d3e7dbef531543838eb029fcba108c7cc7a96e89725fac8855500c0c8ffd8922235f05a86fb9b9

data/.gitignore

@@ -1,17 +1,3 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
 Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+test.rb
+*.gem

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in neocities-ruby.gemspec
 gemspec

data/README.md

@@ -1,29 +1,27 @@
-# Neocities
+# The Neocities Gem
 
-TODO: Write a gem description
+A CLI and library for using the Neocities API. Makes it easy to quickly upload, push, delete, and list your Neocities site.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+### Mac OSX
 
-    gem 'neocities'
+If you're using OSX (or already have ruby installed):
 
-And then execute:
+    gem install neocities
 
-    $ bundle
+### Ubuntu/Debian
 
-Or install it yourself as:
+    sudo apt-get install ruby
 
-    $ gem install neocities
+### Windows
 
-## Usage
+Install ruby with [RubyInstaller](https://rubyinstaller.org/). Then you can install the gem with the above command.
 
-TODO: Write usage instructions here
+### Running
 
-## Contributing
+After that, you are all set! Run `neocities` in a command line to see the options and get started.
 
-1. Fork it ( http://github.com/<my-github-username>/neocities/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+## Neocities::Client
+
+This gem also ships with Neocities::Client, which you can use to write code that interfaces with the Neocities API.

data/bin/neocities

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require File.join(File.dirname(__FILE__), '..', 'lib', 'neocities')
+cli = Neocities::CLI.new ARGV
+cli.run

data/ext/mkrf_conf.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'rubygems/command'
+require 'rubygems/dependency_installer'
+begin
+  Gem::Command.build_args = ARGV
+  rescue NoMethodError
+end
+inst = Gem::DependencyInstaller.new
+begin
+  if Gem.win_platform?
+    inst.install 'openssl-win-root', '~> 1.1'
+  end
+  rescue
+    exit(1)
+end
+
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
+f.write("task :default\n")
+f.close

data/lib/neocities/cli.rb

@@ -0,0 +1,542 @@
+require 'pathname'
+require 'pastel'
+require 'tty/table'
+require 'tty/prompt'
+require 'fileutils'
+require 'json' # for reading configs
+require 'whirly' # for loader spinner
+
+require File.join(File.dirname(__FILE__), 'client')
+
+module Neocities
+  class CLI
+    SUBCOMMANDS = %w{upload delete list info push logout pizza pull}
+    HELP_SUBCOMMANDS = ['-h', '--help', 'help']
+    PENELOPE_MOUTHS = %w{^ o ~ - v U}
+    PENELOPE_EYES = %w{o ~ O}
+
+    def initialize(argv)
+      @argv = argv.dup
+      @pastel = Pastel.new eachline: "\n"
+      @subcmd = @argv.first
+      @subargs = @argv[1..@argv.length]
+      @prompt = TTY::Prompt.new
+      @api_key = ENV['NEOCITIES_API_KEY'] || nil
+      @app_config_path = File.join self.class.app_config_path('neocities'), 'config.json' # added json extension
+    end
+
+    def display_response(resp)
+      if resp[:result] == 'success'
+        puts "#{@pastel.green.bold 'SUCCESS:'} #{resp[:message]}"
+      elsif resp[:result] == 'error' && resp[:error_type] == 'file_exists'
+        out = "#{@pastel.yellow.bold 'EXISTS:'} #{resp[:message]}"
+        out += " (#{resp[:error_type]})" if resp[:error_type]
+        puts out
+      else
+        out = "#{@pastel.red.bold 'ERROR:'} #{resp[:message]}"
+        out += " (#{resp[:error_type]})" if resp[:error_type]
+        puts out
+      end
+    end
+
+    def run
+      if @argv[0] == 'version'
+        puts Neocities::VERSION
+        exit
+      end
+
+      if HELP_SUBCOMMANDS.include?(@subcmd) && SUBCOMMANDS.include?(@subargs[0])
+        send "display_#{@subargs[0]}_help_and_exit"
+      elsif @subcmd.nil? || !SUBCOMMANDS.include?(@subcmd)
+        display_help_and_exit
+      elsif @subargs.join("").match(HELP_SUBCOMMANDS.join('|')) && @subcmd != "info"
+        send "display_#{@subcmd}_help_and_exit"
+      end
+
+      if !@api_key
+        begin
+          file = File.read @app_config_path
+          data = JSON.load file
+
+          if data
+            @api_key = data["API_KEY"].strip # Remove any trailing whitespace causing HTTP requests to fail
+            @sitename = data["SITENAME"] # Store the sitename to be able to reference it later
+            @last_pull = data["LAST_PULL"] # Store the last time a pull was performed so that we only fetch from updated files
+          end
+        rescue Errno::ENOENT
+          @api_key = nil
+        end
+      end
+
+      if @api_key.nil?
+        puts "Please login to get your API key:"
+
+        if !@sitename && !@password
+          @sitename = @prompt.ask('sitename:', default: ENV['NEOCITIES_SITENAME'])
+          @password = @prompt.mask('password:', default: ENV['NEOCITIES_PASSWORD'])
+        end
+
+        @client = Neocities::Client.new sitename: @sitename, password: @password
+
+        resp = @client.key
+        if resp[:api_key]
+          conf = {
+            "API_KEY": resp[:api_key],
+            "SITENAME": @sitename,
+          }
+
+          FileUtils.mkdir_p Pathname(@app_config_path).dirname
+          File.write @app_config_path, conf.to_json
+
+          puts "The api key for #{@pastel.bold @sitename} has been stored in #{@pastel.bold @app_config_path}."
+        else
+          display_response resp
+          exit
+        end
+      else
+        @client = Neocities::Client.new api_key: @api_key
+      end
+
+      send @subcmd
+    end
+
+    def delete
+      display_delete_help_and_exit if @subargs.empty?
+      @subargs.each do |file|
+        puts @pastel.bold("Deleting #{file} ...")
+        resp = @client.delete file
+
+        display_response resp
+      end
+    end
+
+    def logout
+      confirmed = false
+      loop do
+        case @subargs[0]
+        when '-y' then @subargs.shift; confirmed = true
+        when /^-/ then puts(@pastel.red.bold("Unknown option: #{@subargs[0].inspect}")); break
+        else break
+        end
+      end
+      if confirmed
+        FileUtils.rm @app_config_path
+        puts @pastel.bold("Your api key has been removed.")
+      else
+        display_logout_help_and_exit
+      end
+    end
+
+    def info
+      resp = @client.info(@subargs[0] || @sitename)
+
+      if resp[:result] == 'error'
+        display_response resp
+        exit
+      end
+
+      out = []
+
+      resp[:info].each do |k, v|
+        v = Time.parse(v).localtime if v && (k == :created_at || k == :last_updated)
+        out.push [@pastel.bold(k), v]
+      end
+
+      puts TTY::Table.new(out).to_s
+      exit
+    end
+
+    def list
+      display_list_help_and_exit if @subargs.empty?
+      if @subargs.delete('-d') == '-d'
+        @detail = true
+      end
+
+      if @subargs.delete('-a')
+        @subargs[0] = nil
+      end
+
+      resp = @client.list @subargs[0]
+
+      if resp[:result] == 'error'
+        display_response resp
+        exit
+      end
+
+      if @detail
+        out = [
+          [@pastel.bold('Path'), @pastel.bold('Size'), @pastel.bold('Updated')]
+        ]
+        resp[:files].each do |file|
+          out.push([
+            @pastel.send(file[:is_directory] ? :blue : :green).bold(file[:path]),
+            file[:size] || '',
+            Time.parse(file[:updated_at]).localtime
+          ])
+        end
+        puts TTY::Table.new(out).to_s
+        exit
+      end
+
+      resp[:files].each do |file|
+        puts @pastel.send(file[:is_directory] ? :blue : :green).bold(file[:path])
+      end
+    end
+
+    def push
+      display_push_help_and_exit if @subargs.empty?
+      @no_gitignore = false
+      @excluded_files = []
+      @dry_run = false
+      @prune = false
+      loop do
+        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
+      end
+
+      if @subargs[0].nil?
+        display_response result: 'error', message: "no local path provided"
+        display_push_help_and_exit
+      end
+
+      root_path = Pathname @subargs[0]
+
+      if !root_path.exist?
+        display_response result: 'error', message: "path #{root_path} does not exist"
+        display_push_help_and_exit
+      end
+
+      if !root_path.directory?
+        display_response result: 'error', message: 'provided path is not a directory'
+        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
+        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('**', '*'), File::FNM_DOTMATCH)
+
+        if @no_gitignore == false
+          begin
+            ignores = File.readlines('.gitignore').collect! do |ignore|
+              ignore.strip!
+              File.directory?(ignore) ? "#{ignore}**" : ignore
+            end
+            paths.select! do |path|
+              res = true
+              ignores.each do |ignore|
+                if File.fnmatch?(ignore.strip, path)
+                  res = false
+                  break
+                end
+              end
+            end
+            puts "Not pushing .gitignore entries (--no-gitignore to disable)"
+          rescue Errno::ENOENT
+          end
+        end
+
+        paths.select! { |p| !@excluded_files.include?(p) }
+
+        paths.select! { |p| !@excluded_files.include?(Pathname.new(p).dirname.to_s) }
+
+        paths.collect! { |path| Pathname path }
+
+        paths.each do |path|
+          next if path.directory?
+          print @pastel.bold("Uploading #{path} ... ")
+          resp = @client.upload path, path, @dry_run
+
+          if resp[:result] == 'error' && resp[:error_type] == 'file_exists'
+            print @pastel.yellow.bold("EXISTS") + "\n"
+          elsif resp[:result] == 'success'
+            print @pastel.green.bold("SUCCESS") + "\n"
+          else
+            print "\n"
+            display_response resp
+          end
+        end
+      end
+    end
+
+    def upload
+      display_upload_help_and_exit if @subargs.empty?
+      @dir = ''
+
+      loop do
+        case @subargs[0]
+        when '-d' then @subargs.shift; @dir = @subargs.shift
+        when /^-/ then puts(@pastel.red.bold("Unknown option: #{@subargs[0].inspect}")); display_upload_help_and_exit
+        else break
+        end
+      end
+
+      @subargs.each do |path|
+        path = Pathname path
+
+        if !path.exist?
+          display_response result: 'error', message: "#{path} does not exist locally."
+          next
+        end
+
+        if path.directory?
+          puts "#{path} is a directory, skipping (see the push command)"
+          next
+        end
+
+        remote_path = ['/', @dir, path.basename.to_s].join('/').gsub %r{/+}, '/'
+
+        puts @pastel.bold("Uploading #{path} to #{remote_path} ...")
+        resp = @client.upload path, remote_path
+        display_response resp
+      end
+    end
+
+    def pull
+      begin
+        quiet = !(['--log', '-l'].include? @subargs[0])
+
+        file = File.read @app_config_path
+        data = JSON.load file
+
+        last_pull_time = data["LAST_PULL"] ? data["LAST_PULL"]["time"] : nil
+        last_pull_loc = data["LAST_PULL"] ? data["LAST_PULL"]["loc"] : nil
+
+        Whirly.start spinner: ["😺", "😸", "😹", "😻", "😼", "😽", "🙀", "😿", "😾"], status: "Retrieving files for #{@pastel.bold @sitename}" if quiet
+        resp = @client.pull @sitename, last_pull_time, last_pull_loc, quiet
+
+        # write last pull data to file (not necessarily the best way to do this, but better than cloning every time)
+        data["LAST_PULL"] = {
+          "time": Time.now,
+          "loc": Dir.pwd
+        }
+
+        File.write @app_config_path, data.to_json
+      rescue StandardError => ex
+        Whirly.stop if quiet
+        puts @pastel.red.bold "\nA fatal error occurred :-("
+        puts @pastel.red ex
+      ensure
+        exit
+      end
+    end
+
+    def pizza
+      display_pizza_help_and_exit
+    end
+
+    def display_pizza_help_and_exit
+      puts "Sorry, we're fresh out of dough today. Try again tomorrow."
+      exit
+    end
+
+    def display_list_help_and_exit
+      display_banner
+
+      puts <<HERE
+  #{@pastel.green.bold 'list'} - List files on your Neocities site
+
+  #{@pastel.dim 'Examples:'}
+
+  #{@pastel.green '$ neocities list /'}           List files in your root directory
+
+  #{@pastel.green '$ neocities list -a'}          Recursively display all files and directories
+
+  #{@pastel.green '$ neocities list -d /mydir'}   Show detailed information on /mydir
+
+HERE
+      exit
+    end
+
+    def display_delete_help_and_exit
+      display_banner
+
+      puts <<HERE
+  #{@pastel.green.bold 'delete'} - Delete files on your Neocities site
+
+  #{@pastel.dim 'Examples:'}
+
+  #{@pastel.green '$ neocities delete myfile.jpg'}               Delete myfile.jpg
+
+  #{@pastel.green '$ neocities delete myfile.jpg myfile2.jpg'}   Delete myfile.jpg and myfile2.jpg
+
+  #{@pastel.green '$ neocities delete mydir'}                    Deletes mydir and everything inside it (be careful!)
+
+HERE
+      exit
+    end
+
+    def display_upload_help_and_exit
+      display_banner
+
+      puts <<HERE
+  #{@pastel.green.bold 'upload'} - Upload individual files to your Neocities site
+
+  #{@pastel.dim 'Examples:'}
+
+  #{@pastel.green '$ neocities upload img.jpg img2.jpg'}    Upload images to the root of your site
+
+  #{@pastel.green '$ neocities upload -d images img.jpg'}   Upload img.jpg to the 'images' directory on your site
+
+HERE
+      exit
+    end
+
+    def display_pull_help_and_exit
+      display_banner
+
+      puts <<HERE
+  #{@pastel.magenta.bold 'pull'} - Get the most recent version of files from your site
+
+HERE
+      exit
+    end
+
+    def display_push_help_and_exit
+      display_banner
+
+      puts <<HERE
+  #{@pastel.green.bold 'push'} - Recursively upload a local directory to your Neocities site
+
+  #{@pastel.dim 'Examples:'}
+
+  #{@pastel.green '$ neocities push .'}                                 Recursively upload current directory.
+
+  #{@pastel.green '$ neocities push -e node_modules -e secret.txt .'}   Exclude certain files from push
+
+  #{@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
+    end
+
+    def display_info_help_and_exit
+      display_banner
+
+      puts <<HERE
+  #{@pastel.green.bold 'info'} - Get site info
+
+  #{@pastel.dim 'Examples:'}
+
+  #{@pastel.green '$ neocities info fauux'}   Gets info for 'fauux' site
+
+HERE
+      exit
+    end
+
+    def display_logout_help_and_exit
+      display_banner
+
+      puts <<HERE
+  #{@pastel.green.bold 'logout'} - Remove the site api key from the config
+
+  #{@pastel.dim 'Examples:'}
+
+  #{@pastel.green '$ neocities logout -y'}
+
+HERE
+      exit
+    end
+
+    def display_banner
+      puts <<HERE
+
+  |\\---/|
+  | #{PENELOPE_EYES.sample}_#{PENELOPE_EYES.sample} |  #{@pastel.on_cyan.bold ' Neocities '}
+   \\_#{PENELOPE_MOUTHS.sample}_/
+
+HERE
+    end
+
+    def display_help_and_exit
+      display_banner
+      puts <<HERE
+  #{@pastel.dim 'Subcommands:'}
+    push        Recursively upload a local directory to your site
+    upload      Upload individual files to your Neocities site
+    delete      Delete files from your Neocities site
+    list        List files from your Neocities site
+    info        Information and stats for your site
+    logout      Remove the site api key from the config
+    version     Unceremoniously display version and self destruct
+    pull        Get the most recent version of files from your site
+    pizza       Order a free pizza
+
+HERE
+      exit
+    end
+
+    def self.app_config_path(name)
+      platform = if RUBY_PLATFORM =~ /win32/
+        :win32
+      elsif RUBY_PLATFORM =~ /darwin/
+        :darwin
+      elsif RUBY_PLATFORM =~ /linux/
+        :linux
+      else
+        :unknown
+      end
+
+      case platform
+      when :linux
+        if ENV['XDG_CONFIG_HOME']
+          return File.join(ENV['XDG_CONFIG_HOME'], name)
+        end
+
+        if ENV['HOME']
+          return File.join(ENV['HOME'], '.config', name)
+        end
+      when :darwin
+        return File.join(ENV['HOME'], 'Library', 'Application Support', name)
+      else
+        # Windows platform detection is weird, just look for the env variables
+        if ENV['LOCALAPPDATA']
+          return File.join(ENV['LOCALAPPDATA'], name)
+        end
+
+        if ENV['USERPROFILE']
+          return File.join(ENV['USERPROFILE'], 'Local Settings', 'Application Data', name)
+        end
+
+        # Should work for the BSDs
+        if ENV['HOME']
+          return File.join(ENV['HOME'], '.'+name)
+        end
+      end
+    end
+  end
+end

data/lib/neocities/client.rb

@@ -0,0 +1,183 @@
+begin
+  require 'openssl/win/root' if Gem.win_platform?
+rescue
+end
+
+require 'json'
+require 'pathname'
+require 'uri'
+require 'digest'
+require 'httpclient'
+require 'pastel'
+require 'date'
+
+require 'whirly'
+
+module Neocities
+  class Client
+    API_URI = 'https://neocities.org/api/'
+
+    def initialize(opts={})
+      @uri = URI.parse API_URI
+      @http = HTTPClient.new force_basic_auth: true
+      @opts = opts
+      @pastel = Pastel.new eachline: "\n"
+
+      unless opts[:api_key] || (opts[:sitename] && opts[:password])
+        raise ArgumentError, 'client requires a login (sitename/password) or an api_key'
+      end
+
+      if opts[:api_key]
+        @http.default_header = {'Authorization' => "Bearer #{opts[:api_key]}"}
+      else
+        @http.set_auth API_URI, opts[:sitename], opts[:password]
+      end
+    end
+
+    def list(path=nil)
+      get 'list', :path => path
+    end
+
+    def pull(sitename, last_pull_time=nil, last_pull_loc=nil, quiet=true)
+      site_info = get 'info', sitename: sitename
+
+      if site_info[:result] == 'error'
+        raise ArgumentError, site_info[:message]
+      end
+
+      # handle custom domains for supporter accounts
+      if site_info[:info][:domain] && site_info[:info][:domain] != ""
+        domain = "https://#{site_info[:info][:domain]}/"
+      else
+        domain = "https://#{sitename}.neocities.org/"
+      end
+
+      # start stats
+      success_loaded = 0
+      start_time = Time.now
+      curr_dir = Dir.pwd
+
+      # get list of files
+      resp = get 'list'
+
+      if resp[:result] == 'error'
+        raise ArgumentError, resp[:message]
+      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
+          
+          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" if !quiet
+            next
+          end
+          
+          pathtotry = uri_parser.escape(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 = new_path
+            fileconts = @http.get pathtotry
+          end
+
+          if fileconts.ok?
+            print "#{@pastel.green.bold 'SUCCESS'}\n" if !quiet
+            success_loaded += 1
+
+            File.open("#{file[:path]}", "w") do |f|
+              f.write(fileconts.body)
+            end
+          else
+            print "#{@pastel.red.bold 'FAIL'}\n" if !quiet
+          end
+        else
+          FileUtils.mkdir_p "#{file[:path]}"
+        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} 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
+
+      unless path.exist?
+        raise ArgumentError, "#{path.to_s} does not exist."
+      end
+
+      rpath = (remote_path || path.basename)
+
+      res = upload_hash rpath, 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'}
+      else
+        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
+
+    def info(sitename)
+      get 'info', sitename: sitename
+    end
+
+    def get(path, params={})
+      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
+      JSON.parse resp.body, symbolize_names: true
+    end
+  end
+end

data/lib/neocities/version.rb

@@ -1,3 +1,3 @@
 module Neocities
-  VERSION = "0.0.1"
+  VERSION = '0.0.20'
 end

data/lib/neocities.rb

@@ -0,0 +1,3 @@
+require File.join(File.dirname(__FILE__), 'neocities', 'version')
+require File.join(File.dirname(__FILE__), 'neocities', 'client')
+require File.join(File.dirname(__FILE__), 'neocities', 'cli')

data/neocities.gemspec

@@ -7,15 +7,20 @@ Gem::Specification.new do |spec|
   spec.name          = "neocities"
   spec.version       = Neocities::VERSION
   spec.authors       = ["Kyle Drake"]
-  spec.email         = ["kyle@kyledrake.net"]
-  spec.summary       = %q{Library for the NeoCities.org API}
+  spec.email         = ["contact@neocities.org"]
+  spec.summary       = %q{Neocities.org CLI and API client}
   spec.homepage      = "https://neocities.org"
   spec.license       = "MIT"
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files | grep -Ev '^(test)'`.split("\n")
+  spec.executables   = ['neocities']
+  spec.test_files    = spec.files.grep(%r{^(tests)/})
   spec.require_paths = ["lib"]
+  spec.extensions    = ['ext/mkrf_conf.rb']
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  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 'whirly',              '~> 0.3',  '>= 0.3.0'
 end

metadata

@@ -1,56 +1,152 @@
 --- !ruby/object:Gem::Specification
 name: neocities
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.20
 platform: ruby
 authors:
 - Kyle Drake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: tty-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        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'
+    - - '='
+      - !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'
+    - - '='
+      - !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'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: httpclient-fixcerts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 12.3.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.1
+- !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'
+        version: 0.3.0
 description: 
 email:
-- kyle@kyledrake.net
-executables: []
-extensions: []
+- contact@neocities.org
+executables:
+- neocities
+extensions:
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE.txt
 - README.md
-- Rakefile
-- lib/neocities/neocities.rb
+- bin/neocities
+- ext/mkrf_conf.rb
+- lib/neocities.rb
+- lib/neocities/cli.rb
+- lib/neocities/client.rb
 - lib/neocities/version.rb
 - neocities.gemspec
 homepage: https://neocities.org
@@ -72,9 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.5.13
 signing_key: 
 specification_version: 4
-summary: Library for the NeoCities.org API
+summary: Neocities.org CLI and API client
 test_files: []

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Kyle Drake
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/lib/neocities/neocities.rb

@@ -1,4 +0,0 @@
-require "neocities/version"
-
-module Neocities
-end