sumodev_deploy 0.2.1 → 0.2.2

data/lib/sumodev_deploy.rb

@@ -1,29 +1,35 @@
 configuration = Capistrano::Configuration.respond_to?(:instance) ? Capistrano::Configuration.instance(:must_exist) : Capistrano.configuration(:must_exist)
 
 configuration.load do
-  def stop(msg)
-    puts "\nStopped! \n\treason: #{msg}"
-    exit 1
+  def _cset(name, *args, &block)
+    unless exists?(name)
+      set(name, *args, &block)
+    end
   end
 
-  def client
-    self[:client] || stop("sumodev_deploy requires that you set client and project names in your capfile")
-  end
+  _cset(:client)  { abort "sumodev_deploy requires that you set client and project names in your capfile" }
+  _cset(:project) { abort "sumodev_deploy requires that you set client and project names in your capfile"}
 
-  def project
-    self[:project] || stop("sumodev_deploy requires that you set client and project names in your capfile")
-  end
+  _cset(:db_name) { "#{client[0,8]}_#{project[0,7]}"}
 
-  def db_name
-    fetch(:db_name) { "#{client[0,8]}_#{project[0,7]}"}
-  end
+  _cset(:staging_server, 'dev.sumocoders.be')
+  _cset(:production_server, nil)
+  _cset(:app_servers) { production_server || staging_server }
+  _cset(:web_servers) { production_server || staging_server }
+  _cset(:db_server)   { production_server || staging_server }
+
+  _cset(:user, 'sites')
+  _cset(:homedir) { "/home/#{user}/" }
+  _cset(:app_path) { "apps/#{client}/#{project}" }
+  _cset(:shared_files_path) { "#{shared_path}/files/"}
+  _cset(:document_root) { "#{homedir}#{client}/#{project}" }
 
-  set :user, 'sites'
-  set :application, project
-  set :deploy_to,"/home/sites/apps/#{client}/#{application}"
-  set :document_root, "/home/sites/#{client}/#{application}"
+  set(:application) { project }
+  set(:deploy_to) { "#{homedir}#{app_path}"}
 
-  server 'dev.sumocoders.eu', :app, :web, :db, :primary => true
+  role(:app) { app_servers }
+  role(:web) { web_servers }
+  role(:db, :primary => true) { db_server }
 
   namespace :sumodev do
     namespace :db do
@@ -31,12 +37,16 @@ configuration.load do
       task :create, :roles => :db do
         run "create_db #{db_name}"
       end
+      
+      desc "Dump the remote database, and outputs the content so you can pipe it"
+      task :dump, :roles => :db do
+        system %{ssh sites@#{db_server} mysqldump --set-charset #{db_name}}
+      end
 
       desc "Imports the database from the server into your local database"
       task :get, :roles => :db do
-        # @todo Defv would be nice if this also worked on production server. I think we need some extra vars in the capfile for username, password and host. by default these can be the values used on the dev-server.
-        system %{mysqladmin create #{db_name}}
-        system %{ssh sites@dev.sumocoders.eu mysqldump --set-charset #{db_name} | mysql #{db_name}}
+        system %{mysqladmin create #{db_name}}	# @todo Defv ignore errors
+        system %{ssh sites@#{db_server} mysqldump --set-charset #{db_name} | mysql #{db_name}}
       end
 
       desc "Get database info"
@@ -46,9 +56,8 @@ configuration.load do
 
       desc "Imports the database from your local server to the remote one"
       task :put, :roles => :db do
-        # @todo Defv would be nice if this also worked on production server. I think we need some extra vars in the capfile for username, password and host. by default these can be the values used on the dev-server.
-        system %{ssh sites@dev.sumocoders.eu "mysqldump --set-charset #{$db_name} > #{current_path}/#{release_name}.sql" }
-      	system %{mysqldump --set-charset #{db_name} | ssh sites@dev.sumocoders.eu mysql #{db_name}}
+        system %{ssh sites@#{db_server} "mysqldump --set-charset #{$db_name} > #{current_path}/#{release_name}.sql" }
+        system %{mysqldump --set-charset #{db_name} | ssh sites@#{db_server} #{db_name}}
       end
     end
     
@@ -65,13 +74,30 @@ configuration.load do
         end until path.root?
       end
 
+      def rsync(direction, from, to, options = {})
+        servers = find_servers_for_task(current_task)
+        servers = [servers.first] if options[:once]
+
+        servers.each do |server|
+          host_definition = "#{server.user || user}@#{server.host}"
+          host_definition << ":#{server.port}" if server.port && server.port != 22
+
+          case direction
+          when :down
+            run_locally "rsync -rtlpv #{host_definition}:#{from} #{to}"
+          when :up
+            run_locally "rsync -rtlp #{from} #{host_definition}:#{to}"
+          end
+        end
+      end
+
       desc "Sync all remote files to your local install"
       task :get, :roles => :app do
         path = find_folder_in_parents('frontend/files')
         if !path
-            raise "No frontend/files folder found in this or upper folders. Are you sure you're in a Fork project?"
+          abort "No frontend/files folder found in this or upper folders. Are you sure you're in a Fork project?"
         else
-            system %{rsync -rltp #{user}@dev.sumocoders.eu:#{shared_path}/files/ #{path}}
+          rsync :down, shared_files_path, path, :once => true
         end
       end
 
@@ -83,9 +109,9 @@ configuration.load do
         # check if folder exists
         path = find_folder_in_parents('frontend/files')
         if !path
-            raise "No frontend/files folder found in this or upper folders. Are you sure you're in a Fork project?"
+          abort "No frontend/files folder found in this or upper folders. Are you sure you're in a Fork project?"
         else
-          system %{rsync -rltp #{path} #{user}@dev.sumocoders.eu:#{shared_path}/files}
+          rsync :up, "#{path}/", shared_files_path
         end
       end
     end

data/sumodev_deploy.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sumodev_deploy"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.authors = ["Jan De Poorter"]
   s.date = "2012-04-18"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sumodev_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: