capun 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 978c97c1eb0c4875d6427b0f8f3c9b5d041366dd
-  data.tar.gz: b16cc36dffa774a4c702f9b9354de6dce034d825
+  metadata.gz: eb4e11d12db98de66dd3d2c91b08266e60c87dc2
+  data.tar.gz: 6f932877bc38b865bbb187ae62bb6566bc3d66e4
 SHA512:
-  metadata.gz: 3950cc98d2296a3c495f0511482c6f3832af9ad6258b65f05738be7c212c2f949ccefd68f3adfed6394cc4abc9c7b9afeaf920287d4afd12644d5da4f8871152
-  data.tar.gz: 20aae31bbc4fd6a3700a7bc7c770cf112225c10e5988a3d967c4c206c4d4580e5033165b9449741f404e9d198bcc2c759dc1206a68e3c118883c36d4d13e49c3
+  metadata.gz: eb734a2e12ee6163805ec7b6b577b648fb062ba30641f3e31a5eade630cc769019dd6f0b3f4d11d22f761e673de9c406f546d127e235a02d132b990b9b5f7ea1
+  data.tar.gz: e51241ee3450c6ad5ee1991d73da5ab32c4963ee061e0e566e312fad67f01680584be223762cbaa5e17e6f7e97e115551f8f3c8d303cc64990c51a511abc33cc

data/lib/capun/setup.rb

@@ -16,24 +16,25 @@ set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets public/system}
 set :unicorn_config_path, -> { "#{shared_path}/config/unicorn.config.rb" }
 
 set :uploads, []
+# Lambdas are used for lazy access to variables set later, in stage file
 set :std_uploads, [
-  #figaro
+  # figaro
   {what: "config/application.yml", where: '#{shared_path}/config/application.yml', upload: true, overwrite: true},
-  #logstash configs
+  # logstash configs
   {what: "config/deploy/logstash.config.erb", where: '#{shared_path}/config/logstash.config', upload: -> { !!fetch(:addELK) }, overwrite: true},
-  #logrotate configs
+  # logrotate configs
   {what: "config/deploy/logrotate.config.erb", where: '#{shared_path}/config/logrotate.config', upload: -> { !!fetch(:addlogrotate) }, overwrite: true},
-  #basic_authenticatable.rb
+  # basic_authenticatable.rb
   {what: "config/deploy/basic_authenticatable.rb.erb", where: '#{release_path}/app/controllers/concerns/basic_authenticatable.rb', upload: -> { !!fetch(:use_basic_auth) }, overwrite: true},
-  #nginx.conf
+  # nginx.conf
   {what: "config/deploy/nginx.conf.erb", where: '#{shared_path}/config/nginx.conf', upload: -> { !!fetch(:addNginx) }, overwrite: true},
-  #unicorn.config.rb
+  # unicorn.config.rb
   {what: "config/deploy/unicorn.config.rb.erb", where: '#{shared_path}/config/unicorn.config.rb', upload: true, overwrite: true},
-  #database.yml
+  # database.yml
   {what: "config/deploy/database.yml.erb", where: '#{shared_path}/config/database.yml', upload: true, overwrite: true},
-  #jenkins' config.xml
+  # jenkins' config.xml
   {what: "config/deploy/jenkins.config.xml.erb", where: '#{shared_path}/config/jenkins.config.xml', upload: -> { !!fetch(:addJenkins) }, overwrite: false},
-  #newrelic.yml
+  # newrelic.yml
   {what: "config/deploy/newrelic.yml.erb", where: '#{shared_path}/config/newrelic.yml', upload: -> { !!fetch(:addNewRelic) }, overwrite: true}
 ]
 
@@ -57,24 +58,25 @@ namespace :deploy do
   task :kill_me do
     on roles(:app) do
       execute "kill -9 $(ps aux | grep #{fetch(:application)} | grep -v grep | awk '{print $2}') || true"
-    end     
+    end
   end
   before :deploy, 'deploy:kill_me'
 
   desc 'Uploads files to app based on stage'
   task :upload do
     on roles(:app) do |server|
-      #create /home/[user]/apps/[app]/shared/config directory, if it doesn't exist yet
+      # create /home/[user]/apps/[app]/shared/config directory, if it doesn't exist yet
       execute :mkdir, "-p", "#{shared_path}/config"
       execute :sudo, :chown, "-R", "#{fetch(:user)}:#{fetch(:user)}", "#{shared_path}/config/."
       uploads = fetch(:uploads).concat(fetch(:std_uploads))
       uploads.each do |file_hash|
-        what = file_hash[:what]
+        # file_hash[:upload] may be either a boolean or a lambda; in the latter case we use its result
         next if !file_hash[:upload] || ( file_hash[:upload].is_a?(Proc) && !file_hash[:upload].call )
+        what = file_hash[:what]
         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 temlate 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

data/lib/capun/version.rb

@@ -1,3 +1,3 @@
 module Capun
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/lib/generators/capun/stage_generator.rb

@@ -15,7 +15,6 @@ module Capun
           @username = ask("Basic authentication username [ex.: mike]:")
           @password = ask("Basic authentication password [ex.: secret]:")
         end
-        @addNginx = ask("Would you like to add nginx configuration file? [Y/n]").capitalize == 'Y'
         @addJenkins = ask("Would you like to add Jenkins configuration file? [Y/n]").capitalize == 'Y'
         @addNewRelic = ask("Would you like to add New Relic configuration file? [Y/n]").capitalize == 'Y'
         if @addNewRelic
@@ -49,10 +48,8 @@ module Capun
       end
 
       def add_nginx
-        if @addNginx
-          copy_file "nginx.conf.erb", "config/deploy/nginx.conf.erb"
-          append_to_file "config/deploy/#{singular_name}.rb", "\nset :addNginx, true"
-        end
+        copy_file "nginx.conf.erb", "config/deploy/nginx.conf.erb"
+        append_to_file "config/deploy/#{singular_name}.rb", "\nset :addNginx, true"
       end
 
       def add_secret

metadata

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