railsmachine 1.0.5 → 1.0.6

data/README.textile

@@ -0,0 +1,133 @@
+h1. Five Minute Rails Application Deployment
+
+Ready to deploy your Rails application to "Rails Machine":http://railsmachine.com/? Follow these steps and you'll have it running in no time! Feel free to utilize Rails Machine's Ask Us Anything Support and "contact us with any questions you have along the way":https://support.railsmachine.com/index.php?pg=request.
+
+h2. Update Gems
+
+Install the latest version of the "railsmachine gem":http://github.com/railsmachine/railsmachine:
+
+<pre>
+  <code>
+    $ sudo gem install railsmachine
+  </code>
+</pre>
+
+h2. Install Phusion Passenger and Ruby Enterprise Edition
+
+If you do not have Phusion Passenger and Ruby Enterprise Edition installed on your Rails Machine yet you can run this installer on your server. 
+
+<pre>
+  <code>
+    $ wget http://assets.railsmachine.com/wiki/centos_passenger_install.sh
+    $ sh centos_passenger_install.sh
+  </code>
+</pre>
+
+
+h2. Setup Capistrano
+
+Capify your application:
+
+<pre>
+  <code>
+    $ capify .
+  </code>
+</pre>
+
+h2. Configure Capistrano for Rails Machine
+
+The following step customizes your @config/deploy.rb@ with two bits of information you provide:
+
+* *@--name@*: a simple name for your application. no spaces, please.
+** example: my-cool-app
+* *@--domain@*: the primary domain name for your application. please omit the 'www' - we automaticaly alias www.whateveryouprovide.com as needed.
+** example: my-cool-app.com
+
+<pre>
+  <code>
+    $ railsmachine --apply-to . --name my-cool-app --domain my-cool-app.com 
+  </code>
+</pre>
+
+Please note that the domain name provided will need to be correctly pointed at your Rails Machine account. If you don't have a DNS provider, we've been more than happy with "DNS Made Easy":http://dnsmadeeasy.com.
+
+h2. Update Database Config
+
+Update your applications @config/database.yml@'s section with your desired MySQL datbase name, username, and password. The database and user will be created for you in a forthcoming step.
+
+h2. Application Setup
+
+Rails Machine defaults to using mongrel + mod_proxy_balancer to run your Rails Application. If you'd like to switch to "Phusion Passenger":http://www.modrails.com/, edit the line in your application's @config/deploy.rb@ that begins @set :app_server@  to reflect your choice. For example:
+
+<pre>
+  <code>
+    set :app_server, :passenger
+  </code>
+</pre>
+
+Run the following Capistrano task to setup your MySQL databases and configure your application servers (mongrel/passenger):
+
+<pre>
+  <code>
+    $ cap servers:setup
+  </code>
+</pre>
+
+h2. Source Control
+
+h3. If you're already using Source Control...
+
+...edit the lines in your application's @config/deploy.rb@ that begin @set :scm@ and @set :repository@. For example:
+
+<pre>
+  <code>
+    set :scm, :git
+    set :repository, "git@github.com:yourname/my-cool-app.git"
+  </code>
+</pre>
+
+h3. If you're not yet using Source Control...
+
+...you can easily setup a Git/Subversion repository on your Rails Machine.  Subversion is the default, edit the line in your application's @config/deploy.rb@ that begins @set :scm@ if you'd like to change it to git. For example:
+
+<pre>
+  <code>
+    set :scm, :git
+  </code>
+</pre>
+
+Next, run the following task to import your application into a Git/SVN repository on your Rails Machine:
+
+<pre>
+  <code>
+    $ cap repos:setup
+  </code>
+</pre>
+
+h2. Initial Deploy
+
+That's it! You're ready to use Capistrano to deploy your app for the first time:
+
+<pre>
+  <code>
+    $ cap deploy:cold
+  </code>
+</pre>
+
+Once that's done, open your application in a web browser and test it out!
+
+To perform a subsequent deploy with Capistrano:
+
+<pre>
+  <code>
+    $ cap deploy
+  </code>
+</pre>
+
+or, if you need to run migrations as well:
+
+<pre>
+  <code>
+    $ cap deploy:migrations
+  </code>
+</pre>

data/lib/railsmachine/recipes.rb

@@ -42,6 +42,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   set :apache_ssl_ip, nil
   set :apache_ssl_forward_all, false
  
+  # mysql defaults
+  set :mysql_admin, nil
+ 
   set :repository do
     scm = fetch(:scm)
     repos_base = "#{user}@#{domain}#{deploy_to}"
@@ -79,7 +82,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     Used to configure your deployment environment in one command.
     DESC
     task :setup  do
