ms_deploy 0.0.1 → 0.0.2

data/.gitignore

@@ -15,4 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-idea/
+.idea/

data/lib/ms_deploy/recipes/deploy/assets.rb

@@ -1,12 +1,18 @@
 Capistrano::Configuration.instance.load do
 
   namespace :deploy do
-    desc "Compile assets"
-    task :assets do
-      run "cd #{release_path}; RAILS_ENV=#{rails_env} #{rake} assets:precompile"
-    end
-  end
+    namespace :assets, :roles => :web do
+      desc "Compile assets"
+      task :compile do
+        run "cd #{release_path}; RAILS_ENV=#{rails_env} #{rake} assets:precompile"
+      end
+
+      task :symlink, :roles => :web, :except => {:no_release => true} do
+        # fixme do nothing, rails 3.1
+      end
 
-  after 'deploy:symlink_dependencies', 'deploy:assets'
+      after 'deploy:symlink_dependencies', 'deploy:assets:compile'
 
+    end
+  end
 end

data/lib/ms_deploy/recipes/deploy/setup.rb

@@ -1,23 +1,15 @@
 Capistrano::Configuration.instance.load do
 
-  rails_root = File.expand_path('../../../', __FILE__)
-
   namespace :deploy do
     namespace :prepare do
       task :create_config do
-        config_file = "#{rails_root}/#{fetch(:configuration_file_prefix, 'config')}.#{fetch(:stage, 'production')}.yml"
-        raise "No '#{rails_root}/#{fetch(:configuration_file_prefix, 'config')}.#{fetch(:stage, 'production')}.yml' config file for '#{fetch(:stage, 'production')}'" unless File.exists? config_file
-
         run "mkdir -p #{shared_path}/config/"
-        put(File.read(config_file), "#{shared_path}/config/#{fetch(:configuration_file_prefix, 'config')}.production.yml", :via => :scp)
+        put(File.read(database_config_file), "#{shared_path}/config/#{fetch(:configuration_file_prefix, 'config')}.production.yml", :via => :scp)
       end
 
       task :create_database_config do
-        config_file = "#{rails_root}/database.#{fetch(:stage, 'production')}.yml"
-        raise "No '#{rails_root}/database.#{fetch(:configuration_file_prefix, 'config')}.#{fetch(:stage, 'production')}.yml' config file for '#{fetch(:stage, 'production')}'" unless File.exists? config_file
-
         run "mkdir -p #{shared_path}/config/"
-        put(File.read(config_file), "#{shared_path}/config/database.yml", :via => :scp)
+        put(File.read(database_config_file), "#{shared_path}/config/database.yml", :via => :scp)
       end
 
       desc "Set up shared directory structure"
@@ -27,7 +19,7 @@ Capistrano::Configuration.instance.load do
 
       #desc "Rebuilds css and js asset packages"
       #task :rebuild_asset_cache, :roles => :app do
-      #  run "cd #{current_path} && #{rake_path} RAILS_ENV=#{fetch(:rails_env, "production")} asset:packager:build_all" # If you’d like to prevent Capistrano from applying your Moonshine manifests for any reason:
+      #  run "cd #{current_path} && #{rake_path} RAILS_ENV=#{fetch(:rails_env, "production")} asset:packager:build_all"
       #end
     end
   end
@@ -37,3 +29,9 @@ Capistrano::Configuration.instance.load do
   before :"deploy:setup", :"deploy:prepare:create_shared_folders";
 
 end
+
+def database_config_file
+  config_file = "#{rails_root}/config/#{fetch(:configuration_file_prefix, 'config')}.#{fetch(:stage, 'production')}.yml"
+  raise "No config file '#{config_file}' for '#{fetch(:stage, 'production')}'" unless File.exists? config_file
+  config_file
+end

data/lib/ms_deploy/recipes/deploy/symlink.rb

@@ -4,7 +4,7 @@ Capistrano::Configuration.instance.load do
     desc <<-DESC
       Symlink shared directories and files.
     DESC
-    task :symlink_dependencies do
+    task :symlink_dependencies, :roles => :web, :except => {:no_release => true} do
       shared_directories_to_link   = fetch(:shared_directories_to_link, [])
       directories_to_create        = fetch(:directories_to_create, [])
       files_to_delete              = fetch(:files_to_delete, [])
@@ -19,6 +19,7 @@ Capistrano::Configuration.instance.load do
     end
   end
 
+  before 'deploy:finalize_update', 'deploy:symlink'
   after 'deploy:symlink', 'deploy:symlink_dependencies'
 
 end

data/lib/ms_deploy/recipes/mysql.rb

@@ -5,10 +5,11 @@ Capistrano::Configuration.instance.load do
   namespace :deploy do
     namespace :prepare do
       task :database do
-        set_unless :db_admin_user, 'root'
-        set_unless :db_admin_password, Capistrano::CLI.password_prompt("Type your mysql password for user #{db_admin_user}: ")
-        set_unless :db_name, application.to_s + '_' + rails_env.to_s
-        set_unless :db_password, database_config['password']
+        set :db_admin_user, 'root' unless fetch(:db_admin_user, nil)
+        set :db_admin_password, Capistrano::CLI.password_prompt("Type your mysql password for user '#{db_admin_user}': ") unless fetch(:db_admin_password, nil)
+        set :db_name, application.gsub(/\W+/, '')[0..5] + '_' + rails_env.to_s unless fetch(:db_name, nil)
+        set :db_user_name, 'root' unless fetch(:db_user_name, nil)
+        set :db_user_password, '' unless fetch(:db_user_password, nil)
 
         unless database_exits?
           create_database
@@ -38,7 +39,7 @@ Capistrano::Configuration.instance.load do
 
   def setup_database_permissions
     grant_sql = <<-SQL
-       GRANT ALL PRIVILEGES ON #{db_name}.* TO #{application}@localhost IDENTIFIED BY '#{db_password}';
+       GRANT ALL PRIVILEGES ON #{db_name}.* TO #{db_user_name}@localhost IDENTIFIED BY '#{db_user_password}';
     SQL
 
     run "mysql --user=#{db_admin_user} --password=#{db_admin_password} --execute=\"#{grant_sql}\""

data/lib/ms_deploy/version.rb

@@ -1,3 +1,3 @@
 module MsDeploy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/ms_deploy.gemspec

@@ -14,7 +14,11 @@ Gem::Specification.new do |gem|
   gem.name          = "ms_deploy"
   gem.require_paths = ["lib"]
 
+  gem.add_dependency('capistrano')
+  gem.add_dependency('capistrano-ext')
   gem.add_dependency('erubis')
 
+  #gem 'cap-recipes', '>= 0.3.36', :require => false         # http://github.com/nesquena/cap-recipes
+
   gem.version       = MsDeploy::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ms_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000 Z
+date: 2011-12-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &75236870 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *75236870
+- !ruby/object:Gem::Dependency
+  name: capistrano-ext
+  requirement: &75236330 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *75236330
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &76228310 !ruby/object:Gem::Requirement
+  requirement: &75333520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76228310
+  version_requirements: *75333520
 description: capistrano deployment task for my projects
 email:
 - michael.schiller@gmx.de