rob_cap_recipes 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3ace8b50d18face345ca37e56a01a060cb070b1
-  data.tar.gz: ad4ed3ce98b69c3d1f4b4a994e24ab67673380ea
+  metadata.gz: b267201f5e5446369a4e5b08b8f56273a761bd3a
+  data.tar.gz: 2789bdfdca22ebb9a9d36e28e8c3e0eac79b5c11
 SHA512:
-  metadata.gz: a7af5c447a653826642881ac2e65cabf288e60de8ae535dcedfe7584d88658b7461107cd0d815104b90920055ece4644c55a44f8829a2eb1ee63111fe50e4753
-  data.tar.gz: 6f064d18efd01161b852a776fa2cbee290f16618f09704a5d387225150e82057db7044eda4162322c5f3f321c75628834c16dfa6cab0a18b47b6ae5662612420
+  metadata.gz: 2e71a8896ca3a25c055b0a2c3d5771c9a28182abeefc214cba270258d10e108e0067ba3821458bc045125c5d00d5929748c75e894293e4f67d003f9cdf6bdc7d
+  data.tar.gz: 7c6ceab578dd3e0d8aff443ab831537d03f1626d23cb4c1eacf180d70069fcc312f017620bf63022654d7ebee83942b4a8d1967f44fa85e702fac9d9c49a733a

data/lib/rob_cap_recipes/recipes/base.rb

@@ -12,8 +12,7 @@ Capistrano::Configuration.instance(true).load do
 
   _cset :scm, :git
   set(:repository) { "git@gitlab.stridsberg.nu:ruby_#{application.downcase}.git" }
-  _cset :branch, "master"
-
+  _cset(:branch) { `git rev-parse --abbrev-ref HEAD` }
 
   _cset :use_sudo, false
   _cset :keep_releases, 5

data/lib/rob_cap_recipes/recipes/check.rb

@@ -4,6 +4,7 @@ Capistrano::Configuration.instance(true).load do
     task :revision, roles: :web do
       unless `git rev-parse HEAD` == `git rev-parse origin/#{branch}`
         puts "WARNING: HEAD is not the same as origin/#{branch}"
+        puts "if you are on another branch use caps deploy -s branch='current_branch'"
         puts "Run `git push` to sync changes."
         exit
       end

data/lib/rob_cap_recipes/recipes/templates/nginx_unicorn.erb

@@ -1,9 +1,9 @@
-upstream unicorn.<% host_header %> {
+upstream unicorn.<%= host_header %> {
   server unix:/tmp/unicorn.<%= application %>.sock fail_timeout=0;
 }
 
 server {
-  listen <%= host_header %>:80;
+  listen 80;
   server_name <%= host_header %>;
   root <%= current_path %>/public;
 
@@ -18,7 +18,7 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
-    proxy_pass http://unicorn.<%host_header %>;
+    proxy_pass http://unicorn.<%=host_header %>;
   }
 
   error_page 500 502 503 504 /500.html;

data/lib/rob_cap_recipes/version.rb

@@ -1,3 +1,3 @@
 module RobCapRecipes
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rob_cap_recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Robin Stridsberg