deployhq 1.3.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723ab3de0e1e230b74f7d7693ab21a364e10f740
-  data.tar.gz: 7e1278b6f5a88dba69ee5bbb5bd77d07a76ae22a
+  metadata.gz: da343b392a7afa950b197f8181112b114b05d6e0
+  data.tar.gz: 1b7b875b6bb5a77a4b9672836df13cdbdb7278bd
 SHA512:
-  metadata.gz: 44315effe285ba11ec9a8cf03676c58b1fc7a7ff380237933d155aee509e37bc602dada22df25fc3ff00d388ba13a15bbe546b8d763a1e2db3ca93de0fd676d1
-  data.tar.gz: 75271d3366c67bbf22a1699caf048d7b5e32f84a0698507344213867d3ecbd28cada60dbdf1656f6e7a8d7d454ef921e38175599e66b2a3ed82083c76f52912d
+  metadata.gz: 3c60eaf8aa6aeca85fb367d04071198c77abeabad94d72b757588153baf928e2fa4021af1585acad20bfeea345433e38a36ce6dcdcce8fe69aeedd0880ce9e98
+  data.tar.gz: 71a2b3e4179e7893bbb643b172f049125caa9c218f197cbcbed4df12a68e93209b73f1ef7a3b638f468e96168396220911ac3aa070f6eb5132580827238c40aa

data/bin/deployhq

@@ -4,4 +4,4 @@ $LOAD_PATH.unshift(libdir)
 
 require 'deploy/cli'
 
-Deploy::CLI.invoke(*ARGV)
+Deploy::CLI.invoke(ARGV)

data/lib/deploy.rb

@@ -11,25 +11,33 @@ require 'time'
 ## This is a ruby API library for the DeployHQ deployment platform.
 
 require 'deploy/errors'
+require 'deploy/configuration'
 require 'deploy/request'
-require 'deploy/base'
-
-require 'deploy/project'
-require 'deploy/deployment'
-require 'deploy/deployment_tap'
-require 'deploy/deployment_status_poll'
-require 'deploy/server'
-require 'deploy/server_group'
-require 'deploy/version'
+require 'deploy/resource'
+
+require 'deploy/resources/project'
+require 'deploy/resources/deployment'
+require 'deploy/resources/deployment_step'
+require 'deploy/resources/deployment_step_log'
+require 'deploy/resources/server'
+require 'deploy/resources/server_group'
 
+require 'deploy/version'
 
 module Deploy
   class << self
-    ## Domain which you wish to access (e.g. atech.deployhq.com)
-    attr_accessor :site
-    ## E-Mail address you wish to authenticate with
-    attr_accessor :email
-    ## API key for the user you wish to authenticate with
-    attr_accessor :api_key
+    def configure
+      @configuration ||= Configuration.new
+      yield @configuration if block_given?
+      @configuration
+    end
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    def configuration_file=(file_location)
+      @configuration = Configuration.from_file(file_location)
+    end
   end
 end

data/lib/deploy/cli.rb

@@ -1,61 +1,86 @@
 require 'optparse'
 require 'highline/import'
+
 require 'deploy'
+require 'deploy/cli/websocket_client'
+require 'deploy/cli/deployment_progress_output'
 
 HighLine.colorize_strings
 
 module Deploy
   class CLI
-
     ## Constants for formatting output
-    TAP_COLOURS = {:info => :yellow, :error => :red, :success => :green}
     PROTOCOL_NAME = {:ssh => "SSH/SFTP", :ftp => "FTP", :s3 => "Amazon S3", :rackspace => "Rackspace CloudFiles"}
 
-    class Config
-      AVAILABLE_CONFIG = [:account, :username, :api_key, :project]
+    class << self
+      def invoke(args)
+        @options = OpenStruct.new
+
+        parser = OptionParser.new do |opts|
+          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:"
+
+          @options.config_file = './Deployfile'
+          opts.on("-c", "--config path", 'Configuration file path') do |config_file_path|
+            @options.config_file = config_file_path
+          end
 
-      def initialize(config_file=nil)
-        @config_file_path = config_file || File.join(Dir.pwd, 'Deployfile')
-        @config = JSON.parse(File.read(@config_file_path))
-      rescue Errno::ENOENT => e
-        puts "Couldn't find configuration file at #{@config_file_path}"
-        exit 1
-      end
+          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
 
-      def method_missing(meth, *args, &block)
-        if AVAILABLE_CONFIG.include?(meth.to_sym)
-          @config[meth.to_s]
-        else
-          super
+          opts.on_tail('-v', '--version', "Shows Version") do
+            puts Deploy::VERSION
+            exit
+          end
+
+          opts.on_tail("-h", "--help", "Displays Help") do
+            puts opts
+            exit
+          end
         end
-      end
-    end
 
-    class << self
+        begin
+          parser.parse!(args)
+          command = args.pop
+        rescue OptionParser::InvalidOption
+          STDERR.puts parser.to_s
+          exit 1
+        end
+
+        unless command == 'configure'
+          begin
+            Deploy.configuration_file = @options.config_file
+          rescue Errno::ENOENT
+            STDERR.puts "Couldn't find configuration file at #{@options.config_file.inspect}"
+            exit 1
+          end
 
-      def invoke(*args)
-        options = {}
-        OptionParser.new do |opts|
-          opts.banner = "Usage: deployhq [command]"
-          opts.on("-c", "--config", 'Configuration file path') do |v|
-            options[:config_file] = v
+          project_permalink = @options.project || Deploy.configuration.project
+          if project_permalink.nil?
+            STDERR.puts "Project must be specified in config file or as --project argument"
+            exit 1
           end
-        end.parse!
 
-        @configuration = Config.new(options[:config_file])
-        Deploy.site = @configuration.account
-        Deploy.email = @configuration.username
-        Deploy.api_key = @configuration.api_key
-        @project = Deploy::Project.find(@configuration.project)
+          @project = Deploy::Project.find(project_permalink)
+        end
 
-        case args[0]
+        case command
         when 'deploy'
           deploy
         when 'servers'
           server_list
+        when 'configure'
+          configure
         else
-          puts "Usage: deployhq [command]"
-          return
+          STDERR.puts parser.to_s
         end
       end
 
@@ -94,98 +119,45 @@ module Deploy
         end
 
         latest_revision = @project.latest_revision(parent.preferred_branch)
-        @deployment = @project.deploy(parent.identifier, parent.last_revision, latest_revision)
-
-        @server_names = @deployment.servers.each_with_object({}) do |server, hsh|
-          hsh[server['id']] = server['name']
-        end
-        @longest_server_name = @server_names.values.map(&:length).max
-
-        last_tap = nil
-        last_tap_lines = 0
-        current_status = 'pending'
-        previous_status = ''
-        STDOUT.print "Waiting for deployment capacity..."
-        while ['running', 'pending'].include?(current_status)
-          sleep 1
+        deployment = @project.deploy(parent.identifier, parent.last_revision, latest_revision)
 
-          poll = @deployment.status_poll(:since => last_tap, :status => current_status)
-
-          # Status only gets returned from the API if it has changed
-          current_status = poll.status if poll.status
-
-          if current_status == 'pending'
-            STDOUT.print "."
-          elsif current_status == 'running' && previous_status == 'pending'
-            STDOUT.puts "\n"
-          end
-
-          if current_status != 'pending'
-            poll.taps.each do |tap|
-              # Delete most recent tap and redraw it if it's been updated
-              if tap.id.to_i == last_tap
-                if tap.updated
-                  # Restore the cursor to the start of the last entry so we can overwrite
-                  STDOUT.print "\e[#{last_tap_lines}A\r"
-                else
-                  next
-                end
-              end
-
-              tap_output = format_tap(tap)
-              last_tap_lines = tap_output.count("\n")
-              last_tap = tap.id.to_i
-
-              STDOUT.print tap_output
-              STDOUT.flush
-            end
-          end
-
-          previous_status = current_status
-        end
+        STDOUT.print "Waiting for an available deployment slot..."
+        DeploymentProgressOutput.new(deployment).monitor
       end
 
-      def deployment
-        @deployment = @project.deployments.first
-        @server_names = @deployment.servers.each_with_object({}) do |obj, hsh|
-          hsh[obj.delete("id")] = obj["name"]
-        end
-        @longest_server_name = @server_names.values.map(&:length).max
+      def configure
+        configuration = {
+          account: ask_config_question("Account Domain (e.g. atech.deployhq.com)", /\A[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)")
+        }
 
-        @deployment.taps.reverse.each do |tap|
-          STDOUT.puts format_tap(tap)
+        confirmation = true
+        if File.exists?(@options.config_file)
+          confirmation = agree("File already exists at #{@options.config_file}. Overwrite? ")
         end
-      end
-
-      ## Data formatters
 
-      def format_tap(tap)
-        server_name = @server_names[tap.server_id]
+        return unless confirmation
 
-        if server_name
-          padding = (@longest_server_name - server_name.length) / 2.0
-          server_name = "[#{' ' * padding.ceil} #{server_name} #{' ' * padding.floor}]"
-        else
-          server_name = ' '
-        end
+        file_data = JSON.pretty_generate(configuration)
+        File.write(@options.config_file, file_data)
+        say("File written to #{@options.config_file}")
+      end
 
-        text_colour = TAP_COLOURS[tap.tap_type.to_sym] || :white
-
-        String.new.tap do |s|
-          s << "#{server_name} ".color(text_colour, :bold)
-          s << tap.message.color(text_colour).gsub(/\<[^\>]*\>/, '')
-          if tap.backend_message && tap.tap_type == 'command'
-            tap.backend_message.each_line('<br />') do |backend_line|
-              s << "\n"
-              s << " " * server_name.length
-              s << "   "
-              s << backend_line.color(text_colour).gsub(/\<[^\>]*\>/, '')
-            end
-          end
-          s << "\n"
+      def ask_config_question(question_text, valid_format = /.+/)
+        question_text = "#{question_text}: "
+        ask(question_text) do |q|
+          q.whitespace = :remove
+          q.responses[:not_valid] = "That answer is not valid"
+          q.responses[:ask_on_error] = :question
+          q.validate = valid_format
         end
       end
 
+      private
+
+      ## Data formatters
       def format_server(server)
         server_params = {
           "Name" => server.name,

data/lib/deploy/cli/deployment_progress_output.rb

@@ -0,0 +1,61 @@
+module Deploy
+  class CLI
+    class DeploymentProgressOutput
+      SERVER_TAG_COLOURS = %w[32 33 34 35 36].cycle
+
+      attr_reader :deployment, :step_index, :server_tags
+
+      def initialize(deployment)
+        @deployment = deployment
+
+        @step_index = @deployment.steps.each_with_object({}) { |s, hsh| hsh[s.identifier] = s }
+        @server_tags = @deployment.servers.each_with_object({}) do |s, hsh|
+          hsh[s.id] = "\e[#{SERVER_TAG_COLOURS.next};1m[#{s.name}]\e[0m "
+        end
+      end
+
+      def monitor
+        websocket_client = Deploy::CLI::WebsocketClient.new
+
+        subscription = websocket_client.subscribe('deployment', @deployment.identifier)
+        subscription.on('log-entry', &method(:handle_log_entry))
+        subscription.on('status-change', &method(:handle_status_change))
+
+        websocket_client.run
+      end
+
+      private
+
+      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']
+
+        if payload['detail']
+          padding_width = 0
+          padding_width += (server_tag.length - 11) if server_tag
+          padding = ' ' * padding_width
+
+          payload['detail'].split("\n").each do |detail_line|
+            line << "\n#{padding}| #{detail_line}"
+          end
+        end
+
+        STDOUT.print line
+      end
+
+      def handle_status_change(payload)
+        if payload['status'] == 'completed'
+          STDOUT.print "\nDeployment has finished successfully!\n"
+        elsif payload['status'] == 'failed'
+          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

@@ -0,0 +1,144 @@
+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
+
+        def initialize(exchange, routing_key)
+          @exchange = exchange
+          @routing_key = routing_key
+          @events = {}
+        end
+
+        def on(event, &block)
+          @events[event] ||= []
+          @events[event] << block
+        end
+
+        def dispatch(event, payload)
+          return unless @events[event]
+
+          @events[event].each do |block|
+            block.call(payload)
+          end
+        end
+
+        def subscribed?
+          @subscribed == true
+        end
+
+        def subscribed!
+          @subscribed = true
+        end
+      end
+
+      def initialize
+        @subscriptions = {}
+      end
+
+      def subscribe(exchange, routing_key)
+        key = subscription_key(exchange, routing_key)
+        subscriptions[key] ||= Subscription.new(exchange, routing_key)
+      end
+
+      def run
+        catch(:finished) do
+          EM.run do
+            connection.onopen do
+              logger.info "connected"
+            end
+
+            connection.onmessage do |msg, type|
+              receive(msg)
+            end
+
+            connection.onclose do |code, reason|
+              logger.info "disconnected #{code} #{reason}"
+              reset_connection
+            end
+          end
+        end
+      end
+
+      private
+
+      def dispatch(event, payload, mq = nil)
+        case event
+        when 'Welcome'
+          authenticate
+        when 'Authenticated'
+          request_subscriptions
+        when 'Subscribed'
+          successful_subscription(payload)
+        when 'Error', 'InternalError'
+          websocket_error(payload)
+        else
+          subscription_event(event, payload, mq) if mq
+        end
+      end
+
+      def authenticate
+        send('Authenticate', api_key: Deploy.configuration.api_key)
+      end
+
+      def request_subscriptions
+        subscriptions.each do |_key, subscription|
+          send('Subscribe', exchange: subscription.exchange, routing_key: subscription.routing_key)
+        end
+      end
+
+      def successful_subscription(payload)
+        key = subscription_key(payload['exchange'], payload['routing_key'])
+        subscription = subscriptions[key]
+        subscription.subscribed! if subscription
+      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"])
+        subscription = subscriptions[key]
+        subscription.dispatch(event, payload) if subscription
+      end
+
+      def receive(msg)
+        logger.debug "< #{msg}"
+        decoded = JSON.parse(msg)
+        dispatch(decoded['event'], decoded['payload'], decoded['mq'])
+      end
+
+      def send(action, payload = {})
+        msg = JSON.dump(action: action, payload: payload)
+        logger.debug "> #{msg}"
+        connection.send(msg)
+      end
+
+      def connection
+        uri = "#{Deploy.configuration.websocket_hostname}/pushwss"
+        @connection ||= WebSocket::EventMachine::Client.connect(uri: uri)
+      end
+
+      def reset_connection
+        @connection = nil
+      end
+
+      def logger
+        @logger ||= Logger.new(STDOUT)
+        @logger.level = Logger::ERROR
+        @logger
+      end
+
+      def subscription_key(exchange, routing_key)
+        [exchange, routing_key].join('-')
+      end
+    end
+  end
+end

data/lib/deploy/configuration.rb

@@ -0,0 +1,23 @@
+module Deploy
+  class Configuration
+    attr_accessor :account, :username, :api_key, :project
+    attr_writer :websocket_hostname
+
+    def websocket_hostname
+      @websocket_hostname || 'wss://websocket.deployhq.com'
+    end
+
+    def self.from_file(path)
+      file_contents = File.read(path)
+      parsed_contents = JSON.parse(file_contents)
+
+      self.new.tap do |config|
+        config.account = parsed_contents['account']
+        config.username = parsed_contents['username']
+        config.api_key = parsed_contents['api_key']
+        config.project = parsed_contents['project']
+        config.websocket_hostname = parsed_contents['websocket_hostname']
+      end
+    end
+  end
+end

data/lib/deploy/errors.rb

@@ -1,20 +1,22 @@
 module Deploy
-  
+
   ## Base level error which all other deploy errors will inherit from. It may also be
   ## invoked for errors which don't directly relate to other errors below.
   class Error < StandardError; end
-  
+
   module Errors
-    
+
     ## The service is currently unavailable. This may be caused by rate limiting or the API
     ## or the service has been disabled by the system
     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
     class CommunicationError < Error; end
-        
+
+    # Raised from the websocket client when we receive an error event
+    class WebsocketError < Error; end
   end
-end
+end

data/lib/deploy/request.rb

@@ -1,36 +1,36 @@
 module Deploy
   class Request
-    
+
     attr_reader :path, :method
     attr_accessor :data
-    
+
     def initialize(path, method = :get)
       @path = path
       @method = method
     end
-    
+
     def success?
       @success || false
     end
-    
+
     def output
       @output || nil
     end
-    
+
     ## 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.site, @path].join('/'))
+      uri = URI.parse([Deploy.configuration.account, @path].join('/'))
       http_request = http_class.new(uri.request_uri)
-      http_request.basic_auth(Deploy.email, Deploy.api_key)
+      http_request.basic_auth(Deploy.configuration.username, Deploy.configuration.api_key)
       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
-      
+
       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
@@ -50,10 +50,10 @@ module Deploy
       end
       self
     end
-    
+
     private
-    
-    def http_class  
+
+    def http_class
       case @method
       when :post    then Net::HTTP::Post
       when :put     then Net::HTTP::Put
@@ -62,6 +62,6 @@ module Deploy
         Net::HTTP::Get
       end
     end
-    
+
   end
-end
+end

data/lib/deploy/{base.rb → resource.rb}

@@ -1,9 +1,9 @@
 module Deploy
-  class Base
-    
+  class Resource
+
     ## Store all attributes for the model we're working with.
     attr_accessor :id, :attributes, :errors
-    
+
     ## Pass any methods via. the attributes hash to see if they exist
     ## before resuming normal method_missing behaviour
     def method_missing(method, *params)
@@ -16,9 +16,9 @@ module Deploy
         self.attributes[key]
       end
     end
-    
+
     class << self
-      
+
       ## Find a record or set of records. Passing :all will return all records and passing an integer
       ## will return the individual record for the ID passed.
       def find(type, params = {})
@@ -27,7 +27,7 @@ module Deploy
         else find_single(type, params)
         end
       end
-      
+
       ## 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)
@@ -39,7 +39,7 @@ module Deploy
           create_object(o, params)
         end
       end
-      
+
       ## 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)
@@ -49,44 +49,44 @@ module Deploy
           raise Deploy::Errors::NotFound, "Record not found"
         end
       end
-      
+
       ## Post to the specified object on the collection path
       def post(path)
         Request.new(path.to_s, :post).make
       end
-      
+
       ## 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'
       end
-      
+
       ## Return the member path for the passed ID & attributes
       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
       end
-      
+
       private
-            
-      ## Create a new object with the specified attributes and getting and ID. 
+
+      ## 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.attributes = attributes
         o.id         = attributes['id']
-        for key, object in objects.select{|k,v| v.kind_of?(Deploy::Base)}
+        for key, object in objects.select{|k,v| v.kind_of?(Deploy::Resource)}
           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)
@@ -95,17 +95,17 @@ module Deploy
       request.data = data
       request.make
     end
-    
+
     ## 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?
     end
-    
+
     def new_record?
       self.id.nil?
     end
-    
+
     def save
       new_record? ? create : update
     end
@@ -126,7 +126,7 @@ module Deploy
 
     ## 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.    
+    ## 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}
@@ -137,9 +137,9 @@ module Deploy
         false
       end
     end
-    
+
     private
-    
+
     ## Populate the errors hash from the given raw JSON output
     def populate_errors(json)
       self.errors = Hash.new
@@ -148,12 +148,12 @@ module Deploy
         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)|
@@ -161,6 +161,6 @@ module Deploy
         r
       end
     end
-    
+
   end
-end
+end

data/lib/deploy/resources/deployment.rb

@@ -0,0 +1,51 @@
+module Deploy
+  class Deployment < Resource
+    class << self
+      def collection_path(params = {})
+        "projects/#{params[:project].permalink}/deployments"
+      end
+
+      def member_path(id, params = {})
+        "projects/#{params[:project].permalink}/deployments/#{id}"
+      end
+    end
+
+    def default_params
+      {:project => self.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']
+    end
+
+    def servers
+      if attributes['servers'].is_a?(Array)
+        @servers ||= attributes['servers'].map do |server_params|
+          Server.new.tap do |server|
+            server.id = server_params['id']
+            server.attributes = server_params
+          end
+        end
+      else
+        []
+      end
+    end
+
+    def steps
+      if attributes['steps'].is_a?(Array)
+        @steps ||= attributes['steps'].map do |step_params|
+          DeploymentStep.new.tap do |step|
+            step.id = step_params['identifier']
+            step.attributes = step_params
+            step.attributes['deployment'] = self
+          end
+        end
+      else
+        []
+      end
+    end
+  end
+end

data/lib/deploy/resources/deployment_step.rb

@@ -0,0 +1,12 @@
+module Deploy
+  class DeploymentStep < Resource
+    def default_params
+      { deployment: self.deployment, project: self.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

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

data/lib/deploy/{project.rb → resources/project.rb}

@@ -1,5 +1,5 @@
 module Deploy
-  class Project < Base
+  class Project < Resource
 
     ## Return all deployments for this project
     def deployments

data/lib/deploy/{server.rb → resources/server.rb}

@@ -1,16 +1,16 @@
 module Deploy
-  class Server < Base
-    
+  class Server < Resource
+
     class << self
       def collection_path(params = {})
         "projects/#{params[:project].permalink}/servers"
       end
-      
+
       def member_path(id, params = {})
         "projects/#{params[:project].permalink}/servers/#{identifier}"
       end
     end
-    
+
     def default_params
       {:project => self.project}
     end
@@ -26,6 +26,6 @@ module Deploy
         end
       end.join(' ')
     end
-    
+
   end
-end
+end

data/lib/deploy/{server_group.rb → resources/server_group.rb}

@@ -1,20 +1,20 @@
 module Deploy
-  class ServerGroup < Base
-    
+  class ServerGroup < Resource
+
     class << self
       def collection_path(params = {})
         "projects/#{params[:project].permalink}/server_groups"
       end
-      
+
       def member_path(id, params = {})
         "projects/#{params[:project].permalink}/server_groups/#{identifier}"
       end
     end
-    
+
     def default_params
       {:project => self.project}
     end
-    
+
     def servers
       @servers ||= self.attributes['servers'].map {|server_attr| Deploy::Server.send(:create_object, server_attr) }
     end
@@ -32,4 +32,4 @@ module Deploy
     end
 
   end
-end
+end

data/lib/deploy/version.rb

@@ -1,3 +1,3 @@
 module Deploy
-  VERSION = "1.3.4"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deployhq
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Dan Wentworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: websocket-eventmachine-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: |2
       API and CLI client for the DeployHQ deployment platform. Provides the
       deployhq executable.
@@ -49,16 +63,19 @@ extra_rdoc_files: []
 files:
 - bin/deployhq
 - lib/deploy.rb
-- lib/deploy/base.rb
 - lib/deploy/cli.rb
-- lib/deploy/deployment.rb
-- lib/deploy/deployment_status_poll.rb
-- lib/deploy/deployment_tap.rb
+- lib/deploy/cli/deployment_progress_output.rb
+- lib/deploy/cli/websocket_client.rb
+- lib/deploy/configuration.rb
 - lib/deploy/errors.rb
-- lib/deploy/project.rb
 - lib/deploy/request.rb
-- lib/deploy/server.rb
-- lib/deploy/server_group.rb
+- lib/deploy/resource.rb
+- lib/deploy/resources/deployment.rb
+- lib/deploy/resources/deployment_step.rb
+- lib/deploy/resources/deployment_step_log.rb
+- lib/deploy/resources/project.rb
+- lib/deploy/resources/server.rb
+- lib/deploy/resources/server_group.rb
 - lib/deploy/version.rb
 homepage: https://www.deployhq.com
 licenses:

data/lib/deploy/deployment.rb

@@ -1,36 +0,0 @@
-module Deploy
-  class Deployment < Base
-
-    class << self
-      def collection_path(params = {})
-        "projects/#{params[:project].permalink}/deployments"
-      end
-
-      def member_path(id, params = {})
-        "projects/#{params[:project].permalink}/deployments/#{id}"
-      end
-    end
-
-    def default_params
-      {:project => self.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']
-    end
-
-    def taps(params={})
-      params = {:deployment => self, :project => self.project}.merge(params)
-      DeploymentTap.find(:all, params)
-    end
-
-    def status_poll(params = {})
-      params = {:deployment => self, :project => self.project}.merge(params)
-      DeploymentStatusPoll.poll(params)
-    end
-
-  end
-end

data/lib/deploy/deployment_status_poll.rb

@@ -1,34 +0,0 @@
-module Deploy
-  class DeploymentStatusPoll
-    attr_accessor :attributes
-
-    def initialize(parsed_json)
-      self.attributes = parsed_json
-    end
-
-    def status
-      @status ||= attributes['status']
-    end
-
-    def taps
-      return [] unless attributes['taps']
-      @taps ||= attributes['taps'].map { |t| DeploymentTap.send(:create_object, t) }
-    end
-
-    class << self
-      def poll_url(params)
-        base = "projects/#{params[:project].permalink}/deployments/#{params[:deployment].identifier}/logs/poll"
-        base += "?status=#{params[:status]}"
-        base += "&since=#{params[:since]}" if params[:since]
-        base
-      end
-
-      def poll(params = {})
-        req = Request.new(poll_url(params)).make
-        parsed = JSON.parse(req.output)
-
-        new(parsed)
-      end
-    end
-  end
-end

data/lib/deploy/deployment_tap.rb

@@ -1,17 +0,0 @@
-module Deploy
-  class DeploymentTap < Base
-    
-    class << self
-      def collection_path(params = {})
-        base = "projects/#{params[:project].permalink}/deployments/#{params[:deployment].identifier}.js"
-        base += "?since=#{params[:since]}" if params[:since]
-        base
-      end
-    end
-    
-    def default_params
-      {:deployment => self.deployment, :project => self.deployment.project}
-    end
-
-  end
-end