mina-rails-tools 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42ce4596e928ab543ea45cbf4d474bb240cd31d1
-  data.tar.gz: 21f0bce5b2b15e31ea7b168e12d418ffa3b89f4f
+  metadata.gz: e6cc834f968cf4318442fb6e962ab0a57751da78
+  data.tar.gz: 7c5ee6d964ee90802fc568e7201e7895f30576be
 SHA512:
-  metadata.gz: 20b43ea9449a2f9fc45bbb663e18ca6a6c0938498694aebf597b453fe84f8686b64430a85dc1496b4739406210f9851a4e944e7c9037bc51361782a47eb49e22
-  data.tar.gz: c16949e2c3a8f012b6273037443c4906e23cdbf8dc812026554e51f43bd4405a95a83c3c3adc04dbf13e1c1de8a3bfcc03181535bde56f1163e7acc60fdd1ce8
+  metadata.gz: 2d6c717339be2b0c6fd6629200d1a2f3eca872366539c4307559085438a3b1828b6ac1b8390965e4539fc549147a57e5dc24f3a612db950a6d7978c58b80f52b
+  data.tar.gz: bca7a36e46266bc1c54ae82401681dbf012cae1cfaded987544cc19f79ed32181cc337432fa85981e19103dec24c1545437f82dc585dad947b74af67171e75a9

data/lib/mina/extras/nginx.rb

@@ -5,34 +5,34 @@ set :nginx_port, 80
 set :nginx_default, false
 
 namespace :nginx do
-    
+
   # desc "Nginx: Setup config files"
   # task :setup => [:upload, :link]
-  
+
   desc "Nginx: Parses config file and uploads it to server"
   task :upload do
     upload_shared_file("nginx.conf")
   end
-  
+
   desc "Nginx: Symlink config file"
   task :link do
     invoke :sudo
     extra_echo("Nginx: Symlink config file")
-    
-    command %{sudo ln -fs "#{fetch(:deploy_to)}/shared/nginx.conf" "#{nginx_conf_path}/#{fetch(:app)}.conf"}
+
+    command %{sudo ln -fs "#{fetch(:deploy_to)}/shared/nginx.conf" "#{fetch(:nginx_conf_path)}/#{fetch(:app)}.conf"}
     # command check_symlink nginx_conf_path
   end
-    
+
   desc "Current nginx config"
   task :config do
     invoke :sudo
-    
+
     command_echo("#"*80)
-    command_echo("# File: #{nginx_conf_path}/#{fetch(:app)}.conf")
-    command %{sudo cat "#{nginx_conf_path}/#{fetch(:app)}.conf"}
+    command_echo("# File: #{fetch(:nginx_conf_path)}/#{fetch(:app)}.conf")
+    command %{sudo cat "#{fetch(:nginx_conf_path)}/#{fetch(:app)}.conf"}
     command_echo("#"*80)
   end
-  
+
   %w(stop start restart reload status).each do |action|
     desc "#{action.capitalize} Nginx"
     task action.to_sym do

data/lib/mina/extras/templates/nginx.conf.erb

@@ -4,11 +4,11 @@ upstream unicorn-<%= app %> {
 
 # <%= app %> Server
 server {
-  listen <%= nginx_port %><%= ' default' if nginx_default %>;
-  server_name <%= domain %>;
+  listen <%= fetch(:nginx_port) %><%= ' default' if fetch(:nginx_default) %>;
+  server_name <%= fetch(:domain) %>;
+
+  root <%= fetch(:deploy_to) %>/<%= fetch(:current_path) %>/public;
 
-  root <%= fetch(:deploy_to) %>/<%= current_path %>/public;
-  
   gzip on;
   gzip_types text/plain text/xml application/xml application/xml+rss
              text/css text/javascript application/javascript application/json;

data/lib/mina/extras/templates/unicorn_init.sh.erb

@@ -6,7 +6,7 @@ TIMEOUT=60
 APP_ROOT="<%= "#{fetch(:deploy_to)}" %>"
 PID_PATH="<%= "#{fetch(:deploy_to)}/#{shared_path!}/pids" %>"
 PID="$PID_PATH/unicorn.pid"
-ENVIRONMENT="<%= rails_env || "production" %>"
+ENVIRONMENT="<%= fetch(:rails_env) || "production" %>"
 CONFIG="$APP_ROOT/<%= "#{shared_path!}/unicorn.rb" %>"
 UARGS="-D -c $CONFIG -E $ENVIRONMENT"
 CMD="cd $APP_ROOT/<%= current_path! %> && bundle exec unicorn_rails $UARGS"
@@ -63,4 +63,4 @@ reopen-logs)
   echo >&2 "Usage: $0 <start|stop|restart|upgrade|force-stop|reopen-logs>"
   exit 1
   ;;
-esac
+esac

data/lib/mina/extras/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Extras
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-rails-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Joey Lin