-      sudo  "chown -R #{user}:#{user} #{deploy_to.gsub(application,'')}"
+      sudo  "chown -R #{user}:#{user} #{File.dirname(deploy_to)}"
       deploy.setup
     begin
       db.setup
@@ -217,7 +220,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     DESC
     task :setup, :roles => :scm  do
     begin
-      sudo  "chown -R #{user}:#{user} #{deploy_to.gsub(application,'')}"
+      sudo  "chown #{user}:#{user} #{deploy_to.gsub(application,'')}"
       localrepo.setup
     rescue
       puts "repos:setup failed!"

data/lib/railsmachine/recipes/db/mysql.rb

@@ -24,8 +24,6 @@ Capistrano.plugin :mysql_helper, MySQLMethods
 
 Capistrano::Configuration.instance(:must_exist).load do
   
-  set :mysql_admin, nil
-  
   namespace :db do
   
     desc "Execute MySQL statements using --execute option. Set the 'sql' variable."

data/lib/railsmachine/recipes/web/apache.rb

@@ -8,6 +8,16 @@ Capistrano::Configuration.instance(:must_exist).load do
     set to true."
     task :configure, :roles => :web do      
       set_apache_conf
+      conf_dir = File.dirname(apache_conf)
+
+      # Try to make the conf directory, in case user has configured something
+      # different, or conf/apps isn't present in the system image
+      run("[ -d #{conf_dir} ] && echo \"yes\" || echo \"no\"") do |c, s, o|
+        if o =~ /no?/
+          puts "Directory #{conf_dir} not found, creating it..."
+          send(run_method, "mkdir -p #{conf_dir}")
+        end
+      end
       
       run("[ -f #{ apache_conf} ] && echo \"yes\" || echo \"no\"") do |c, s, o|
         if o =~ /yes?/
@@ -63,7 +73,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   def set_apache_conf
     if  apache_default_vhost
       set :apache_conf, "/etc/httpd/conf/default.conf" unless  apache_default_vhost_conf
-    else 
+    else
       set :apache_conf, "/etc/httpd/conf/apps/#{application}.conf" unless  apache_conf
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: railsmachine
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Rails Machine
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 -05:00
+date: 2009-10-29 00:00:00 -04:00
 default_executable: railsmachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,49 +28,37 @@ executables:
 - railsmachine
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
-- COPYING
-- LICENSE
-- README
-- Rakefile
 - bin/railsmachine
-- test/cli
-- lib/railsmachine
-- lib/railsmachine/generators
 - lib/railsmachine/generators/loader.rb
-- lib/railsmachine/generators/railsmachine
 - lib/railsmachine/generators/railsmachine/railsmachine_generator.rb
-- lib/railsmachine/generators/railsmachine/templates
 - lib/railsmachine/generators/railsmachine/templates/deploy.rb
 - lib/railsmachine/generators/railsmachine/USAGE
-- lib/railsmachine/recipes
-- lib/railsmachine/recipes/app
 - lib/railsmachine/recipes/app/deploy.rb
 - lib/railsmachine/recipes/app/mongrel.rb
 - lib/railsmachine/recipes/app/passenger.rb
-- lib/railsmachine/recipes/db
 - lib/railsmachine/recipes/db/mysql.rb
 - lib/railsmachine/recipes/db/postgresql.rb
 - lib/railsmachine/recipes/db/sqlite3.rb
-- lib/railsmachine/recipes/scm
 - lib/railsmachine/recipes/scm/git.rb
 - lib/railsmachine/recipes/scm/subversion.rb
-- lib/railsmachine/recipes/web
 - lib/railsmachine/recipes/web/apache.rb
-- lib/railsmachine/recipes/web/templates
-- lib/railsmachine/recipes/web/templates/mongrel
 - lib/railsmachine/recipes/web/templates/mongrel/httpd-ssl.conf
 - lib/railsmachine/recipes/web/templates/mongrel/httpd.conf
-- lib/railsmachine/recipes/web/templates/passenger
 - lib/railsmachine/recipes/web/templates/passenger/httpd-ssl.conf
 - lib/railsmachine/recipes/web/templates/passenger/httpd.conf
 - lib/railsmachine/recipes.rb
-- tools/rakehelp.rb
 - resources/defaults.yaml
-has_rdoc: false
+- tools/rakehelp.rb
+- README.textile
+- LICENSE
+- COPYING
+has_rdoc: true
 homepage: http://railsmachine.com/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -91,9 +79,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: railsmachine
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: The Rails Machine task library
 test_files: []
 

data/README

@@ -1,83 +0,0 @@
-Five Minute Rails Application Deployment
-
-Ready to deploy your Rails application to Rails Machine? Follow these steps and you’ll have it running in no time! Free to utilize Rails Machine’s Ask Us Anything Support and contact us with any questions you have along the way.
-
-Update Gems
-
-Install the latest version of the railsmachine gem:
-
-    $ sudo gem install railsmachine
-  
-Install Phusion Passenger and Ruby Enterprise Edition
-
-If you do not have Phusion Passenger and Ruby Enterprise Edition installed on your Rails Machine yet you can run this installer on your server.
-
-    $ wget http://assets.railsmachine.com/wiki/centos_passenger_install.sh
-    $ sh centos_passenger_install.sh
-  
-Setup Capistrano
-
-Capify your application:
-
-     $ capify .
-  
-Configure Capistrano for Rails Machine
-
-The following step customizes your config/deploy.rb with two bits of information you provide:
-
---name: a simple name for your application. no spaces, please.
-example: my-cool-app
---domain: the primary domain name for your application. please omit the ‘www’ – we automaticaly alias www.whateveryouprovide.com as needed.
-example: my-cool-app.com
-     $ railsmachine --apply-to . --name my-cool-app --domain my-cool-app.com 
-  
-Please note that the domain name provided will need to be correctly pointed at your Rails Machine account. If you don’t have a DNS provider, we’ve been more than happy with DNS Made Easy.
-
-Update Database Config
-
-Update your applications config/database.yml’s section with your desired MySQL datbase name, username, and password. The database and user will be created for you in a forthcoming step.
-
-Application Setup
-
-Rails Machine defaults to using mongrel + mod_proxy_balancer to run your Rails Application. If you’d like to switch to Phusion Passenger, edit the line in your application’s config/deploy.rb that begins set :app_server to reflect your choice. For example:
-
-     set :app_server, :passenger
-  
-Run the following Capistrano task to setup your MySQL databases and configure your application servers (mongrel/passenger):
-
-     $ cap servers:setup
-  
-Source Control
-
-If you’re already using Source Control…
-
-...edit the lines in your application’s config/deploy.rb that begin set :repository and set :repository. For example:
-
-    set :scm, :git
-    set :repository, "git@github.com:yourname/my-cool-app.git" 
-  
-If you’re not yet using Source Control…
-
-...you can easily setup a Git/Subversion repository on your Rails Machine. Subversion is the default, edit the line in your application’s config/deploy.rb that begins set :scm if you’d like to change it to git. For example:
-
-     set :scm, :git
-  
-Next, run the following task to import your application into a Git/SVN repository on your Rails Machine:
-
-     $ cap repos:setup
-  
-Initial Deploy
-
-That’s it! You’re ready to use Capistrano to deploy your app for the first time:
-
-     $ cap deploy:cold
-  
-Once that’s done, open your application in a web browser and test it out!
-
-To perform a subsequent deploy with Capistrano:
-
-     $ cap deploy
-  
-or, if you need to run migrations as well:
-
-     $ cap deploy:migrations

data/Rakefile

@@ -1,53 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'tools/rakehelp'
-require 'fileutils'
-include FileUtils
-
-setup_tests
-setup_clean ["pkg", "lib/*.bundle", "*.gem", ".config"]
-
-setup_rdoc ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
-
-desc "Does a full compile, test run"
-task :default => [:test, :package]
-
-version="1.0.5"
-name="railsmachine"
-
-setup_gem(name, version) do |spec|
-  spec.summary = "The Rails Machine task library"
-  spec.description = spec.summary
-  spec.author="Rails Machine"
-  spec.add_dependency('capistrano', '>= 2.1.0')
-  spec.has_rdoc = false
-  spec.files += Dir.glob("bin/*")
-  spec.files += Dir.glob("resources/**/*")
-  spec.default_executable = "railsmachine"
-  spec.executables = ["railsmachine"]
-  spec.email = "support@railsmachine.com"
-  spec.homepage = "http://railsmachine.com/"
-  spec.rubyforge_project = "railsmachine"
-end
-
-task :install => [:test, :package] do
-  sh %{sudo gem install pkg/#{name}-#{version}.gem}
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{name}}
-end
-
-task :gem_source do
-  mkdir_p "pkg/gems"
-
-  FileList["**/*.gem"].each { |gem| mv gem, "pkg/gems" }
-  FileList["pkg/*.tgz"].each {|tgz| rm tgz }
-  rm_rf "pkg/#{name}-#{version}"
-
-  sh %{ generate_yaml_index.rb -d pkg }
-  sh %{ scp -r pkg/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/railsmachine/releases/ }
-end