dolphin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cdebd25f15c7ca3178f5b20d2fcf659ddac74c1
-  data.tar.gz: bd3f80a28f9c699457432c035aab9d56f741aa27
+  metadata.gz: df915c5f7dbaac8d7a2e3904d4bfa6ba128ed99d
+  data.tar.gz: 1054605420d1488164062a8d4c5a49f4d822873b
 SHA512:
-  metadata.gz: 9a8cbd6cda2c393fc43ec56837d8945c6fa5158328b7aeddadc8a8c6143c3b0215c6e716527ac1eee52b37ad0cf427ba82047c331a0e684eb6cacfe781f1e408
-  data.tar.gz: 40c74e0f464376b848e2e5a099a07eb7abbbe4a5a43245451404e70238ac3d12c03d15da0edbaa83afe0109610619d31f05a7062fb30d7b66bc3feb513b9da8d
+  metadata.gz: 96461fe1ef517739578562d155e6a5921321f4f7c2627419a542d0647f712306a84a78d7f02aeebe176c0c9121d1a38c4a5a240af824a6b00b3f84dc029d7ed3
+  data.tar.gz: 5d8a93ccbde600fcc4342dc7b4597a6b607fccef8c6a4b96a5aaf16f7edcd31c773dd4a2d0a820b5169a673dbe28aded71e31a17fa64c8fdd96ef3ce4f4f682d

data/README.md

@@ -19,7 +19,9 @@ Dolphin: deploy agilely like dolphins can swim. A multi-threaded multi-stage dep
 * Bye bye, complexity;
 * Welcome, nimbleness.
 
-## Installation / Rails generator
+## Installation / Rails generators
+
+### Installation
 
 Add this line to your application's Gemfile:
 
@@ -29,14 +31,26 @@ Or install it yourself as:
 
     $ gem install dolphin
 
+### Generator for dolphin executable
+
 Run generator from your Rails application:
 
     $ bin/rails g dolphin:install
 
 This will create an executable script as bin/dolphin.
 
+### Generator for Puma config
+
+Run generator from your Rails application:
+
+    $ bin/rails g dolphin:puma
+
+This will create a config file for Puma as config/puma.rb.
+
 ## Configuration
 
+### Config for dolphin executable
+
 Edit the bin/dolphin script generated as above to adjust settings. Please refer to detailed comments inside the script. Minimum config would require the following:
 
     # settings require user input
@@ -71,6 +85,18 @@ Edit the bin/dolphin script generated as above to adjust settings. Please refer
       @branch = 'master'
     end
 
+### Config for Puma
+
+Edit the config/puma.rb script generated as above to adjust settings. Please refer to detailed comments inside the script. Minimum config would require the following:
+
+    # settings require user input
+    # -----------------------------
+    # name of this application
+    application = 'best_app'
+
+You may also refer to Puma for explanation of options:
+* [puma]
+
 ## Usage
 
 ### Help
@@ -265,6 +291,7 @@ To extend dolphin's functionality with your custom modules is easy. It is Ruby a
 
 * [capistrano]
 * [chruby]
+* [puma]
 * [git-deploy]
 * [hell]
 * [mina]
@@ -281,6 +308,7 @@ To extend dolphin's functionality with your custom modules is easy. It is Ruby a
 
 [capistrano]: https://github.com/capistrano/capistrano
 [chruby]: https://github.com/postmodern/chruby
+[puma]: https://github.com/puma/puma
 [git-deploy]: https://github.com/mislav/git-deploy
 [hell]: https://github.com/seatgeek/hell
 [mina]: https://github.com/nadarei/mina

data/lib/dolphin/puma.rb

@@ -6,8 +6,7 @@ class Dolphin::Puma < Dolphin::Base
     menu = [
       "
         cd #{@deploy_dir}
-        RAILS_ENV=#{@env} bundle exec puma -t 8:32 -e #{@env} -d -b unix://#{@sockets}/#{@application}.sock -S #{@pids}/#{@application}.state --control unix://#{@sockets}/pumactl.sock
-        # --pidfile #{@pids}/#{@application}.pid
+        RAILS_ENV=#{@env} bundle exec puma -C config/puma.rb
       ",
     ]
 

data/lib/dolphin/version.rb

@@ -1,3 +1,3 @@
 module Dolphin
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/generators/dolphin/install_generator.rb

@@ -8,7 +8,7 @@ class Dolphin::InstallGenerator < Rails::Generators::Base
     copy_file "dolphin", target
     # make it executable
     chmod(target, 0755)
-    puts "Now edit bin/dolphin to adjust deployment settings\nThen run bin/dolphin to deploy."
+    puts "Now edit #{target}  to adjust deployment settings\nThen run bin/dolphin to deploy."
   end
 
 end

data/lib/generators/dolphin/puma_generator.rb

@@ -0,0 +1,12 @@
+require 'rails/generators'
+
+class Dolphin::PumaGenerator < Rails::Generators::Base
+  source_root File.expand_path("../templates", __FILE__)
+
+  def setup
+    target = "config/puma.rb"
+    copy_file "puma.rb", target
+    puts "Now edit #{target} to adjust settings for Puma"
+  end
+
+end

data/lib/generators/dolphin/templates/dolphin

@@ -29,7 +29,6 @@ class Dolphin::Base
     # on servers under @app_dir, the directory where this application resides
     @deploy_dir = "#{@app_dir}/#{@application}"
     # puma related settings
-    @sockets = "#{@deploy_dir}/tmp/sockets"
     @pids = "#{@deploy_dir}/tmp/pids"
 
     # internal variables, no need to change by user

data/lib/generators/dolphin/templates/puma.rb

@@ -0,0 +1,34 @@
+# settings require user input
+# -----------------------------
+# name of this application
+application = 'best_app'
+
+# settings with default values
+# -----------------------------
+deploy_dir = File.expand_path('../..', __FILE__)
+sockets = "#{deploy_dir}/tmp/sockets"
+pids = "#{deploy_dir}/tmp/pids"
+
+environment ENV['RAILS_ENV']
+
+# number of cpu
+nproc = `nproc`.to_i
+
+if nproc > 1
+  # multiple cpu, running in cluster mode
+  threads 2,16
+  workers nproc
+  preload_app!
+else
+  # in single mode
+  threads 8,32
+end
+
+daemonize true
+state_path "#{pids}/#{application}.state"
+
+# pumactl socket
+activate_control_app "unix://#{sockets}/pumactl.sock"
+
+# using unix socket
+bind "unix://#{sockets}/#{application}.sock"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolphin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Neng Xu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -104,7 +104,9 @@ files:
 - lib/dolphin/setup.rb
 - lib/dolphin/version.rb
 - lib/generators/dolphin/install_generator.rb
+- lib/generators/dolphin/puma_generator.rb
 - lib/generators/dolphin/templates/dolphin
+- lib/generators/dolphin/templates/puma.rb
 - spec/dolphin/base_spec.rb
 - spec/dolphin/deploy_spec.rb
 - spec/dolphin/git_spec.rb