Ruby 3 upgrade (#14)

* feat: upgrades deps and bumps gem version

* chore: remove pry

* chore: remove some comments

* fix: adds all platforms to Gemfile

* chore: updates readme

* chore: add Gemfile.lock to .gitignore

Author: ganchdev

.gitignore

@@ -1,3 +1,6 @@
 examples
 *.gem
+.ruby-version
+.idea
 Deployfile
+Gemfile.lock

Gemfile.lock

@@ -2,8 +2,7 @@
 
 ## Installation
 
-You'll need Ruby installed on your system. We've tested on 2.2.3, but other
-versions may work fine.
+You'll need Ruby installed on your system. We've tested on `2.7.8` and later.
 
 ```
 gem install deployhq

README.md

@@ -16,8 +16,9 @@ Gem::Specification.new do |s|
   s.bindir = "bin"
   s.executables << "deployhq"
 
-  s.add_dependency('json', '~> 1.8')
-  s.add_dependency('highline', '~> 2.0')
+  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')
 
   s.author = "Dan Wentworth"

deployhq.gemspec

@@ -69,7 +69,12 @@ def invoke(args)
             exit 1
           end
 
-          @project = Deploy::Project.find(project_permalink)
+          begin
+            @project = Deploy::Project.find(project_permalink)
+          rescue Deploy::Errors::TimeoutError => e
+            STDERR.puts e
+            exit 1
+          end
         end
 
         case command
@@ -135,7 +140,7 @@ def configure
         }
 
         confirmation = true
-        if File.exists?(@options.config_file)
+        if File.exist?(@options.config_file)
           confirmation = agree("File already exists at #{@options.config_file}. Overwrite? ")
         end
 

lib/deploy/cli.rb

@@ -13,9 +13,12 @@ class ServiceUnavailable < Error; end
     ## Access was denied to the remote service
     class AccessDenied < Error; end
 
-    ## A communication error occured while talking to the Deploy API
+    ## 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/errors.rb

@@ -1,3 +1,6 @@
+require 'faraday'
+require 'json'
+
 module Deploy
   class Request
 
@@ -20,47 +23,41 @@ 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, @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"
+      uri = URI.parse(Deploy.configuration.account)
+      connection_url = "#{uri.scheme}://#{uri.host}:#{uri.port}"
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      if uri.scheme == 'https'
-        http.use_ssl = true
+      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'
       end
 
       data = self.data.to_json if self.data.is_a?(Hash) && self.data.respond_to?(:to_json)
-      http_result = http.request(http_request, data)
-      @output = http_result.body
-      @success = case http_result
-      when Net::HTTPSuccess
-        true
-      when Net::HTTPServiceUnavailable
-        raise Deploy::Errors::ServiceUnavailable
-      when Net::HTTPForbidden, Net::HTTPUnauthorized
-        raise Deploy::Errors::AccessDenied, "Access Denied for '#{Deploy.configuration.username}'"
-      when Net::HTTPNotFound
-        raise Deploy::Errors::CommunicationError, "Not Found at #{uri.to_s}"
-      when Net::HTTPClientError
-        false
-      else
-        raise Deploy::Errors::CommunicationError, http_result.body
+
+      response = connection.send(@method) do |req|
+        req.url @path
+        req.body = data
       end
-      self
-    end
 
-    private
+      @output = response.body
+      @success = case response.status
+                 when 200..299
+                   true
+                 when 503
+                   raise Deploy::Errors::ServiceUnavailable
+                 when 401, 403
+                   raise Deploy::Errors::AccessDenied, "Access Denied for '#{Deploy.configuration.username}'"
+                 when 404
+                   raise Deploy::Errors::CommunicationError, "Not Found at #{uri.to_s}"
+                 when 400..499
+                   false
+                 else
+                   raise Deploy::Errors::CommunicationError, response.body
+                 end
 
-    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
+      self
+    rescue Faraday::TimeoutError
+      raise Deploy::Errors::TimeoutError, "Your request timed out, please try again in a few seconds"
     end
 
   end

lib/deploy/request.rb

@@ -30,7 +30,10 @@ def find(type, params = {})
 
       ## Find all objects and return an array of objects with the attributes set.
       def find_all(params)
-        output = JSON.parse(Request.new(collection_path(params)).make.output)
+        request = Request.new(collection_path(params))
+        output = request.make.output
+        output = JSON.parse(output)
+
         if output.is_a?(Hash) && output['records'] && output['pagination']
           output = output['records']
         end
@@ -42,9 +45,12 @@ def find_all(params)
 
       ## Find a single object and return an object for it.
       def find_single(id, params = {})
-        o = JSON.parse(Request.new(member_path(id, params)).make.output)
-        if o.is_a?(Hash)
-          create_object(o, params)
+        request = Request.new(member_path(id, params))
+        output = request.make.output
+        output = JSON.parse(output)
+
+        if output.is_a?(Hash)
+          create_object(output, params)
         else
           raise Deploy::Errors::NotFound, "Record not found"
         end

lib/deploy/resource.rb

@@ -18,14 +18,14 @@ def latest_revision(branch = '')
       parsed['ref']
     end
 
-    ## Create a deployment in this project (and queue it to run)
+    # Create a deployment in this project (and queue it to run)
     def deploy(server, start_revision, end_revision)
       run_deployment(server, start_revision, end_revision) do |d|
         d.mode = 'queue'
       end
     end
 
-    ##
+    # Create a deployment preview
     def preview(server, start_revision, end_revision)
       run_deployment(server, start_revision, end_revision) do |d|
         d.mode = 'preview'

lib/deploy/resources/project.rb

@@ -1,3 +1,3 @@
 module Deploy
-  VERSION = "2.0.4".freeze
+  VERSION = "2.1.0".freeze
 end