uberspacify 0.9.0 → 0.9.1

data/README.md

@@ -1,6 +1,6 @@
 # Uberspacify
 
-Uberspacify helps you deploy a Ruby on Rails app on Uberspace, a popular German shared hosting provider.
+Uberspacify helps you deploy a Ruby on Rails app on Uberspace, a popular shared hosting provider.
 
 All the magic is built into a couple nice Capistrano scripts. Uberspacify will create an environment for your app, install Passenger, run it in standalone mode, monitor it using Daemontools, and configure Apache to reverse-proxy to it. Uberspacify will also find out your Uberspace MySQL password and create databases as well as a `database.yml`
 
@@ -31,7 +31,11 @@ load 'deploy/assets'
 Now, you need to add a few lines regarding your Uberspace to your `config/deploy.rb`. It is safe to copy, paste & adapt the following:
 
 ```ruby
-require 'uberspacify/recipes'
+# include uberspacify base recipes
+require 'uberspacify/base'
+
+# uncomment this if you don't use MySQL
+require 'uberspacify/mysql' 
 
 # the Uberspace server you are on
 server 'phoenix.uberspace.de', :web, :app, :db, :primary => true
@@ -58,6 +62,11 @@ set :repository, 'https://github.com/yeah/dummyapp.git'
 # be available on port 80 and 443 from the outside. However, if you'd like to
 # set this yourself, go ahead.
 # set :passenger_port, 55555
+
+# By default, Ruby Enterprise Edition 1.8.7 is used for Uberspace. If you
+# prefer Ruby 1.9 or any other version, please refer to the RVM documentation
+# at https://rvm.io/integration/capistrano/ and set this variable.
+# set :rvm_ruby_string, '1.9.3@rails-dummyapp'
 ```
 
 Done. That was the hard part. It's easy from here on out. Next, add all new/modified files to version control. If you use Git, the following will do:

data/lib/uberspacify/base.rb

@@ -0,0 +1,107 @@
+require 'capistrano_colors'    
+require 'rvm/capistrano'
+require 'bundler/capistrano'
+
+def abort_red(msg)
+  abort "  * \e[#{1};31mERROR: #{msg}\e[0m" 
+end
+  
+Capistrano::Configuration.instance.load do
+
+  # required variables
+  _cset(:user)                  { abort_red "Please configure your Uberspace user in config/deploy.rb using 'set :user, <username>'" }
+  _cset(:repository)            { abort_red "Please configure your code repository config/deploy.rb using 'set :repository, <repo uri>'" }
+
+  # optional variables
+  _cset(:domain)                { nil }
+  _cset(:passenger_port)        { rand(61000-32768+1)+32768 } # random ephemeral port
+  
+  _cset(:deploy_via)            { :remote_cache }
+  _cset(:git_enable_submodules) { 1 }
+  _cset(:branch)                { 'master' }
+
+  _cset(:keep_releases)         { 3 }
+
+  # uberspace presets
+  set(:deploy_to)               { "/var/www/virtual/#{user}/rails/#{application}" }
+  set(:home)                    { "/home/#{user}" }
+  set(:use_sudo)                { false }
+  set(:rvm_type)                { :user }
+  set(:rvm_install_ruby)        { :install }
+  set(:rvm_ruby_string)         { "ree@rails-#{application}" } 
+
+  ssh_options[:forward_agent] = true
+  default_run_options[:pty]   = true
+
+  # callbacks
+  before  'deploy:setup',       'rvm:install_rvm'
+  before  'deploy:setup',       'rvm:install_ruby'
+  after   'deploy:setup',       'uberspace:setup_svscan'
+  after   'deploy:setup',       'daemontools:setup_daemon'
+  after   'deploy:setup',       'apache:setup_reverse_proxy'
+  after   'deploy:update_code', 'deploy:symlink_shared'
+  after   'deploy',             'deploy:cleanup'
+
+  # custom recipes
+  namespace :uberspace do
+    task :setup_svscan do
+      run 'uberspace-setup-svscan ; echo 0'
+    end
+  end
+  
+  namespace :daemontools do
+    task :setup_daemon do
+      daemon_script = <<-EOF
+#!/bin/bash
+export HOME=#{fetch :home}
+source $HOME/.bash_profile
+cd #{fetch :deploy_to}/current
+rvm use #{fetch :rvm_ruby_string}
+exec bundle exec passenger start -p #{fetch :passenger_port} -e production 2>&1
+      EOF
+
+      log_script = <<-EOF
+#!/bin/sh
+exec multilog t ./main
+      EOF
+
+      run                 "mkdir -p #{fetch :home}/etc/run-rails-#{fetch :application}"
+      run                 "mkdir -p #{fetch :home}/etc/run-rails-#{fetch :application}/log"
+      put daemon_script,  "#{fetch :home}/etc/run-rails-#{fetch :application}/run"
+      put log_script,     "#{fetch :home}/etc/run-rails-#{fetch :application}/log/run"
+      run                 "chmod +x #{fetch :home}/etc/run-rails-#{fetch :application}/run"
+      run                 "chmod +x #{fetch :home}/etc/run-rails-#{fetch :application}/log/run"
+      run                 "ln -nfs #{fetch :home}/etc/run-rails-#{fetch :application} #{fetch :home}/service/rails-#{fetch :application}"
+
+    end
+  end
+
+  namespace :apache do
+    task :setup_reverse_proxy do
+      htaccess = <<-EOF
+RewriteEngine On
+RewriteRule ^(.*)$ http://localhost:#{fetch :passenger_port}/$1 [P]
+      EOF
+      path = fetch(:domain) ? "/var/www/virtual/#{fetch :user}/#{fetch :domain}" : "#{fetch :home}/html"
+      run                 "mkdir -p #{path}"
+      put htaccess,       "#{path}/.htaccess"
+    end
+  end
+
+  namespace :deploy do
+    task :start do
+      run "svc -u #{fetch :home}/service/rails-#{fetch :application}"
+    end
+    task :stop do
+      run "svc -d #{fetch :home}/service/rails-#{fetch :application}"
+    end
+    task :restart do
+      run "svc -du #{fetch :home}/service/rails-#{fetch :application}"
+    end
+
+    task :symlink_shared do
+      run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
+    end
+  end
+
+end

data/lib/uberspacify/mysql.rb

@@ -0,0 +1,38 @@
+Capistrano::Configuration.instance.load do
+
+  # callbacks
+  after   'deploy:setup',       'mysql:setup_database_and_config'
+
+  # custom recipes
+  namespace :mysql do
+    task :setup_database_and_config do
+      my_cnf = capture('cat ~/.my.cnf')
+      config = {}
+      %w(development production test).each do |env|
+        
+        config[env] = {
+          'adapter' => 'mysql2',
+          'encoding' => 'utf8',
+          'database' => "#{fetch :user}_rails_#{fetch :application}_#{env}",
+          'host' => 'localhost'
+        }
+        
+        my_cnf.match(/^user=(\w+)/)
+        config[env]['username'] = $1
+
+        my_cnf.match(/^password=(\w+)/)
+        config[env]['password'] = $1
+
+        my_cnf.match(/^port=(\d+)/)
+        config[env]['port'] = $1.to_i
+        
+        run "mysql -e 'CREATE DATABASE IF NOT EXISTS #{config[env]['database']} CHARACTER SET utf8 COLLATE utf8_general_ci;'"
+      end
+      
+      run "mkdir -p #{fetch :shared_path}/config"
+      put config.to_yaml, "#{fetch :shared_path}/config/database.yml"
+      
+    end
+  end
+
+end

data/lib/uberspacify/recipes.rb

@@ -1,139 +1,2 @@
-require 'capistrano_colors'    
-require 'rvm/capistrano'
-require 'bundler/capistrano'
-
-def abort_red(msg)
-  abort "  * \e[#{1};31mERROR: #{msg}\e[0m" 
-end
-  
-Capistrano::Configuration.instance.load do
-
-  # required variables
-  _cset(:user)                  { abort_red "Please configure your Uberspace user in config/deploy.rb using 'set :user, <username>'" }
-  _cset(:repository)            { abort_red "Please configure your code repository config/deploy.rb using 'set :repository, <repo uri>'" }
-
-  # optional variables
-  _cset(:domain)                { nil }
-  _cset(:passenger_port)        { rand(61000-32768+1)+32768 } # random ephemeral port
-  
-  _cset(:deploy_via)            { :remote_cache }
-  _cset(:git_enable_submodules) { 1 }
-  _cset(:branch)                { 'master' }
-
-  _cset(:keep_releases)         { 3 }
-
-  # uberspace presets
-  set(:deploy_to)               { "/var/www/virtual/#{user}/rails/#{application}" }
-  set(:home)                    { "/home/#{user}" }
-  set(:use_sudo)                { false }
-  set(:rvm_type)                { :user }
-  set(:rvm_install_ruby)        { :install }
-  set(:rvm_ruby_string)         { "ree@rails-#{application}" } 
-
-  ssh_options[:forward_agent] = true
-  default_run_options[:pty]   = true
-
-  # callbacks
-  before  'deploy:setup',       'rvm:install_rvm'
-  before  'deploy:setup',       'rvm:install_ruby'
-  after   'deploy:setup',       'uberspace:setup_svscan'
-  after   'deploy:setup',       'daemontools:setup_daemon'
-  after   'deploy:setup',       'apache:setup_reverse_proxy'
-  after   'deploy:setup',       'mysql:setup_database_and_config'
-  after   'deploy:update_code', 'deploy:symlink_shared'
-  after   'deploy',             'deploy:cleanup'
-
-  # custom recipes
-  namespace :uberspace do
-    task :setup_svscan do
-      run 'uberspace-setup-svscan ; echo 0'
-    end
-  end
-  
-  namespace :daemontools do
-    task :setup_daemon do
-      daemon_script = <<-EOF
-#!/bin/bash
-export HOME=#{fetch :home}
-source $HOME/.bash_profile
-cd #{fetch :deploy_to}/current
-rvm use #{fetch :rvm_ruby_string}
-exec bundle exec passenger start -p #{fetch :passenger_port} -e production 2>&1
-      EOF
-
-      log_script = <<-EOF
-#!/bin/sh
-exec multilog t ./main
-      EOF
-
-      run                 "mkdir -p #{fetch :home}/etc/run-rails-#{fetch :application}"
-      run                 "mkdir -p #{fetch :home}/etc/run-rails-#{fetch :application}/log"
-      put daemon_script,  "#{fetch :home}/etc/run-rails-#{fetch :application}/run"
-      put log_script,     "#{fetch :home}/etc/run-rails-#{fetch :application}/log/run"
-      run                 "chmod +x #{fetch :home}/etc/run-rails-#{fetch :application}/run"
-      run                 "chmod +x #{fetch :home}/etc/run-rails-#{fetch :application}/log/run"
-      run                 "ln -nfs #{fetch :home}/etc/run-rails-#{fetch :application} #{fetch :home}/service/rails-#{fetch :application}"
-
-    end
-  end
-
-  namespace :apache do
-    task :setup_reverse_proxy do
-      htaccess = <<-EOF
-RewriteEngine On
-RewriteRule ^(.*)$ http://localhost:#{fetch :passenger_port}/$1 [P]
-      EOF
-      path = fetch(:domain) ? "/var/www/virtual/#{fetch :user}/#{fetch :domain}" : "#{fetch :home}/html"
-      run                 "mkdir -p #{path}"
-      put htaccess,       "#{path}/.htaccess"
-    end
-  end
-
-  namespace :mysql do
-    task :setup_database_and_config do
-      my_cnf = capture('cat ~/.my.cnf')
-      config = {}
-      %w(development production test).each do |env|
-        
-        config[env] = {
-          'adapter' => 'mysql2',
-          'encoding' => 'utf8',
-          'database' => "#{fetch :user}_rails_#{fetch :application}_#{env}",
-          'host' => 'localhost'
-        }
-        
-        my_cnf.match(/^user=(\w+)/)
-        config[env]['username'] = $1
-
-        my_cnf.match(/^password=(\w+)/)
-        config[env]['password'] = $1
-
-        my_cnf.match(/^port=(\d+)/)
-        config[env]['port'] = $1.to_i
-        
-        run "mysql -e 'CREATE DATABASE IF NOT EXISTS #{config[env]['database']} CHARACTER SET utf8 COLLATE utf8_general_ci;'"
-      end
-      
-      run "mkdir -p #{fetch :shared_path}/config"
-      put config.to_yaml, "#{fetch :shared_path}/config/database.yml"
-      
-    end
-  end
-
-  namespace :deploy do
-    task :start do
-      run "svc -u #{fetch :home}/service/rails-#{fetch :application}"
-    end
-    task :stop do
-      run "svc -d #{fetch :home}/service/rails-#{fetch :application}"
-    end
-    task :restart do
-      run "svc -du #{fetch :home}/service/rails-#{fetch :application}"
-    end
-
-    task :symlink_shared do
-      run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
-    end
-  end
-
-end
+require 'uberspacify/base'
+require 'uberspacify/mysql'

data/lib/uberspacify/version.rb

@@ -1,3 +1,3 @@
 module Uberspacify
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,185 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: uberspacify
-version: !ruby/object:Gem::Version 
-  hash: 59
+version: !ruby/object:Gem::Version
+  version: 0.9.1
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 0
-  version: 0.9.0
 platform: ruby
-authors: 
+authors:
 - Jan Schulz-Hofen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 2
-        - 12
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.12.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capistrano_colors
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: capistrano_colors
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rvm-capistrano
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+- !ruby/object:Gem::Dependency
+  name: rvm-capistrano
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: passenger
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 3
-        - 0
-        - 15
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: passenger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.15
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.15
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: daemon_controller
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: daemon_controller
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mysql2
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 3
-        - 11
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.11
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.11
 description: Deploy Rails apps on Uberspace
-email: 
+email:
 - jan@launchco.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/uberspacify.rb
+- lib/uberspacify/base.rb
+- lib/uberspacify/mysql.rb
 - lib/uberspacify/recipes.rb
 - lib/uberspacify/version.rb
 - uberspacify.gemspec
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Uberspacify helps you deploy a Ruby on Rails app on Uberspace, a popular German shared hosting provider.
+summary: Uberspacify helps you deploy a Ruby on Rails app on Uberspace, a popular
+  German shared hosting provider.
 test_files: []
-