VladTheEnterprising 0.1.8 → 0.2

data/README.txt

@@ -95,8 +95,11 @@ Currently consists of the following:
 
   Migrations and Versioning
   =========================
- 
-  As of 1.8, schema migrations and versioning are supported.  By 
+  
+  As of 0.2.0, schema creations are supported.  The ddl is expected to
+  be in: db/schemas/[SchemaName].sql
+
+  As of 0.1.8, schema migrations and versioning are supported.  By 
   default the app will look under db/migrations/[schema name]/[version
   no]-[text]/[upgrade.sql|rollback.sql]
 
@@ -139,6 +142,7 @@ Currently consists of the following:
   being that there's ssh and the mysql client available on the
   db_master.
 
+
 * The Xen Master
   
   Beginnings of a series of tasks for autmating the creation and

data/Rakefile

@@ -8,6 +8,8 @@ require './lib/nytd/dbslayer'
 
 require './lib/vlad/enterprising.rb'
 require './lib/nytd/builder'
+require './lib/nytd/util'
+require './lib/nytd/cnx_mysql'
 Hoe.new('VladTheEnterprising', VLAD_ENTERPRISING_VERSION) do |p|
   p.rubyforge_name = 'vlad_the_enterprising'
   p.author = 'Michael L. Welles'
@@ -21,4 +23,11 @@ Hoe.new('VladTheEnterprising', VLAD_ENTERPRISING_VERSION) do |p|
 end
 Vlad.load()
 
+if defined?( target_environment ) and ( target_environment == :production  )
+  unless ENV['FORCE']
+    certain = ask('Are you sure you want to target production? [Y/n]')
+    raise "Oops, good thing we checked.  Aborting." unless certain == "Y"
+  end
+end
+
 # vim: syntax=Ruby

data/lib/vlad/dba/mysql.rb

@@ -20,7 +20,7 @@ namespace :vlad do
       puts "#{target_host} mysql user open file ulimit: #{n}"
     end
 
-
+	
     desc "Bootstraps mysql slave candiates, installs mysql, syncs them to the master, and starts them."
     task :bootstrap_new_slaves => [
                                    :assert_production_target_subset,
@@ -41,9 +41,9 @@ namespace :vlad do
                                    :check_slaves,]
 
 
-    task :ask_root_password  do
+   task :ask_root_password do
       mysql_root_password
-    end
+   end
 
     task :ask_replication_password  do
       mysql_replication_password
@@ -109,10 +109,12 @@ namespace :vlad do
       slaves = Rake::RemoteTask.hosts_for(:new_slave)
       slaves.each do |slave|
         name = slave.gsub(/\..*$/,"").gsub(/-/, "")
-        mysql_query "grant all privileges  on *.* to '#{name}_dump'@'#{slave}' identified by '#{mysql_replication_password}'", "", :u => "root", :p => mysql_root_password
+        mysql_query :sql => "grant all privileges  on *.* to '#{name}_dump'@'#{slave}' identified by '#{mysql_replication_password}'", 
+					:u => "root", :p => mysql_root_password
         ip =  Resolv.getaddress(slave)
         if ip
-          mysql_query "grant all privileges  on *.* to '#{name}_dump'@'#{ip}' identified by '#{mysql_replication_password}'", "", :u => "root", :p => mysql_root_password
+          mysql_query :sql => "grant all privileges  on *.* to '#{name}_dump'@'#{ip}' identified by '#{mysql_replication_password}'", 
+		  				:u => "root", :p => mysql_root_password
         end
       end
     end
@@ -121,10 +123,12 @@ namespace :vlad do
       slaves = Rake::RemoteTask.hosts_for(:new_slave)
       slaves.each do |slave|
         name = slave.gsub(/\..*$/,"").gsub(/-/, "")
-        mysql_query "grant replication slave, super, reload  on *.* to '#{name}_repl'@'#{slave}' identified by '#{mysql_replication_password}'", "", :u => "root", :p => mysql_root_password
+        mysql_query :sql => "grant replication slave, super, reload  on *.* to '#{name}_repl'@'#{slave}' identified by '#{mysql_replication_password}'", 
+					:u => "root", :p => mysql_root_password
         ip =  Resolv.getaddress(slave)
         if ip
-          mysql_query "grant replication slave, super, reload  on *.* to '#{name}_repl'@'#{ip}' identified by '#{mysql_replication_password}'", "", :u => "root", :p => mysql_root_password
+          mysql_query :sql => "grant replication slave, super, reload  on *.* to '#{name}_repl'@'#{ip}' identified by '#{mysql_replication_password}'",
+		  			:u => "root", :p => mysql_root_password
         end
       end
     end
@@ -133,8 +137,10 @@ namespace :vlad do
       slaves = Rake::RemoteTask.hosts_for(:new_slave)
       slaves.each do |slave|
         name = slave.gsub(/\..*$/,"").gsub(/-/, "")
-        mysql_query "REVOKE replication slave, super, reload FROM #{name}_repl", "", :u => "root", :p => mysql_root_password, :force => true
-        mysql_query "drop user #{name}_repl", "", :u => "root", :p => mysql_root_password, :force => true
+        mysql_query :sql => "REVOKE replication slave, super, reload FROM #{name}_repl", 
+					:u => "root", :p => mysql_root_password, :force => true
+        mysql_query :sql => "drop user #{name}_repl", 
+					:u => "root", :p => mysql_root_password, :force => true
       end
     end
 
@@ -144,8 +150,10 @@ namespace :vlad do
       slaves = Rake::RemoteTask.hosts_for(:new_slave)
       slaves.each do |slave|
         name = slave.gsub(/\..*$/,"").gsub(/-/, "")
-        mysql_query "REVOKE ALL PRIVILEGES, GRANT OPTION FROM #{name}_dump", "", :u => "root", :p => mysql_root_password, :force => true
-        mysql_query "drop user #{name}_dump", "", :u => "root", :p => mysql_root_password, :force => true
+        mysql_query :sql => "REVOKE ALL PRIVILEGES, GRANT OPTION FROM #{name}_dump", 
+					:u => "root", :p => mysql_root_password, :force => true
+        mysql_query :sql => "drop user #{name}_dump", 
+					:u => "root", :p => mysql_root_password, :force => true
       end
     end
 
@@ -240,9 +248,11 @@ namespace :vlad do
 
     remote_task :start_new_slaves, :roles => :new_slave do
       begin
-        mysql_query "flush privileges; slave start;", "", :u => "root"
+        mysql_query :sql => "flush privileges; slave start;", 
+			:u => "root"
       rescue
-        mysql_query "flush privileges; slave start;", "", :u => "root", :p => mysql_root_password
+        mysql_query "flush privileges; slave start;", 
+			:u => "root", :p => mysql_root_password
       end
     end
 
@@ -259,12 +269,13 @@ namespace :vlad do
       datfile = dumpfile.sub(/\.gz$/,"").sub(/-/, "-#{database}-")
       dumpfile = datfile + ".gz"
       run "mkdir -p `dirname #{datfile}`; exit 0"
-      run "#{mysqldump} --single-transaction -uroot -p'#{mysql_root_password}' #{db_arg} > #{datfile}"
+      run "#{mysqldump} --routines --single-transaction -uroot -p'#{mysql_root_password}' #{db_arg} > #{datfile}"
       `mkdir -p \`dirname #{datfile}\``
       run "nice gzip #{datfile}"
       cmd="ssh #{target_host} cat #{dumpfile}  > #{dumpfile}"
       `#{cmd}`
-      run "if [ -e #{dumpfile} ]; then rm #{dumpfile}; else exit 1; fi"
+	  run "if [ -e #{dumpfile} ]; then rm #{dumpfile}; else exit 1; fi"
+	  FileUtils.ln_sf(File.basename(dumpfile), "dumps/#{ENV['DATABASE']}-latest.dat.gz")
       puts "Done: #{dumpfile}"
     end
     task :dump => [:ask_root_password]
@@ -350,17 +361,21 @@ namespace :vlad do
 
     desc "stops replication on all slaves"
     remote_task :stop_slaves, :roles => [:db_slave, :new_slave] do
-      mysql_query "slave stop;", "", :u => "root",  :p => mysql_root_password
+      mysql_query :sql => "slave stop;",
+	  			   :u => "root",  :p => mysql_root_password
     end
 
     desc "starts replication on all slaves"
     remote_task :start_slaves, :roles => [:db_slave, :new_slave] do
-      mysql_query "flush privileges; slave start;", "", :u => "root",  :p => mysql_root_password
+      mysql_query :sql => "slave start;", 
+	  			:u => "root",  :p => mysql_root_password
     end
+
     desc "shows available databases"
     remote_task :show_all_databases, :roles => :db_master do
       puts "#{target_host}"
-      mysql_query "SHOW DATABASES;", "", :u => "root", :p => mysql_root_password
+      mysql_query :sql => "SHOW DATABASES;",
+	  			:u => "root", :p => mysql_root_password
     end
     task :show_all_databases => [:ask_root_password]
 
@@ -383,20 +398,30 @@ namespace :vlad do
     desc "Executes query specified in QUERY='' argument on database specified in the DATABASE='' argument on the :db_master for the target environment and prints the results"
     remote_task :query, :roles => :db_master do
       raise "Please specify what QUERY to run against what database, i.e. QUERY='select foo from bar' DATABASE='Movies' TARGET='staging'" unless ENV['QUERY']
-      puts mysql_query(ENV['QUERY'],ENV['DATABASE'], :u => 'root', :p => mysql_root_password )
+      puts mysql_query(:sql => ENV['QUERY'],
+	  				   :db => ENV['DATABASE'], 
+					   :u => 'root', :p => mysql_root_password )
     end
 
     desc "Executes query specified in QUERY='' argument on database specified in the DATABASE='' argument on all the slaves for the target environment and prints the results"
     remote_task :query_slaves, :roles => :db_slave do
       raise "Please specify what QUERY to run against what database, i.e. QUERY='select foo from bar' DATABASE='Movies' TARGET='staging'" unless ENV['QUERY']
-      puts "#{target_host}: " + mysql_query(ENV['QUERY'],ENV['DATABASE'], :u => 'root', :p => mysql_root_password ).gsub("\n", "*****")
+      puts "#{target_host}: " + mysql_query( :sql => ENV['QUERY'], :db => ENV['DATABASE'], :u => 'root', :p => mysql_root_password ).gsub("\n", "*****")
     end
 
+	remote_task :install_slave_crontab, :roles => :db_slave do
+	  file = "files/mysql/crontabs/db_slave.crontab"
+	  if File.exist?(file)
+	  	scp file, ".crontab"
+		run "crontab .crontab"
+	  end
+	end
+	
     remote_task :schema_info, :roles => :db_master do
       databases.select{ |db| db == "mysql" ? false : true }.each do |database|
         begin
-        output = mysql_query("select version from schema_info limit 1",
-                             database,
+        output = mysql_query(:sql => "select version from schema_info limit 1",
+        					 :db => database,
                              :u => 'root',
                              :p => mysql_root_password)
 
@@ -409,7 +434,38 @@ namespace :vlad do
       end
     end
     task :schema_info => [:ask_root_password]
-
+	
+	desc "Creates a database specified by DATABASE argument, using schema defined in db/schemas/[DATABASE].sql"
+	remote_task :create_database, :roles => :db_master do
+	  database = ENV['DATABASE']
+ 	  sql = File.read("db/schemas/#{database}.sql")
+	  src = Tempfile.new("#{database}-create").path
+	  create = "CREATE DATABASE IF NOT EXISTS #{database};\n"	  
+	  File.open(src, "w") do |f|
+	  	f.write(sql)
+		if Rake.application.options.trace
+			puts create
+			puts sql
+		end
+	  end
+	  mysql_query( :sql => create, :u => 'root', :p => mysql_root_password)	  	  
+	  scp src, src
+	  mysql_query( :sql => "source #{src};", 
+	  		:db => database, 
+			:u => 'root', 
+			:p => mysql_root_password)	  
+	end
+	task :create_database => [:assert_single_master]
+	
+	remote_task :drop_database, :roles => :db_master do
+	  database = ENV['DATABASE']
+	  drop = "DROP DATABASE IF EXISTS #{database}"
+	  mysql_query( :sql => drop, 
+	  		:u => 'root', 
+			:p => mysql_root_password)	  	  
+	end
+	task :drop_database => [:assert_single_master]
+	
     desc "Runs db migrations for current TARGET can be controlled with better granuarity with DATABASE and VERSION arguments"
     remote_task :migrate, :roles => :db_master do
       assert_database_if_version_given()
@@ -420,17 +476,18 @@ namespace :vlad do
       targets.each do |database|
         database_dir = File.join(migration_dir, database)
         begin
-        output = mysql_query("select version from schema_info limit 1",
-                             database,
+        output = mysql_query(:sql => "select version from schema_info limit 1",
+        					 :db => database,
                              :u => 'root',
                              :p => mysql_root_password)
-          current_version = output.split(/\n/)[1].to_i
+		puts output if Rake.application.options.trace  
+        current_version = output.split(/\n/)[1].to_i
         rescue
           current_version = 0
         end
         migrations = { }
         dirs =  Dir.new(database_dir).entries.select{|d| d.match(/^\d+/)}
-        dirs.each { |dir| migrations[dir.sub(/[^\d]*$/, "")] = dir }
+        dirs.each { |dir| migrations[dir.sub(/[^\d].*$/, "")] = dir }
         target_version = ENV['VERSION'].to_i if ENV['VERSION']
         target_version ||= migrations.keys.sort{|a,b| a.to_i <=> b.to_i }.last.to_i rescue 0
         case
@@ -450,18 +507,18 @@ namespace :vlad do
           have_migrations = lambda{ false }
           puts "#{database} already at version #{target_version} on #{target_host}"
         end
-
+  		sql = "CREATE TABLE IF NOT EXISTS schema_info ( version INT default 0 );\n"
+        mysql_query(:sql => sql, 
+        			:db => database, 
+				    :u => 'root', :p => mysql_root_password)
         while have_migrations.call() do
           next_version = iterator.call(current_version)
           migration_file = next_file.call(current_version)
           if migration_file && File.exist?(migration_file)
-          sql = "start transaction;\n"
-            sql << "CREATE TABLE IF NOT EXISTS schema_info ( version INT default 0 );\n"
-            sql << File.read(migration_file)
+            sql = File.read(migration_file)
             sql << "\n"
             sql << "update schema_info set version = #{next_version};\n"
-            sql << "commit;"
-            src = "/tmp/#{database}-version-#{File.basename(File.dirname(migration_file))}-#{File.basename(migration_file)}"
+            src = Tempfile.new("#{database}-version-#{File.basename(File.dirname(migration_file))}-#{File.basename(migration_file)}").path
             File.open(src, "w"){ |f| f.write(sql) }
             scp src, src
             if Rake.application.options.trace
@@ -469,7 +526,10 @@ namespace :vlad do
               puts sql
               puts "============================================\n"
             end
-            mysql_query("source #{src};", database, :u => 'root', :p => mysql_root_password)
+            mysql_query(:source => src,
+            		    :db => database, 
+						:u => 'root', 
+						:p => mysql_root_password)
             puts "Executed: #{migration_file} on #{target_host}"
           end
           current_version = next_version
@@ -478,19 +538,31 @@ namespace :vlad do
       end
     end
     task :migrate => [:ask_root_password, :assert_single_master]
-
+	
+	desc "restores the latest dump available for given DATABASE to specified TARGET"
+	task :restore_latest => [:set_dumpfile, :restore]
+	
+	task :set_dumpfile do
+		ENV["DUMPFILE"] = "dumps/#{ENV['DATABASE']}-latest.dat.gz"
+	end
+	
     desc "restores a dump to current db_master from file set in mysql_dumpfile or in a DUMPFILE argument"
     remote_task :restore, :roles => :db_master do
+      dump ||= "dumps/#{ENV['DATABASE']}-latest.dat.gz"
       dump = ENV["DUMPFILE"] || dump
-      raise "Please specify a valid dumpfile to restore via :mysql_dumpfile in the config or use the DUMPFILE argument!" unless File.exist?(dump)
+      raise "Can't find DUMPFILE  '#{dump}' create specify a valid dumpfile to restore via the DUMPFILE argument!" unless File.exist?(dump)
       scp dump, dump
       p = ""
       unless mysql_root_password.nil? or mysql_root_password == ""
         p = "-p'#{mysql_root_password}' "
       end
       if ENV['DATABASE']
-        mysql_query "DROP DATABASE IF EXISTS #{ENV['DATABASE']}", "", :u => 'root', :p => mysql_root_password
-        mysql_query "CREATE DATABASE IF NOT EXISTS #{ENV['DATABASE']}", "", :u => 'root', :p => mysql_root_password
+        mysql_query :sql => "DROP DATABASE IF EXISTS #{ENV['DATABASE']}", 
+					:u => 'root', 
+					:p => mysql_root_password
+        mysql_query :sql => "CREATE DATABASE IF NOT EXISTS #{ENV['DATABASE']}", 
+					:u => 'root', 
+					:p => mysql_root_password
       end
       run "cat #{dump} | gunzip - | #{mysql_path_bin}/mysql -uroot #{p} #{ENV['DATABASE']}"
     end
@@ -578,7 +650,7 @@ def mysql_replication_password
 end
 
 class Rake::RemoteTask
-  def mysql_query( sql, database="", options = {})
+  def mysql_query( options = {} )
     if options[:force]
       force_enabled = true
       options[:force] = nil
@@ -586,19 +658,35 @@ class Rake::RemoteTask
     if options[:p] == ""
       options[:p] = nil
     end
+	if options[:sql]
+	  f=Tempfile.new("sql")
+	  File.open(f.path, "w"){ |file| file.write(options[:sql])}
+	  scp f.path, f.path + ".sql"
+	  options[:source] = f.path + ".sql"
+	  if Rake.application.options.trace
+	  	puts "#{options[:source]}: #{options[:sql]}"
+	  end 
+	end
+	database = options[:db]
     args = options.keys.collect do |key|
       case key
       when :p :
-          if options[key] && options[key] != ""
-            "-#{key}'#{options[key]}'"
-          end
+        if options[key] && options[key] != ""
+          "-#{key}'#{options[key]}'"
+        end
       when :force :
-          ""
+        ""
+      when :db :
+      	""
+      when :sql :
+		""
+	  when :source :
+	  	"-e 'source #{options[:source]};'"
       else
         "-#{key}'#{options[key]}'"
       end
     end.join " "
-    command = "echo \"#{sql}\" | #{mysql} #{args} #{database}"
+    command = "#{mysql} #{args} #{database}"
     command << "; exit 0" if force_enabled
     run command
   end

data/lib/vlad/enterprising.rb

@@ -4,7 +4,7 @@ require 'vlad/environmentalist'
 require 'vlad/xen_master'
 require 'vlad/dba'
 require 'vlad/webmaster/apache'
-VLAD_ENTERPRISING_VERSION = '0.1.8' unless defined? VLAD_ENTERPRISING_VERSION
+VLAD_ENTERPRISING_VERSION = '0.2' unless defined? VLAD_ENTERPRISING_VERSION
 
 
 # rsync the given files to <tt>target_host</tt>.

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: VladTheEnterprising
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
-date: 2007-11-02 00:00:00 -04:00
+  version: "0.2"
+date: 2008-01-02 00:00:00 -05:00
 summary: Adds 'enterprisey' features to Vlad The Deployer
 require_paths: 
 - lib