fix: remove highline colors and revert to net http

Author: ganchdev

deployhq.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.bindir = "bin"
   s.executables << "deployhq"
 
-  s.add_dependency('faraday', '~> 2.7')
   s.add_dependency('json', '~> 2.6')
   s.add_dependency('highline', '~> 2.1')
   s.add_dependency('websocket-eventmachine-client', '~> 1.2')

lib/deploy/cli.rb

@@ -5,8 +5,6 @@
 require 'deploy/cli/websocket_client'
 require 'deploy/cli/deployment_progress_output'
 
-HighLine.colorize_strings
-
 module Deploy
   class CLI
     ## Constants for formatting output
@@ -69,12 +67,7 @@ def invoke(args)
             exit 1
           end
 
-          begin
-            @project = Deploy::Project.find(project_permalink)
-          rescue Deploy::Errors::TimeoutError => e
-            STDERR.puts e
-            exit 1
-          end
+          @project = Deploy::Project.find(project_permalink)
         end
 
         case command
@@ -93,15 +86,15 @@ def server_list
         @server_groups ||= @project.server_groups
         if @server_groups.count > 0
           @server_groups.each do |group|
-            puts "Group: #{group.name}".bold
+            puts "Group: #{group.name}"
             puts group.servers.map {|server| format_server(server) }.join("\n\n")
           end
         end
 
         @ungrouped_servers ||= @project.servers
         if @ungrouped_servers.count > 0
           puts "\n" if @server_groups.count > 0
-          puts "Ungrouped Servers".bold
+          puts "Ungrouped Servers"
           puts @ungrouped_servers.map {|server| format_server(server) }.join("\n\n")
         end
       end
@@ -186,7 +179,7 @@ def format_kv_pair(hash)
         longest_key = hash.keys.map(&:length).max + 2
         hash.each_with_index.map do |(k,v), i|
           str = sprintf("%#{longest_key}s : %s", k,v)
-          i == 0 ? str.color(:bold) : str
+          str
         end.join("\n")
       end
 

lib/deploy/errors.rb

@@ -16,9 +16,6 @@ class AccessDenied < Error; end
     ## A communication error occurred while talking to the Deploy API
     class CommunicationError < Error; end
 
-    # A timeout error
-    class TimeoutError < Error; end
-
     # Raised from the websocket client when we receive an error event
     class WebsocketError < Error; end
   end

lib/deploy/request.rb

@@ -1,6 +1,3 @@
-require 'faraday'
-require 'json'
-
 module Deploy
   class Request
 
@@ -23,41 +20,47 @@ def output
     ## Make a request to the Deploy API using net/http. Data passed can be a hash or a string
     ## Hashes will be converted to JSON before being sent to the remote service.
     def make
-      uri = URI.parse(Deploy.configuration.account)
-      connection_url = "#{uri.scheme}://#{uri.host}:#{uri.port}"
+      uri = URI.parse([Deploy.configuration.account, @path].join('/'))
+      http_request = http_class.new(uri.request_uri)
+      http_request.basic_auth(Deploy.configuration.username, Deploy.configuration.api_key)
+      http_request["Accept"] = "application/json"
+      http_request["Content-Type"] = "application/json"
 
-      connection = Faraday.new(url: connection_url, request: { timeout: 3 }) do |client|
-        client.request :authorization, :basic, Deploy.configuration.username, Deploy.configuration.api_key
-        client.headers['Accept'] = 'application/json'
-        client.headers['Content-Type'] = 'application/json'
+      http = Net::HTTP.new(uri.host, uri.port)
+      if uri.scheme == 'https'
+        http.use_ssl = true
       end
 
       data = self.data.to_json if self.data.is_a?(Hash) && self.data.respond_to?(:to_json)
-
-      response = connection.send(@method) do |req|
-        req.url @path
-        req.body = data
-      end
-
-      @output = response.body
-      @success = case response.status
-                 when 200..299
+      http_result = http.request(http_request, data)
+      @output = http_result.body
+      @success = case http_result
+                 when Net::HTTPSuccess
                    true
-                 when 503
+                 when Net::HTTPServiceUnavailable
                    raise Deploy::Errors::ServiceUnavailable
-                 when 401, 403
+                 when Net::HTTPForbidden, Net::HTTPUnauthorized
                    raise Deploy::Errors::AccessDenied, "Access Denied for '#{Deploy.configuration.username}'"
-                 when 404
+                 when Net::HTTPNotFound
                    raise Deploy::Errors::CommunicationError, "Not Found at #{uri.to_s}"
-                 when 400..499
+                 when Net::HTTPClientError
                    false
                  else
-                   raise Deploy::Errors::CommunicationError, response.body
+                   raise Deploy::Errors::CommunicationError, http_result.body
                  end
-
       self
-    rescue Faraday::TimeoutError
-      raise Deploy::Errors::TimeoutError, "Your request timed out, please try again in a few seconds"
+    end
+
+    private
+
+    def http_class
+      case @method
+      when :post    then Net::HTTP::Post
+      when :put     then Net::HTTP::Put
+      when :delete  then Net::HTTP::Delete
+      else
+        Net::HTTP::Get
+      end
     end
 
   end