haste 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b0a30cd28db8b86bddf18e6566da74606f8ff696
-  data.tar.gz: ed8009b3dc3d1a66e62d78f122117bddc1b7c1f2
+SHA256:
+  metadata.gz: 4cc8bef048fb30c944bfbcdac49747d5628bde679d6d0c75651c71ef83c29e54
+  data.tar.gz: ab3fe8bfea6e0e4d4c0ab2f5d490f4bc7dc97c948b40f053c80d1ce447a998fd
 SHA512:
-  metadata.gz: 491b3fb08ee4d71703e52794390eb247926407aa6cf5d0d2bf053a53e6eb4c7beb882ea2ae90d416cc2aa423700c72031a33df202db6e2db76cf4562586e2728
-  data.tar.gz: 53f96da87beeeff259d4a1ca43a953b0c47aae0dd15c2a3f369b914e78983c6c388c8184e13cbb51e3222c9a9de9eb16a93be6f2ec625d94c90d7ef2b726d449
+  metadata.gz: 331cf67f756c7384644f4d00c8877e1d611cfe1187e40ed877d1babba413f4dea50e70f1352409b40613eb1af7ebfcad2761b7e145438c6e4c3382d3e9d6c9be
+  data.tar.gz: 5ddc100be5baa4c28f0acdb5eea37fe12cd2fe6fe052df246ad8a61767a11e728d62942dc1d70ccf1a38ba3414e663a7ef942fb8f78de2fc53f0a76248dc5e44

data/lib/haste/cli.rb

@@ -4,7 +4,13 @@ module Haste
 
     # Create a new uploader
     def initialize
-      @uploader = Uploader.new ENV['HASTE_SERVER']
+      @uploader = Uploader.new(
+        ENV['HASTE_SERVER'],
+        ENV['HASTE_SERVER_TOKEN'],
+        ENV['HASTE_SHARE_SERVER'],
+        ENV['HASTE_USER'],
+        ENV['HASTE_PASS'],
+        ENV['HASTE_SSL_CERTS'])
     end
 
     # And then handle the basic usage
@@ -16,11 +22,7 @@ module Haste
         key = @uploader.upload_raw STDIN.readlines.join
       end
       # Put together a URL
-      if ARGV.include?('--raw')
-        url = "#{@uploader.server_url}/raw/#{key}"
-      else
-        url = "#{@uploader.server_url}/#{key}"
-      end
+      url = "#{@uploader.share_server_url}/share/#{key}"
       # And write data out
       if STDOUT.tty?
         STDOUT.puts url

data/lib/haste/uploader.rb

@@ -4,16 +4,27 @@ require 'uri'
 
 module Haste
 
-  DEFAULT_URL = 'https://hastebin.com'
+  DEFAULT_SERVER_URL = 'https://hastebin.com'
+  DEFAULT_SHARE_SERVER_URL = 'https://hastebin.com'
 
   class Uploader
 
-    attr_reader :server_url
+    attr_reader :server_url, :server_token, :share_server_url, :server_user, :server_pass, :ssl_certs
 
-    def initialize(server_url = nil)
-      @server_url = server_url || Haste::DEFAULT_URL
-      @server_url = @server_url.dup
-      @server_url = @server_url.chop if @server_url.end_with?('/')
+    def initialize(server_url = nil, server_token = nil, share_server_url = nil, server_user = nil, server_pass = nil, ssl_certs = nil)
+      @server_url = generate_url(server_url || Haste::DEFAULT_SERVER_URL)
+      @share_server_url = generate_url(share_server_url || Haste::DEFAULT_SHARE_SERVER_URL)
+      
+      @server_user = server_user
+      @server_token = server_token
+      @server_pass = server_pass
+      @ssl_certs   = ssl_certs
+    end
+
+    def generate_url(url)
+      url = url.dup
+      url = url.chop if url.end_with?('/')
+      return url
     end
 
     # Take in a path and return a key
@@ -51,11 +62,32 @@ module Haste
     end
 
     def connection
-      @connection ||= Faraday.new(:url => server_url) do |c|
-        c.adapter Faraday.default_adapter
+      @connection ||= connection_set
+    end
+
+    def connection_set
+      return connection_https if @ssl_certs
+      connection_http
+    end
+
+    def connection_http
+      Faraday.new(:url => server_url) do |c|
+        connection_config(c)
       end
     end
 
+    def connection_https
+      Faraday.new(:url => server_url, :ssl => { :ca_path => @ssl_certs }) do |c|
+        connection_config(c)
+      end
+    end
+
+    def connection_config(config)
+      config.request :authorization, 'Bearer', @server_token if @server_token
+      config.basic_auth(@server_user, @server_pass) if @server_user
+      config.adapter Faraday.default_adapter
+    end
+
     def fail_with(msg)
       raise Exception.new(msg)
     end

data/lib/haste/version.rb

@@ -1,5 +1,3 @@
 module Haste
-
-  VERSION = '0.2.3'
-
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haste
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
-- John Crepezzi
-autorequire: 
+- Toptal
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 description: CLI Haste Client
-email: john.crepezzi@gmail.com
+email: open-source@toptal.com
 executables:
 - haste
 extensions: []
@@ -66,11 +66,11 @@ files:
 - lib/haste/uploader.rb
 - lib/haste/version.rb
 - spec/spec_helper.rb
-homepage: https://github.com/seejohnrun/haste-client
+homepage: https://github.com/toptal/haste-client
 licenses:
 - MIT License
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,9 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Haste Client
 test_files: