meskyanichi-generators 0.3.1 → 0.3.3

data/CHANGELOG

@@ -1,4 +1,29 @@
 
+	Meskyanichi - Generators |0.3.3| 
+-----------------------------------------------------------
+
+	- Extracted 3 symlink tasks and merged them into a single task.
+
+
+
+	Meskyanichi - Generators |0.3.2| 
+-----------------------------------------------------------
+
+	- Automatically sets up the db and assets folder when the
+	"cap deploy:setup" is run. Also generates three other folders
+	within the assets folder "images, videos, files".
+	- Renamed the task "cap deploy:syn_database" to
+	"cap deploy:sync_database_config_file"
+	- Added the task "cap deploy:sync_sqlite3"
+	- Added the task "cap deploy:symlink_sqlite3"
+	- Added the task "cap deploy:reset_capistrano_environment"
+	- "cap deploy:setup" no longer automatically updates repository
+	- "cap deploy:repository" will now be called manually, it will update
+	the local repository and push it to the remote repository, and afterwards
+	deploy it to the server.
+	- The symlink_database task has been renamed to symlink_database_config_file
+	- After deployment, the assets folder will be symlinked from shared/assets to public/assets
+
 	Meskyanichi - Generators |0.3.1| 
 -----------------------------------------------------------
 

data/README.rdoc

@@ -13,17 +13,17 @@ a few simple generators that might help you get your application up and running
 
 Essentially what this does, is generate a basic Capistrano deployment recipe. The recipe does a couple of things initially when you set it up.
 
-  Create the necessary folders and files, namely the releases, current(symlink) and the shared folder
-  Creates a log folder and generates a new production.log
-  Creates a config folder and then syncs the database.yml from your Rails application to the remote server
+  *Create the necessary folders and files, namely the releases, current(symlink) and the shared folder
+  *Creates a log folder and generates a new production.log
+  *Creates a assets folder in the shared folder on the remote server, linking to the public/assets in the rails app
+  *Creates a config folder and then syncs the database.yml from your Rails application to the remote server
 
 During every deployment, the recipe will:
 
-  Update your remote repository before deployment to ensure all files are up to date
-  After deployment, will restart the application for Passenger
-  After deployment, will place the symlinks for the database and production.log files correctly
-  Make the javascripts and stylesheets directory, located in the RAILS_ROOT/public directory,
-  writable to avoid script caching errors
+  *After deployment, will restart the application for Passenger
+  *After deployment, will place the symlinks for the database, production.log, assets and production.sqlite3 files correctly
+  *Make the javascripts and stylesheets directory, located in the RAILS_ROOT/public directory,
+   writable to avoid script caching errors
 
 If you wish to generate the simple Capistrano Template, open the terminal, go to the root of your rails application and type the following:
 	
@@ -55,8 +55,8 @@ Now the whole process in steps:
   2: sudo gem install meskyanichi-generators
   3: go to root of rails app and type "capify ."
   4: then type "script/generate capistrano_template [arg1..arg6]"
-  5: when it prompts if you wish to overwrite, type "y" and hit return
-  6: now type "cap deploy:setup" to set up the whole directory structure and files
+  5: type "capify ."
+  6: now type "cap deploy:setup" to set up the whole directory structure and files on the remote server
   7: after the setup is finished, and assuming you have your local git repository set up correctly,
   type "cap deploy" and your application will go live in a matter of seconds!
 	
@@ -69,7 +69,11 @@ deploy.rb file located in the config directory and have a look. You can easily m
 The recipe provides a few commands which are pretty useful. Including syncing your local database.yml file
 with the one on the server so that you are not forced to go SSH or FTP to the server to manually change it.
 
-  cap deploy:sync_database
+  cap deploy:sync_database_config_file
+
+The command below will sync your local production.sqlite3 file to the remote server, in the right location so the symlink will effectively work.
+
+  cap deploy:sync_sqlite3
 	
 If you wish to restart your application for Passenger without re-deploying your application, for example, after syncing the new database.yml,
 and you once again don't want to SHH manually, then you can do a:
@@ -85,7 +89,15 @@ but also executes the tasks I mentioned at the top of this README.
 
   cap deploy
 	
-After you've setup Capistrano correctly using the cap deploy:setup, you may now use the above command to deploy your rails application!
+After you've setup Capistrano correctly using the cap deploy:setup, you can use the above command to deploy your rails application!
+
+  cap deploy:update_repository
+
+This command will first update your local repository, and then deploy to the remote server.
+
+  cap deploy:reset_capistrano_environment
+
+The command above will first remove all releases and shared files/folders, then reinitialize the setup process.
 
 
 
