Changeset 90

Timestamp:

04/23/08 23:21:57 (7 months ago)

Author:

jweiss

Message:

finish UI work on excluded hosts

Location:

trunk

Files:

• CHANGELOG.txt (modified) (1 diff)
• app/helpers/deployments_helper.rb (modified) (1 diff)
• app/models/deployment.rb (modified) (3 diffs)
• app/views/deployments/new.html.erb (modified) (2 diffs)
• app/views/stylesheets/application.html.erb (modified) (1 diff)
• public/images/peritor_theme/host_off.png (added)
• public/images/peritor_theme/host_on.png (added)
• test/functional/deployments_controller_test.rb (modified) (1 diff)
• test/test_helper.rb (modified) (1 diff)
• test/unit/deployment_test.rb (modified) (3 diffs)

trunk/CHANGELOG.txt

@@ -1 +1 @@
 
 * SVN *
+
+* Ability to disable host per deloy. This way host that are down do not block a deployment
 
 * Check syntax of recipes. Provided by Mathias Meyer

trunk/app/helpers/deployments_helper.rb

@@ -8 +8 @@
     end
   end
+  
+  def if_disabled_host?(host, text)
+    (@deployment.excluded_host_ids.include?(host.id) ? text : '' rescue '')
+  end
+  
+  def if_enabled_host?(host, text)
+    (@deployment.excluded_host_ids.include?(host.id) ? '' : text rescue text)
+  end
 end

trunk/app/models/deployment.rb

@@ -33 +33 @@
       end
       
+      ensure_not_all_hosts_excluded
     end
   end
@@ -126 +127 @@
   # will deploy to. This computed out of the list
   # of given roles and the excluded hosts
-  def deploy_to_roles
-    self.roles.delete_if{|role| self.excluded_hosts.include?(role.host) }
+  def deploy_to_roles(base_roles=self.roles)
+    base_roles.dup.delete_if{|role| self.excluded_hosts.include?(role.host) }
   end
   
@@ -146 +147 @@
   def excluded_host_ids=(val)
     val = [val] unless val.is_a?(Array)
-    self.write_attribute('excluded_host_ids', val)
+    self.write_attribute('excluded_host_ids', val.map(&:to_i))
+  end
+  
+  protected
+  def ensure_not_all_hosts_excluded
+    unless self.stage.blank? || self.excluded_host_ids.blank?
+      if deploy_to_roles(self.stage.roles).blank?
+        errors.add('base', "You cannot exclude all hosts.")
+      end
+    end
   end
 end

trunk/app/views/deployments/new.html.erb

@@ -25 +25 @@
   
   <p>
+    <b>Deployment Options</b><br />
+    <a id="s_e_h" href="#" onclick="show_disable_hosts(); return false" class="arrow_link">Show Manage Deployed Hosts</a>
+    <a id="h_e_h" href="#" onclick="hide_disable_hosts(); return false" class="arrow_link" style="display:none;">Hide Manage Deployed Hosts</a>
+    <div id="excluded_hosts" style="display:none;">
+      <% if @stage.roles.count > 0 %>
+        <table class="sortable" style="width: 410px;">
+          <tr>
+            <th width="1%">Status</th>
+            <th width="99%">Host</th>
+          </tr>
+          <% for host in @stage.hosts %>
+            <tr class="<%= cycle :even, :odd, :name => 'hosts'  %> <%= if_disabled_host?(host,'disabled_host') %>">
+              <td style="padding:3px 0px 0px 0px;" valign="middle" align="center">
+                <%= image_tag('peritor_theme/host_on.png', 
+                              :id => "host_#{host.id}_on", 
+                              :class => 'exlcude_host_trigger_on',
+                              :style => if_disabled_host?(host,'display:none;') + 'cursor:pointer;')%>
+                <%= image_tag('peritor_theme/host_off.png', 
+                              :id => "host_#{host.id}_off", 
+                              :class => 'exlcude_host_trigger_off',
+                              :style => if_enabled_host?(host,'display:none;') + 'cursor:pointer;')%>
+                <input style="display:none;" type="checkbox" value="<%=h host.id %>" name="deployment[excluded_host_ids][]" id="deployment_excluded_host_ids_<%=h host.id %>" <%= (@deployment.excluded_host_ids.include?(host.id) ? 'checked="checked"' : ''  rescue '')%>/></td>
+              <td><%= link_to h(host.name), host_path(host) %></td>
+            </tr>
+          <% end %>
+        </table>
+
+      <% else %>
+       No hosts for this stage!<br /><br />
+      <% end %>
+      <br />
+    </div>
+  </p>
+  <p>
     <%= submit_tag "Start Deployment" %>
   </p>
@@ -30 +64 @@
 
 <%= link_to 'Back', project_stage_path(@project, @stage), :class => 'arrow_link'  %>
+
+<% content_for(:page_scripts) do %>
+  <script type="text/javascript">
+ 
+    function show_disable_hosts(){
+      $('h_e_h').show();
+      $('s_e_h').hide();
+      $('excluded_hosts').show();
+    }
+   
+    function hide_disable_hosts(){
+      $('h_e_h').hide();
+      $('s_e_h').show();
+      $('excluded_hosts').hide();
+    }
+    
+    function disable_host(){
+      var own_id = /host_(\d)_on/.exec(this.id)[1];
+      var other_id = "host_" + own_id + '_off';
+      console.log('in diable host ' + own_id + '. other: ' + other_id);
+      $(this).hide();
+      $(other_id).show();
+      $('deployment_excluded_host_ids_' + own_id).writeAttribute('checked', 'checked');
+      $(this).up('tr').removeClassName('enabled_host');
+      $(this).up('tr').addClassName('disabled_host');
+    }
+    
+    function enable_host(){
+      var own_id = /host_(\d)_off/.exec(this.id)[1];
+      var other_id = "host_" + own_id + '_on';
+      console.log('in enable host ' + own_id + '. other: ' + other_id);
+      $(this).hide();
+      $(other_id).show();
+      $('deployment_excluded_host_ids_' + own_id).writeAttribute('checked', false);
+      $(this).up('tr').removeClassName('disabled_host');
+      $(this).up('tr').addClassName('enabled_host');
+    }
+    
+    Event.observe(window, 'load', function(){
+      <% unless @deployment.excluded_host_ids.blank? %>
+        show_disable_hosts();
+      <% end %>
+      
+      $$('img.exlcude_host_trigger_on').each(function(el){
+        el.observe('click', disable_host);
+      });
+      
+      $$('img.exlcude_host_trigger_off').each(function(el){
+        el.observe('click', enable_host);
+      })
+    });
+  </script>
+<% end %>

trunk/app/views/stylesheets/application.html.erb

@@ -604 +604 @@
 .alt {
   background: #eef;
+}
+
+tr.disabled_host a{
+        color: grey;
 }
 

trunk/test/functional/deployments_controller_test.rb

@@ -93 +93 @@
     assert_equal 1, Deployment.count
   end
+  
+  def test_excluded_hosts
+    Deployment.delete_all
+    host_down = create_new_host
+    down_role = create_new_role(:stage => @stage, :name => 'foo', :host => host_down)
+    
+    assert_equal 2, @stage.roles.count
+    
+    post :create, :deployment => { :excluded_host_ids => [host_down.id],:task => 'deploy:default', :description => 'update to newest', :prompt_config => {} }, :project_id => @project.id, :stage_id => @stage.id
+    
+    assert_equal 1, Deployment.count
+    deployment = Deployment.find(:first)
+    assert_equal [host_down], deployment.excluded_hosts
+    assert_equal [@role], deployment.deploy_to_roles
+  end
 
 end

trunk/test/test_helper.rb

@@ -69 +69 @@
   end
   
-  def create_new_role(options = {})
-    options = {
-      :stage => create_new_stage,
-      :host => create_new_host,
-      :name => random_string,
-      :primary => 0
-    }.update(options)
-    
-    r = Role.new
-    r.name = options[:name]
-    r.stage = options[:stage]
-    r.host = options[:host]
-    r.primary = options[:primary]
-    r.save!
-    
-    return r
-  end
+  # def create_new_role(options = {})
+  #   options = {
+  #     :stage => create_new_stage,
+  #     :host => create_new_host,
+  #     :name => random_string,
+  #     :primary => 0
+  #   }.update(options)
+  #   
+  #   r = Role.new
+  #   r.name = options[:name]
+  #   r.stage = options[:stage]
+  #   r.host = options[:host]
+  #   r.primary = options[:primary]
+  #   r.save!
+  #   
+  #   return r
+  # end
   
   def create_new_project_configuration(options = {})

trunk/test/unit/deployment_test.rb

@@ -234 +234 @@
     assert_equal [host], deployment.excluded_hosts
     
-    deployment.excluded_host_ids = host.id
+    deployment.excluded_host_ids = host.id.to_s
     assert_equal [host.id], deployment.excluded_host_ids
   end
@@ -246 +246 @@
     role_db = create_new_role(:name => 'db', :stage => stage, :host => host_2)
     
+    stage.reload
+    assert_equal 3, stage.roles.count
     deployment = create_new_deployment(
                   :stage => stage, 
@@ -257 +259 @@
   end
   
+  def test_cannot_exclude_all_hosts
+    stage = create_new_stage
+    host = create_new_host
+    role_app = create_new_role(:name => 'app', :stage => stage, :host => host)
+    
+    d = Deployment.new
+    d.task = 'foo'
+    d.stage = stage
+    d.description = 'foo bar'
+    d.excluded_host_ids = role_app.host.id
+    d.user = create_new_user
+
+    assert !d.valid?
+    assert d.errors.on('base')
+  end