soprano 0.61 → 0.90

data/lib/soprano/db.rb

@@ -0,0 +1,88 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :soprano do
+    namespace :db do
+      desc <<-DESC
+      Create MySQL user and database using data from config/database.yml.
+      DESC
+      task :setup, :roles => :db, :only => { :primary => true } do
+        config = YAML::load(File.open("config/database.yml"))[rails_env]
+        root_password = Capistrano::CLI.password_prompt(prompt="Enter a root password for MySQL: ")
+
+        run "mysql --user='root' --password='#{root_password}' -e \"CREATE DATABASE IF NOT EXISTS #{config["database"]} DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; GRANT ALL PRIVILEGES ON #{config["database"]}.* TO '#{config["username"]}'@'localhost' IDENTIFIED BY '#{config["password"]}' WITH GRANT OPTION;\""
+      end
+
+      desc <<-DESC
+      Dumps the database for the current environment into db/env-data.sql.bz2.
+      Any existing backup will be overwritten.
+      DESC
+      task :backup, :roles => :db, :only => { :primary => true } do
+        config = YAML::load(File.open("config/database.yml"))[rails_env]
+        case config["adapter"]
+        when "mysql", "mysql2"
+          cmd = ["mysqldump"]
+          cmd << "--host='#{config['host']}'" unless config["host"].nil?
+          cmd << "--user='#{config['username'].nil? ? 'root' : config['username']}'"
+          cmd << "--password='#{config['password']}'" unless config["password"].nil?
+          cmd << config["database"]
+          cmd << "| bzip2 > #{current_path}/db/#{rails_env}-data.sql.bz2"
+          run cmd.join(" ")
+        else
+          puts "Task not supported by '#{config['adapter']}'."
+        end
+      end
+
+      desc <<-DESC
+      Dump the database for the current environment and take a local copy.
+      DESC
+      task :download_backup, :roles => :db, :only => { :primary => true } do
+        backup
+        get "#{current_path}/db/#{rails_env}-data.sql.bz2", "db/#{rails_env}-data.sql.bz2"
+      end
+
+      desc <<-DESC
+      Load an existing database dump into the development environment's database.
+      DESC
+      task :load_backup do
+        run_locally "rake db:drop"
+        run_locally "rake db:create"
+
+        config = YAML::load(File.open("config/database.yml"))["development"]
+        case config["adapter"]
+        when "mysql", "mysql2"
+          cmd = ["bzcat db/#{rails_env}-data.sql.bz2 | mysql"]
+          cmd << "--host='#{config['host']}'" unless config["host"].nil?
+          cmd << "--user='#{config['username'].nil? ? 'root' : config['username']}'"
+          cmd << "--password='#{config['password']}'" unless config["password"].nil?
+          cmd << config["database"]
+          run_locally cmd.join(" ")
+        else
+          puts "Task not supported by '#{config['adapter']}'."
+        end
+      end
+
+      task :replicate do
+        download_backup
+        load_backup
+      end
+    end
+  end
+
+  on :load do
+    if fetch(:setup_database_after_deploy_setup, false)
+      after "deploy:setup", "soprano:db:setup"
+    end
+
+    if fetch(:backup_database_before_migrations, false)
+      before "deploy:migrate", "soprano:db:backup"
+    end
+
+    if fetch(:disable_web_during_migrations, false)
+      before "deploy:migrations", "deploy:web:disable"
+      after  "deploy:migrations", "deploy:web:enable"
+    end
+  end
+
+  depend :remote, :command, "mysql"
+  depend :remote, :command, "mysqldump"
+  depend :remote, :command, "bzip2"
+end

data/lib/soprano/defaults.rb

@@ -0,0 +1,20 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  set :scm, :git
+  set :deploy_via, :remote_cache
+
+  set :rails_env, "production"
+
+  set(:deploy_to) { "/var/www/apps/#{application}" }
+
+  role(:app) { host }
+  role(:web) { host }
+  role(:db, :primary => true) { host }
+
+  set :use_sudo, false
+
+  # Needed for proper password prompts
+  default_run_options[:pty] = true
+
+  # SSH options
+  ssh_options[:forward_agent] = true
+end

data/lib/soprano/delayed_job.rb

@@ -0,0 +1,9 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  on :load do
+    if fetch(:delayed_job, false)
+      after "deploy:stop",    "delayed_job:stop"
+      after "deploy:start",   "delayed_job:start"
+      after "deploy:restart", "delayed_job:restart"
+    end
+  end
+end

data/lib/soprano/nginx_vhost.rb

@@ -0,0 +1,36 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :soprano do
+    namespace :nginx do
+      desc <<-DESC
+      Enable virtual host.
+      DESC
+      task :enable_vhost, :roles => :web do
+        sudo "ln -fs #{current_path}/config/nginx.conf /etc/nginx/sites-enabled/#{application}"
+        sudo "/etc/init.d/nginx reload"
+      end
+
+      desc <<-DESC
+      Disable virtual host.
+      DESC
+      task :disable_vhost, :roles => :web do
+        sudo "rm /etc/nginx/sites-enabled/#{application}"
+        sudo "/etc/init.d/nginx reload"
+      end
+
+      desc <<-DESC
+      Reload nginx configuration if the application nginx virtual host config file was changed.
+      DESC
+      task :reload_if_config_file_changed, :roles => :web do
+        run "bash -c \"if ! cmp #{previous_release}/config/nginx.conf #{current_path}/config/nginx.conf; then #{sudo} /etc/init.d/nginx reload; fi\""
+      end
+    end
+  end
+
+  on :load do
+    if fetch(:link_vhost_from_app, true)
+      before "deploy:start",   "soprano:nginx:enable_vhost"
+      after  "deploy:stop",    "soprano:nginx:disable_vhost"
+      after  "deploy:restart", "soprano:nginx:reload_if_config_file_changed"
+    end
+  end
+end

data/lib/soprano/passenger.rb

@@ -0,0 +1,19 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :deploy do
+    desc "Start application."
+    task :start, :roles => :app do
+      run "touch #{current_release}/tmp/restart.txt"
+    end
+
+    desc "Stop application."
+    task :stop, :roles => :app do
+    end
+
+    desc "Restart application."
+    task :restart, :roles => :app do
+      run "touch #{current_release}/tmp/restart.txt"
+    end
+  end
+
+  depend :remote, :gem, "passenger", ">=2.2.2"
+end

data/lib/soprano/remote.rb

@@ -0,0 +1,45 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :remote do
+    def get_cmd
+      cmd = self[:cmd]
+      raise "A command must be given. Pleae, call the task with -s cmd=\"your command\"" unless cmd
+      cmd
+    end
+
+    def remote_call(command)
+      run wrap_command(command) do |channel, stream, data|
+        puts "#{data}"
+        break if stream == :err
+      end
+    end
+
+    def wrap_command(command)
+      "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec #{command}"
+    end
+
+    desc "execute an arbitrary command from application folder"
+    task "command", :roles => :app do
+      remote_call get_cmd
+    end
+
+    desc "execute an arbitrary rake task from application folder"
+    task "rake", :roles => :app do
+      remote_call "rake #{get_cmd}"
+    end
+
+    desc "execute an arbitrary thor script from application folder"
+    task "thor", :roles => :app do
+      remote_call "thor #{get_cmd}"
+    end
+
+    desc "execute an arbitrary ruby script in application environment"
+    task "runner", :roles => :app do
+      remote_call "script/rails runner \"#{get_cmd}\""
+    end
+
+    desc "tail the application log"
+    task :tail, :roles => :app do
+      remote_call("tail -n 10000 -f log/#{rails_env}.log")
+    end
+  end
+end

data/lib/soprano/unicorn.rb

@@ -0,0 +1,32 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  def unicorn_conf
+    fetch(:unicorn_conf, "#{current_path}/config/unicorn.rb")
+  end
+
+  def unicorn_bin
+    fetch(:unicorn_bin, 'bundle exec unicorn')
+  end
+
+  def unicorn_pid
+    fetch(:unicorn_pid, "#{deploy_to}/shared/pids/unicorn.pid")
+  end
+
+  namespace :deploy do
+    desc "Start application."
+    task :start, :roles => :app do
+      run "cd #{current_path} && #{unicorn_bin} -c #{unicorn_conf} -E #{rails_env} -D"
+    end
+
+    desc "Stop application."
+    task :stop, :roles => :app do
+      run "if [ -f #{unicorn_pid} ] && [ -e /proc/$(cat #{unicorn_pid}) ]; then kill -QUIT `cat #{unicorn_pid}`; fi"
+    end
+
+    desc "Restart application."
+    task :restart, :roles => :app do
+      run "if [ -f #{unicorn_pid} ] && [ -e /proc/$(cat #{unicorn_pid}) ]; then kill -USR2 `cat #{unicorn_pid}`; else cd #{current_path} && #{unicorn_bin} -c #{unicorn_conf} -E #{rails_env} -D; fi"
+    end
+  end
+
+  depend :remote, :gem, "passenger", ">=2.2.2"
+end

data/lib/soprano/version.rb

@@ -1,3 +1,3 @@
-module Capone
-  VERSION = "0.61"
+module Soprano
+  VERSION = "0.90"
 end

data/lib/soprano.rb

@@ -1,9 +1,4 @@
-unless Capistrano::Configuration.respond_to?(:instance)
-  abort "Soprano requires Capistrano 2"
-end
-
-Capistrano::Configuration.instance.load do
-  Dir["#{File.dirname(__FILE__)}/../recipes/*.rb"].each do |recipe|
-    load(recipe)
-  end
-end
+require 'soprano/version'
+require 'soprano/defaults'
+require 'soprano/remote'
+require 'soprano/db'

data/soprano.gemspec

@@ -4,7 +4,7 @@ require "soprano/version"
 
 Gem::Specification.new do |s|
   s.name        = "soprano"
-  s.version     = Capone::VERSION
+  s.version     = Soprano::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Dmitriy Kiriyenko"]
   s.email       = ["dmitriy.kiriyenko@gmail.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soprano
 version: !ruby/object:Gem::Version
-  version: '0.61'
+  version: '0.90'
   prerelease: 
 platform: ruby
 authors:
@@ -59,16 +59,14 @@ files:
 - README.md
 - Rakefile
 - lib/soprano.rb
+- lib/soprano/db.rb
+- lib/soprano/defaults.rb
+- lib/soprano/delayed_job.rb
+- lib/soprano/nginx_vhost.rb
+- lib/soprano/passenger.rb
+- lib/soprano/remote.rb
+- lib/soprano/unicorn.rb
 - lib/soprano/version.rb
-- recipes/daemon_strategy.rb
-- recipes/db.rb
-- recipes/defaults.rb
-- recipes/delayed_job.rb
-- recipes/nginx.rb
-- recipes/remote.rb
-- recipes/replicate.rb
-- recipes/servers/mongrel_cluster.rb
-- recipes/servers/passenger.rb
 - soprano.gemspec
 homepage: https://github.com/dmitriy-kiriyenko/soprano
 licenses: []

data/recipes/daemon_strategy.rb

@@ -1,10 +0,0 @@
-on :load do
-  strategy = fetch(:daemon_strategy, nil)
-
-  if strategy && [:passenger, :mongrel_cluster].include?(strategy)
-    puts "Providing strategy via set :daemon_strategy, #{strategy} is deprecated!"
-    puts "Use require 'servers/#{strategy}' instead."
-
-    load File.join(File.dirname(__FILE__), "servers", "#{strategy}.rb")
-  end
-end

data/recipes/db.rb

@@ -1,97 +0,0 @@
-namespace :soprano do
-  namespace :db do
-    desc <<-DESC
-      Create MySQL user and database using data from config/database.yml.
-    DESC
-    task :setup, :roles => :db, :only => { :primary => true } do
-      config = YAML::load(File.open("config/database.yml"))[rails_env]
-      root_password = Capistrano::CLI.password_prompt(prompt="Enter a root password for MySQL: ")
-
-      run "mysql --user='root' --password='#{root_password}' -e \"CREATE DATABASE IF NOT EXISTS #{config["database"]} DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; GRANT ALL PRIVILEGES ON #{config["database"]}.* TO '#{config["username"]}'@'localhost' IDENTIFIED BY '#{config["password"]}' WITH GRANT OPTION;\""
-    end
-
-    desc <<-DESC
-      Load fixtures from db/fixtures to the database.
-    DESC
-    task :load_fixtures, :roles => :db, :only => { :primary => true } do
-      run "rake db:fixtures:load FIXTURES_PATH=db/fixtures RAILS_ENV=#{rails_env} -f #{release_path}/Rakefile"
-    end
-
-    desc <<-DESC
-      Dumps the database for the current environment into db/env-data.sql.bz2.
-      Any existing backup will be overwritten.
-    DESC
-    task :backup, :roles => :db, :only => { :primary => true } do
-      config = YAML::load(File.open("config/database.yml"))[rails_env]
-      case config["adapter"]
-        when "mysql", "mysql2"
-          cmd = ["mysqldump"]
-          cmd << "--host='#{config['host']}'" unless config["host"].nil?
-          cmd << "--user='#{config['username'].nil? ? 'root' : config['username']}'"
-          cmd << "--password='#{config['password']}'" unless config["password"].nil?
-          cmd << config["database"]
-          cmd << "| bzip2 > #{current_path}/db/#{rails_env}-data.sql.bz2"
-          run cmd.join(" ")
-      else
-        puts "Task not supported by '#{config['adapter']}'."
-      end
-    end
-
-    desc <<-DESC
-      Dump the database for the current environment and take a local copy.
-    DESC
-    task :download_backup, :roles => :db, :only => { :primary => true } do
-      backup
-      get "#{current_path}/db/#{rails_env}-data.sql.bz2", "db/#{rails_env}-data.sql.bz2"
-    end
-
-    desc <<-DESC
-      Load an existing database dump into the development environment's database.
-    DESC
-    task :load_backup do
-      run_locally "rake db:drop"
-      run_locally "rake db:create"
-
-      config = YAML::load(File.open("config/database.yml"))["development"]
-      case config["adapter"]
-        when "mysql", "mysql2"
-          cmd = ["bzcat db/#{rails_env}-data.sql.bz2 | mysql"]
-          cmd << "--host='#{config['host']}'" unless config["host"].nil?
-          cmd << "--user='#{config['username'].nil? ? 'root' : config['username']}'"
-          cmd << "--password='#{config['password']}'" unless config["password"].nil?
-          cmd << config["database"]
-          run_locally cmd.join(" ")
-      else
-        puts "Task not supported by '#{config['adapter']}'."
-      end
-    end
-
-    task :replicate do
-      download_backup
-      load_backup
-    end
-  end
-end
-
-on :load do
-  if fetch(:setup_database_after_deploy_setup, true)
-    after "deploy:setup", "soprano:db:setup"
-  end
-
-  if fetch(:load_fixtures_to_database_after_deploy_cold, false)
-    after "deploy:cold", "soprano:db:load_fixtures"
-  end
-
-  if fetch(:backup_database_before_migrations, false)
-    before "deploy:migrate", "soprano:db:backup"
-  end
-
-  if fetch(:disable_web_during_migrations, false)
-    before "deploy:migrations", "deploy:web:disable"
-    after  "deploy:migrations", "deploy:web:enable"
-  end
-end
-
-depend :remote, :command, "mysql"
-depend :remote, :command, "mysqldump"
-depend :remote, :command, "bzip2"

data/recipes/defaults.rb

@@ -1,30 +0,0 @@
-set :scm, :git
-set :deploy_via, :remote_cache
-
-set :rails_env, "production"
-
-set(:deploy_to) { "/var/www/apps/#{application}" }
-
-role(:app) { host }
-role(:web) { host }
-role(:db, :primary => true) { host }
-
-set :use_sudo, false
-
-# Needed for proper password prompts
-default_run_options[:pty] = true
-
-# SSH options
-ssh_options[:forward_agent] = true
-
-# You can redefine these variables in your config/deploy.rb
-
-# set :install_gems, true
-
-# set :backup_database_before_migrations, false
-# set :disable_web_during_migrations, false
-# set :setup_database_after_deploy_setup, true
-# set :load_fixtures_to_database_after_deploy_cold, false
-
-# set :whenever, false
-# set :delayed_job, false

data/recipes/delayed_job.rb

@@ -1,7 +0,0 @@
-on :load do
-  if fetch(:delayed_job, false)
-    after "deploy:stop",    "delayed_job:stop"
-    after "deploy:start",   "delayed_job:start"
-    after "deploy:restart", "delayed_job:restart"
-  end
-end

data/recipes/nginx.rb

@@ -1,34 +0,0 @@
-namespace :soprano do
-  namespace :nginx do
-    desc <<-DESC
-      Enable virtual host.
-    DESC
-    task :enable_vhost, :roles => :web do
-      sudo "ln -fs #{current_path}/config/nginx.conf /etc/nginx/sites-enabled/#{application}"
-      sudo "/etc/init.d/nginx reload"
-    end
-
-    desc <<-DESC
-      Disable virtual host.
-    DESC
-    task :disable_vhost, :roles => :web do
-      sudo "rm /etc/nginx/sites-enabled/#{application}"
-      sudo "/etc/init.d/nginx reload"
-    end
-
-    desc <<-DESC
-      Reload nginx configuration if the application nginx virtual host config file was changed.
-    DESC
-    task :reload_if_config_file_changed, :roles => :web do
-      run "bash -c \"if ! cmp #{previous_release}/config/nginx.conf #{current_path}/config/nginx.conf; then #{sudo} /etc/init.d/nginx reload; fi\""
-    end
-  end
-end
-
-on :load do
-  if fetch(:link_vhost_from_app, false)
-    before "deploy:start",   "soprano:nginx:enable_vhost"
-    after  "deploy:stop",    "soprano:nginx:disable_vhost"
-    after  "deploy:restart", "soprano:nginx:reload_if_config_file_changed"
-  end
-end

data/recipes/remote.rb

@@ -1,43 +0,0 @@
-namespace :remote do
-  def get_cmd
-    cmd = self[:cmd]
-    raise "A command must be given. Pleae, call the task with -s cmd=\"your command\"" unless cmd
-    cmd
-  end
-
-  def remote_call(command)
-    run wrap_command(command) do |channel, stream, data|
-      puts "#{data}"
-      break if stream == :err
-    end
-  end
-
-  def wrap_command(command)
-    "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec #{command}"
-  end
-
-  desc "execute an arbitrary command from application folder"
-  task "command", :roles => :app do
-    remote_call get_cmd
-  end
-
-  desc "execute an arbitrary rake task from application folder"
-  task "rake", :roles => :app do
-    remote_call "rake #{get_cmd}"
-  end
-
-  desc "execute an arbitrary thor script from application folder"
-  task "thor", :roles => :app do
-    remote_call "thor #{get_cmd}"
-  end
-
-  desc "execute an arbitrary ruby script in application environment"
-  task "runner", :roles => :app do
-    remote_call "script/rails runner \"#{get_cmd}\""
-  end
-
-  desc "tail the application log"
-  task :tail, :roles => :app do
-    remote_call("tail -n 10000 -f log/#{rails_env}.log")
-  end
-end

data/recipes/replicate.rb

@@ -1,3 +0,0 @@
-task :replicate do
-  soprano.db.replicate
-end

data/recipes/servers/mongrel_cluster.rb

@@ -1,6 +0,0 @@
-require "mongrel_cluster/recipes"
-
-set :mongrel_conf, "#{deploy_to}/current/config/mongrel_cluster.yml"
-
-depend :remote, :gem, "mongrel", ">=1.1.5"
-depend :remote, :gem, "mongrel_cluster", ">=1.0.5"

data/recipes/servers/passenger.rb

@@ -1,17 +0,0 @@
-namespace :deploy do
-  desc "Start application."
-  task :start, :roles => :app do
-    run "touch #{current_release}/tmp/restart.txt"
-  end
-
-  desc "Stop application."
-  task :stop, :roles => :app do
-  end
-
-  desc "Restart application."
-  task :restart, :roles => :app do
-    run "touch #{current_release}/tmp/restart.txt"
-  end
-end
-
-depend :remote, :gem, "passenger", ">=2.2.2"