capun 0.0.26 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88e639b8f32e81ef68d93907b57d825d84f50d51
-  data.tar.gz: 74c4ca3f205029a4083d8be932d87ca297bc7eec
+  metadata.gz: f687ea72e07c645a7a15bb41b7aba245c100e400
+  data.tar.gz: d72d3dfb58567f90f1ce03205d907df96a581fb2
 SHA512:
-  metadata.gz: c66bbd507b47fe438ef003629531eb4d0923227240a9a15001e386822bcad992974ac094878b8961b738b4bae66f31c31e1fe12ab11858bc91c875c721de40cf
-  data.tar.gz: ee5072b1f0f316e1bfcd0222a311805445030b9c085a11ea1dcb518ff2c0d51b3d91c95bba74a5b510fb93aade5daff3a592533164111071a039477b74c15f17
+  metadata.gz: 542b23dd8bfaa65c6a1715a1bce54c1678d875b54cc2ee4468e3e1b6134d694467100bac7bc9de2a8b17ec47e06da14066935611a02e60e392a6a2ee4875ebdd
+  data.tar.gz: 9125d5cc76404ce291c8e82e2e88264fb5a395d92fdc272a9a63343994d168ed81f98dc598e2f85062cf85837bdd67aa95f501151ed00e26b5621a7eb2add5e4

data/lib/capun/setup.rb

@@ -33,7 +33,7 @@ set :std_uploads, [
   # database.yml
   {what: "config/deploy/database.yml.erb", where: '#{shared_path}/config/database.yml', upload: true, overwrite: true},
   # jenkins' config.xml
-  {what: "config/deploy/jenkins.config.xml.erb", where: '#{shared_path}/config/jenkins.config.xml', upload: -> { !!fetch(:addJenkins) }, overwrite: false},
+  {what: "config/deploy/jenkins.config.xml.erb", where: '/var/lib/jenkins/jobs/#{fetch(:application)}/config.xml', upload: -> { !!fetch(:addJenkins) }, overwrite: false},
   # newrelic.yml
   {what: "config/deploy/newrelic.yml.erb", where: '#{shared_path}/config/newrelic.yml', upload: -> { !!fetch(:addNewRelic) }, overwrite: true}
 ]
@@ -45,7 +45,6 @@ set :std_symlinks, [
   {what: "logrotate.config", where: '/etc/logrotate.d/#{fetch(:application)}'},
   {what: "database.yml", where: '#{release_path}/config/database.yml'},
   {what: "application.yml", where: '#{release_path}/config/application.yml'},
-  {what: "jenkins.config.xml", where: '/var/lib/jenkins/jobs/#{fetch(:application)}/config.xml'},
   {what: "newrelic.yml", where: '#{release_path}/config/newrelic.yml'}
 ]
 
@@ -76,7 +75,7 @@ namespace :deploy do
         next unless File.exists?(what)
         where = eval "\"" + file_hash[:where] + "\""
         next if !file_hash[:overwrite] && test("[ -f #{where} ]")
-        # compile temlate if it ends with .erb before upload
+        # compile template if it ends with .erb before upload
         upload! (what.end_with?(".erb") ? StringIO.new(ERB.new(File.read(what)).result(binding)) : what), where
         info "copying: #{what} to: #{where}"
       end
@@ -103,7 +102,7 @@ namespace :deploy do
   task :make_dirs do
     on roles(:app) do
       execute :mkdir, "-p", "/home/#{fetch(:user)}/apps/#{fetch(:application)}"
-      if fetch(:addJenkins)
+      if fetch(:addJenkins) && !test("[ -d /var/lib/jenkins/jobs/#{fetch(:application)}/ ]")
         execute :sudo, :mkdir, "-p", "/var/lib/jenkins/jobs/#{fetch(:application)}"
         execute :sudo, :chown, "#{fetch(:user)}", "/var/lib/jenkins/jobs/#{fetch(:application)}"
       end

data/lib/capun/version.rb

@@ -1,3 +1,3 @@
 module Capun
-  VERSION = "0.0.26"
+  VERSION = "0.0.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capun
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.28
 platform: ruby
 authors:
 - Ivan Zamylin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler