neocities 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc8567acab05a229147c442cf46dcb8ac0c411ac
-  data.tar.gz: e64269881d5f0cf8832fcfba5d0ae0d1b18a2bba
+  metadata.gz: a7fc3c5a5006cc43a1d376c76c016af351a0b577
+  data.tar.gz: 34b8fc7ddd3bac03b081855fc589a3e09d9e49ce
 SHA512:
-  metadata.gz: b1b550fb524099c129db0e6c76aeb24b4a5232a2839248b8a89cf7306b2e8780a8c2dcdc96cdabec529f120dad89e00c553c9eab3282a7c2cdf779ee3bb1106c
-  data.tar.gz: bba3cb4c3b246360b33463b68295e49a83f6be9d0e4a6b1d43058cb6dac030e4c65fbe020989bb69b72f1452af6f3f3577bc6c257828de2c6d79af17d1e88892
+  metadata.gz: f83a532c0b208f5f73d77fa8727a439df85baac46ff9a0dcb746d38ca78497af68c1a6d924204b394a025ef419149dcdb2595dbb48192bf7484bad611fd77d76
+  data.tar.gz: 294cf5bd9ef2413b8196fd7ad156e142b6d680f51166fff2f0ae1c277cf983cbb93aff446bf0e27f51ea5daee0afe5200fc298e2b57467d8e26b9bb64a24e5fa

data/lib/neocities/cli.rb

@@ -19,12 +19,16 @@ 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'
+      @app_config_path = File.join self.class.app_config_path('neocities'), 'config'
     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]
@@ -207,7 +211,9 @@ module Neocities
           print @pastel.bold("Uploading #{path} ... ")
           resp = @client.upload path, path
 
-          if resp[:result] == 'success'
+          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"
@@ -380,11 +386,7 @@ HERE
       exit
     end
 
-    def self.app_config_path
-      File.join root_config_path, 'neocities'
-    end
-
-    def self.root_config_path
+    def self.app_config_path(name)
       platform = if RUBY_PLATFORM =~ /win32/
         :win32
       elsif RUBY_PLATFORM =~ /darwin/
@@ -396,14 +398,30 @@ HERE
       end
 
       case platform
-      when :win32
-        return File.join(ENV['LOCALAPPDATA']) if ENV['LOCALAPPDATA']
-        File.join ENV['USERPROFILE'], 'Local Settings', 'Application Data'
+      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
-        File.join ENV['HOME'], 'Library', 'Application Support'
+        return File.join(ENV['HOME'], 'Library', 'Application Support', name)
       else
-        return File.join(ENV['XDG_CONFIG_HOME']) if ENV['XDG_CONFIG_HOME']
-        File.join ENV['HOME'], '.config'
+        # 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

data/lib/neocities/client.rb

@@ -3,12 +3,11 @@ begin
 rescue
 end
 
-require 'net/http'
-require 'net/https'
 require 'json'
 require 'pathname'
 require 'uri'
-require 'net/http/post/multipart'
+require 'digest'
+require 'httpclient'
 
 module Neocities
   class Client
@@ -16,13 +15,19 @@ module Neocities
 
     def initialize(opts={})
       @uri = URI.parse API_URI
-      @http = Net::HTTP.new @uri.host, @uri.port
-      @http.use_ssl = true
+      @http = HTTPClient.new force_basic_auth: true
       @opts = opts
 
-      unless @opts[:api_key] || (@opts[:sitename] && @opts[:password])
+      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)
@@ -33,6 +38,10 @@ module Neocities
       get 'key'
     end
 
+    def upload_hash(remote_path, sha1_hash)
+      post 'upload_hash', remote_path => sha1_hash
+    end
+
     def upload(path, remote_path=nil)
       path = Pathname path
 
@@ -40,7 +49,17 @@ module Neocities
         raise ArgumentError, "#{path.to_s} does not exist."
       end
 
-      post 'upload', (remote_path || path.basename) => UploadIO.new(path.to_s, 'application/octet-stream')
+      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
+        File.open(path.to_s) do |file|
+          post 'upload', rpath => file
+        end
+      end
     end
 
     def delete(*paths)
@@ -51,25 +70,16 @@ module Neocities
       get 'info', sitename: sitename
     end
 
-    private
-
     def get(path, params={})
-      req = Net::HTTP::Get.new "#{@uri.path}#{path}?#{URI.encode_www_form(params)}"
-      request req
+      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={})
-      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
+      uri = @uri+path
+      resp = @http.post uri, args
       JSON.parse resp.body, symbolize_names: true
     end
   end

data/lib/neocities/version.rb

@@ -1,3 +1,3 @@
 module Neocities
-  VERSION = '0.0.5'
+  VERSION = '0.0.7'
 end

data/neocities.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ['ext/mkrf_conf.rb']
 
-  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'
+  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 'httpclient',          '~> 2.8',  '>= 2.8.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neocities
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Kyle Drake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-table
@@ -71,25 +71,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: multipart-post
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.8.3
 description: 
 email:
 - contact@neocities.org