@@ -128,6 +140,7 @@ The default ignoration rules that are added to the main .gitignore file located
   tmp/**/*
   config/database.yml
   db/*.sqlite3
+  public/assets
 
 
 == Rake Tasks
@@ -178,6 +191,4 @@ If all was set up correctly, you should now be able to push your local repositor
 
 == Copyright
 
-Copyright (c) 2009 Michael. See LICENSE for details.
-
-
+Copyright (c) 2009 Michael. See LICENSE for details.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 1
+:patch: 3

data/generators/capistrano_template/capistrano_template_generator.rb

@@ -5,7 +5,7 @@ class CapistranoTemplateGenerator < Rails::Generator::Base
     
     @domain_name  = @args[0] || "MyDomain.com"
     @scm          = @args[1] || "git"
-    @repository   = @args[2] || "ssh://MyDomain.com/MyRepository.git"
+    @repository   = @args[2] || "ssh://user@MyDomain.com/MyRepository.git"
     @branch       = @args[3] || "master"
     @user         = @args[4] || "root"
     @deploy_to    = @args[5] || "/var/www/vhosts/#{domain_name}/httpdocs"

data/generators/capistrano_template/templates/deploy.rb

@@ -31,15 +31,27 @@ default_run_options[:pty] = true
 # You can add additional deployment tasks, or alter the ones below.
 namespace :deploy do
   
-  desc "Sets up the shared folder on the remote server"
-  task :setup_shared_folder do
-    run "touch #{shared_path}/log/production.log"
-    run "chmod 0666 #{shared_path}/log/production.log"
+  # Tasks performed before deployment
+  desc "Updates repository before deployment."
+  task :update_repository do
+    system "git add ."
+    system "git commit -a -m 'Comitted for deployment.'"
+    system "git push origin master"
+    system "cap deploy"
   end
   
-  desc "Syncs the database.yml to the server"
-  task :sync_database do
-    system "rsync -vr --exclude='.DS_Store' config/database.yml #{user}@#{application}:#{shared_path}/config/"
+  # Tasks performed during/after deployment
+  desc "Sets up all symlinks."
+  task :setup_symlinks do
+    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
+    run "ln -nfs #{shared_path}/db/production.sqlite3 #{release_path}/db/production.sqlite3"
+    run "ln -nfs #{shared_path}/assets #{release_path}/public/assets"
+  end
+  
+  desc "Make javascripts and stylesheets directories writable."
+  task :make_js_and_css_writable do
+    run "chmod 777 #{release_path}/public/javascripts" 
+    run "chmod 777 #{release_path}/public/stylesheets"
   end
   
   desc "Restart Application with Passenger."
@@ -47,33 +59,43 @@ namespace :deploy do
     run "touch #{current_path}/tmp/restart.txt"
   end
   
-  desc "Symlink database."
-  task :symlink_database do
-    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
+  # Tasks performed during capistrano setup
+  desc "Sets up the shared folder on the remote server"
+  task :setup_shared_folder do
+    run "touch #{shared_path}/log/production.log"
+    run "chmod 0666 #{shared_path}/log/production.log"
+    run "mkdir #{shared_path}/db"
+    run "mkdir -p #{shared_path}/assets/images"
+    run "chmod 777 #{shared_path}/assets/images"
+    run "mkdir -p #{shared_path}/assets/videos"
+    run "chmod 777 #{shared_path}/assets/videos"
+    run "mkdir -p #{shared_path}/assets/files"
+    run "chmod 777 #{shared_path}/assets/files"
   end
   
-  desc "Make javascripts and stylesheets directories writable."
-  task :make_js_and_css_writable do
-    run "chmod 777 #{release_path}/public/javascripts" 
-    run "chmod 777 #{release_path}/public/stylesheets"
+  desc "Syncs the database.yml to the server"
+  task :sync_database_config_file do
+    system "rsync -vr --exclude='.DS_Store' config/database.yml #{user}@#{application}:#{shared_path}/config/"
   end
   
-  desc "Updates repository before deployment."
-  task :update_repository do
-      system "git add ."
-      system "git commit -a -m 'Comitted for repository.'"
-      system "git push origin master"
+  # Tasks that are performed only manually
+  desc "Syncs the production sqlite3 file to the server."
+  task :sync_sqlite3 do
+    system "rsync -vr --exclude='.DS_Store' db/production.sqlite3 #{user}@#{application}:#{shared_path}/db/production.sqlite3"
+  end
+  
+  desc "Reset Capistrano Environment."
+  task :reset_capistrano_environment do
+    run "rm -rf #{shared_path}/"
+    run "rm -rf #{release_path}/"
+    system "cap deploy:setup"
   end
   
 end
 
-# Tasks that run before the deployment process
-before 'deploy', 'deploy:update_repository'
-
 # Tasks that run directly after the initial setup
 after 'deploy:setup', 'deploy:setup_shared_folder'
-after 'deploy:setup', 'deploy:sync_database'
+after 'deploy:setup', 'deploy:sync_database_config_file'
 
 # Tasks that run directly after deployment
-after 'deploy:update_code', 'deploy:symlink_database'
-after 'deploy:update_code', 'deploy:make_js_and_css_writable'
+after 'deploy:update_code', 'deploy:setup_symlinks'

data/generators/git_template/git_template_generator.rb

@@ -10,7 +10,9 @@ class GitTemplateGenerator < Rails::Generator::Base
      'log/*.log',
      'tmp/**/*',
      'config/database.yml',
-     'db/*.sqlite3']
+     'db/*.sqlite3',
+     'public/assets'
+     ]
     
      @all_ignorations += @args unless @args.empty?
   end

data/generators.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{generators}
-  s.version = "0.3.1"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael"]
-  s.date = %q{2009-06-04}
+  s.date = %q{2009-06-05}
   s.email = %q{meskyan@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: meskyanichi-generators
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors: 
 - Michael
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -07:00
+date: 2009-06-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency