capistrano-generals 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdebc6315f89ed9b6e0c9a4a4d14e7e73a3e6244
-  data.tar.gz: 5d313806553a1fc320e9a1eb46db7c6e627d4830
+  metadata.gz: d136e725fcb93bd1cc091d07d57fd41e18827bbd
+  data.tar.gz: d42a6257cb5b87d3e04349f2374de5e5da498d03
 SHA512:
-  metadata.gz: 7502b3c0524e108402761ba462da56afc8510a61013e790f7c766543c1a28141bf61b91c6762c24bcae983a8b8d77865271444b0ccd8ec5886d1e9c5ea8367d9
-  data.tar.gz: 9410356ba56ad748d5444695a12573b313ebe1a81836e57d535112290397f15d66dac42038ff71d3dc7e37fa62a1bf433812d5f5884bf40dccad6963210817b1
+  metadata.gz: 4b018c2ee47f23b398c1a4ab91d484008efd12ab0faedc745ba73e705e5558eccac5fc1488665d734f13314dece33c53d599f7b744bd48d239991402c5687a4a
+  data.tar.gz: a7967de06065b57dc86d1f4c23a8ad8344611f5dac8a78bd4469a2b2b549ca3a5752498b3dc0d6895a43025bdf221e170d7cdccdea024d3581220b6fc95c6da8

data/lib/capistrano/generals/helpers.rb

@@ -5,7 +5,33 @@ module Capistrano
         "\033[31m#{text}\033[0m"
       end
 
-      def get_config_file config, stage
+      # Try to find stage specific file, otherwice select default
+      # If the default does not exists, abort
+      def get_config_file(file_name, stage)
+        # Default local_file_name is stage specific.
+        local_file_name = get_config_file_name(file_name, stage)
+
+        # Check if file exists, else select default file
+        # If default file does not exists abort.
+        unless file_exists? local_file_name
+          unless file_exists? file_name
+            abort red "Cannot find file #{local_file_name} or #{file_name} on machine"
+          end
+          # The default file does exists, selecting that one
+          warn "Cannot find stage specific config file #{local_file_name} on machine, taking default #{file_name}"
+          local_file_name = file_name
+        end
+        local_file_name
+      end
+
+      # Returns if the file exists
+      # The default File.exists? does not work on a remote
+      def file_exists?(file_name)
+        test("[ -f #{file_name} ]")
+      end
+
+      # Get the stage specific name of the file
+      def get_config_file_name(config, stage)
         path = File.dirname(config)
         extension = File.extname(config)
         filename = File.basename(config, extension)

data/lib/capistrano/generals/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Generals
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/capistrano/tasks/deploy/restarts.rake

@@ -0,0 +1,11 @@
+namespace :deploy do
+
+  desc 'Restart nginx and unicorn.'
+  task :restart do
+    on roles(:app) do
+      execute "sudo /etc/init.d/unicorn_#{fetch(:application)}_#{fetch(:stage)} upgrade"
+      execute "sudo /etc/init.d/nginx restart"
+    end
+  end
+
+end

data/lib/capistrano/tasks/deploy/symlink.rake

@@ -12,26 +12,16 @@ namespace :deploy do
       # Loop through all linked files
       fetch(:linked_files).each do |file_name|
 
-        # Default local_file_name is stage specific.
-        local_file_name = get_config_file(file_name, fetch(:stage).to_s)
-
         # Initialize variable outsize run_locally block to make sure it can be
         # passed into the remote block
         local_cksum = nil
+        local_file_name = ''
 
         # Get file information
         run_locally do
 
-          # Check if file exists, else select default file
-          # If default file does not exists abort.
-          unless File.exists? local_file_name
-            unless File.exists? file_name
-              abort red "Cannot find file #{local_file_name} or #{file_name} on local machine"
-            end
-            # The default file does exists, selecting that one
-            warn "Cannot find stage specific config file #{local_file_name} on local machine, taking default #{file_name}"
-            local_file_name = file_name
-          end
+          # Try to find stage specific file, otherwice select default
+          local_file_name = get_config_file(file_name, fetch(:stage).to_s)
 
           # Get local file info
           local_cksum = capture :cksum, local_file_name

data/lib/capistrano/tasks/git.rake

@@ -17,7 +17,7 @@ namespace :git do
 
       # Push selected branch to github
       unless system "git push #{repo_url} #{fetch(:branch)} #{'-f' if ENV['FORCE']}"
-        abort red "Failed to push changes to #{fetch(:repo_url)} (set FORCE=true to force push to github)"
+        abort red "Failed to push changes to #{fetch(:repo_url)} (set FORCE=true to force push)"
       end
     end
   end

data/lib/capistrano/tasks/setup.rake

@@ -2,11 +2,18 @@ namespace :setup do
 
   desc "Symlinks config files for Nginx and Unicorn"
   task :symlink_nginx_and_unicorn do
-    on roles(:app) do
-      execute "ln -nfs #{current_path}/config/nginx.conf /etc/nginx/sites-enabled/#{fetch(:application)}"
-      execute "ln -nfs #{current_path}/config/unicorn_init.sh /etc/init.d/unicorn_#{fetch(:application)}"
+    on roles :app do
+      # Find stage specific config file
+      file_name = File.join current_path, 'config/nginx.conf'
+      file_name = get_config_file(file_name, fetch(:stage).to_s)
+      execute "ln -nfs #{file_name} /etc/nginx/sites-enabled/#{fetch(:application)}_#{fetch(:stage)}"
+
+      # Find stage specific config file
+      file_name = File.join current_path, 'config/unicorn_init.sh'
+      file_name = get_config_file(file_name, fetch(:stage).to_s)
+      execute "ln -nfs #{file_name} /etc/init.d/unicorn_#{fetch(:application)}_#{fetch(:stage)}"
       # Start unicorn at startup
-      execute "sudo update-rc.d unicorn_#{fetch(:application)} defaults"
+      execute "sudo update-rc.d unicorn_#{fetch(:application)}_#{fetch(:stage)} defaults"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-generals
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stef Schenkelaars
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -69,6 +69,7 @@ files:
 - lib/capistrano/generals.rb
 - lib/capistrano/generals/helpers.rb
 - lib/capistrano/generals/version.rb
+- lib/capistrano/tasks/deploy/restarts.rake
 - lib/capistrano/tasks/deploy/symlink.rake
 - lib/capistrano/tasks/git.rake
 - lib/capistrano/tasks/setup.rake
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Some general capistrano tasks which are commonly used