dokuen 0.0.9 → 0.0.10

data/README.md

@@ -1,6 +1,7 @@
 # Dokuen, a Personal App Platform
 
-Dokuen is a "personal app platform". It's the same idea as all of these PaaS and IaaS services out there, except you host it on your own machine. It's specifically for hosting multiple 12-factor applications on one Mac. [Here](http://bugsplat.info/2012-05-17-dokuen-a-personal-app-platform.html) is an article that explains my motivations.
+Dokuen is a "personal app platform". It's the same idea as all of these PaaS and IaaS services out there, except you host it on
+your own machine. Currently, Dokuen supports Mac and Ubuntu. [Here](http://bugsplat.info/2012-05-17-dokuen-a-personal-app-platform.html) is an article that explains my motivations.
 
 ## Requirements
 
@@ -29,7 +30,7 @@ gem install dokuen
 
 ### Step 2
 
-Install nginx using homebrew:
+Install nginx using homebrew or your distro's package manager:
 
 ```
 $ brew install nginx
@@ -46,7 +47,7 @@ Run this:
 ```
 $ sudo mkdir -p /usr/local/var/dokuen
 $ cd /usr/local/var/dokuen
-$ sudo dokuen setup
+$ sudo dokuen setup .
 ```
 
 This will ask you a few questions, set up a few directories, and install a few useful commands. It'll also show you some things you need to do.
@@ -109,4 +110,11 @@ $ ssh git@<your_host> dokuen scale web=1 --application=<name>
 
 Unfortunately the stock Heroku buildpacks install a vendored node.js compiled for the Heroku platform, which happens to be linux. This doesn't work for Mac, which means you have to use a slightly patched version. This one works with a homebrew-installed node.js: https://github.com/peterkeen/heroku-buildpack-ruby
 
+## License
+
+MIT
+
+## Contact and Development
+
+Fork and send me a pull request. If you'd like to talk about Dokuen there's `#dokuen` on `irc.freenode.net`, as well as a [mailing list](https://groups.google.com/forum/#!forum/dokuen). 
 

data/lib/dokuen/application.rb

@@ -176,13 +176,27 @@ class Dokuen::Application
     end
   end
 
-  def shutdown(release)
+  def shutdown(release=nil)
+    if release.nil?
+      with_app_dir do
+        release = File.readlink("current")
+      end
+    end
+
     with_release_dir(release) do
       running_processes.each do |proc, pidfile|
-        pid = File.read(pidfile).to_i rescue nil
-        if pid
-          Process.kill("TERM", pid)
-        end
+        pid = YAML.load(File.read(pidfile))['pid']
+        Process.kill("TERM", pid)
+      end
+    end
+  end
+
+  def restart
+    with_current_release do
+      running_processes.each do |proc, pidfile|
+        pid = YAML.load(File.read(pidfile))['pid']
+        puts "Sending USR2 to pid #{pid}"
+        Process.kill("USR2", pid)
       end
     end
   end

data/lib/dokuen/cli.rb

@@ -78,6 +78,13 @@ class Dokuen::CLI < Thor
       key, val = var.chomp.split('=', 2)
       app.set_env(key, val)
     end
+    app.restart
+  end
+
+  desc "restart", "restart all instances of the application"
+  def restart
+    app = Dokuen::Application.new(options[:application], @config)
+    app.restart
   end
 
   desc "config_delete VARS", "delete some config variables"
@@ -86,9 +93,10 @@ class Dokuen::CLI < Thor
     vars.each do |var|
       app.delete_env(var)
     end
+    app.restart
   end
 
-  desc "boot", "Scale all of the current applications"
+  desc "boot", "Scale all of the current applications", :hide => true
   def boot
     Dir.glob("#{@config.dokuen_dir}/apps/*") do |appdir|
       next if File.basename(appdir)[0] == '.'
@@ -98,6 +106,15 @@ class Dokuen::CLI < Thor
     end
   end
 
+  desc "shutdown", "Shut down all applications", :hide => true
+  def shutdown
+    Dir.glob("#{@config.dokuen_dir}/apps/*") do |appdir|
+      next if File.basename(appdir)[0] == '.'
+      app = Dokuen::Application.new(File.basename(appdir), @config)
+      app.shutdown
+    end
+  end
+
   desc "install_buildpack URL", "Add a buildpack to the mason config"
   def install_buildpack(url)
     system("#{@config.bin_path}/mason buildpacks:install #{url}")

data/lib/dokuen/version.rb

@@ -1,3 +1,3 @@
 module Dokuen
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/dokuen/wrapper.rb

@@ -16,7 +16,6 @@ class Dokuen::Wrapper
 
   def run!
     return if daemonize! == nil
-    load_env
     loop do
       run_loop
     end
@@ -87,7 +86,12 @@ class Dokuen::Wrapper
     end
   end
 
+  def term_signal
+    app.config.stop_signal rescue 15
+  end
+
   def run_loop
+    load_env
     reader, writer = (IO.method(:pipe).arity == 0 ? IO.pipe : IO.pipe("BINARY"))
     procfile = Foreman::Procfile.new("Procfile")
     entry = procfile[proc]
@@ -96,11 +100,11 @@ class Dokuen::Wrapper
     log_file = File.open(log_path, 'a')
 
     Signal.trap("USR2") do
-      process.kill("TERM")
+      process.kill(term_signal)
     end
 
     Signal.trap("TERM") do
-      if not process.kill(9)
+      if not process.kill(term_signal)
         raise "Failed to kill process #{process.pid}"
       end
       File.delete(pidfile)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dokuen
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000Z
+date: 2012-06-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake