rubber 2.0.4 → 2.0.5

data/CHANGELOG

@@ -1,4 +1,41 @@
+2.0.5 (06/12/2012)
+------------------
+
+New Features:
+============
+[torquebox] Initial work on a TorqueBox template. <160557b>
+[torquebox] Merge pull request #154 from wr0ngway/add_torquebox <d750ecb>
+[torquebox] [torquebox] Bumped to TorqueBox 2.0.3 from 2.0.2. <2851768>
+[torquebox] [torquebox] Do rolling deploys with TorqueBox so the site doesn't go down when deploying. <8582889>
+
+Bug Fixes:
+=========
+
+[core] force older version of net-ssh till issues get resolved <5b8c2f7>
+[core] Fix typo causing Ubuntu 11+ to time out waiting for incorrect volume id <cf1dfa4>
+[core] Merge pull request #168 from akremer/fstab_fix <9d2e6fc>
+[core] Restore fstab.bak if EBS times out <b27cc79>
+[apache] use dash instead of another subdomain level for web tool proxy hosts to prevent ssl complaints with wildcard certs <8237bac>
+[cassandra, collectd, elasticsearch, graphite, graylog, jenkins, mongodb, mysql_cluster, redis, zookeeper] be more strict in selecting role directory during bootstrap <f8818e4>
+[complete_passenger_nginx] Changed passenger_nginx role dependencies so that web_tools can be run on a separate instance. <8a3cefb>
+[complete_passenger_nginx] Merge pull request #166 from rwc9u/web_tools_nginx_multi_instance <44ec7e1>
+[passenger_nginx] Changed nginx.conf to only include the tools.conf on an instance that has the web_tools role. See the following thread where this change was discussed: <376428f>
+[passenger_nginx] Merge pull request #165 from rwc9u/web_tools_nginx <88ab69a>
+
+
+2.0.4 (05/15/2012)
+------------------
+
+Bug Fixes:
+=========
+
+[apache] make sure admin uis know we are ssl so they generate correct urls <b6409da>
+[collectd] fix syntax error <205a07a>
+[resque] use puma to run resque server as a rackup with rails environment loaded so resque-retry can find job classes <518eb27>
+
+
 2.0.3 (05/11/2012)
+------------------
 
 New Features:
 ============
@@ -20,6 +57,7 @@ Bug Fixes:
 
 
 2.0.2 (05/08/2012)
+------------------
 
 New Features:
 ============
@@ -49,7 +87,7 @@ Bug Fixes:
 
 
 2.0.1 (04/29/2012)
-----------
+------------------
 
 New Features:
 ============
@@ -73,7 +111,7 @@ Bug Fixes:
 
 
 2.0.0 (04/24/2012)
-----------
+------------------
 
 New Features:
 ============
@@ -144,7 +182,7 @@ Locked the default version of Ruby down to a particular patch release so by defa
 Ruby 1.9.3 fixes with nginx
 
 1.15.0 (09/13/2011)
------
+-------------------
 
 New Features:
 ============
@@ -179,13 +217,13 @@ Fixed timing issue with multiple resque workers starting (thanks Matt Conway)
 Fixed an issue with hostnames that happen to be monit commands (thanks Michael Glass)
 
 1.14.1 (06/02/2011)
------
+-------------------
 
 Upgraded the version of RVM installed by default
 Switched from using our own installation method to using the new RVM installer
 
 1.14.0 (06/02/2011)
------
+-------------------
 
 Projects using bundler will now run rake with bundle exec
 Added ability to lockdown the version of rake that RVM will install (vulcanize base for the changes)

data/Rakefile

@@ -15,66 +15,98 @@ end
 
 task :changelog do
 
-  helper = Bundler::GemHelper.new(Dir.pwd)
-  version = "v#{helper.gemspec.version}"
-
   changelog_file = 'CHANGELOG'
   entries = ""
-
-  # Get a list of current tags
-  tags = `git tag -l`.split
-  tags = tags.sort_by {|t| t[1..-1].split(".").collect {|s| s.to_i } }
-  newest_tag = tags[-1]
-
-  if version == newest_tag
-    puts "You need to update version, same as most recent tag: #{version}"
-    exit
+  
+  helper = Bundler::GemHelper.new(Dir.pwd)
+  current_version = "v#{helper.gemspec.version}"
+  starting_version = nil
+  ending_version = nil, ending_version_name = nil
+
+  if ENV['VERSION']
+    ver = ENV['VERSION']
+    first_ver, second_ver = ver.split("..")
+    starting_version = "v#{first_ver.gsub(/^[^\d]*/, '')}" if ! first_ver.nil? && first_ver.size > 0
+    ending_version = "v#{second_ver.gsub(/^[^\d]*/, '')}" if ! second_ver.nil? && second_ver.size > 0
+    ending_version_name = ending_version if ending_version
   end
-
-  # If we already have a changelog, make the last tag be the
-  # last one in the changelog, and the next one be the one
-  # following that in the tag list
-  newest_changelog_version = nil
-  if File.exist?(changelog_file)
+  
+  # If we already have a changelog, make the starting_version be the
+  # last one in the changelog
+  #
+  if ! starting_version && File.exist?(changelog_file)
     entries = File.read(changelog_file)
     head = entries.split.first
-    if head =~ /\d\.\d\.\d/
-      newest_changelog_version = "v#{head}"
-
-      if version == newest_changelog_version
-        puts "You need to update version, same as most recent changelog: #{version}"
-        exit
+    if head =~ /(\d\.\d\.\d).*/
+      starting_version = "v#{$1}"
+      
+      if current_version == starting_version
+        puts "WARN: gemspec version is the same as most recent changelog: #{current_version}"
       end
-
     end
   end
+  
+   # Get a list of current tags
+  tags = `git tag -l`.split
+  tags = tags.sort_by {|t| t[1..-1].split(".").collect {|s| s.to_i } }
+  newest_tag = tags[-1]
+
+  if current_version == newest_tag
+    # When generating CHANGELOG after release, we want the last tag as the ending version
+    ending_version = newest_tag
+    ending_version_name = newest_tag
+  else
+    # When generating CHANGELOG before release, we want the current ver as the ending version
+    ending_version = "HEAD"
+    ending_version_name = current_version
+  end
 
+  if starting_version
+    version_selector = "#{starting_version}..#{ending_version}"
+  else
+    puts "WARN: No starting version, dumping entire history, try: rake changelog VERSION=v1.2.3"
+    version_selector = ""
+  end
+  
   # Generate changelog from repo
-  log=`git log --pretty='format:%s <%h> [%cn]' #{newest_tag}..HEAD`
+  puts "Generating a changelog for #{version_selector}"
+  log=`git log --pretty='format:%s <%h>' #{version_selector}`.lines.to_a
 
   # Strip out maintenance entries
-  log = log.lines.to_a.delete_if do |l|
+  log = log.delete_if do |l|
      l =~ /^Regenerated? gemspec/ ||
          l =~ /^version bump/i ||
+         l =~ /^bump version/i ||
          l =~ /^Updated changelog/ ||
          l =~ /^Merged? branch/
   end
-
+  
+  # Add templates user needs to run vulcanize for
+  log = log.collect do |l|
+    if l =~ /<(.+)>/
+      ver = $1
+      files = `git diff --name-only #{ver}^1 #{ver}`.lines.to_a
+      templates = files.collect {|f| f =~ /templates\/([^\/]+)\// ? $1 : nil}.compact.sort.uniq
+      templates << 'core'  if templates.size == 0
+      l = "[#{templates.join(", ")}] #{l}"
+    end
+    l
+  end
+  
+  # sort so core comes first
+  log = log.sort_by {|s| s =~ /\[.*core.*\]/ ? "" : s }  
+  
   # Write out changelog file
   File.open(changelog_file, 'w') do |out|
-    out.puts version.gsub(/^v/, '')
-    out.puts "-----"
+    ver_title = ending_version_name.gsub(/^v/, '') + " (#{Time.now.strftime("%m/%d/%Y")})"
+    out.puts ver_title
+    out.puts "-" * ver_title.size
     out.puts "\n"
     out.puts log
     out.puts "\n"
     out.puts entries
   end
 
-  # Commit and push
-  unless ENV['NO_PUSH']
-    sh "git ci -m'Updated changelog' #{changelog_file}"
-    sh "git push"
-  end
 end
 
 desc 'Test the rubber plugin.'

data/lib/rubber/recipes/rubber/setup.rb

@@ -85,7 +85,7 @@ namespace :rubber do
       # graphite web app)
       if ic.role_names.include?('web_tools')
         Array(rubber_env.web_tools_proxies).each do |name, settings|
-          hosts_data << "#{name}.#{ic.full_name}"
+          hosts_data << "#{name}-#{ic.full_name}"
         end
       end
       
@@ -123,7 +123,7 @@ namespace :rubber do
       # graphite web app)
       if ic.role_names.include?('web_tools')
         Array(rubber_env.web_tools_proxies).each do |name, settings|
-          hosts_data << "#{name}.#{ic.full_name}"
+          hosts_data << "#{name}-#{ic.full_name}"
         end
       end
       
@@ -408,7 +408,7 @@ namespace :rubber do
       # graphite web app)
       if instance_item.role_names.include?('web_tools')
         Array(rubber_env.web_tools_proxies).each do |name, settings|
-          provider.update("#{name}.#{instance_item.name}", instance_item.external_ip)
+          provider.update("#{name}-#{instance_item.name}", instance_item.external_ip)
         end
       end
     end
@@ -426,7 +426,7 @@ namespace :rubber do
       # graphite web app)
       if instance_item.role_names.include?('web_tools')
         Array(rubber_env.web_tools_proxies).each do |name, settings|
-          provider.destroy("#{name}.#{instance_item.name}")
+          provider.destroy("#{name}-#{instance_item.name}")
         end
       end
     end

data/lib/rubber/recipes/rubber/volumes.rb

@@ -136,9 +136,10 @@ namespace :rubber do
 		          # Ensure volume is ready before running mkfs on it.
 		          echo 'Waiting for device'
               cnt=0
-              while ! [[ -b #{vol_spec['device']} ]]; do
+              while ! [[ -b $device ]]; do
                 if [[ "$cnt" -eq "15" ]]; then
                   echo 'Timed out waiting for EBS device to be ready.'
+                  mv /etc/fstab.bak /etc/fstab
                   exit 1
                 fi
                 echo '.'

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end
 

data/rubber.gemspec

@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'capistrano', '~> 2.12'
+  # TODO: force older version of net-ssh till connectivity issues with 2.5.x get resolved
+  s.add_dependency 'net-ssh', '~> 2.4.0'
   s.add_dependency 'thor'
   s.add_dependency 'clamp'
   s.add_dependency 'open4'

data/templates/apache/config/rubber/role/web_tools/tools-apache-vhost.conf

@@ -74,7 +74,7 @@ NameVirtualHost *:<%= rubber_env.web_tools_ssl_port %>
     proxy_host = rubber_instances.for_role(settings.role).first.full_name rescue nil
     next unless proxy_host
     
-    host = "#{name}.#{rubber_env.full_host}"
+    host = "#{name}-#{rubber_env.full_host}"
     host_and_port = "#{host}:#{rubber_env.web_tools_ssl_port}"
 
     # don't use settings.path here - mapping the host/port is sufficient,

data/templates/apache/config/rubber/role/web_tools/tools-index.html

@@ -30,7 +30,7 @@
         # graphite web app)
         Array(rubber_env.web_tools_proxies).each do |name, settings|
       %>
-        <li><a href="https://<%= name %>.<%= tools_host.full_name %>:<%= rubber_env.web_tools_ssl_port %><%= settings.path || '/' %>"><%= name.capitalize %></a></li>
+        <li><a href="https://<%= name %>-<%= tools_host.full_name %>:<%= rubber_env.web_tools_ssl_port %><%= settings.path || '/' %>"><%= name.capitalize %></a></li>
       <% end %>
 
 		</ul>

data/templates/cassandra/config/rubber/deploy-cassandra.rb

@@ -64,7 +64,7 @@ namespace :rubber do
 
 
             # Gen just the conf for cassandra
-            rubber.run_config(:file => "role/cassandra", :force => true, :deploy_path => release_path)
+            rubber.run_config(:file => "role/cassandra/", :force => true, :deploy_path => release_path)
           end
         end
         send task_name

data/templates/collectd/config/rubber/deploy-collectd.rb

@@ -14,7 +14,7 @@ namespace :rubber do
       if exists.strip.size == 0
         rubber.update_code_for_bootstrap
 
-        rubber.run_config(:file => "role/collectd", :force => true, :deploy_path => release_path)
+        rubber.run_config(:file => "role/collectd/", :force => true, :deploy_path => release_path)
 
         restart
       end

data/templates/complete_passenger_nginx/config/rubber/rubber-complete.yml

@@ -1,6 +1,7 @@
 role_dependencies:
   web: [haproxy]
   app: [passenger_nginx]
+  web_tools: [passenger_nginx]
 
 web_port: 80
 web_ssl_port: 443

data/templates/elasticsearch/config/rubber/deploy-elasticsearch.rb

@@ -27,7 +27,7 @@ namespace :rubber do
         # After everything installed on machines, we need the source tree
         # on hosts in order to run rubber:config for bootstrapping the db
         rubber.update_code_for_bootstrap
-        rubber.run_config(:file => "role/elasticsearch", :force => true, :deploy_path => release_path)
+        rubber.run_config(:file => "role/elasticsearch/", :force => true, :deploy_path => release_path)
 
         restart
       end

data/templates/graphite/config/rubber/deploy-graphite.rb

@@ -151,7 +151,7 @@ namespace :rubber do
         if exists.strip.size == 0
           rubber.update_code_for_bootstrap
 
-          rubber.run_config(:file => "role/graphite_server", :force => true, :deploy_path => release_path)
+          rubber.run_config(:file => "role/graphite_server/", :force => true, :deploy_path => release_path)
 
           restart
         end
@@ -206,7 +206,7 @@ namespace :rubber do
         if exists.strip.size == 0
           rubber.update_code_for_bootstrap
 
-          rubber.run_config(:file => "role/graphite_web", :force => true, :deploy_path => release_path)
+          rubber.run_config(:file => "role/graphite_web/", :force => true, :deploy_path => release_path)
 
           # django email validation barfs on localhost, but for full_host to work
           # in admin_email, we need a env with host defined

data/templates/graylog/config/rubber/deploy-graylog.rb

@@ -31,7 +31,7 @@ namespace :rubber do
         exists = capture("echo $(ls /etc/graylog2.conf 2> /dev/null)")
         if exists.strip.size == 0
           rubber.update_code_for_bootstrap
-          rubber.run_config(:file => "role/graylog_server", :force => true, :deploy_path => release_path)
+          rubber.run_config(:file => "role/graylog_server/", :force => true, :deploy_path => release_path)
 
           restart
         end
@@ -80,7 +80,7 @@ namespace :rubber do
         if exists.strip.size == 0
           rubber.update_code_for_bootstrap
 
-          rubber.run_config(:file => "role/graylog_web", :force => true, :deploy_path => release_path)
+          rubber.run_config(:file => "role/graylog_web/", :force => true, :deploy_path => release_path)
           
           rubber.sudo_script 'bootstrap_graylog_web', <<-ENDSCRIPT
             cd #{rubber_env.graylog_web_dir}

data/templates/jenkins/config/rubber/deploy-jenkins.rb

@@ -23,7 +23,7 @@ namespace :rubber do
       exists = capture("echo $(ls /etc/apache2/jenkins.auth 2> /dev/null)")
       if exists.strip.size == 0
         rubber.update_code_for_bootstrap
-        rubber.run_config(:file => "role/jenkins", :force => true, :deploy_path => release_path)
+        rubber.run_config(:file => "role/jenkins/", :force => true, :deploy_path => release_path)
 
         restart
         rubber.apache.restart

data/templates/mongodb/config/rubber/deploy-mongodb.rb

@@ -23,7 +23,7 @@ namespace :rubber do
       exists = capture("echo $(ls #{rubber_env.mongodb_data_dir} 2> /dev/null)")
       if exists.strip.size == 0
         rubber.update_code_for_bootstrap
-        rubber.run_config(:file => "role/mongodb", :force => true, :deploy_path => release_path)
+        rubber.run_config(:file => "role/mongodb/", :force => true, :deploy_path => release_path)
 
         restart
       end

data/templates/mysql_cluster/config/rubber/deploy-mysql_cluster.rb

@@ -60,7 +60,7 @@ namespace :rubber do
         task task_name, :hosts => ic.full_name do
           exists = capture("if grep -c rubber.*mysql_mgm /etc/mysql/ndb_mgmd.cnf &> /dev/null; then echo exists; fi")
           if exists.strip.size == 0
-            rubber.run_config(:file => "role/mysql_mgm", :deploy_path => release_path)
+            rubber.run_config(:file => "role/mysql_mgm/", :deploy_path => release_path)
             rsudo "service mysql-ndb-mgm start"
           end
         end
@@ -72,7 +72,7 @@ namespace :rubber do
         task task_name, :hosts => ic.full_name do
           exists = capture("if grep -c rubber.*mysql_data /etc/mysql/my.cnf &> /dev/null; then echo exists; fi")
           if exists.strip.size == 0
-            rubber.run_config(:file => "role/mysql_data", :deploy_path => release_path)
+            rubber.run_config(:file => "role/mysql_data/", :deploy_path => release_path)
             rsudo "service mysql-ndb start-initial"
           end
         end
@@ -84,7 +84,7 @@ namespace :rubber do
         task task_name, :hosts => ic.full_name do
           exists = capture("if grep -c rubber.*mysql_sql /etc/mysql/my.cnf &> /dev/null; then echo exists; fi")
           if exists.strip.size == 0
-            rubber.run_config(:file => "role/mysql_sql", :deploy_path => release_path)
+            rubber.run_config(:file => "role/mysql_sql/", :deploy_path => release_path)
             rsudo "service mysql start"
             env = rubber_cfg.environment.bind()
             # For mysql 5.0 cluster, need to create users and database for EVERY sql node

data/templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf

@@ -59,7 +59,7 @@ http
 	passenger_user <%= rubber_env.app_user %>;
 	
   include /etc/nginx/rubber/passenger_nginx.conf;
-  <% if rubber_instances.for_role('web_tools').first %>
+  <% if rubber_instances[rubber_env.host].role_names.include?('web_tools') %> 
     include /etc/nginx/rubber/tools.conf;
   <% end %>
 }

data/templates/redis/config/rubber/deploy-redis.rb

@@ -47,7 +47,7 @@ namespace :rubber do
         rubber.update_code_for_bootstrap
   
         # Gen just the conf for cassandra
-        rubber.run_config(:file => "role/redis", :force => true, :deploy_path => release_path)
+        rubber.run_config(:file => "role/redis/", :force => true, :deploy_path => release_path)
       
         restart
       end