capun 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c6b065c5ffd8c41238ded0c7a8ef01a9d42aa26
-  data.tar.gz: 9c894551307e0ff135d6f50a45620c5d75f1be59
+  metadata.gz: 978c97c1eb0c4875d6427b0f8f3c9b5d041366dd
+  data.tar.gz: b16cc36dffa774a4c702f9b9354de6dce034d825
 SHA512:
-  metadata.gz: 576ce8084fe50492582b72a38f7bea98ef39fa02b2c2a4c07b6de2ae3966fdaa32743105f466927f6d9466c0b6a34bf6e3180ce1075b830ee16ae21944b8612a
-  data.tar.gz: 6099f03a9449c0b3236e67941ef2e02047ba33b5bf0de40d8e8151d0c374fe7a08782ba1822545cdbd602e46ea8163a8a5855ba3d618afceccd68a0a95c1d048
+  metadata.gz: 3950cc98d2296a3c495f0511482c6f3832af9ad6258b65f05738be7c212c2f949ccefd68f3adfed6394cc4abc9c7b9afeaf920287d4afd12644d5da4f8871152
+  data.tar.gz: 20aae31bbc4fd6a3700a7bc7c770cf112225c10e5988a3d967c4c206c4d4580e5033165b9449741f404e9d198bcc2c759dc1206a68e3c118883c36d4d13e49c3

data/lib/capun/setup.rb

@@ -1,6 +1,6 @@
 require 'digest'
 set :deploy_to, -> {"/home/#{fetch(:user)}/apps/#{fetch(:application)}"}
-set :rvm1_ruby_version, "2.0.0"
+set :rvm1_ruby_version, "ruby-2.3.0"
 set :branch, 'master'
 # Remote caching will keep a local git repository on the server you're deploying to
 # and simply run a fetch from that rather than an entire clone
@@ -18,25 +18,23 @@ set :unicorn_config_path, -> { "#{shared_path}/config/unicorn.config.rb" }
 set :uploads, []
 set :std_uploads, [
   #figaro
-  {what: "config/application.yml", where: '#{shared_path}/config/application.yml', overwrite: true},
+  {what: "config/application.yml", where: '#{shared_path}/config/application.yml', upload: true, overwrite: true},
   #logstash configs
-  {what: "config/deploy/logstash.config.erb", where: '#{shared_path}/config/logstash.config', overwrite: true},
+  {what: "config/deploy/logstash.config.erb", where: '#{shared_path}/config/logstash.config', upload: -> { !!fetch(:addELK) }, overwrite: true},
   #logrotate configs
-  {what: "config/deploy/logrotate.config.erb", where: '#{shared_path}/config/logrotate.config', overwrite: true},
+  {what: "config/deploy/logrotate.config.erb", where: '#{shared_path}/config/logrotate.config', upload: -> { !!fetch(:addlogrotate) }, overwrite: true},
   #basic_authenticatable.rb
-  {what: "config/deploy/basic_authenticatable.rb.erb", where: '#{release_path}/app/controllers/concerns/basic_authenticatable.rb', overwrite: true},
+  {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
-  {what: "config/deploy/nginx.conf.erb", where: '#{shared_path}/config/nginx.conf', overwrite: true},
+  {what: "config/deploy/nginx.conf.erb", where: '#{shared_path}/config/nginx.conf', upload: -> { !!fetch(:addNginx) }, overwrite: true},
   #unicorn.config.rb
-  {what: "config/deploy/unicorn.config.rb.erb", where: '#{shared_path}/config/unicorn.config.rb', overwrite: true},
-  #secret_token.rb
-  {what: "config/initializers/secret_token.rb", where: '#{release_path}/config/initializers/secret_token.rb', overwrite: true},
+  {what: "config/deploy/unicorn.config.rb.erb", where: '#{shared_path}/config/unicorn.config.rb', upload: true, overwrite: true},
   #database.yml
-  {what: "config/deploy/database.yml.erb", where: '#{shared_path}/config/database.yml', overwrite: true},
+  {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', overwrite: false},
+  {what: "config/deploy/jenkins.config.xml.erb", where: '#{shared_path}/config/jenkins.config.xml', upload: -> { !!fetch(:addJenkins) }, overwrite: false},
   #newrelic.yml
-  {what: "config/deploy/newrelic.yml.erb", where: '#{release_path}/config/newrelic.yml', overwrite: true}
+  {what: "config/deploy/newrelic.yml.erb", where: '#{shared_path}/config/newrelic.yml', upload: -> { !!fetch(:addNewRelic) }, overwrite: true}
 ]
 
 set :symlinks, []
@@ -46,7 +44,8 @@ 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: "jenkins.config.xml", where: '/var/lib/jenkins/jobs/#{fetch(:application)}/config.xml'},
+  {what: "newrelic.yml", where: '#{release_path}/config/newrelic.yml'}
 ]
 
 before 'deploy', 'rvm1:install:rvm'  # install/update RVM
@@ -71,7 +70,8 @@ namespace :deploy do
       uploads = fetch(:uploads).concat(fetch(:std_uploads))
       uploads.each do |file_hash|
         what = file_hash[:what]
-        next if !File.exists?(what)
+        next if !file_hash[:upload] || ( file_hash[:upload].is_a?(Proc) && !file_hash[:upload].call )
+        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
@@ -146,8 +146,10 @@ namespace :deploy do
 
   desc 'Restart nginx'
   task :restart_nginx do
-    on roles(:app) do
-      execute :sudo, "service nginx reload"
+    if fetch(:addNginx)
+      on roles(:app) do
+        execute :sudo, "service nginx reload"
+      end
     end
   end
 
@@ -170,4 +172,4 @@ after "deploy:publishing", "deploy:set_up_jenkins"
 after "deploy:publishing", "deploy:prepare_logrotate"
 after "deploy:publishing", "deploy:restart_nginx"
 after "deploy:publishing", "deploy:restart_logstash"
-after "deploy:publishing", "unicorn:restart"
+after "deploy:publishing", "unicorn:legacy_restart"

data/lib/capun/version.rb

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

data/lib/generators/capun/install_generator.rb

@@ -16,15 +16,12 @@ module Capun
       def copy_files
         empty_directory "config/deploy"
         copy_file "database.yml.erb", "config/deploy/database.yml.erb"
-        copy_file "nginx.conf.erb", "config/deploy/nginx.conf.erb"
         copy_file "unicorn.config.rb.erb", "config/deploy/unicorn.config.rb.erb"
         copy_file "Capfile", "Capfile"
       end
 
       def add_to_gitignore
-        gsub_file ".gitignore", "\nconfig/initializers/secret_token.rb", '' if File.exists?("./.gitignore")
         gsub_file ".gitignore", "\nconfig/deploy/database.yml.erb", '' if File.exists?("./.gitignore")
-        append_to_file ".gitignore", "\nconfig/initializers/secret_token.rb" if File.exists?("./.gitignore")
         append_to_file ".gitignore", "\nconfig/deploy/database.yml.erb" if File.exists?("./.gitignore")
       end
 

data/lib/generators/capun/stage_generator.rb

@@ -15,10 +15,8 @@ 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'
-        if @addJenkins
-            @jenkinsToken = ask("New Jenkins token key:")
-        end
         @addNewRelic = ask("Would you like to add New Relic configuration file? [Y/n]").capitalize == 'Y'
         if @addNewRelic
           @newRelicKey = ask("New relic key:")
@@ -50,6 +48,13 @@ module Capun
         end
       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
+      end
+
       def add_secret
         if File.exists?("config/secrets.yml")
           secret_token_does_not_exist = Thor::CoreExt::HashWithIndifferentAccess.new(::YAML::load_file("config/secrets.yml"))[singular_name].nil?
@@ -91,7 +96,8 @@ module Capun
       def add_jenkins
         if @addJenkins
           copy_file "jenkins.config.xml.erb", "config/deploy/jenkins.config.xml.erb"
-          append_to_file "config/deploy/#{singular_name}.rb", "\nset :addJenkins, true\nset :jenkinsToken, \"#{@jenkinsToken}\""
+          jenkinsToken = Digest::MD5.hexdigest(@appname + Time.now.to_f.to_s)
+          append_to_file "config/deploy/#{singular_name}.rb", "\nset :addJenkins, true\nset :jenkinsToken, \"#{jenkinsToken}\""
         end
       end
 

data/lib/generators/capun/templates/deploy.rb.erb

@@ -9,6 +9,6 @@ server '<%= @server %>', user: fetch(:user), roles: %w{web app db}
 set :repo_url, '<%= @repo %>'
 # set :branch, 'master'
 
-set :rvm1_ruby_version, "ruby-2.0.0-p481"
+set :rvm1_ruby_version, "ruby-2.3.0"
 
-# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets public/system}
+# set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets public/system}

data/lib/generators/capun/templates/jenkins.config.xml.erb

@@ -54,7 +54,6 @@
 source ~/.bash_profile
 rvm use <%= fetch(:rvm1_ruby_version) %>
 ln -s ../../common/application.yml config/application.yml
-ln -s ../../../common/secret_token.rb config/initializers/secret_token.rb
 
 bundle install
 

data/lib/generators/capun/templates/newrelic.yml.erb

@@ -28,7 +28,7 @@ common: &default_settings
 # If your application has other named environments, configure them here.
 development:
   <<: *default_settings
-  app_name: <%= fetch(:application) %> (Development)
+  app_name: <%= fetch(:application) %>
 
   # NOTE: There is substantial overhead when running in developer mode.
   # Do not use for production or load testing.
@@ -41,4 +41,4 @@ test:
 
 <%= fetch(:stage) %>:
   <<: *default_settings
-  app_name: <%= fetch(:application) %> (Production)
+  app_name: <%= fetch(:application) %>

metadata

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