weapon 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b6b5520a327f18f9e318546d2b70fce70cd86bb
-  data.tar.gz: f42c3be68c2451b00595b1f828c6bc761a404006
+  metadata.gz: e41f3b41099196ae19a48053b50d6ced363bb798
+  data.tar.gz: 7a4e95b893d4d6f886107d0de647530da14cdd51
 SHA512:
-  metadata.gz: 817954fee8cfe14108ec4a8f72a5280acbfd5fbd7b242b2a4c8208acd73d086921dbcaaf76510061fcb6dca0e8f2bee4b4a89b8433d6049229c669ddf4e2d737
-  data.tar.gz: bcffdafb303f7369d2a186088facc448ddf46777ebb9613cadb96a0e69de2fe697c1f444896e7b4a188237194aa60e5233737fd163d0aac2dfaf8af6ca5e2e1c
+  metadata.gz: 4176ce495905bd7756f644a8e661a086db698e17ae06c550bcc6ff9ee38e071b375e6f1ad200f32e8872a1723f2b0c70a7c5f346487bbe681075b7ca37ccfade
+  data.tar.gz: 9d6fd074e7f608318313b7112572aa0b261d2edfd0d709597c085e8e8a1882fd8f1486bd8f0a06d9497378d3462fe374cd9850fd003f8eb0b92e6b5541d27965

data/lib/support/mina_unicorn/deploy.rb

@@ -84,7 +84,7 @@ end
 
 desc "Shows logs."
 task :logs do
-  queue %[cd #{deploy_to!}/current && tail -f log/production.log]
+  queue %[cd #{deploy_to!}/current && tail -f log/#{rails_env}.log]
 end
 
 desc "Display the unicorn logs."

data/lib/support/mina_unicorn/staging-unicorn-nginx.conf

@@ -0,0 +1,29 @@
+upstream app_name_for_replace {
+    # Path to Unicorn SOCK file, as defined previously
+    server unix:/tmp/app_name_for_replace.unicorn.sock;
+}
+
+server {
+
+
+    listen 80;
+    server_name domain_for_replace;
+
+    # Application root, as defined previously
+    root deploy_directory_for_replace_staging/current/public;
+
+    try_files $uri @app_name_for_replace;
+    access_log /var/log/nginx/app_name_for_replace_access.log;
+    error_log /var/log/nginx/app_name_for_replace_error.log;
+
+    location @app_name_for_replace{
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $http_host;
+        proxy_redirect off;
+        proxy_pass http://app_name_for_replace;
+    }
+
+    error_page 500 502 503 504 /500.html;
+    client_max_body_size 4G;
+    keepalive_timeout 10;
+}

data/lib/support/mina_unicorn/unicorn-nginx.conf

@@ -10,7 +10,7 @@ server {
     server_name domain_for_replace;
 
     # Application root, as defined previously
-    root /home/chuck/www/app_name_for_replace/current/public;
+    root deploy_directory_for_replace/current/public;
 
     try_files $uri @app_name_for_replace;
     access_log /var/log/nginx/app_name_for_replace_access.log;

data/lib/weapon.rb

@@ -37,9 +37,11 @@ class Weapon < Thor
   def setup_mina_unicorn
     makesure_in_git
 
-    gem 'mina-multistage', require: false
-    gem 'mina-unicorn', require: false
-    gem 'unicorn'
+    gem_group :development do
+      gem 'mina-multistage', require: false
+      gem 'mina-unicorn', require: false
+      gem 'unicorn'
+    end
     run "bundle"
     FileUtils.mkdir_p "config/deploy"
     FileUtils.mkdir_p "config/unicorn"
@@ -50,6 +52,7 @@ class Weapon < Thor
     copy_file 'support/mina_unicorn/deploy_production.rb', 'config/deploy/production.rb'
     copy_file 'support/mina_unicorn/deploy_staging.rb', 'config/deploy/staging.rb'
     copy_file 'support/mina_unicorn/unicorn-nginx.conf', 'unicorn-nginx.conf'
+    copy_file 'support/mina_unicorn/staging-unicorn-nginx.conf', 'staging-unicorn-nginx.conf'
 
     puts "setup mina deploy"
 
@@ -67,6 +70,7 @@ class Weapon < Thor
       gsub_file "config/unicorn/staging.rb", "#{key}_for_replace", eval(key)
 
       gsub_file "unicorn-nginx.conf", "#{key}_for_replace", eval(key)
+      gsub_file "staging-unicorn-nginx.conf", "#{key}_for_replace", eval(key)
       gsub_file "config/deploy.rb", "#{key}_for_replace", eval(key)
 
     end
@@ -85,7 +89,7 @@ class Weapon < Thor
     run 'scp config/application.yml ' + username + '@' + domain + ':' + deploy_directory + '_staging/shared/config/'
     run 'scp config/secrets.yml ' + username + '@' + domain + ':' + deploy_directory + '_staging/shared/config/'
 
-    run 'scp unicorn-nginx.conf ' + username + '@' + domain + ':' + "/etc/nginx/sites-enabled/#{app_name}.conf"
+    #run 'scp unicorn-nginx.conf ' + username + '@' + domain + ':' + "/etc/nginx/sites-enabled/#{app_name}.conf"
 =begin
     run "git clone https://github.com/sstephenson/rbenv.git ~/.rbenv"
     run "echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.zshrc"
@@ -94,7 +98,8 @@ class Weapon < Thor
 
     run 'mina setup'
     run 'mina deploy'
-    puts "remember to restart nginx server"
+    puts "remember to make soft link to unicorn-nginx.conf && staging-unicorn-nginx.conf".colorize(:blue)
+    puts "remember to restart nginx server".colorize(:blue)
   end
 
   desc "setup_settings_ui", "setup settings ui"
@@ -179,9 +184,11 @@ class Weapon < Thor
     gem 'slack-notifier'
     gem 'activevalidators'
 
-    gem 'mina', require: false
-    gem 'mina-multistage', require: false
-    gem 'mina-sidekiq', require: false
+    gem_group :development do
+      gem 'mina', require: false
+      gem 'mina-multistage', require: false
+      gem 'mina-sidekiq', require: false
+    end
 
     gem 'figaro'
     gem 'whenever', '~> 0.9.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weapon
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
-- Chuck.lei
+- seaify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +104,7 @@ files:
 - lib/support/mina_unicorn/deploy.rb
 - lib/support/mina_unicorn/deploy_production.rb
 - lib/support/mina_unicorn/deploy_staging.rb
+- lib/support/mina_unicorn/staging-unicorn-nginx.conf
 - lib/support/mina_unicorn/unicorn-nginx.conf
 - lib/support/mina_unicorn/unicorn.rb
 - lib/support/mina_unicorn/unicorn_production.rb