mina-extras 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce6fa4c8ce44da5d61ce6e133194275a38ebb93
-  data.tar.gz: e4b55f9022a8c8477a32c196f7a998131e198602
+  metadata.gz: e3c534503b80e236a0194f9de6441875fa1a6151
+  data.tar.gz: 352858159ab06ff9850686002eb75acddfdab94d
 SHA512:
-  metadata.gz: f36fa0bce7f4a906e873d868db6b43ee7639b171eb612ae987ed9cdcfd93af904e22e1f4ab3f098b6c7ff2d0eab57b5b1edfdd3b0b712cdf43c454860c326c40
-  data.tar.gz: b717139ed9a712439c00ce716bb6c4bc344267ad9f401f877129fcdd8692950ed62ab04ea1cf08509568b8901ff5d049423cc9143a6b016c1afd385205df1ec1
+  metadata.gz: 388899fd2a3d3ddc4a96b1df88bae8847698626ecceaa443fd5960ed135298cb02d6b640f555e7a08c1e288de7955a678077371f071c5231dfbb581413a480ef
+  data.tar.gz: 2527d59396f6ba6c21eabdcba9e98a28de66fcbec4907349e4c4c7050824690dc7dbbc5734302011a7f82d65517fae302b6803d0926c0e933b4c240973ab3ff3

data/lib/mina-extras/auto-repository.rb

@@ -1 +1 @@
-set :repository,  %x[git config --get remote.origin.url].strip
+set_default :repository, %x[git config --get remote.origin.url].strip

data/lib/mina-extras/git.rb

@@ -1 +1 @@
-set :current_git_branch, %x[git rev-parse --abbrev-ref HEAD].strip
+set_default :current_git_branch, %x[git rev-parse --abbrev-ref HEAD].strip

data/lib/mina-extras/puma.rb

@@ -1,15 +1,13 @@
-namespace :puma do
-  task :config do
-    set :puma_cmd_prefix, "cd #{deploy_to}/#{current_path} ; RAILS_ENV=#{rails_env!}"
-    set :puma_pid_path, "#{deploy_to}/#{shared_path}/pids/puma.pid"
-    set :puma_sock_dir, "#{deploy_to}/#{shared_path}/sockets"
-    set :puma_start_cmd, "bundle exec puma -C #{File.join(deploy_to,current_path,'config','puma.rb')}"
-    set :puma_stop_cmd, "bundle exec pumactl -S #{puma_sock_dir}/puma.state stop"
-    set :puma_restart_cmd, "bundle exec pumactl -S #{puma_sock_dir}/puma.state phased-restart"
-  end
+set_default :puma_cmd_prefix, lambda { "cd #{deploy_to}/#{current_path} ; RAILS_ENV=#{rails_env!}" }
+set_default :puma_pid_path, lambda { "#{deploy_to}/#{shared_path}/pids/puma.pid" }
+set_default :puma_sock_dir, lambda { "#{deploy_to}/#{shared_path}/sockets" }
+set_default :puma_start_cmd, lambda { "bundle exec puma -C #{File.join(deploy_to,current_path,'config','puma.rb')}" }
+set_default :puma_stop_cmd, lambda { "bundle exec pumactl -S #{puma_sock_dir}/puma.state stop" }
+set_default :puma_restart_cmd, lambda { "bundle exec pumactl -S #{puma_sock_dir}/puma.state phased-restart" }
 
+namespace :puma do
   desc 'Start puma'
-  task :start => [:config, :environment] do
+  task :start => [:environment] do
     queue %{
       echo "-----> Starting puma"
       #{echo_cmd "#{puma_cmd_prefix} #{puma_start_cmd}"}
@@ -17,7 +15,7 @@ namespace :puma do
   end
 
   desc 'Stop puma'
-  task :stop => [:config, :environment] do
+  task :stop => [:environment] do
     queue %{
       echo "-----> Stopping puma"
       #{echo_cmd "#{puma_cmd_prefix} #{puma_stop_cmd}"}
@@ -25,7 +23,7 @@ namespace :puma do
   end
 
   desc 'Restart puma'
-  task :restart => [:config, :environment] do
+  task :restart => [:environment] do
     queue %{
       PUMA_PID=$(cat "#{puma_pid_path}")
       kill -0 $PUMA_PID > /dev/null 2>&1

data/lib/mina-extras/rvm.rb

@@ -6,8 +6,8 @@ if File.exist?("#{app_root}/.ruby-gemset")
 else
   version, gemset = version.split("@")
 end
-set :current_ruby, version
-set :current_gemset, gemset
+set_default :current_ruby, version
+set_default :current_gemset, gemset
 
 task :'rvm:use:current' do
   invoke :"rvm:use[#{current_ruby!}@#{current_gemset!}]"

data/lib/mina-extras/unicorn.rb

@@ -1,19 +1,15 @@
-namespace :unicorn do
-  task :config do
-    cmd_prefix  = "cd #{deploy_to}/#{current_path} ; "
-    cmd_prefix += "RAILS_ENV=#{rails_env!} bundle exec"
-    config_file_path = "#{File.join(deploy_to,current_path,'config','unicorn.rb')}"
-    pid_path = "#{File.join(deploy_to,current_path,'tmp','pids')}"
-    pid_file = "#{File.join(pid_path,'unicorn.pid')}"
-    
-    set :unicorn_start_cmd, "#{cmd_prefix} unicorn -c #{config_file_path} -D -E production"
-    set :unicorn_stop_cmd, "kill -s QUIT `cat #{pid_file}`"
-    set :unicorn_terminate_cmd, "kill -s TERM `cat #{pid_file}`"
-    set :unicorn_setup_cmd, "mkdir -p #{pid_path}"
-  end
+config_file_path = "#{File.join(deploy_to,current_path,'config','unicorn.rb')}"
+pid_path = "#{File.join(deploy_to,current_path,'tmp','pids')}"
+pid_file = "#{File.join(pid_path,'unicorn.pid')}"
+
+set_default :unicorn_start_cmd, lambda { "cd #{deploy_to}/#{current_path} ; RAILS_ENV=#{rails_env!} bundle exec unicorn -c #{config_file_path} -D -E production" }
+set_default :unicorn_stop_cmd, lambda { "kill -s QUIT `cat #{pid_file}`" }
+set_default :unicorn_terminate_cmd, lambda { "kill -s TERM `cat #{pid_file}`" }
+set_default :unicorn_setup_cmd, lambda { "mkdir -p #{pid_path}" }
 
+namespace :unicorn do
   desc 'Start Unicorn'
-  task :start => [:config, :environment] do
+  task :start => [:environment] do
     queue %{
       echo "------> Starting Unicorn"
       #{echo_cmd unicorn_start_cmd}
@@ -21,7 +17,7 @@ namespace :unicorn do
   end
 
   desc 'Stop Unicorn'
-  task :stop => [:config, :environment] do
+  task :stop => [:environment] do
     queue %{
       echo "------> Stopping Unicorn"
       #{echo_cmd unicorn_stop_cmd}
@@ -29,7 +25,7 @@ namespace :unicorn do
   end
 
   desc 'Stop Unicorn'
-  task 'force-stop' => [:config, :environment] do
+  task 'force-stop' => [:environment] do
     queue %{
       echo "------> Force stopping Unicorn"
       #{echo_cmd unicorn_terminate_cmd}
@@ -37,7 +33,7 @@ namespace :unicorn do
   end
 
   desc 'Restart Unicorn'
-  task :restart => [:config, :environment] do
+  task :restart => [:environment] do
     queue %{
       echo "------> Stopping Unicorn"
       #{echo_cmd unicorn_stop_cmd}
@@ -47,11 +43,10 @@ namespace :unicorn do
   end
 
   desc 'Setup paths'
-  task :setup => [:config, :environment] do
+  task :setup => [:environment] do
     queue %{
       echo "------> creating pid folder"
       #{echo_cmd unicorn_setup_cmd}
     }
   end
-
 end

data/lib/mina-extras/whenever.rb

@@ -3,11 +3,11 @@
 # Add in "to :launch do"
 #   invoke :'whenever:update_crontab'
 
-set :whenever_environment,  lambda { rails_env! }
-set :whenever_variables,    lambda { "environment=#{whenever_environment!}" }
-set :whenever_command,      "bundle exec whenever"
-set :whenever_update_flags, lambda { "--update-crontab #{whenever_identifier!} --set #{whenever_variables!}" }
-set :whenever_clear_flags,  lambda { "--clear-crontab #{whenever_identifier!}" }
+set_default :whenever_environment,  lambda { rails_env! }
+set_default :whenever_variables,    lambda { "environment=#{whenever_environment!}" }
+set_default :whenever_command,      "bundle exec whenever"
+set_default :whenever_update_flags, lambda { "--update-crontab #{whenever_identifier!} --set #{whenever_variables!}" }
+set_default :whenever_clear_flags,  lambda { "--clear-crontab #{whenever_identifier!}" }
 
 namespace :whenever do
   desc "Update application's crontab entries using Whenever"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-extras
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jan Berdajs