lib/core/transport.rb in rise-cli-0.3.2 vs lib/core/transport.rb in rise-cli-0.3.4
- old
+ new
@@ -1,10 +1,11 @@
require 'rex/text'
require 'uri'
require 'json'
require 'http'
require 'active_support'
+require 'core'
module Rise
#
# Handles all communication with the rise upload server
@@ -52,10 +53,10 @@
isdir = File.directory?(f)
final_path = File.absolute_path(f).gsub(
File.expand_path(folder_path), '')
uri = URI.parse("#{upload_uri_base}/#{final_path.gsub(' ', '')}?dir=#{isdir}")
begin
- vputs ("Uploading #{f.basename}")
+ Rise::Text.vputs("Uploading #{File.basename(f)}")
res = HTTP.auth("#{key}").put(uri.to_s, body: ActiveSupport::Gzip.compress(File.read(f)))
abort(Paint["Upload failed. Got error code #{res.code} with message: #{JSON.parse(res)['message']}", :red]) unless (!res.code.nil? && res.code == 200)
rescue Errno::EISDIR
res = HTTP.auth("#{key}").put(uri.to_s, body: '')
abort(Paint["Upload failed. Got error code #{res.code} with message: #{JSON.parse(res)['message']}", :red]) unless (!res.code.nil? && res.code == 200)