kompanee-recipes 0.0.4 → 0.0.5

data/lib/kompanee-recipes/app_setup.rb

@@ -4,26 +4,26 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Create MySQL Database"
       task :create, :roles => [:db, :mysql] do
         create_script = <<-CREATESCRIPT
-          create database #{application} character set utf8;
-          create user '#{application}'@'localhost' identified by '#{db_app_password}';
-          grant all on #{application}.* to #{application}@localhost;
+          create database #{application_safe} character set utf8;
+          create user '#{application_safe}'@'localhost' identified by '#{db_app_password}';
+          grant all on #{application_safe}.* to #{application_safe}@localhost;
         CREATESCRIPT
 
-        put create_script, "#{user_home}/create_#{application}_db_script"
-        sudo %Q{bash -c "mysql --user=root --password=#{db_root_password} < #{user_home}/create_#{application}_db_script"}
-        run "rm #{user_home}/create_#{application}_db_script"
+        put create_script, "#{user_home}/create_#{application_safe}_db_script"
+        sudo %Q{bash -c "mysql --user=root --password=#{db_root_password} < #{user_home}/create_#{application_safe}_db_script"}
+        run "rm #{user_home}/create_#{application_safe}_db_script"
       end
 
       desc "Drop MySQL Database"
       task :drop, :roles => [:db, :mysql] do
         drop_script = <<-DROPSCRIPT
-          drop user #{application}@localhost;
-          drop database #{application};
+          drop user #{application_safe}@localhost;
+          drop database #{application_safe};
         DROPSCRIPT
 
-        put drop_script, "#{user_home}/drop_#{application}_db_script"
-        sudo %Q{bash -c "mysql --user=root --password=#{db_root_password} < #{user_home}/drop_#{application}_db_script"}
-        run "rm #{user_home}/drop_#{application}_db_script"
+        put drop_script, "#{user_home}/drop_#{application_safe}_db_script"
+        sudo %Q{bash -c "mysql --user=root --password=#{db_root_password} < #{user_home}/drop_#{application_safe}_db_script"}
+        run "rm #{user_home}/drop_#{application_safe}_db_script"
       end
     end
 
@@ -37,9 +37,9 @@ Capistrano::Configuration.instance(:must_exist).load do
             ServerName #{deploy_name}
             DocumentRoot #{deploy_to}/current/public
 
-            SetEnv GEM_HOME #{rvm_gemdir}@#{application}
-            SetEnv GEM_PATH #{rvm_gemdir}@#{application}:#{rvm_gemdir}@global:#{rvm_gemdir}
-            SetEnv BUNDLE_PATH #{rvm_gemdir}@#{application}
+            SetEnv GEM_HOME #{rvm_gemdir}@#{application_safe}
+            SetEnv GEM_PATH #{rvm_gemdir}@#{application_safe}:#{rvm_gemdir}@global:#{rvm_gemdir}
+            SetEnv BUNDLE_PATH #{rvm_gemdir}@#{application_safe}
 
             <Directory "#{deploy_to}/current/public">
               Options FollowSymLinks -MultiViews

data/lib/kompanee-recipes/deploy.rb

@@ -6,6 +6,8 @@ Capistrano::Configuration.instance(:must_exist).load do
   set :use_sudo, false
   set :default_shell, false
   set :rake, "bundle install; bundle exec rake"
+
+  set(:application_safe)      {application.gsub(/-/, "_")}
   
   ######################################################################
   #                         SERVER SPECIFIC                            #

data/lib/kompanee-recipes.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module KompaneeRecipes
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kompanee-recipes
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - The Kompanee