Changeset 89

Timestamp:

04/23/08 18:38:44 (7 months ago)

Author:

jweiss

Message:

backend code for host exclusion in deployments

Location:

trunk

Files:

• app/models/deployment.rb (modified) (2 diffs)
• db/migrate/023_add_exclude_hosts_to_deployment.rb (added)
• db/schema.rb (modified) (3 diffs)
• lib/webistrano/deployer.rb (modified) (1 diff)
• test/test_helper.rb (modified) (2 diffs)
• test/unit/deployment_test.rb (modified) (1 diff)
• test/unit/webistrano_deployer_test.rb (modified) (1 diff)

trunk/app/models/deployment.rb

@@ -8 +8 @@
   validates_inclusion_of :success, :in => 0..1
   
-  attr_accessible :task, :prompt_config, :description
+  serialize :excluded_host_ids
+  
+  attr_accessible :task, :prompt_config, :description, :excluded_host_ids
   
   tz_time_attributes :created_at, :updated_at, :completed_at
@@ -112 +114 @@
     end
   end
+  
+  # returns a list of hosts that this deployment
+  # will deploy to. This computed out of the list
+  # of given roles and the excluded hosts
+  def deploy_to_hosts
+    all_hosts = self.roles.map(&:host).uniq
+    return all_hosts - self.excluded_hosts
+  end
+  
+  # returns a list of roles that this deployment
+  # 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) }
+  end
+  
+  # a list of all excluded hosts for this deployment
+  # see excluded_host_ids
+  def excluded_hosts
+    res = []
+    self.excluded_host_ids.each do |h_id|
+      res << (Host.find(h_id) rescue nil)
+    end
+    res.compact
+  end
+  
+  def excluded_host_ids
+    self.read_attribute('excluded_host_ids').blank? ? [] : self.read_attribute('excluded_host_ids')
+  end
+  
+  def excluded_host_ids=(val)
+    val = [val] unless val.is_a?(Array)
+    self.write_attribute('excluded_host_ids', val)
+  end
 end

trunk/db/schema.rb

@@ -10 +10 @@
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 22) do
+ActiveRecord::Schema.define(:version => 23) do
 
   create_table "configuration_parameters", :force => true do |t|
@@ -26 +26 @@
     t.string   "task"
     t.text     "log"
-    t.integer  "success",      :default => 0
+    t.integer  "success",           :default => 0
     t.integer  "stage_id"
     t.datetime "created_at"
@@ -33 +33 @@
     t.text     "description"
     t.integer  "user_id"
+    t.string   "excluded_host_ids"
   end
 

trunk/lib/webistrano/deployer.rb

@@ -177 +177 @@
     # sets the roles on the Capistrano configuration
     def set_stage_roles(config)
-      deployment.roles.each do |r|
+      deployment.deploy_to_roles.each do |r|
         
         # create role attributes hash

trunk/test/test_helper.rb

@@ -174 +174 @@
       :roles => [],
       :description => random_string,
-      :user => create_new_user
+      :user => create_new_user,
+      :excluded_host_ids => []
     }.update(options)
     
@@ -184 +185 @@
     d.prompt_config = options[:prompt_config]
     d.description = options[:description]
+    d.excluded_host_ids = options[:excluded_host_ids]
     d.user = options[:user]
 

trunk/test/unit/deployment_test.rb

@@ -227 +227 @@
   end
   
+  def test_excluded_hosts_accessor
+    host = create_new_host
+    deployment = create_new_deployment(:excluded_host_ids => [host.id], :stage => @stage)
+
+    assert_equal [host.id], deployment.excluded_host_ids
+    assert_equal [host], deployment.excluded_hosts
+    
+    deployment.excluded_host_ids = host.id
+    assert_equal [host.id], deployment.excluded_host_ids
+  end
+  
+  def test_excluded_hosts
+    host_1 = create_new_host
+    host_2 = create_new_host
+    stage = create_new_stage
+    role_app = create_new_role(:name => 'app', :stage => stage, :host => host_1)
+    role_www = create_new_role(:name => 'www', :stage => stage, :host => host_2)
+    role_db = create_new_role(:name => 'db', :stage => stage, :host => host_2)
+    
+    deployment = create_new_deployment(
+                  :stage => stage, 
+                  :excluded_host_ids => [host_1.id])
+    
+    assert_equal 3, deployment.roles.count
+    assert_equal [host_1], deployment.excluded_hosts
+                  
+    assert_equal [host_2], deployment.deploy_to_hosts
+    assert_equal [role_www, role_db].map(&:id).sort, deployment.deploy_to_roles.map(&:id).sort
+  end
+  
+  
+  
 end

trunk/test/unit/webistrano_deployer_test.rb

@@ -158 +158 @@
   end
   
+  def test_excluded_hosts
+    # prepare stage + roles
+    @stage = create_new_stage
+    dead_host = create_new_host
+    
+    www_role = @stage.roles.build(:name => 'www', :host_id => @host.id)
+    www_role.save!
+    
+    app_role = @stage.roles.build(:name => 'app', :host_id => @host.id)
+    app_role.save!
+    
+    db_role = @stage.roles.build(:name => 'db', :host_id => dead_host.id)
+    db_role.save!    
+
+    @stage.reload
+
+    deployment = create_new_deployment(:stage => @stage, :excluded_host_ids => [dead_host.id])
+    assert_equal [www_role, app_role].map(&:id).sort, deployment.deploy_to_roles.map(&:id).sort
+    # prepare Mocks
+    #
+    
+    # Logger stubing
+    mock_cap_logger = mock
+    mock_cap_logger.expects(:level=).with(3)
+    
+    # config stubbing
+    mock_cap_config = mock
+    mock_cap_config.stubs(:logger).returns(mock_cap_logger)
+    mock_cap_config.stubs(:logger=)
+    mock_cap_config.stubs(:load)
+    mock_cap_config.stubs(:trigger)
+    mock_cap_config.stubs(:find_and_execute_task)
+    mock_cap_config.stubs(:[])
+    mock_cap_config.stubs(:fetch).with(:scm)
+    
+    # ignore vars
+    mock_cap_config.stubs(:set)
+      
+    #  
+    # now check the roles        
+    # 
+    
+    #mock_cap_config.expects(:role).with('db', @host.name)
+    mock_cap_config.expects(:role).with('www', @host.name)
+    mock_cap_config.expects(:role).with('app', @host.name)
+    
+    
+    # main mock install
+    Webistrano::Configuration.expects(:new).returns(mock_cap_config)
+    
+    # get things started
+    deployer = Webistrano::Deployer.new( deployment )
+    deployer.invoke_task!
+  end
+  
   def test_invoke_task
     assert_correct_task_called('deploy:setup')