neocities 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91023e44cb2b6df2ed6014513a925da7b00420f7
-  data.tar.gz: 728a534ab0854def9a92ce9397aca1b5b07ca80b
+  metadata.gz: e6247ca86f02faa4f57147bf46dde7f04e6d96f9
+  data.tar.gz: 9f4a4b8f63992410de81fb9992edd7f133e7ad4d
 SHA512:
-  metadata.gz: 8c9e360c1d69af9f34d5ba7be22dc87944e827e781a2f689212d39e75d5520cf08767510c9f590b28ab1213ed510b427e218c8cccbb9f9ecf86f26de866942c4
-  data.tar.gz: 40f7d15988184963237693961b240ad5467eb231eb2bee559fa7d5ec527f585526573fef66936bc46ad1a1e098ea002727020929b87707f69c8ea609a5fd34d8
+  metadata.gz: 5547e47f7ff6d96504cf4b7883da0503b5a9bda6d6cd795fdae357afb83e67152e1fffe33e012193e5512ec83e502dfd6882c520fc76e79397e339354027dded
+  data.tar.gz: efcd58356410fbd8ee8e28389d789c803ba7ff6659f4ce8ff9aafba49637bff0d05ac39ef033e50d50ffb6e4c398e337a24320ce33f354d9a3ceedbab48a3aba

data/.gitignore

@@ -1,2 +1,3 @@
 Gemfile.lock
 test.rb
+*.gem

data/README.md

@@ -0,0 +1,15 @@
+# The Neocities Gem
+
+A CLI and library for using the Neocities API. Makes it easy to quickly upload, push, delete, and list your Neocities site.
+
+## Installation
+
+If you're using OSX (or already have ruby installed), run this command:
+
+    gem install neocities
+
+After that, you are all set! Run `neocities` to see the options and get started.
+
+## 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

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

data/lib/neocities.rb

@@ -1,3 +1,3 @@
-require_relative 'neocities/version'
-require_relative 'neocities/client'
-require_relative 'neocities/cli'
+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/lib/neocities/cli.rb

@@ -4,11 +4,11 @@ require 'tty/table'
 require 'tty/prompt'
 require 'fileutils'
 require 'buff/ignore'
+require File.join(File.dirname(__FILE__), 'client')
 
 module Neocities
   class CLI
-    API_KEY_PATH = ENV['HOME']+'/.neocities/api_key'
-    SUBCOMMANDS = %w{upload delete list info sync pizza}
+    SUBCOMMANDS = %w{upload delete list info push logout pizza}
     HELP_SUBCOMMANDS = ['-h', '--help', 'help']
     PENELOPE_MOUTHS = %w{^ o ~ - v U}
     PENELOPE_EYES = %w{o ~ O}
@@ -20,6 +20,7 @@ module Neocities
       @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, 'config'
     end
 
     def display_response(resp)
@@ -42,7 +43,7 @@ module Neocities
       send "display_#{@subcmd}_help_and_exit" if @subargs.empty?
 
       begin
-        @api_key = File.read API_KEY_PATH
+        @api_key = File.read @app_config_path
       rescue Errno::ENOENT
         @api_key = nil
       end
@@ -59,9 +60,9 @@ module Neocities
 
         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}."
+          FileUtils.mkdir_p Pathname(@app_config_path).dirname
+          File.write @app_config_path, res[:api_key]
+          puts "The api key for #{@pastel.bold @sitename} has been stored in #{@pastel.bold @app_config_path}."
         else
           display_response resp
           exit
@@ -82,6 +83,21 @@ module Neocities
       end
     end
 
+    def logout
+      confirmed = false
+      loop {
+        case @subargs[0]
+        when '-y' then @subargs.shift; confirmed = true
+        when /^-/ then puts(@pastel.red.bold("Unknown option: #{@subargs[0].inspect}")); display_logout_help_and_exit
+        else break
+        end
+      }
+      if confirmed
+        FileUtils.rm @app_config_path
+        puts @pastel.bold("Your api key has been removed.")
+      end
+    end
+
     def info
       resp = @client.info(@subargs[0] || @sitename)
 
@@ -137,14 +153,14 @@ module Neocities
       end
     end
 
-    def sync
+    def push
       @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
+        when /^-/ then puts(@pastel.red.bold("Unknown option: #{@subargs[0].inspect}")); display_push_help_and_exit
         else break
         end
       }
@@ -153,12 +169,12 @@ module Neocities
 
       if !root_path.exist?
         display_response result: 'error', message: "path #{root_path} does not exist"
-        display_sync_help_and_exit
+        display_push_help_and_exit
       end
 
       if !root_path.directory?
         display_response result: 'error', message: 'provided path is not a directory'
-        display_sync_help_and_exit
+        display_push_help_and_exit
       end
 
       Dir.chdir(root_path) do
@@ -166,10 +182,20 @@ module Neocities
 
         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
+            ignores = File.readlines('.gitignore').collect! do |ignore|
+              File.directory?(ignore.strip!) ? "#{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
 
@@ -179,7 +205,7 @@ module Neocities
 
         paths.each do |path|
           next if path.directory?
-          print @pastel.bold("Syncing #{path} ... ")
+          print @pastel.bold("Uploading #{path} ... ")
           resp = @client.upload path, path
 
           if resp[:result] == 'success'
@@ -213,7 +239,7 @@ module Neocities
         end
 
         if path.directory?
-          puts "#{path} is a directory, skipping (see the sync command)"
+          puts "#{path} is a directory, skipping (see the push command)"
           next
         end
 
@@ -256,9 +282,11 @@ HERE
 
   #{@pastel.dim 'Examples:'}
 
-  #{@pastel.green '$ neocities delete myfile.jpg'}                 Delete myfile.jpg
+  #{@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 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
@@ -280,19 +308,19 @@ HERE
       exit
     end
 
-    def display_sync_help_and_exit
+    def display_push_help_and_exit
       display_banner
 
       puts <<HERE
-  #{@pastel.green.bold 'sync'} - Upload a local directory to your Neocities site
+  #{@pastel.green.bold 'push'} - Recursively upload a local directory to your Neocities site
 
   #{@pastel.dim 'Examples:'}
 
-  #{@pastel.green '$ neocities sync .'}                                 Recursively upload current directory
+  #{@pastel.green '$ neocities push .'}                                 Recursively upload current directory.
 
-  #{@pastel.green '$ neocities sync -e node_modules -e secret.txt .'}   Exclude certain files from sync
+  #{@pastel.green '$ neocities push -e node_modules -e secret.txt .'}   Exclude certain files from push
 
-  #{@pastel.green '$ neocities sync --no-gitignore .'}                  Don't use .gitignore to exclude files
+  #{@pastel.green '$ neocities push --no-gitignore .'}                  Don't use .gitignore to exclude files
 
 HERE
       exit
@@ -308,6 +336,20 @@ HERE
 
   #{@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
@@ -326,16 +368,44 @@ HERE
       display_banner
       puts <<HERE
   #{@pastel.dim 'Subcommands:'}
-    sync        Recursively upload a local directory to your site
+    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
     pizza       Order a free pizza
 
 HERE
       exit
     end
+
+    def self.app_config_path
+      File.join root_config_path, 'neocities'
+    end
+
+    def self.root_config_path
+      platform = if RUBY_PLATFORM =~ /win32/
+        :win32
+      elsif RUBY_PLATFORM =~ /darwin/
+        :darwin
+      elsif RUBY_PLATFORM =~ /linux/
+        :linux
+      else
+        :unknown
+      end
+
+      case platform
+      when :win32
+        return File.join(ENV['LOCALAPPDATA']) if ENV['LOCALAPPDATA']
+        File.join ENV['USERPROFILE'], 'Local Settings', 'Application Data'
+      when :darwin
+        File.join ENV['HOME'], 'Library', 'Application Support'
+      else
+        return File.join(ENV['XDG_CONFIG_HOME']) if ENV['XDG_CONFIG_HOME']
+        File.join ENV['HOME'], '.config'
+      end
+    end
   end
 end

data/lib/neocities/client.rb

@@ -1,27 +1,31 @@
-require 'http'
+require 'net/http'
+require 'net/https'
 require 'json'
 require 'pathname'
+require 'uri'
+require 'net/http/post/multipart'
 
 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
+      @uri = URI.parse API_URI
+      @http = Net::HTTP.new @uri.host, @uri.port
+      @http.use_ssl = true
+      @opts = opts
+
+      unless @opts[:api_key] || (@opts[:sitename] && @opts[:password])
         raise ArgumentError, 'client requires a login (sitename/password) or an api_key'
       end
     end
 
     def list(path=nil)
-      run :get, 'list', params: {path: path}
+      get 'list', :path => path
     end
 
     def key
-      run :get, 'key', {}
+      get 'key'
     end
 
     def upload(path, remote_path=nil)
@@ -31,25 +35,37 @@ module Neocities
         raise ArgumentError, "#{path.to_s} does not exist."
       end
 
-      run :post, 'upload', form: {
-        (remote_path || path.basename) => HTTP::FormData::File.new(path.to_s)
-      }
+      post 'upload', (remote_path || path.basename) => UploadIO.new(path.to_s, 'application/octet-stream')
     end
 
     def delete(*paths)
-      run :post, 'delete', form: {'filenames[]' => paths}
+      post 'delete', 'filenames[]' => paths
     end
 
     def info(sitename)
-      run :get, 'info', params: {sitename: sitename}
+      get 'info', sitename: sitename
     end
 
     private
 
-    def run(meth, path, args)
-      resp = @http.send(meth, API_URI+path, args)
-      JSON.parse resp.body, symbolize_names: true
+    def get(path, params={})
+      req = Net::HTTP::Get.new "#{@uri.path}#{path}?#{URI.encode_www_form(params)}"
+      request req
+    end
+
+    def post(path, args={})
+      req = Net::HTTP::Post::Multipart.new("#{@uri.path}#{path}", args)
+      res = request req
     end
 
+    def request(req)
+      if @opts[:api_key]
+        req['Authorization'] = "Bearer #{@opts[:api_key]}"
+      else
+        req.basic_auth @opts[:sitename], @opts[:password]
+      end
+      resp = @http.request req
+      JSON.parse resp.body, symbolize_names: true
+    end
   end
 end

data/lib/neocities/version.rb

@@ -1,3 +1,3 @@
 module Neocities
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/neocities.gemspec

@@ -16,18 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(tests)/})
   spec.require_paths = ["lib"]
 
-  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'
+  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 'multipart-post', '~> 2.0', '>= 2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neocities
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kyle Drake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-table
@@ -71,39 +71,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: http
+  name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        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'
+        version: 2.0.0
 description: 
 email:
 - contact@neocities.org
@@ -114,6 +100,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- README.md
 - bin/neocities
 - lib/neocities.rb
 - lib/neocities/cli.rb