neocities 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e57f453b9ea7929315daf45943965369a7d9ee
-  data.tar.gz: 1329416d9d7ffde417ba98ba67c0e050fff11fec
+  metadata.gz: 91023e44cb2b6df2ed6014513a925da7b00420f7
+  data.tar.gz: 728a534ab0854def9a92ce9397aca1b5b07ca80b
 SHA512:
-  metadata.gz: c3510f9cb980ffbb3c163ff2698421f2a97318b3dbcc07fb50db7a3774dd5d8b4192aac0db600684852fe234dc0335551f34c1f79d8b74104f486ccbec0f0998
-  data.tar.gz: 67772ce43a82756e3a9ebf91929bf41e9a154885d5f4ccf4bd20a7821fbdca0aa03acd2d0d061a74bb2416ad9261a9f9c86cbedb5f67bcfcdd863ecd4d133afc
+  metadata.gz: 8c9e360c1d69af9f34d5ba7be22dc87944e827e781a2f689212d39e75d5520cf08767510c9f590b28ab1213ed510b427e218c8cccbb9f9ecf86f26de866942c4
+  data.tar.gz: 40f7d15988184963237693961b240ad5467eb231eb2bee559fa7d5ec527f585526573fef66936bc46ad1a1e098ea002727020929b87707f69c8ea609a5fd34d8

data/.gitignore

@@ -1,17 +1,2 @@
-*.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

data/Gemfile

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

data/bin/neocities

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../lib/neocities'
+cli = Neocities::CLI.new ARGV
+cli.run

data/lib/neocities.rb

@@ -0,0 +1,3 @@
+require_relative 'neocities/version'
+require_relative 'neocities/client'
+require_relative 'neocities/cli'

data/lib/neocities/cli.rb

@@ -0,0 +1,341 @@
+require 'pathname'
+require 'pastel'
+require 'tty/table'
+require 'tty/prompt'
+require 'fileutils'
+require 'buff/ignore'
+
+module Neocities
+  class CLI
+    API_KEY_PATH = ENV['HOME']+'/.neocities/api_key'
+    SUBCOMMANDS = %w{upload delete list info sync pizza}
+    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
+    end
+
+    def display_response(resp)
+      if resp[:result] == 'success'
+        puts "#{@pastel.green.bold 'SUCCESS:'} #{resp[:message]}"
+      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
+
+      display_help_and_exit if @subcmd.nil? || @argv.include?(HELP_SUBCOMMANDS) || !SUBCOMMANDS.include?(@subcmd)
+      send "display_#{@subcmd}_help_and_exit" if @subargs.empty?
+
+      begin
+        @api_key = File.read API_KEY_PATH
+      rescue Errno::ENOENT
+        @api_key = nil
+      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
+
+        res = @client.key
+        if res[:api_key]
+          FileUtils.mkdir_p Pathname(API_KEY_PATH).dirname
+          File.write API_KEY_PATH, res[:api_key]
+          puts "The api key for #{@pastel.bold @sitename} has been stored in #{@pastel.bold API_KEY_PATH}."
+        else
+          display_response resp
+          exit
+        end
+      else
+        @client = Neocities::Client.new api_key: @api_key
+      end
+
+      send @subcmd
+    end
+
+    def delete
+      @subargs.each do |file|
+        puts @pastel.bold("Deleting #{file} ...")
+        resp = @client.delete file
+
+        display_response resp
+      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 k == :created_at || k == :last_updated
+        out.push [@pastel.bold(k), v]
+      end
+
+      puts TTY::Table.new(out).to_s
+      exit
+    end
+
+    def list
+      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 sync
+      @no_gitignore = false
+      @excluded_files = []
+      loop {
+        case @subargs[0]
+        when '--no-gitignore' then @subargs.shift; @no_gitignore = true
+        when '-e' then @subargs.shift; @excluded_files.push(@subargs.shift)
+        when /^-/ then puts(@pastel.red.bold("Unknown option: #{@subargs[0].inspect}")); display_sync_help_and_exit
+        else break
+        end
+      }
+
+      root_path = Pathname @subargs[0]
+
+      if !root_path.exist?
+        display_response result: 'error', message: "path #{root_path} does not exist"
+        display_sync_help_and_exit
+      end
+
+      if !root_path.directory?
+        display_response result: 'error', message: 'provided path is not a directory'
+        display_sync_help_and_exit
+      end
+
+      Dir.chdir(root_path) do
+        paths = Dir.glob(File.join('**', '*'))
+
+        if @no_gitignore == false
+          begin
+            ignore = Buff::Ignore::IgnoreFile.new '.gitignore'
+            ignore.apply! paths
+            puts "Not syncing .gitignore entries (--no-gitignore to disable)"
+          rescue Buff::Ignore::IgnoreFileNotFound
+          end
+        end
+
+        paths.select! {|p| !@excluded_files.include?(p)}
+
+        paths.collect! {|path| Pathname path}
+
+        paths.each do |path|
+          next if path.directory?
+          print @pastel.bold("Syncing #{path} ... ")
+          resp = @client.upload path, path
+
+          if 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 {
+        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
+      }
+
+      @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 sync 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 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
+
+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_sync_help_and_exit
+      display_banner
+
+      puts <<HERE
+  #{@pastel.green.bold 'sync'} - Upload a local directory to your Neocities site
+
+  #{@pastel.dim 'Examples:'}
+
+  #{@pastel.green '$ neocities sync .'}                                 Recursively upload current directory
+
+  #{@pastel.green '$ neocities sync -e node_modules -e secret.txt .'}   Exclude certain files from sync
+
+  #{@pastel.green '$ neocities sync --no-gitignore .'}                  Don't use .gitignore to exclude files
+
+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_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:'}
+    sync        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
+    version     Unceremoniously display version and self destruct
+    pizza       Order a free pizza
+
+HERE
+      exit
+    end
+  end
+end

data/lib/neocities/client.rb

@@ -0,0 +1,55 @@
+require 'http'
+require 'json'
+require 'pathname'
+
+module Neocities
+  class Client
+    API_URI = 'https://neocities.org/api/'
+
+    def initialize(opts={})
+      if opts[:api_key]
+        @http = HTTP.auth "Bearer #{opts[:api_key]}"
+      elsif opts[:sitename] && opts[:password]
+        @http = HTTP.basic_auth user: opts[:sitename], pass: opts[:password]
+      else
+        raise ArgumentError, 'client requires a login (sitename/password) or an api_key'
+      end
+    end
+
+    def list(path=nil)
+      run :get, 'list', params: {path: path}
+    end
+
+    def key
+      run :get, 'key', {}
+    end
+
+    def upload(path, remote_path=nil)
+      path = Pathname path
+
+      unless path.exist?
+        raise ArgumentError, "#{path.to_s} does not exist."
+      end
+
+      run :post, 'upload', form: {
+        (remote_path || path.basename) => HTTP::FormData::File.new(path.to_s)
+      }
+    end
+
+    def delete(*paths)
+      run :post, 'delete', form: {'filenames[]' => paths}
+    end
+
+    def info(sitename)
+      run :get, 'info', params: {sitename: sitename}
+    end
+
+    private
+
+    def run(meth, path, args)
+      resp = @http.send(meth, API_URI+path, 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.2'
 end

data/neocities.gemspec

@@ -7,15 +7,27 @@ 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.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_dependency 'tty-table',     '~> 0.8', '>= 0.8.0'
+  spec.add_dependency 'tty-prompt',    '~> 0.12', '>= 0.12.0'
+  spec.add_dependency 'pastel',        '~> 0.7', '>= 0.7.1'
+  spec.add_dependency 'http',          '~> 2.2', '>= 2.2.2'
+  spec.add_dependency 'buff-ignore',   '~> 1.2'
+
+#  spec.add_development_dependency      'rake', '~> 10.0'
+#  spec.add_development_dependency      'faker'
+#  spec.add_development_dependency      'minitest'
+#  spec.add_development_dependency      'minitest-reporters'
+#  spec.add_development_dependency      'rack-test'
+#  spec.add_development_dependency      'mocha'
+#  spec.add_development_dependency      'webmock'
+#  spec.add_development_dependency      'simplecov'
 end

metadata

@@ -1,56 +1,123 @@
 --- !ruby/object:Gem::Specification
 name: neocities
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kyle Drake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2017-05-15 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.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.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.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.2.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: buff-ignore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: 
 email:
-- kyle@kyledrake.net
-executables: []
+- contact@neocities.org
+executables:
+- neocities
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- lib/neocities/neocities.rb
+- bin/neocities
+- lib/neocities.rb
+- lib/neocities/cli.rb
+- lib/neocities/client.rb
 - lib/neocities/version.rb
 - neocities.gemspec
 homepage: https://neocities.org
@@ -73,8 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 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/README.md

@@ -1,29 +0,0 @@
-# Neocities
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'neocities'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install neocities
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-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

data/Rakefile

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

data/lib/neocities/neocities.rb

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