cap-puma 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6cff304d389f27a1734f05e93e166879f709df8
-  data.tar.gz: 244edc01dc21ac73caead0cf0361bf04b4d73324
+  metadata.gz: 4ff6eb513d0b18870a1b47cc11aa1f2152ba322e
+  data.tar.gz: 64a27a4bd06578d529846b442096585e0440aef9
 SHA512:
-  metadata.gz: 93267d79137bf75b883d69132071053a14e3c1c65638fbf10c94cfda6f93b3613050d0192671224fd1a0c911244a6950e4cddc1fd5ff1c9a86d7b21eb82f7656
-  data.tar.gz: cf4ffbec2d23c9abee1db28ec99485da9426e3967af79852c8b6e38936a3be77e67e9c1105dd62a3f320bd4b40596242c36fbbaa968891c4e3eee61f4836d820
+  metadata.gz: e810cb469065f3ee15c4dd3813536f4eb45638790f8bbee5e5c823d118c450897aa7f51f96c52dec3b215a21d341277f93ef26650d145becda995eddb183c838
+  data.tar.gz: cb03d1615ae9019274277df5fb622cc9a301bdf88e15d2e949f089a82ff94cea155de7d91f03c41b9b4ae8e44b422185e16e4f14cd76802973d6b89f6bacd9d1

data/cap-puma.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "cap-puma"
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ["John D'Agostino"]
   spec.email         = ["john.dagostino@gmail.com"]
   spec.description   = %q{Capistrano v3 Rake tasks for Puma}

data/lib/capistrano/tasks/puma.rake

@@ -1,25 +1,25 @@
 namespace :puma do
-  before 'deploy:started', :configure do
-    set :puma_cmd, "bundle exec puma"
-    set :pumactl_cmd, "bundle exec pumactl"
-    set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
-    set :puma_state, "#{shared_path}/sockets/puma.state"
-    set :puma_socket, "unix://#{shared_path}/sockets/puma.sock"
-    set :puma_role, :app
-  end
-
   desc 'Start puma'
   task :start do
     on roles fetch(:puma_role) do
-      run "#{puma_cmd} #{start_options}", :pty => false
+      within current_path do
+        execute fetch(:puma_cmd), "#{start_options}"
+      end
+    end
+  end
+
+  desc 'ensure directories exist'
+  task :directories do
+    on roles fetch(:puma_role) do
+      execute :mkdir, '-pv', shared_path, "sockets"
     end
   end
 
   desc 'Stop puma'
   task :stop do
     on roles fetch(:puma_role) do
-      within release_path do
-        run "#{pumactl_cmd} -S #{state_path} stop"
+      within current_path do
+        execute fetch(:pumactl_cmd), "-S #{state_path} stop"
       end
     end
   end
@@ -27,13 +27,8 @@ namespace :puma do
   desc 'Restart puma'
   task :restart do
     on roles fetch(:puma_role) do
-      within release_path do
-        begin
-          run "#{pumactl_cmd} -S #{state_path} restart"
-        rescue Capistrano::CommandError => ex
-          puts "Failed to restart puma: #{ex}\nAssuming not started."
-          start
-        end
+      within current_path do
+        execute fetch(:pumactl_cmd), "-S #{state_path} restart"
       end
     end
   end
@@ -41,8 +36,8 @@ namespace :puma do
   desc 'Restart puma (phased restart)'
   task :phased_restart do
     on roles fetch(:puma_role) do
-      within release_path do
-        run "#{pumactl_cmd} -S #{state_path} phased-restart"
+      within current_path do
+        execute fetch(:pumactl_cmd), "-S #{state_path} phased-restart"
       end
     end
   end
@@ -51,24 +46,24 @@ namespace :puma do
     if config_file
       "-q -d -e #{puma_env} -C #{config_file}"
     else
-      "-q -d -e #{puma_env} -b '#{puma_socket}' -S #{state_path} --control 'unix://#{shared_path}/sockets/pumactl.sock'"
+      "-q -d -e #{puma_env} -b '#{fetch(:puma_socket)}' -S #{state_path} --control 'unix://#{shared_path}/sockets/pumactl.sock'"
     end
   end
 
   def config_file
     @_config_file ||= begin
       file = fetch(:puma_config_file, nil)
-      file = "./config/puma/#{puma_env}.rb" if !file && File.exists?("./config/puma/#{puma_env}.rb")
+      file = "./config/puma/#{puma_env}.rb" if !file && File.exists?("./config/puma/#{fetch(:puma_env)}.rb")
       file
     end
   end
 
   def puma_env
-    fetch(:rack_env, fetch(:rails_env, 'production'))
+    fetch(:puma_env)
   end
 
   def state_path
-    (config_file ? configuration.options[:state] : nil) || puma_state
+    (config_file ? configuration.options[:state] : nil) || fetch(:puma_state)
   end
 
   def configuration
@@ -79,5 +74,16 @@ namespace :puma do
     config
   end
 
-  after 'deploy:finishing', :reset
+  after 'deploy:finishing', 'puma:restart'
+end
+
+namespace :load do
+  task :defaults do
+    set :puma_cmd, fetch(:puma_cmd, "bundle exec puma")
+    set :pumactl_cmd, fetch(:pumactl_cmd, "bundle exec pumactl")
+    set :puma_env, fetch(:puma_env, fetch(:rack_env, fetch(:rails_env, 'production')))
+    set :puma_state, fetch(:puma_state, "#{shared_path}/sockets/puma.state")
+    set :puma_socket, fetch(:puma_socket, "unix://#{shared_path}/sockets/puma.sock")
+    set :puma_role, fetch(:puma_role, :app)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cap-puma
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - John D'Agostino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler