mina-puma 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e515893bb0511bd463e93fda214bdc26e56ffc
-  data.tar.gz: 7a923340a7e2c5a859d0732a820b45e7863583dd
+  metadata.gz: c68864f1dc2893df94157667a384d239f553abc3
+  data.tar.gz: 6011e5b815f40a885b5f952d2f686f2ea1de2c1b
 SHA512:
-  metadata.gz: 24b077c9d7b907ff73d6bccb0048596701952071363545996b1d81bbfb0cab5bdc37dfc78670bac7aa04d5b193116fbaf5b16d8e99f842b08bb4f6e4d634f7e7
-  data.tar.gz: 14d90cbba5c5faca762e148cb1ed751d9e6efa575bb4fe3d2604d6e04bef23404528e92ca4df751483fb85e8d51264d998e553a9e0d919454e78687daebf4f23
+  metadata.gz: fb8818233cf6c6aac522d6e7a460de8c32a3468b87f7e44410fdab64c494c4e5d0f4a4bcdfb9f0a8a5706806fbbce59a33d164980e804590ee0a2b8e9abfbbf6
+  data.tar.gz: 8453b5a1931f663233f1192c5ff07d16f66721f264454f3a67f73c42cd13b9da6a99a74ed7d9adbaaf6ed40dba69d6980a92ff30fb4aa891c0317528afade5b2

data/lib/mina/puma/tasks.rake

@@ -16,42 +16,33 @@ namespace :puma do
 
   desc 'Start puma'
   task :start => :environment do
-    in_directory "#{deploy_to}/#{current_path}" do
-      queue! %(#{puma_cmd} #{start_options})
-    end
+    queue! %[
+      if [ -e '#{pumactl_socket}' ]; then
+        echo 'Puma is already running!';
+      else
+        if [ -e '#{puma_config}' ]; then
+          cd #{deploy_to}/#{current_path} && #{puma_cmd} -q -d -e #{puma_env} -C #{puma_config}
+        else
+          cd #{deploy_to}/#{current_path} && #{puma_cmd} -q -d -e #{puma_env} -b 'unix://#{puma_socket}' -S #{puma_state} --control 'unix://#{pumactl_socket}'
+        fi
+      fi
+    ]
   end
 
   desc 'Stop puma'
   task stop: :environment do
-    in_directory "#{deploy_to}/#{current_path}" do
-      queue! %(#{pumactl_cmd} -S #{puma_state} stop)
-    end
+    queue! %[
+      if [ -e '#{pumactl_socket}' ]; then
+        cd #{deploy_to}/#{current_path} && #{pumactl_cmd} -S #{puma_state} stop
+      else
+        echo 'Puma is not running!';
+      fi
+    ]
   end
 
   desc 'Restart puma'
   task restart: :environment do
-    in_directory "#{deploy_to}/#{current_path}" do
-      if check_exists?(pumactl_socket)
-        queue! %(#{pumactl_cmd} -S #{puma_state} stop)
-        queue! %(#{puma_cmd} #{start_options})
-      else
-        queue! %(#{puma_cmd} #{start_options})
-      end
-    end
+    invoke :'puma:stop'
+    invoke :'puma:start'
   end
-
-  private
-
-    def start_options
-      if check_exists?(puma_config)
-        "-q -d -e #{puma_env} -C #{puma_config}"
-      else
-        "-q -d -e #{puma_env} -b 'unix://#{puma_socket}' -S #{puma_state} --control 'unix://#{pumactl_socket}'"
-      end
-    end
-
-    def check_exists?(file)
-      boolean = capture("if [ -e '#{file}' ]; then echo 'yes'; else echo 'no'; fi").chomp
-      boolean == 'yes' ? true : false
-    end
-end
+end

data/lib/mina/puma/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Puma
-    VERSION = "0.0.10"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-puma
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Tobias Sandelius