capistrano-unicorn-nginx 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e038ef42790b2e2e9fdbc34f37ac6d4b44e1f4b
-  data.tar.gz: 7180b47e77e78edc458a79911acc901df9a95a6e
+  metadata.gz: 7b24ca75112ef51965b402453911b78ad2464cb7
+  data.tar.gz: dcf24a353ca4264baeed850c4869b29867ce4b81
 SHA512:
-  metadata.gz: f39f6cbd00235af5642493388123b78b084499076f8ca23f00ab2b08a0279211cc0a3ade952375fda65c74ec4bb8066dc09921e0b3f2ed847d41d7dd559c659f
-  data.tar.gz: 89ede75ee9776a58a9f0749764b888e04baea723e0b9174a804ec0a26e8f504b1674d02ff562dc09ba21c04ebd9b25fbfa1ade6fa2b180d0ef30fab8e034daed
+  metadata.gz: 9960a5da13b29a0be460ffc64b58b05344b129646771972258f4174a274ff317425d92ecd9ae5ded81922bf50a4180ec9e2ebc13537b1d394f28f6ac7aea55e2
+  data.tar.gz: 3f67ac584a2ac65d6b85557b36b1ecfe3305405389935e61aba1b9267228a65489675bcd012c8d7d1a8fc35fc21ab293df8cd99b8c0102f4cab35b12243b5787

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### v1.0.2, 2014-03-30
+- add `sudo_upload!` helper method for easier uploads
+- improve the way how templates are handled
 ### v1.0.1, 2014-03-30
 - refactor all unicorn and nginx paths to separate modules
 - speed up `nginx:setup_ssl` task

data/lib/capistrano/dsl/nginx_paths.rb

@@ -2,10 +2,6 @@ module Capistrano
   module DSL
     module NginxPaths
 
-      def nginx_config_tmp_file
-        "#{fetch(:tmp_dir)}/#{fetch(:nginx_config_name)}"
-      end
-
       def nginx_sites_available_file
         "/etc/nginx/sites-available/#{fetch(:nginx_config_name)}"
       end

data/lib/capistrano/dsl/unicorn_paths.rb

@@ -2,10 +2,6 @@ module Capistrano
   module DSL
     module UnicornPaths
 
-      def unicorn_initd_tmp_file
-        "#{fetch(:tmp_dir)}/#{fetch(:unicorn_service)}"
-      end
-
       def unicorn_initd_file
         "/etc/init.d/#{fetch(:unicorn_service)}"
       end

data/lib/capistrano/tasks/nginx.rake

@@ -34,8 +34,7 @@ namespace :nginx do
   task :setup do
     on roles :web do
       next if file_exists? nginx_sites_available_file
-      template 'nginx_conf.erb', nginx_config_tmp_file
-      sudo :mv, nginx_config_tmp_file, nginx_sites_available_file
+      sudo_upload! template('nginx_conf.erb'), nginx_sites_available_file
       sudo :ln, '-fs', nginx_sites_available_file, nginx_sites_enabled_file
     end
   end
@@ -46,8 +45,8 @@ namespace :nginx do
     on roles :web do
       next if file_exists?(nginx_ssl_cert_file) && file_exists?(nginx_ssl_cert_key_file)
       if fetch(:nginx_upload_local_cert)
-        upload! fetch(:nginx_ssl_cert_local_path), nginx_ssl_cert_file
-        upload! fetch(:nginx_ssl_cert_key_local_path), nginx_ssl_cert_key_file
+        sudo_upload! fetch(:nginx_ssl_cert_local_path), nginx_ssl_cert_file
+        sudo_upload! fetch(:nginx_ssl_cert_key_local_path), nginx_ssl_cert_key_file
       end
       sudo :chown, 'root:root', nginx_ssl_cert_file
       sudo :chown, 'root:root', nginx_ssl_cert_key_file

data/lib/capistrano/tasks/unicorn.rake

@@ -29,9 +29,8 @@ namespace :unicorn do
   task :setup_initializer do
     on roles :app do
       next if file_exists? unicorn_initd_file
-      template 'unicorn_init.erb', unicorn_initd_tmp_file
-      execute :chmod, '+x', unicorn_initd_tmp_file
-      sudo :mv, unicorn_initd_tmp_file, unicorn_initd_file
+      sudo_upload! template('unicorn_init.erb'), unicorn_initd_file
+      execute :chmod, '+x', unicorn_initd_file
       sudo 'update-rc.d', '-f', fetch(:unicorn_service), 'defaults'
     end
   end
@@ -40,7 +39,7 @@ namespace :unicorn do
   task :setup_app_config do
     on roles :app do
       next if file_exists? fetch(:unicorn_config)
-      template 'unicorn.rb.erb', fetch(:unicorn_config)
+      upload! template('unicorn.rb.erb'), fetch(:unicorn_config)
     end
   end
 

data/lib/capistrano/unicorn_nginx/helpers.rb

@@ -8,14 +8,13 @@ module Capistrano
         SSHKit::Command.new(:bundle, :exec, :unicorn, args).to_command
       end
 
-      def template(template_name, target)
+      def template(template_name)
         config_file = "#{fetch(:templates_path)}/#{template_name}"
         # if no customized file, proceed with default
         unless File.exists?(config_file)
           config_file = File.join(File.dirname(__FILE__), "../../generators/capistrano/unicorn_nginx/templates/#{template_name}")
         end
-        config_stream = StringIO.new(ERB.new(File.read(config_file)).result(binding))
-        upload! config_stream, target
+        StringIO.new(ERB.new(File.read(config_file)).result(binding))
       end
 
       def file_exists?(path)
@@ -26,6 +25,14 @@ module Capistrano
         capture :id, '-un'
       end
 
+      def sudo_upload!(from, to)
+        filename = File.basename(to)
+        to_dir = File.dirname(to)
+        tmp_file = "#{fetch(:tmp_dir)}/#{filename}"
+        upload! from, tmp_file
+        sudo :mv, tmp_file, to_dir
+      end
+
     end
   end
 end

data/lib/capistrano/unicorn_nginx/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module UnicornNginx
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn-nginx
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano