openteam-capistrano 0.0.5 → 0.0.6

data/lib/openteam/capistrano/recipes.rb

@@ -1,5 +1,7 @@
 require "openteam/capistrano/dependencies"
-require "openteam/capistrano/setup"
 require "openteam/capistrano/hooks"
-require "openteam/capistrano/tagging"
+require "openteam/capistrano/setup_common"
+require "openteam/capistrano/setup_deploy"
+require "openteam/capistrano/setup_git"
 require "openteam/capistrano/subscriber"
+require "openteam/capistrano/tagging"

data/lib/openteam/capistrano/setup_common.rb

@@ -0,0 +1,25 @@
+Capistrano::Configuration.instance.load do
+  # do not use sudo by default
+  set :use_sudo,          false
+
+  # source repostitory settings
+  # this files will be symlinked from shared to current path on deploy:create_symlinks
+  set :shared_children,   %w[config/settings.yml config/database.yml log tmp/sockets tmp/pids]
+
+  # for assets compilation on host with nodejs
+  set :default_shell,     'bash -l'
+
+  # make bin stubs for candy console rails runs
+  set :bundle_flags,      '--binstubs --deployment --quiet'
+
+  # gem capistrano-db-tasks
+  # we do not need dump file after db:pull
+  set :db_local_clean,    true
+
+  # gem whenever
+  # point to bundled version of whenever command
+  set :whenever_command,  'bundle exec whenever'
+
+  # tagging needs this
+  set :local_user,        ENV['USER'] || ENV['USERNAME']
+end

data/lib/openteam/capistrano/setup_deploy.rb

@@ -0,0 +1,24 @@
+Capistrano::Configuration.instance.load do
+  after 'multistage:ensure', 'openteam:setup_deploy'
+
+  namespace :openteam do
+    task :setup_deploy do
+      set :deploy_config,     YAML::load(File.open('config/deploy.yml'))[stage.to_s]
+
+      # application name
+      set :application,       deploy_config['application']
+
+      # deployment host
+      set :domain,            deploy_config['domain']
+
+      #  deloyment gateway
+      set:gateway,            deploy_config['gateway'] if deploy_config.has_key? 'gateway'
+
+      # application root
+      set :deploy_to,         "/srv/#{application}"
+
+      # setup server
+      server domain, :app, :web, :db, :primary => true
+    end
+  end
+end

data/lib/openteam/capistrano/setup_git.rb

@@ -0,0 +1,8 @@
+Capistrano::Configuration.instance.load do
+  set :scm,               :git
+  set(:ssh_repository)    { `git config --get remote.origin.url`.chomp }
+  set(:repository)        { ssh_repository.gsub(/^git@(.+?):(.+)$/, 'git://\1/\2') }
+  set :branch,            :master
+  set :deploy_via,        :remote_cache
+  set :ssh_options,       {:forward_agent => true}
+end

data/openteam-capistrano.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'openteam-capistrano'
-  gem.version       = '0.0.5'
+  gem.version       = '0.0.6'
   gem.authors       = ["OpenTeam developers"]
   gem.email         = ["developers@openteam.ru"]
   gem.description   = %q{OpenTeam common capistrano recipe}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openteam-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-db-tasks
@@ -107,7 +107,9 @@ files:
 - lib/openteam/capistrano/dependencies.rb
 - lib/openteam/capistrano/hooks.rb
 - lib/openteam/capistrano/recipes.rb
-- lib/openteam/capistrano/setup.rb
+- lib/openteam/capistrano/setup_common.rb
+- lib/openteam/capistrano/setup_deploy.rb
+- lib/openteam/capistrano/setup_git.rb
 - lib/openteam/capistrano/subscriber.rb
 - lib/openteam/capistrano/tagging.rb
 - openteam-capistrano.gemspec
@@ -125,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4109376646261653517
+      hash: 2912125959121799691
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4109376646261653517
+      hash: 2912125959121799691
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/openteam/capistrano/setup.rb

@@ -1,62 +0,0 @@
-Capistrano::Configuration.instance.load do
-  after 'multistage:ensure', 'openteam:setup'
-
-  namespace :openteam do
-    task :setup do
-      def deploy_config
-        @deploy_config ||= YAML::load(File.open('config/deploy.yml'))[stage.to_s]
-      end
-
-      def ssh_git_repository_url
-        `git config --get remote.origin.url`.chomp
-      end
-
-      def git_repository_url
-        @git_repository_url ||=  ssh_git_repository_url.gsub(/^git@(.+?):(.+)$/, 'git://\1/\2')
-      end
-
-      set :application,       deploy_config['application']
-      set :domain,            deploy_config['domain']
-      set :gateway,           deploy_config['gateway'] if deploy_config.has_key? 'gateway'
-
-      # application root
-      set :deploy_to,         "/srv/#{application}"
-
-      # do not use sudo by default
-      set :use_sudo,          false
-
-      # source repostitory settings
-      set :scm,               :git
-      set :repository,        git_repository_url
-      set :branch,            :master
-      set :deploy_via,        :remote_cache
-      set :ssh_options,       {:forward_agent => true}
-
-      # this files will be symlinked from shared to current path on deploy
-      set :shared_children,   %w[config/settings.yml config/database.yml log tmp/sockets tmp/pids]
-
-      # for assets compilation on host with nodejs
-      set :default_shell,     'bash -l'
-
-      # make bin stubs for candy console rails runs
-      set :bundle_flags,      '--binstubs --deployment --quiet'
-
-      # gem capistrano-db-tasks
-      # we do not need dump file after db:pull
-      set :db_local_clean,    true
-
-      # gem whenever
-      # point to bundled version of whenever command
-      set :whenever_command,  'bundle exec whenever'
-
-      # tagging needs this
-      set :local_user,        ENV['USER'] || ENV['USERNAME']
-
-      # subscriber name
-      set :subscriber_name,   "#{application}-subscriber"
-
-      # setup server
-      server domain, :app, :web, :db, :primary => true
-    end
-  end
-end