capistrano-nginx-unit 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62b0d922cb2c6e70e8027253e76fd5b9cb0be6fbfb25a8ee31ec5c12a14661a2
-  data.tar.gz: 939506d0e5896d0f6e0c9058a8953a900543ab533410d2ddb89888bc3607d995
+  metadata.gz: 46570db097e14918f9d04863542c5832a9fbdb72cbd8fb974296a534608f9c69
+  data.tar.gz: dd0b9a3ab22b37c83598322d0842af3e46e0189f9dc508fc45065a5e73cc9191
 SHA512:
-  metadata.gz: 3992ecbc1b83746ec29ef21a65e511e252d1e1267f0ad9df70b2841b377367b16c4c9d8bdd7e01b14afd9e8984cea89eb9252aa50cced62bb913a809bbff766d
-  data.tar.gz: 3b4480dd832694971899c0a6f83cac055490a4aa62bbfa302bef2bae17d57457d97a66bae093ee7499a4749e2278f97184f0b224a83e913b0c5b280f1b677b77
+  metadata.gz: 84a684b6ee4c2576d52bafb6fd19501ea8434b9057a7390c3710744329ddd0e7643969261f083cbc819192ce707a50f9219da84b2311b87e6e1521e0f9800ca9
+  data.tar.gz: 168c9932f4b17f74d5bf8ece2859595596026ce960afdb4e8c01d141aca9dd445e2cb4700b4c1dc0672b2e64f76111674debbd9090e6d8dd64df512ac386cf27

data/.editorconfig

@@ -0,0 +1,10 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_size = 2
+
+[*.rb]
+trim_trailing_whitespace = true
+
+[*.rake]
+trim_trailing_whitespace = true

data/README.md

@@ -18,9 +18,12 @@ require "capistrano/nginx-unit"
 Defined following tasks.
 
 ```
-cap nginx_unit:configure           # Set listener and application configuration for NGINX Unit
-cap nginx_unit:configure_app       # Set application configuration for NGINX Unit
-cap nginx_unit:configure_listener  # Set listener configuration for NGINX Unit
+cap nginx_unit:attach              # Attach listener and application configuration to NGINX Unit
+cap nginx_unit:attach_app          # Attach application configuration to NGINX Unit
+cap nginx_unit:attach_listener     # Attach listener configuration to NGINX Unit
+cap nginx_unit:detach              # Detach listener and application configuration from NGINX Unit
+cap nginx_unit:detach_app          # Detach application configuration from NGINX Unit
+cap nginx_unit:detach_listener     # Detach listener configuration from NGINX Unit
 cap nginx_unit:start               # Start NGINX Unit process
 ```
 
@@ -39,9 +42,9 @@ set :nginx_unit_group,        -> { nil }
 set :nginx_unit_script,       -> { "config.ru" }
 ```
 
-If you want to apply new code when deployed, please invoke `nginx_unit:configure` task after `deploy:published`.
+If you want to apply new code when deployed, please invoke `nginx_unit:attach` task after `deploy:published`.
 
 ```rb
 # deploy.rb
-after "deploy:published", "nginx_unit:configure"
+after "deploy:published", "nginx_unit:attach"
 ```

data/lib/capistrano/nginx-unit/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  NGINX_UNIT_VERSION = "0.2"
+  NGINX_UNIT_VERSION = "0.3"
 end

data/lib/capistrano/tasks/nginx-unit.rake

@@ -22,8 +22,8 @@ namespace :nginx_unit do
       if test("[ -e #{pid_file} ] && kill -0 `cat #{pid_file}`")
         info "NGINX Unit is already started"
       else
-        execute :sudo, :unitd, 
-                "--pid #{pid_file}", 
+        execute :sudo, :unitd,
+                "--pid #{pid_file}",
                 "--control unix:#{fetch(:nginx_unit_control_sock)}",
                 fetch(:nginx_unit_options)
       end
@@ -32,24 +32,23 @@ namespace :nginx_unit do
 
   # If you want to apply new code when deployed,
   # please invoke this task after deploy:published
-  desc "Set listener and application configuration for NGINX Unit"
-  task :configure do
+  desc "Attach listener and application configuration to NGINX Unit"
+  task :attach do
     invoke "nginx_unit:start"
-    invoke "nginx_unit:configure_app"
-    invoke "nginx_unit:configure_listener"
+    invoke "nginx_unit:attach_app"
+    invoke "nginx_unit:attach_listener"
   end
 
-  desc "Set listener configuration for NGINX Unit"
-  task :configure_listener do
+  desc "Attach listener configuration to NGINX Unit"
+  task :attach_listener do
     on release_roles(fetch(:nginx_unit_roles)) do
       listener_json = JSON.generate("application" => fetch(:application))
-
-      configure_nginx_unit("/listeners/#{fetch(:nginx_unit_listen)}", listener_json)
+      control_nginx_unit(:put, path: "/listeners/#{fetch(:nginx_unit_listen)}", json: listener_json)
     end
   end
 
-  desc "Set application configuration for NGINX Unit"
-  task :configure_app do
+  desc "Attach application configuration to NGINX Unit"
+  task :attach_app do
     on release_roles(fetch(:nginx_unit_roles)) do |role|
       released_dir = capture(:readlink, "-f", current_path)
       raise "Doesn't exist released dir: #{released_dir}" unless test("[ -d #{released_dir} ]")
@@ -62,27 +61,41 @@ namespace :nginx_unit do
         script:    File.join(released_dir, fetch(:nginx_unit_script))
       })
 
-      info "application config: #{app_json}"
-      configure_nginx_unit("/applications/#{fetch(:nginx_unit_app_name)}", app_json)
+      control_nginx_unit(:put, path: "/applications/#{fetch(:nginx_unit_app_name)}", json: app_json)
     end
   end
 
-  # Send request to NGINX Unit control socket
-  def configure_nginx_unit(path, json)
-    info "#{path} => #{json}"
+  desc "Detach listener and application configuration from NGINX Unit"
+  task :detach do
+    invoke "nginx_unit:detach_listener"
+    invoke "nginx_unit:detach_app"
+  end
+
+  desc "Detach listener configuration from NGINX Unit"
+  task :detach_listener do
+    on release_roles(fetch(:nginx_unit_roles)) do
+      control_nginx_unit(:delete, path: "/listeners/#{fetch(:nginx_unit_listen)}")
+    end
+  end
 
-    res = JSON.parse(capture(:curl,
-      "-X PUT",
-      "-d '#{json}'",
+  desc "Detach application configuration from NGINX Unit"
+  task :detach_app do
+    on release_roles(fetch(:nginx_unit_roles)) do
+      control_nginx_unit(:delete, path: "/applications/#{fetch(:nginx_unit_app_name)}")
+    end
+  end
+
+  # Send request to NGINX Unit control socket
+  def control_nginx_unit(method, path: "", json: nil)
+    args = [
+      "-fs",
+      "-X #{method.to_s.upcase}",
       "--unix-socket #{fetch(:nginx_unit_control_sock)}",
       "'http://localhost/#{path}'"
-    ))
+    ]
 
-    if res["error"]
-      fatal res
-      raise "Faild to configure"
-    else
-      info res
-    end
+    args << "-d '#{json}'" if json
+
+    execute :curl, *args
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nginx-unit
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - murakmii
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt