openteam-capistrano 0.0.1 → 0.0.2

data/lib/openteam/capistrano/hooks.rb

@@ -1,8 +1,10 @@
 # set up hooks
 Capistrano::Configuration.instance.load do
-  after('multistage:ensure') do
-    server domain, :app, :web, :db, :primary => true
-  end
+  after 'multistage:ensure',  'openteam:setup'
+
+  #after('multistage:ensure') do
+    #server domain, :app, :web, :db, :primary => true
+  #end
 
   after 'deploy:update_code', 'deploy:migrate'
 

data/lib/openteam/capistrano/setup.rb

@@ -1,38 +1,53 @@
 Capistrano::Configuration.instance.load do
-  def deploy_config
-    @deploy_config ||= YAML::load(File.open('config/deploy.yml'))[stage.to_s]
-  end
+  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'] }
+      set :application,       deploy_config['application']
+      set :domain,            deploy_config['domain']
+      set :gateway,           deploy_config['gateway'] if deploy_config.has_key? 'gateway'
 
-  set(:deploy_to)         { "/srv/#{application}" }
+      set :deploy_to,         "/srv/#{application}"
 
-  # source repostitory settings
-  set :scm,               :git
-  set(:repository)        { `git config --get remote.origin.url`.strip }
-  set :branch,            :master
-  set :deploy_via,        :remote_cache
-  set :ssh_options,       { :forward_agent => true }
+      # 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]
+      # 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'
+      # 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'
+      # 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 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'
+      # 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']
+      # tagging needs this
+      set :local_user,        ENV['USER'] || ENV['USERNAME']
+
+      # setup server
+      server domain, :app, :web, :db, :primary => true
+    end
+  end
 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.1'
+  gem.version       = '0.0.2'
   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.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3262326284942122593
+      hash: 3229573802702059234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3262326284942122593
+      hash: 3229573802702059234
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24