rhc 1.15.6 → 1.16.9

data/lib/rhc/exceptions.rb

@@ -120,6 +120,18 @@ module RHC
     end
   end
 
+  class DeploymentNotFoundException < Exception
+    def initialize(message="Deployment not found")
+      super message, 131
+    end
+  end
+
+  class DeploymentsNotSupportedException < Exception
+    def initialize(message="The server does not support deployments")
+      super message, 132
+    end
+  end
+
   class MissingScalingValueException < Exception
     def initialize(message="Must provide either a min or max value for scaling")
       super message
@@ -135,12 +147,24 @@ module RHC
   class ConnectionFailed < Exception
   end
 
+  class SSHAuthenticationFailed < Exception
+    def initialize(host, user)
+      super "Authentication to server #{host} with user #{user} failed"
+    end
+  end
+
   class SSHConnectionRefused < ConnectionFailed
     def initialize(host, user)
       super "The server #{host} refused a connection with user #{user}.  The application may be unavailable.", 1
     end
   end
 
+  class SSHCommandFailed < Exception
+    def initialize(exit_status, message=nil)
+      super message || "SSH command finished with exit status = #{exit_status}", 133
+    end
+  end
+
   class AdditionalStorageArgumentsException < Exception
     def initialize(message="Only one storage action can be performed at a time.")
       super message, 1

data/lib/rhc/git_helpers.rb

@@ -1,4 +1,4 @@
-  require 'open4'
+require 'open4'
 require 'fileutils'
 
 module RHC

data/lib/rhc/helpers.rb

@@ -330,24 +330,27 @@ module RHC
       headings.merge!({
         :creation_time  => "Created",
         :expires_in_seconds => "Expires In",
-        :uuid           => "ID",
-        :id             => 'ID',
-        :current_scale  => "Current",
-        :scales_from    => "Minimum",
-        :scales_to      => "Maximum",
-        :gear_sizes     => "Allowed Gear Sizes",
-        :consumed_gears => "Gears Used",
-        :max_gears      => "Gears Allowed",
-        :max_domains    => "Domains Allowed",
+        :uuid            => "ID",
+        :id              => 'ID',
+        :current_scale   => "Current",
+        :scales_from     => "Minimum",
+        :scales_to       => "Maximum",
+        :gear_sizes      => "Allowed Gear Sizes",
+        :consumed_gears  => "Gears Used",
+        :max_gears       => "Gears Allowed",
+        :max_domains     => "Domains Allowed",
         :compact_members => "Members",
-        :gear_info      => "Gears",
-        :plan_id        => "Plan",
-        :url            => "URL",
-        :ssh_string     => "SSH",
+        :gear_info       => "Gears",
+        :plan_id         => "Plan",
+        :url             => "URL",
+        :ssh_string      => "SSH",
         :connection_info => "Connection URL",
-        :gear_profile   => "Gear Size",
+        :gear_profile    => "Gear Size",
         :visible_to_ssh? => 'Available',
         :downloaded_cartridge_url => 'From',
+        :auto_deploy     => 'Deployment',
+        :sha1            => 'SHA1',
+        :ref             => 'Git Reference'
       })
 
       headings[value]

data/lib/rhc/highline_extensions.rb

@@ -53,13 +53,13 @@ class HighLineExtension < HighLine
           @last_line_open = false
           @output.puts
         end
-        statement = statement.join("#{indentation}\n") 
+        statement = statement.join("#{indentation}\n")
       end
       statement = send(:page_print, statement) unless @page_at.nil?
 
       @output.print(indentation) unless @last_line_open
 
-      @last_line_open = 
+      @last_line_open =
         if statement[-1, 1] == " " or statement[-1, 1] == "\t"
           @output.print(statement)
           @output.flush
@@ -147,7 +147,7 @@ class HighLineExtension < HighLine
       @multi_indent = multi
       @indent_level -= increase
     end
-  end 
+  end
   #:nocov:
 
   ##
@@ -170,7 +170,7 @@ class HighLineExtension < HighLine
   #
   # > Hello
   # >
-  # > World 
+  # > World
   #
   # with only one newline between the two.  Biggest margin wins.
   #
@@ -298,7 +298,7 @@ end
 
 #
 # Represent a columnar layout of items with wrapping and flexible layout.
-# 
+#
 class HighLine::Table
   include RowBased
 
@@ -310,7 +310,7 @@ class HighLine::Table
     opts[:color]
   end
 
-  protected 
+  protected
     attr_reader :items
 
     def opts
@@ -333,7 +333,7 @@ class HighLine::Table
     def source_rows
       @source_rows ||= begin
         (@mapper ? (items.map &@mapper) : items).each do |row|
-          row.map! do |col| 
+          row.map! do |col|
             case col
             when Array then col.join("\n")
             when String then col
@@ -388,17 +388,17 @@ class HighLine::Table
           end
       end
 
-      remaining = column_widths.inject(0) do |sum, w| 
+      remaining = column_widths.inject(0) do |sum, w|
           if w.set == 0
             sum += w.max
-            available -= w.min 
+            available -= w.min
           end
           sum
         end
       fair = available.to_f / remaining.to_f
 
       column_widths.
-        each do |w| 
+        each do |w|
           if w.set == 0
             alloc = (w.max * fair).to_i
             overflow = alloc + w.min - w.max
@@ -424,7 +424,7 @@ class HighLine::Table
       @widths ||= begin
         case w = opts[:width]
         when Array
-          column_widths.zip(w[1..-1]).each do |width, col| 
+          column_widths.zip(w[1..-1]).each do |width, col|
             width.set = col || 0
             width.max = width.set if width.set > width.max
           end
@@ -450,15 +450,15 @@ class HighLine::Table
 
     def rows
       @rows ||= begin
-        body = (header_rows + source_rows).inject([]) do |a,row| 
+        body = (header_rows + source_rows).inject([]) do |a,row|
           row = row.zip(widths).map{ |column,w| w && w > 0 ? column.textwrap_ansi(w, false) : [column] }
           (row.map(&:length).max || 0).times do |i|
             s = []
             row.each_with_index do |lines, j|
               cell = lines[i]
               l = cell ? cell.strip_ansi.length : 0
-              s << 
-                  if align[j] == :right 
+              s <<
+                  if align[j] == :right
                     "#{' '*(widths[j]-l) if l < widths[j]}#{cell}"
                   else
                     "#{cell}#{' '*(widths[j]-l) if l < widths[j]}"
@@ -468,7 +468,7 @@ class HighLine::Table
           end
           a
         end
-        
+
         body = heading.to_a.concat(body) if heading
         body
       end

data/lib/rhc/output_helpers.rb

@@ -26,22 +26,21 @@ module RHC
     #---------------------------
     # Application information
     #---------------------------
-    def display_app(app,cartridges = nil)
+    def display_app(app, cartridges=nil, properties=nil)
       paragraph do
         header [app.name, "@ #{app.app_url}", "(uuid: #{app.uuid})"] do
           section(:bottom => 1) do
             say format_table \
               nil,
-              get_properties(
-                app,
-                :domain,
+              get_properties(app, properties ||
+                [:domain,
                 :creation_time,
                 :gear_info,
                 :git_url,
                 :initial_git_url,
                 :ssh_string,
-                :aliases
-              ),
+                :auto_deploy,
+                :aliases]),
               :delete => true
           end
           cartridges.each{ |c| section(:bottom => 1){ display_cart(c) } } if cartridges
@@ -49,6 +48,10 @@ module RHC
       end
     end
 
+    def display_app_configurations(rest_app)
+      display_app(rest_app, nil, [:auto_deploy, :keep_deployments, :deployment_type, :deployment_branch])
+    end
+
     def format_cart_header(cart)
       [
         cart.name,
@@ -94,7 +97,7 @@ module RHC
     end
 
     def display_key(key, *properties)
-      properties = [:fingerprint, :visible_to_ssh?] if properties.empty?
+      properties = [:fingerprint, :principal, :visible_to_ssh?] if properties.empty?
       say format_table(
         properties.include?(:name) ? nil : format_key_header(key),
         get_properties(key, *properties),
@@ -153,6 +156,41 @@ module RHC
       end
     end
 
+    def display_deployment(item, highlight_active=true)
+      deployment = item[:deployment]
+      active = item[:active]
+      paragraph do
+        say format_table(
+          "Deployment ID #{deployment.id} #{active ? '(active)' : '(inactive)'}",
+          get_properties(deployment, :ref, :sha1, :created_at, :artifact_url, :hot_deploy, :force_clean_build, :activations),
+          {
+            :delete => true,
+            :color => (:green if active && highlight_active)
+          }
+        )
+      end
+    end
+
+    def display_deployment_list(deployment_activations, highlight_active=true)
+      if deployment_activations.present?
+        paragraph do
+          deployment_activations.each do |item|
+            activation = item[:activation]
+            deployment = item[:deployment]
+            rollback = item[:rollback]
+            rollback_to = item[:rollback_to]
+            rolled_back = item[:rolled_back]
+            active = item[:active]
+            say color(
+              date(activation.created_at.to_s) +
+              ', deployment ' + deployment.id +
+              (rollback ? " (rollback to #{date(rollback_to.to_s)}#{rolled_back ? ', rolled back' : ''})" : rolled_back ? ' (rolled back)' : ''),
+                active ? :green : rolled_back ? :yellow : nil)
+          end
+        end
+      end
+    end
+
     private
       def format_table(heading,values,opts = {})
         values = values.to_a if values.is_a? Hash
@@ -171,7 +209,7 @@ module RHC
 
       # This uses the array of properties to retrieve them from an object
       def get_properties(object,*properties)
-        properties.map do |prop|
+        properties.flatten.map do |prop|
           # Either send the property to the object or yield it
           next if prop.nil?
           value = begin
@@ -195,7 +233,7 @@ module RHC
           end
         when :visible_to_ssh?
           value || nil
-        when :creation_time
+        when :creation_time, :created_at
           date(value)
         when :scales_from,:scales_to
           (value == -1 ? "available" : value)
@@ -207,6 +245,10 @@ module RHC
           value.kind_of?(Array) ? value.join(', ') : value
         when :expires_in_seconds
           distance_of_time_in_words(value)
+        when :activations
+          value.collect{|item| date(item.created_at.to_s)}.join("\n")
+        when :auto_deploy
+          value ? 'auto (on git push)' : "manual (use 'rhc deploy')"
         else
           case value
           when Array then value.empty? ? '<none>' : value.join(', ')

data/lib/rhc/rest.rb

@@ -12,6 +12,7 @@ module RHC
     autoload :Authorization,        'rhc/rest/authorization'
     autoload :Cartridge,            'rhc/rest/cartridge'
     autoload :Client,               'rhc/rest/client'
+    autoload :Deployment,           'rhc/rest/deployment'
     autoload :Domain,               'rhc/rest/domain'
     autoload :EnvironmentVariable,  'rhc/rest/environment_variable'
     autoload :GearGroup,            'rhc/rest/gear_group'

data/lib/rhc/rest/activation.rb

@@ -0,0 +1,11 @@
+module RHC
+  module Rest
+    class Activation < Base
+      define_attr :created_at
+
+      def <=>(other)
+       other.created_at <=> created_at
+      end
+    end
+  end
+end

data/lib/rhc/rest/application.rb

@@ -8,7 +8,8 @@ module RHC
       define_attr :domain_id, :name, :creation_time, :uuid,
                   :git_url, :app_url, :gear_profile, :framework,
                   :scalable, :health_check_path, :embedded, :gear_count,
-                  :ssh_url, :building_app, :cartridges, :initial_git_url
+                  :ssh_url, :building_app, :cartridges, :initial_git_url,
+                  :auto_deploy, :deployment_branch, :deployment_type, :keep_deployments, :deployments
       alias_method :domain_name, :domain_id
 
       # Query helper to say consistent with cartridge
@@ -177,6 +178,57 @@ module RHC
         has_param?('ADD_CARTRIDGE', 'environment_variables')
       end
 
+      def deployments
+        debug "Listing deployments for application #{name}"
+        raise RHC::DeploymentsNotSupportedException if !supports? "LIST_DEPLOYMENTS"
+        rest_method("LIST_DEPLOYMENTS").sort
+      end
+
+      def deployment_activations
+        items = []
+
+        # building an array of activations with their deployments
+        deployments.each do |deployment|
+          deployment.activations.each do |activation|
+            items << {:activation => activation, :deployment => deployment}
+          end
+        end
+
+        items.sort! {|a,b| a[:activation].created_at <=> b[:activation].created_at }
+
+        first_activation = {}
+
+        items.each do |item|
+          deployment = item[:deployment]
+          activation = item[:activation]
+
+          # set the currently active (last activation by date)
+          item[:active] = item == items.last
+
+          # mark rollbacks (activations whose deployment had previous activations)
+          if rollback_to = first_activation[deployment.id]
+            item[:rollback] = true
+            item[:rollback_to] = rollback_to
+            # mark rolled back (all in between a rollback and its original deployment)
+            items.each {|i| i[:rolled_back] = true if i[:activation].created_at > rollback_to && i[:activation].created_at < activation.created_at }
+          else
+            first_activation[deployment.id] = activation.created_at
+          end
+
+        end
+
+        items
+      end
+
+      def configure(options={})
+        debug "Running update for #{name} with options #{options.inspect}"
+        if supports? "UPDATE"
+          rest_method "UPDATE", options
+        else
+          raise RHC::DeploymentsNotSupportedException
+        end
+      end
+
       def add_alias(app_alias)
         debug "Running add_alias for #{name}"
         rest_method "ADD_ALIAS", :event => "add-alias", :alias => app_alias

data/lib/rhc/rest/client.rb

@@ -518,24 +518,33 @@ module RHC
             data.map{ |json| Alias.new(json, self) }
           when 'environment-variables'
             data.map{ |json| EnvironmentVariable.new(json, self) }
+          when 'deployments'
+            data.map{ |json| Deployment.new(json, self) }
           else
             data
           end
         end
 
         def parse_messages(result, data)
-          warnings, messages = Array(result['messages']).inject([[],[]]) do |a, m|
+          raw = (result || {})['messages'] || []
+          raw.delete_if do |m|
+            m.delete_if{ |k,v| k.nil? || v.blank? } if m.is_a? Hash
+            m.blank?
+          end
+          warnings, messages, raw = Array(raw).inject([[],[],[]]) do |a, m|
             severity, field, text = m.values_at('severity', 'field', 'text')
-            text.gsub!(/\A\n+/m, "")
-            text.rstrip!
+            text = (text || "").gsub(/\A\n+/m, "").rstrip
             case severity
             when 'warning'
               a[0] << text
             when 'debug'
+              a[2] << m
               a[1] << text if debug?
             when 'info'
+              a[2] << m
               a[1] << text if debug? || field == 'result'
             else
+              a[2] << m
               a[1] << text
             end
             a
@@ -548,17 +557,16 @@ module RHC
             end
           elsif data.is_a?(Hash)
             data['messages'] = messages
-            data['warnings'] = warnings  
+            data['warnings'] = warnings
           end
 
           warnings.each do |warning|
-            # Prevent repeated warnings during the same client session
-            if !defined?(@warning_map) || !@warning_map.include?(warning)
-              @warning_map ||= Set.new
+            unless (@warning_map ||= Set.new).include?(warning)
               @warning_map << warning
               warn warning
             end
           end if respond_to? :warn
+          raw
         end
 
         def raise_generic_error(url, client)
@@ -576,11 +584,7 @@ module RHC
           parse_error = nil
           begin
             result = RHC::Json.decode(response.content)
-            messages = Array(result['messages'])
-            messages.delete_if do |m|
-              m.delete_if{ |k,v| k.nil? || v.blank? } if m.is_a? Hash
-              m.blank?
-            end
+            messages = parse_messages(result, {})
           rescue => e
             debug "Response did not include a message from server: #{e.message}"
           end