deployhq 2.0.3 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 806781a3e039b0c27a95bb0128b8ac1a5a8bcade
-  data.tar.gz: fcc05ab94ec7adcc1ced3005acec05686844b307
+SHA256:
+  metadata.gz: 7822d0dc6c5d8d2ba5b4dc65e955badf2e80fb3634897c5671155035ba6dbbe3
+  data.tar.gz: 17493bebc4b52686ce52bbbec87736084746eb97392fa7942913f31b508b1e5d
 SHA512:
-  metadata.gz: 90dda81926d93cf8eea3b8fd4367c9c81b4aa41615a37562e313881e92453276f8074403c408003312de930c350dade1d40579f4c80ff957af44018c4699aacb
-  data.tar.gz: 60d447c667e83d23dac4c8ac1a2096dff581d0d8d5648e2b781f6498ca4bb00a8b1a754dde324bcb33975736e3de411104cd8bea64eb142e57d8a3212c47c20c
+  metadata.gz: 7b533389d7fa5604510a5ced8f9b1e22187df73cc23a6d79a2e2e9b98c0ea2ee1f0875816babbd7a5e3c6b66928274e14ac5777397283d5e6e3f7a1ba8c6c753
+  data.tar.gz: b5d3ec552dd78c0caceed18f64b6a1753480c54665cf50ebbf28c8aa26249ed144133915f02c645a147e14b20d9cf0662cf6de2991125da694764519fc0480dc

data/bin/deployhq

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-libdir = File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+libdir = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(libdir)
 
 require 'deploy/cli'

data/lib/deploy/cli/deployment_progress_output.rb

@@ -1,9 +1,15 @@
+# frozen_string_literal: true
+
 module Deploy
   class CLI
+
     class DeploymentProgressOutput
+
       SERVER_TAG_COLOURS = %w[32 33 34 35 36].cycle
 
-      attr_reader :deployment, :step_index, :server_tags
+      attr_reader :deployment
+      attr_reader :step_index
+      attr_reader :server_tags
 
       def initialize(deployment)
         @deployment = deployment
@@ -26,13 +32,14 @@ module Deploy
 
       private
 
+      # rubocop:disable Metrics/AbcSize
       def handle_log_entry(payload)
         step = step_index[payload['step']]
         server_tag = server_tags[step.server]
 
-        line = "\n"
-        line << server_tag if server_tag
-        line << payload['message']
+        lines = ["\n"]
+        lines << server_tag
+        lines << payload['message']
 
         if payload['detail']
           padding_width = 0
@@ -40,22 +47,25 @@ module Deploy
           padding = ' ' * padding_width
 
           payload['detail'].split("\n").each do |detail_line|
-            line << "\n#{padding}| #{detail_line}"
+            lines << "\n#{padding}| #{detail_line}"
           end
         end
 
-        STDOUT.print line
+        $stdout.print lines.join
       end
+      # rubocop:enable Metrics/AbcSize
 
       def handle_status_change(payload)
         if payload['status'] == 'completed'
-          STDOUT.print "\nDeployment has finished successfully!\n"
+          $stdout.print "\nDeployment has finished successfully!\n"
         elsif payload['status'] == 'failed'
-          STDOUT.print "\nDeployment has failed!\n"
+          $stdout.print "\nDeployment has failed!\n"
         end
 
         throw(:finished) if %w[completed failed].include?(payload['status'])
       end
+
     end
+
   end
 end

data/lib/deploy/cli/websocket_client.rb

@@ -1,14 +1,20 @@
+# frozen_string_literal: true
+
 require 'websocket-eventmachine-client'
 require 'logger'
 
 module Deploy
   class CLI
+
     # Manages a connection and associated subscriptions to DeployHQ's websocket
     class WebsocketClient
+
       attr_reader :subscriptions
 
       class Subscription
-        attr_reader :exchange, :routing_key
+
+        attr_reader :exchange
+        attr_reader :routing_key
 
         def initialize(exchange, routing_key)
           @exchange = exchange
@@ -36,6 +42,7 @@ module Deploy
         def subscribed!
           @subscribed = true
         end
+
       end
 
       def initialize
@@ -51,10 +58,10 @@ module Deploy
         catch(:finished) do
           EM.run do
             connection.onopen do
-              logger.info "connected"
+              logger.info 'connected'
             end
 
