luban-rack 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 313729df0ba4064d8f42d76cd9575bc1d6a0eac7
-  data.tar.gz: 4346730b53422db3cc5a927b9a272704e348c9f6
+  metadata.gz: 626db6c7b396d14e293e920efe56d3425761ef82
+  data.tar.gz: a62a72eeb89fd03d1ba6db97d538423fde5ca2e4
 SHA512:
-  metadata.gz: 12a82940fd47c7bf4d17698967d4812b861158a105d652ab4e61eb0900a84668889912b74fcd24e7ad1cad4413b814803171e9d9dd43e88e40ab3566e8f6b83b
-  data.tar.gz: c07e9df4ecf664e1f2faa43e96d334047a594cede7b75d7a5d6b650b3094831b24dc366edbb723741fc8d7150a2d7f30d0b4731fa511c8a8ef5cffc525dd7f4a
+  metadata.gz: 170aa8e0fabb3e51061e634011210820a4e422a6d0d613662991e175f726867e743fc9564629510699907423822986fb6f9d91994d02d4f6ae01f23fe99d0607
+  data.tar.gz: b86ae5dc78705ec32a35d50f1f9eee07ccde33c170d80482f7f376cdca0fd0f823c555a78c9444c20daf2ec3eb1e11b15e08e48b31a3f7da3ed88abeb0942765

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+## Version 0.2.17 (Nov 14, 2016)
+
+Minor enhancements:
+  * Added publish callback for web server
+  * Added Puma plugin for Luban integration to
+    * Solved process tag unchanged during phase restart
+    * Loaded app from releast path directly instead of current_app_path 
+
 ## Version 0.2.16 (Nov 09, 2016)
 
 Bug fixes:

data/lib/luban/deployment/applications/rack/publisher.rb

@@ -3,6 +3,13 @@ module Luban
     module Applications
       class Rack
         class Publisher < Luban::Deployment::Application::Publisher
+          include WebServer
+
+          def after_publish
+            super
+            publish_web_server
+          end
+
           protected
 
           def init

data/lib/luban/deployment/applications/rack/templates/puma/puma.rb.erb

@@ -2,4 +2,6 @@
 
 <% web_server[:opts].each_pair do |key, value| -%>
 <%= key %> <%= value.is_a?(Array) ? parameterize(*value) : value.inspect %>
-<% end %>
+<% end %>
+
+plugin 'luban'

data/lib/luban/deployment/applications/rack/version.rb

@@ -2,7 +2,7 @@ module Luban
   module Deployment
     module Applications
       class Rack
-        VERSION = '0.2.16'
+        VERSION = '0.2.17'
       end
     end
   end

data/lib/luban/deployment/applications/rack/web_server.rb

@@ -19,6 +19,8 @@ module Luban
 
           def current_web_server; web_server[:name]; end
 
+          def publish_web_server; end
+
           protected
 
           def init

data/lib/luban/deployment/applications/rack/web_servers/puma/plugin/luban.rb

@@ -0,0 +1,24 @@
+# Backport :define_singleton_method
+unless Kernel.method_defined? :define_singleton_method
+  module Kernel
+    def define_singleton_method(*args, &block)
+      class << self
+        self
+      end.send(:define_method, *args, &block)
+    end
+  end
+end
+
+Puma::Plugin.create do
+  def start(launcher)
+    launcher.define_singleton_method(:phased_restart) do
+      init_options = { config_files: @options.all_of(:config_files) }
+      @options.instance_variable_set(:@cur, init_options)
+      @options.instance_variable_set(:@set, [init_options])
+      @config.load
+      @restart_dir = dir if dir = @options[:directory]
+      set_process_title
+      super()
+    end
+  end
+end

data/lib/luban/deployment/applications/rack/web_servers/puma.rb

@@ -11,8 +11,7 @@ module Luban
                   address: "127.0.0.1",
                   port: port + 1,
                   socket: socket_file_path.to_s,
-                  #directory: release_path.to_s,
-                  directory: current_app_path.to_s,
+                  directory: release_path.to_s,
                   environment: stage,
                   # Daemon options
                   daemonize: true,
@@ -30,7 +29,7 @@ module Luban
                   prune_bundler: true,
                   # Control app options
                   control_socket: control_socket_file_path.to_s,
-                  control_opts: { authen_tocken: port.to_s }
+                  control_opts: { auth_token: port.to_s }
                 }
               end
 
@@ -150,6 +149,24 @@ module Luban
             def phased_restart_command
               @phased_restart_command ||= bundle_command("#{puma_command} phased-restart")
             end
+
+            def publish_web_server
+              install_puma_plugins if publish_app?
+            end
+
+            protected
+
+            def install_puma_plugins
+              src_plugin_path = Pathname.new(__FILE__).dirname.join('puma', 'plugin')
+              dst_plugin_path = within(release_path) do
+                                  Pathname.new(capture(bundle_executable, :show, 'puma'))
+                                end.join('lib', 'puma', 'plugin')
+              Pathname.glob(src_plugin_path.join('*.rb')).each do |src_plugin|
+                dst_plugin = dst_plugin_path.join(src_plugin.basename)
+                upload_by_template(file_to_upload: dst_plugin, template_file: src_plugin,
+                                   auto_revision: true)
+              end
+            end
           end
         end
       end

data/luban-rack.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban
@@ -100,6 +100,7 @@ files:
 - lib/luban/deployment/applications/rack/version.rb
 - lib/luban/deployment/applications/rack/web_server.rb
 - lib/luban/deployment/applications/rack/web_servers/puma.rb
+- lib/luban/deployment/applications/rack/web_servers/puma/plugin/luban.rb
 - lib/luban/deployment/applications/rack/web_servers/thin.rb
 - lib/luban/rack.rb
 - luban-rack.gemspec