soprano 0.6 → 0.20

data/README.md

@@ -1,7 +1,5 @@
 # Soprano
 
-[![The Sopranos](http://i.minus.com/idGXKU.jpeg)](http://www.imdb.com/title/tt0141842/)
-
 Soprano is the set of Capistrano recipes that help me to deploy my
 applications.
 
@@ -16,7 +14,7 @@ been borrowed from its sources.
 
 For Rails 3 add to your `Gemfile`:
 
-    gem 'soprano', :require => false
+    gem 'soprano', :require => false, :version => '>= 0.1.0'
 
 ## Example usage
 
@@ -33,37 +31,25 @@ To start using Soprano you just need to add `require "soprano"` to your
 
 ## Features
 
-### Remote
-
-*Sometimes* we need to execute an arbitrary command or script on our
-server within the application. To aid with thin, Soprano offers a bunch
-of `remote` scripts. For example:
-
-    cap remote:command -s cmd="ls -l" # You'll even get the output
+### Whenever
 
-Similar tasks exist for rake, thor and runner. Try `cap -T remote`. Note:
-runner does not put to the STDOUT anything.
+Using [whenever](https://github.com/javan/whenever) is as easy as `set`ing `:whenever` to `true`. Just like this:
 
-Don't forget to use `-s` option. Also wrap `cmd=` argument in quotes.
-Yeah, this is not comfortable, but it's intentional. Consider it a
-syntax vinegar. If you have a repeated task, write a Capistrano recipe
-for it. This remote calls are for really occasional tasks.
+    set :whenever, true
 
-You also have `cap remote:tail` to tail the application log.
+Whenever will use your application deploy path as crontab identifier.
 
-If all you need is just remotely run the rake tasks, you may also want to
-consider using [Cape](https://github.com/njonsson/cape).
+You may wish to override the command, used to invoke whenever, e.g., to use Bundler:
 
-### Other
+    set :whenever_command, 'bundle exec whenever'
 
-Readme about other features in process...
+Other features in process...
 
 ## Thanks
 
-- Jamis Buck for [Capistrano](https://github.com/halorgium/capistrano),
+- Jamis Buck for [Capistrano](http://github.com/jamis/capistrano),
 - Rubaidh Ltd for their awesome
-  [Rubaidhstrano](http://github.com/rubaidh/rubaidhstrano),
-- Denis Barushev for [Capone](https://github.com/denis/capone).
+  [Rubaidhstrano](http://github.com/rubaidh/rubaidhstrano).
 
 ## Copyright
 

data/lib/soprano/version.rb

@@ -1,3 +1,3 @@
 module Capone
-  VERSION = "0.6"
+  VERSION = "0.20"
 end

data/recipes/daemon_strategy.rb

@@ -1,10 +1,7 @@
 on :load do
-  strategy = fetch(:daemon_strategy)
+  strategy = fetch(:daemon_strategy, :mongrel_cluster)
 
   if [: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")
+    load File.join(File.dirname(__FILE__), "daemon_strategies", "#{strategy}.rb")
   end
 end

data/recipes/db.rb

@@ -77,7 +77,6 @@ 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

data/recipes/defaults.rb

@@ -19,6 +19,9 @@ ssh_options[:forward_agent] = true
 
 # You can redefine these variables in your config/deploy.rb
 
+# set :daemon_strategy, :mongrel_cluster
+# set :web_server, :nginx
+
 # set :install_gems, true
 
 # set :backup_database_before_migrations, false

data/recipes/gems.rb

@@ -0,0 +1,23 @@
+namespace :soprano do
+  namespace :gems do
+    desc <<-DESC
+      Install gems needed by application.
+    DESC
+    task :install, :roles => :app do
+      run "rake gems:install -f #{release_path}/Rakefile RAILS_ENV=#{rails_env}"
+    end
+
+    desc <<-DESC
+      Update installed gems.
+    DESC
+    task :update, :roles => :app do
+      sudo "gem update --no-rdoc --no-ri"
+    end
+  end
+end
+
+on :load do
+  if fetch(:install_gems, true)
+    after "deploy:update_code", "soprano:gems:install"
+  end
+end

data/recipes/nginx.rb

@@ -26,7 +26,7 @@ namespace :soprano do
 end
 
 on :load do
-  if fetch(:link_vhost_from_app, false)
+  if fetch(:web_server, :nginx) == :nginx
     before "deploy:start",   "soprano:nginx:enable_vhost"
     after  "deploy:stop",    "soprano:nginx:disable_vhost"
     after  "deploy:restart", "soprano:nginx:reload_if_config_file_changed"

data/recipes/whenever.rb

@@ -0,0 +1,17 @@
+namespace :soprano do
+  namespace :whenever do
+    desc <<-DESC
+      Update the crontab file with whenever.
+    DESC
+    task :update_crontab, :roles => :db do
+      whenever_command = fetch(:whenever_command, "whenever")
+      run "cd #{release_path} && #{whenever_command} --set environment=#{rails_env} --update-crontab #{deploy_to}"
+    end
+  end
+end
+
+on :load do
+  if fetch(:whenever, false)
+    after "deploy:symlink", "soprano:whenever:update_crontab"
+  end
+end

data/soprano.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_dependency "capistrano", ">= 2.5.0"
-  s.add_development_dependency "rake"
 end

metadata

@@ -1,97 +1,102 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: soprano
-version: !ruby/object:Gem::Version
-  version: '0.6'
+version: !ruby/object:Gem::Version 
+  hash: 35
   prerelease: 
+  segments: 
+  - 0
+  - 20
+  version: "0.20"
 platform: ruby
-authors:
+authors: 
 - Dmitriy Kiriyenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-07-01 00:00:00 +03:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! "Soprano is the set of rake tasks and capistrano recipes.\n                     Use
-  it to avoid writing typical scenarios and maintaining them\n                     in
-  favour of configuring your builds and deploys declaratively."
-email:
+  type: :runtime
+  version_requirements: *id001
+description: |-
+  Soprano is the set of rake tasks and capistrano recipes.
+                       Use it to avoid writing typical scenarios and maintaining them
+                       in favour of configuring your builds and deploys declaratively.
+email: 
 - dmitriy.kiriyenko@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
-- .rvmrc
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/soprano.rb
 - lib/soprano/version.rb
+- recipes/daemon_strategies/mongrel_cluster.rb
+- recipes/daemon_strategies/passenger.rb
 - recipes/daemon_strategy.rb
 - recipes/db.rb
 - recipes/defaults.rb
 - recipes/delayed_job.rb
+- recipes/gems.rb
 - recipes/nginx.rb
-- recipes/remote.rb
 - recipes/replicate.rb
-- recipes/servers/mongrel_cluster.rb
-- recipes/servers/passenger.rb
+- recipes/whenever.rb
 - soprano.gemspec
+has_rdoc: true
 homepage: https://github.com/dmitriy-kiriyenko/soprano
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Soprano is the set of rake tasks and capistrano recipes.
 test_files: []
+

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@soprano --create

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