-            connection.onmessage do |msg, type|
+            connection.onmessage do |msg, _type|
               receive(msg)
             end
 
@@ -68,7 +75,7 @@ module Deploy
 
       private
 
-      def dispatch(event, payload, mq = nil)
+      def dispatch(event, payload, rmq = nil)
         case event
         when 'Welcome'
           authenticate
@@ -79,7 +86,7 @@ module Deploy
         when 'Error', 'InternalError'
           websocket_error(payload)
         else
-          subscription_event(event, payload, mq) if mq
+          subscription_event(event, payload, rmq) if rmq
         end
       end
 
@@ -96,17 +103,17 @@ module Deploy
       def successful_subscription(payload)
         key = subscription_key(payload['exchange'], payload['routing_key'])
         subscription = subscriptions[key]
-        subscription.subscribed! if subscription
+        subscription&.subscribed!
       end
 
       def websocket_error(payload)
         raise Deploy::Errors::WebsocketError, payload['error']
       end
 
-      def subscription_event(event, payload, mq)
-        key = subscription_key(mq["e"], mq["rk"])
+      def subscription_event(event, payload, rmq)
+        key = subscription_key(rmq['e'], rmq['rk'])
         subscription = subscriptions[key]
-        subscription.dispatch(event, payload) if subscription
+        subscription&.dispatch(event, payload)
       end
 
       def receive(msg)
@@ -131,7 +138,7 @@ module Deploy
       end
 
       def logger
-        @logger ||= Logger.new(STDOUT)
+        @logger ||= Logger.new($stdout)
         @logger.level = Logger::ERROR
         @logger
       end
@@ -139,6 +146,8 @@ module Deploy
       def subscription_key(exchange, routing_key)
         [exchange, routing_key].join('-')
       end
+
     end
+
   end
 end

data/lib/deploy/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optparse'
 require 'highline/import'
 
@@ -5,43 +7,50 @@ require 'deploy'
 require 'deploy/cli/websocket_client'
 require 'deploy/cli/deployment_progress_output'
 
-HighLine.colorize_strings
+OptionsStruct = Struct.new(:config_file, :project)
 
+# rubocop:disable Metrics/ClassLength
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/MethodLength
+# rubocop:disable Metrics/PerceivedComplexity
 module Deploy
   class CLI
+
     ## Constants for formatting output
-    PROTOCOL_NAME = {:ssh => "SSH/SFTP", :ftp => "FTP", :s3 => "Amazon S3", :rackspace => "Rackspace CloudFiles"}
+    PROTOCOL_NAME = { ssh: 'SSH/SFTP', ftp: 'FTP', s3: 'Amazon S3', rackspace: 'Rackspace CloudFiles' }.freeze
 
     class << self
+
       def invoke(args)
-        @options = OpenStruct.new
+        @options = OptionsStruct.new
 
         parser = OptionParser.new do |opts|
-          opts.banner = "Usage: deployhq [options] command"
-          opts.separator ""
-          opts.separator "Commands:"
+          opts.banner = 'Usage: deployhq [options] command'
+          opts.separator ''
+          opts.separator 'Commands:'
           opts.separator "deploy\t\t Start a new deployment"
           opts.separator "servers\t\t List configured servers and server groups"
           opts.separator "configure\t\t Create a new configuration file for this tool"
-          opts.separator ""
-          opts.separator "Common Options:"
+          opts.separator ''
+          opts.separator 'Common Options:'
 
           @options.config_file = './Deployfile'
-          opts.on("-c", "--config path", 'Configuration file path') do |config_file_path|
+          opts.on('-c', '--config path', 'Configuration file path') do |config_file_path|
             @options.config_file = config_file_path
           end
 
-          opts.on("-p", "--project project",
-            "Project to operate on (default is read from project: in config file)") do |project_permalink|
+          opts.on('-p', '--project project',
+                  'Project to operate on (default is read from project: in config file)') do |project_permalink|
             @options.project = project_permalink
           end
 
-          opts.on_tail('-v', '--version', "Shows Version") do
+          opts.on_tail('-v', '--version', 'Shows Version') do
             puts Deploy::VERSION
             exit
           end
 
-          opts.on_tail("-h", "--help", "Displays Help") do
+          opts.on_tail('-h', '--help', 'Displays Help') do
             puts opts
             exit
           end
@@ -51,7 +60,7 @@ module Deploy
           parser.parse!(args)
           command = args.pop
         rescue OptionParser::InvalidOption
-          STDERR.puts parser.to_s
+          warn parser
           exit 1
         end
 
@@ -59,13 +68,13 @@ module Deploy
           begin
             Deploy.configuration_file = @options.config_file
           rescue Errno::ENOENT
-            STDERR.puts "Couldn't find configuration file at #{@options.config_file.inspect}"
+            warn "Couldn't find configuration file at #{@options.config_file.inspect}"
             exit 1
           end
 
           project_permalink = @options.project || Deploy.configuration.project
           if project_permalink.nil?
-            STDERR.puts "Project must be specified in config file or as --project argument"
+            warn 'Project must be specified in config file or as --project argument'
             exit 1
           end
 
@@ -80,25 +89,25 @@ module Deploy
         when 'configure'
           configure
         else
-          STDERR.puts parser.to_s
+          warn parser
         end
       end
 
       def server_list
         @server_groups ||= @project.server_groups
-        if @server_groups.count > 0
+        if @server_groups.count.positive?
           @server_groups.each do |group|
-            puts "Group: #{group.name}".bold
-            puts group.servers.map {|server| format_server(server) }.join("\n\n")
+            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.map {|server| format_server(server) }.join("\n\n")
-        end
+        return unless @ungrouped_servers.count.positive?
+
+        puts "\n" if @server_groups.count.positive?
+        puts 'Ungrouped Servers'
+        puts @ungrouped_servers.map { |server| format_server(server) }.join("\n\n")
       end
 
       def deploy
@@ -108,10 +117,10 @@ module Deploy
         parent = nil
         while parent.nil?
           parent = choose do |menu|
-            menu.prompt = "Please choose a server or group to deploy to:"
+            menu.prompt = 'Please choose a server or group to deploy to:'
 
             menu.choices(*(@ungrouped_servers + @server_groups))
-            menu.choice("List Server Details") do
+            menu.choice('List Server Details') do
               server_list
               nil
             end
@@ -121,21 +130,21 @@ module Deploy
         latest_revision = @project.latest_revision(parent.preferred_branch)
         deployment = @project.deploy(parent.identifier, parent.last_revision, latest_revision)
 
-        STDOUT.print "Waiting for an available deployment slot..."
+        $stdout.print 'Waiting for an available deployment slot...'
         DeploymentProgressOutput.new(deployment).monitor
       end
 
       def configure
         configuration = {
-          account: ask_config_question("Account Domain (e.g. https://atech.deployhq.com)",
-            %r{\Ahttps?://[a-z0-9\.\-]+.deployhq.com\z}),
-          username: ask_config_question("Username or e-mail address"),
-          api_key: ask_config_question("API key (You can find this in Settings -> Security)"),
-          project: ask_config_question("Default project to use (please use permalink from web URL)")
+          account: ask_config_question('Account Domain (e.g. https://atech.deployhq.com)',
+                                       /\Ahttps?:\/\/[a-z0-9.-]+.deployhq.com\z/),
+          username: ask_config_question('Username or e-mail address'),
+          api_key: ask_config_question('API key (You can find this in Settings -> Security)'),
+          project: ask_config_question('Default project to use (please use permalink from web URL)')
         }
 
         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
 
@@ -150,7 +159,7 @@ module Deploy
         question_text = "#{question_text}: "
         ask(question_text) do |q|
           q.whitespace = :remove
-          q.responses[:not_valid] = "That answer is not valid"
+          q.responses[:not_valid] = 'That answer is not valid'
           q.responses[:ask_on_error] = :question
           q.validate = valid_format
         end
@@ -161,30 +170,38 @@ module Deploy
       ## Data formatters
       def format_server(server)
         server_params = {
-          "Name" => server.name,
-          "Type" => PROTOCOL_NAME[server.protocol_type.to_sym],
-          "Path" => server.server_path,
-          "Branch" => server.preferred_branch,
-          "Current Revision" => server.last_revision,
+          'Name' => server.name,
+          'Type' => PROTOCOL_NAME[server.protocol_type.to_sym],
+          'Path' => server.server_path,
+          'Branch' => server.preferred_branch,
+          'Current Revision' => server.last_revision
         }
-        server_params["Hostname"] = [server.hostname, server.port].join(':') if server.hostname
-        server_params["Bucket"] = server.bucket_name if server.bucket_name
-        server_params["Region"] = server.region if server.region
-        server_params["Container"] = server.container_name if server.container_name
+        server_params['Hostname'] = [server.hostname, server.port].join(':') if server.hostname
+        server_params['Bucket'] = server.bucket_name if server.bucket_name
+        server_params['Region'] = server.region if server.region
+        server_params['Container'] = server.container_name if server.container_name
 
-        Array.new.tap do |a|
+        [].tap do |a|
           a << format_kv_pair(server_params)
         end.join("\n")
       end
 
+      # rubocop:disable Lint/FormatParameterMismatch
       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
+        hash.each_with_index.map do |(k, v), _i|
+          str = format("%#{longest_key}s : %s", k, v)
+          str
         end.join("\n")
       end
+      # rubocop:enable Lint/FormatParameterMismatch
 
     end
+
   end
 end
+# rubocop:enable Metrics/ClassLength
+# rubocop:enable Metrics/AbcSize
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:enable Metrics/MethodLength
+# rubocop:enable Metrics/PerceivedComplexity

data/lib/deploy/configuration.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+
 module Deploy
   class Configuration
-    attr_accessor :account, :username, :api_key, :project
+
+    attr_accessor :account
+    attr_accessor :username
+    attr_accessor :api_key
+    attr_accessor :project
     attr_writer :websocket_hostname
 
     def websocket_hostname
@@ -11,7 +17,7 @@ module Deploy
       file_contents = File.read(path)
       parsed_contents = JSON.parse(file_contents)
 
-      self.new.tap do |config|
+      new.tap do |config|
         config.account = parsed_contents['account']
         config.username = parsed_contents['username']
         config.api_key = parsed_contents['api_key']
@@ -19,5 +25,6 @@ module Deploy
         config.websocket_hostname = parsed_contents['websocket_hostname']
       end
     end
+
   end
 end

data/lib/deploy/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Deploy
 
   ## Base level error which all other deploy errors will inherit from. It may also be
@@ -13,10 +15,12 @@ module Deploy
     ## 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
 
     # Raised from the websocket client when we receive an error event
     class WebsocketError < Error; end
+
   end
+
 end

data/lib/deploy/request.rb

@@ -1,7 +1,15 @@
+# frozen_string_literal: true
+
+require 'json'
+
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/MethodLength
 module Deploy
   class Request
 
-    attr_reader :path, :method
+    attr_reader :path
+    attr_reader :method
     attr_accessor :data
 
     def initialize(path, method = :get)
@@ -23,30 +31,28 @@ module Deploy
       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"
+      http_request['Accept'] = 'application/json'
+      http_request['Content-Type'] = 'application/json'
 
       http = Net::HTTP.new(uri.host, uri.port)
-      if uri.scheme == 'https'
-        http.use_ssl = true
-      end
+      http.use_ssl = true if uri.scheme == 'https'
 
       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
+      case http_result
       when Net::HTTPSuccess
-        true
+        @success = true
       when Net::HTTPServiceUnavailable
-        raise Deploy::Errors::ServiceUnavailable
+        @success = raise Deploy::Errors::ServiceUnavailable
       when Net::HTTPForbidden, Net::HTTPUnauthorized
-        raise Deploy::Errors::AccessDenied, "Access Denied for '#{Deploy.configuration.username}'"
+        @success = raise Deploy::Errors::AccessDenied, "Access Denied for '#{Deploy.configuration.username}'"
       when Net::HTTPNotFound
-        raise Deploy::Errors::CommunicationError, "Not Found at #{uri.to_s}"
+        @success = raise Deploy::Errors::CommunicationError, "Not Found at #{uri}"
       when Net::HTTPClientError
-        false
+        @success = false
       else
-        raise Deploy::Errors::CommunicationError, http_result.body
+        @success = raise Deploy::Errors::CommunicationError, http_result.body
       end
       self
     end
@@ -65,3 +71,6 @@ module Deploy
 
   end
 end
+# rubocop:enable Metrics/AbcSize
+# rubocop:enable Metrics/CyclomaticComplexity
+# rubocop:enable Metrics/MethodLength

data/lib/deploy/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Deploy
   class Resource
 
@@ -9,14 +11,18 @@ module Deploy
     def method_missing(method, *params)
       set = method.to_s.include?('=')
       key = method.to_s.sub('=', '')
-      self.attributes = Hash.new unless self.attributes.is_a?(Hash)
+      self.attributes = ({}) unless attributes.is_a?(Hash)
       if set
-        self.attributes[key] = params.first
+        attributes[key] = params.first
       else
-        self.attributes[key]
+        attributes[key]
       end
     end
 
+    def respond_to_missing?(method_name, include_private = false)
+      method_name.to_s.start_with?('user_') || super
+    end
+
     class << self
 
       ## Find a record or set of records. Passing :all will return all records and passing an integer
@@ -30,11 +36,13 @@ module Deploy
 
       ## 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)
-        if output.is_a?(Hash) && output['records'] && output['pagination']
-          output = output['records']
-        end
+        request = Request.new(collection_path(params))
+        output = request.make.output
+        output = JSON.parse(output)
+
+        output = output['records'] if output.is_a?(Hash) && output['records'] && output['pagination']
         return [] unless output.is_a?(Array)
+
         output.map do |o|
           create_object(o, params)
         end
@@ -42,12 +50,13 @@ module Deploy
 
       ## 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)
-        else
-          raise Deploy::Errors::NotFound, "Record not found"
-        end
+        request = Request.new(member_path(id, params))
+        output = request.make.output
+        output = JSON.parse(output)
+
+        raise Deploy::Errors::NotFound, 'Record not found' unless output.is_a?(Hash)
+
+        create_object(output, params)
       end
 
       ## Post to the specified object on the collection path
@@ -58,18 +67,18 @@ module Deploy
       ## Return the collection path for this model. Very lazy pluralizion here
       ## at the moment, nothing in Deploy needs to be pluralized with anything
       ## other than just adding an 's'.
-      def collection_path(params = {})
-        class_name.downcase + 's'
+      def collection_path(_params = {})
+        "#{class_name.downcase}s"
       end
 
       ## Return the member path for the passed ID & attributes
-      def member_path(id, params = {})
+      def member_path(id, _params = {})
         [collection_path, id].join('/')
       end
 
       ## Return the deploy class name
       def class_name
-        self.name.to_s.split('::').last.downcase
+        name.to_s.split('::').last.downcase
       end
 
       private
@@ -77,20 +86,21 @@ module Deploy
       ## Create a new object with the specified attributes and getting and ID.
       ## Returns the newly created object
       def create_object(attributes, objects = [])
-        o = self.new
+        o = new
         o.attributes = attributes
         o.id         = attributes['id']
-        for key, object in objects.select{|k,v| v.kind_of?(Deploy::Resource)}
+        objects.select { |_k, v| v.is_a?(Deploy::Resource) }.each do |key, object|
           o.attributes[key.to_s] = object
         end
         o
       end
+
     end
 
     ## Run a post on the member path. Returns the ouput from the post, false if a conflict or raises
     ## a Deploy::Error. Optionally, pass a second 'data' parameter to send data to the post action.
     def post(action, data = nil)
-      path = self.class.member_path(self.id, default_params) + "/" + action.to_s
+      path = "#{self.class.member_path(id, default_params)}/#{action}"
       request = Request.new(path, :post)
       request.data = data
       request.make
@@ -99,20 +109,21 @@ module Deploy
     ## Delete this record from the remote service. Returns true or false depending on the success
     ## status of the destruction.
     def destroy
-      Request.new(self.class.member_path(self.id, default_params), :delete).make.success?
+      Request.new(self.class.member_path(id, default_params), :delete).make.success?
     end
 
     def new_record?
-      self.id.nil?
+      id.nil?
     end
 
     def save
       new_record? ? create : update
     end
 
+    # rubocop:disable Metrics/AbcSize
     def create
       request = Request.new(self.class.collection_path(default_params), :post)
-      request.data = {self.class.class_name.downcase.to_sym => attributes_to_post}
+      request.data = { self.class.class_name.downcase.to_sym => attributes_to_post }
       if request.make && request.success?
         new_record = JSON.parse(request.output)
         self.attributes = new_record
@@ -123,13 +134,14 @@ module Deploy
         false
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     ## Push the updated attributes to the remote. Returns true if the record was saved successfully
     ## other false if not. If not saved successfully, the errors hash will be updated with an array
     ## of all errors with the submission.
     def update
-      request = Request.new(self.class.member_path(self.id, default_params), :put)
-      request.data = {self.class.class_name.downcase.to_sym => attributes_to_post}
+      request = Request.new(self.class.member_path(id, default_params), :put)
+      request.data = { self.class.class_name.downcase.to_sym => attributes_to_post }
       if request.make && request.success?
         true
       else
@@ -142,23 +154,21 @@ module Deploy
 
     ## Populate the errors hash from the given raw JSON output
     def populate_errors(json)
-      self.errors = Hash.new
-      JSON.parse(json).inject(self.errors) do |r, e|
+      self.errors = ({})
+      JSON.parse(json).each_with_object(errors) do |e, r|
         r[e.first] = e.last
-        r
       end
     end
 
     ## An array of params which should always be sent with this instances requests
     def default_params
-      Hash.new
+      {}
     end
 
     ## Attributes which can be passed for update & creation
     def attributes_to_post
-      self.attributes.inject(Hash.new) do |r,(key,value)|
-        r[key] = value if value.is_a?(String) || value.is_a?(Integer) || value.is_a?(Fixnum)
-        r
+      attributes.each_with_object({}) do |(key, value), r|
+        r[key] = value if value.is_a?(String) || value.is_a?(Integer)
       end
     end
 

data/lib/deploy/resources/deployment.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module Deploy
   class Deployment < Resource
+
     class << self
+
       def collection_path(params = {})
         "projects/#{params[:project].permalink}/deployments"
       end
@@ -8,17 +12,16 @@ module Deploy
       def member_path(id, params = {})
         "projects/#{params[:project].permalink}/deployments/#{id}"
       end
+
     end
 
     def default_params
-      {:project => self.project}
+      { project: project }
     end
 
     def project
-      if self.attributes['project'].is_a?(Hash)
-        self.attributes['project'] = Project.send(:create_object, self.attributes['project'])
-      end
-      self.attributes['project']
+      attributes['project'] = Project.send(:create_object, attributes['project']) if attributes['project'].is_a?(Hash)
+      attributes['project']
     end
 
     def servers
@@ -47,5 +50,6 @@ module Deploy
         []
       end
     end
+
   end
 end

data/lib/deploy/resources/deployment_step.rb

@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
 module Deploy
   class DeploymentStep < Resource
+
     def default_params
-      { deployment: self.deployment, project: self.deployment.project }
+      { deployment: deployment, project: deployment.project }
     end
 
     def logs(params = {})
       params = default_params.merge(step: self).merge(params)
       DeploymentStepLog.find(:all, params)
     end
+
   end
 end

data/lib/deploy/resources/deployment_step_log.rb

@@ -1,7 +1,15 @@
+# frozen_string_literal: true
+
 module Deploy
   class DeploymentStepLog < Resource
+
     def self.collection_path(params = {})
-      "projects/#{params[:project].permalink}/deployments/#{params[:deployment].identifier}/steps/#{params[:step].identifier}/logs"
+      permalink = params[:project].permalink
+      project_identifier = params[:project].identifier
+      step_identifier = params[:step].identifier
+
+      "projects/#{permalink}/deployments/#{project_identifier}/steps/#{step_identifier}/logs"
     end
+
   end
 end

data/lib/deploy/resources/project.rb

@@ -1,31 +1,33 @@
+# frozen_string_literal: true
+
 module Deploy
   class Project < Resource
 
     ## Return all deployments for this project
     def deployments
-      Deployment.find(:all, :project => self)
+      Deployment.find(:all, project: self)
     end
 
     ## Return a deployment
     def deployment(identifier)
-      Deployment.find(identifier, :project => self)
+      Deployment.find(identifier, project: self)
     end
 
     def latest_revision(branch = '')
       branch ||= 'master'
-      req = Request.new(self.class.member_path(self.permalink) + "/repository/latest_revision?branch=#{branch}").make
+      req = Request.new(self.class.member_path(permalink) + "/repository/latest_revision?branch=#{branch}").make
       parsed = JSON.parse(req.output)
       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'
@@ -34,11 +36,11 @@ module Deploy
 
     ## Return all servers for this project
     def servers
-      Server.find(:all, :project => self)
+      Server.find(:all, project: self)
     end
 
     def server_groups
-      ServerGroup.find(:all, :project => self)
+      ServerGroup.find(:all, project: self)
     end
 
     private

data/lib/deploy/resources/server.rb

@@ -1,28 +1,32 @@
+# frozen_string_literal: true
+
 module Deploy
   class Server < Resource
 
     class << self
+
       def collection_path(params = {})
         "projects/#{params[:project].permalink}/servers"
       end
 
-      def member_path(id, params = {})
+      def member_path(_id, params = {})
         "projects/#{params[:project].permalink}/servers/#{identifier}"
       end
+
     end
 
     def default_params
-      {:project => self.project}
+      { project: project }
     end
 
     def to_s
-      Array.new.tap do |a|
-        a << self.name
-        a << "(branch: #{self.preferred_branch})" if self.preferred_branch
-        if self.last_revision
-          a << "(currently: #{self.last_revision})"
+      [].tap do |a|
+        a << name
+        a << "(branch: #{preferred_branch})" if preferred_branch
+        if last_revision
+          a << "(currently: #{last_revision})"
         else
-          a << "(currently undeployed)"
+          a << '(currently undeployed)'
         end
       end.join(' ')
     end

data/lib/deploy/resources/server_group.rb

@@ -1,32 +1,36 @@
+# frozen_string_literal: true
+
 module Deploy
   class ServerGroup < Resource
 
     class << self
+
       def collection_path(params = {})
         "projects/#{params[:project].permalink}/server_groups"
       end
 
-      def member_path(id, params = {})
+      def member_path(_id, params = {})
         "projects/#{params[:project].permalink}/server_groups/#{identifier}"
       end
+
     end
 
     def default_params
-      {:project => self.project}
+      { project: project }
     end
 
     def servers
-      @servers ||= self.attributes['servers'].map {|server_attr| Deploy::Server.send(:create_object, server_attr) }
+      @servers ||= attributes['servers'].map { |server_attr| Deploy::Server.send(:create_object, server_attr) }
     end
 
     def to_s
-      Array.new.tap do |a|
-        a << self.name
-        a << "(branch: #{self.preferred_branch})" if self.preferred_branch
-        if self.last_revision
-          a << "(currently: #{self.last_revision})"
+      [].tap do |a|
+        a << name
+        a << "(branch: #{preferred_branch})" if preferred_branch
+        if last_revision
+          a << "(currently: #{last_revision})"
         else
-          a << "(currently undeployed)"
+          a << '(currently undeployed)'
         end
       end.join(' ')
     end

data/lib/deploy/version.rb

@@ -1,3 +1,12 @@
+# frozen_string_literal: true
+
 module Deploy
-  VERSION = "2.0.3".freeze
+
+  VERSION_FILE_ROOT = File.expand_path('../../VERSION', __dir__)
+  if File.file?(VERSION_FILE_ROOT)
+    VERSION = File.read(VERSION_FILE_ROOT).strip.sub(/\Av/, '')
+  else
+    VERSION = '0.0.0.dev'
+  end
+
 end

data/lib/deploy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 
@@ -25,7 +27,9 @@ require 'deploy/resources/server_group'
 require 'deploy/version'
 
 module Deploy
+
   class << self
+
     def configure
       @configuration ||= Configuration.new
       yield @configuration if block_given?
@@ -39,5 +43,7 @@ module Deploy
     def configuration_file=(file_location)
       @configuration = Configuration.from_file(file_location)
     end
+
   end
+
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: deployhq
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.2
 platform: ruby
 authors:
-- Dan Wentworth
+- Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
   requirement: !ruby/object:Gem::Requirement
@@ -52,10 +52,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: |2
-      API and CLI client for the DeployHQ deployment platform. Provides the
-      deployhq executable.
-email: dan@atech.io
+description: API and CLI client for the DeployHQ deployment platform. Provides the
+  deployhq executable.
+email:
+- adam@k.io
 executables:
 - deployhq
 extensions: []
@@ -77,7 +77,7 @@ files:
 - lib/deploy/resources/server.rb
 - lib/deploy/resources/server_group.rb
 - lib/deploy/version.rb
-homepage: https://www.deployhq.com
+homepage: https://github.com/krystal/deployhq-lib
 licenses:
 - MIT
 metadata: {}
@@ -89,15 +89,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: API and CLI client for the DeployHQ