dokuen 0.0.12 → 0.0.13

data/README.md

@@ -8,22 +8,12 @@ your own machine. Currently, Dokuen supports Mac and Ubuntu. [Here](http://bugsp
 * [Gitolite](https://github.com/sitaramc/gitolite)
 * [Nginx](http://wiki.nginx.org/Main)
 
+
 ## Installation
 
 
 ### Step 1
 
-WARNING: At the moment Dokuen needs a custom version of Mason. A patch has been accepted but as
-of now (2012-05-19) there hasn't been a release with this patch. So, install mason:
-
-```
-$ git clone https://github.com/peterkeen/mason
-$ cd mason
-$ gem build mason.gemspec
-$ gem install mason-0.0.11.gem
-```
-
-Then, install dokuen:
 ```
 gem install dokuen
 ```
@@ -50,7 +40,7 @@ $ cd /usr/local/var/dokuen
 $ 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.
+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. Crucially, you'll need to modify your gitolite config and install it.
 
 ## Creating an App
 
@@ -108,6 +98,33 @@ $ ssh git@<your_host> dokuen scale web=0 --application=<name>
 $ ssh git@<your_host> dokuen scale web=1 --application=<name>
 ```
 
+
+## How it works
+
+When you run `ssh git@<your_host> dokuen create --application=foo`, Dokuen creates a few directories in it's install directory, setting things up for app deployments. In particular, it creates this structure:
+
+```
+foo/
+    releases/    # timestamped code pushes
+    env/         # environment variables. FILENAME => file contents
+    logs/        # log files, one per process
+    build/       # cache directory for build side-effects like gems
+```
+
+When you run `git push dokuen master`, the following series of events happens:
+
+* If the target git repo does not exist, gitolite creates it
+* git runs the `pre-receive` hook, which invokes `/path/to/dokuen/install/bin/dokuen`, which is a wrapper around dokuen with the correct config file set
+* runs `git archive <git repo> <sha1 of new master branch> > <tmpdir>`
+* invokes `mason` on the tmpdir, building the application into a timestamped subdirectory of `releases`
+* creates a symlink `current` that points at the new timestamped directory
+* creates a symlink `previous` that points at the previous value of `current`
+* spins up the configured number of processes as set using `dokuen scale`
+* writes out a new nginx configuration and restarts nginx
+* shuts down the previous processes
+
+When Dokuen "spins up" a process, it forks the main process, creates a `Dokuen::Wrapper` instance and calls `run!` on it. The wrapper's job is to immediately daemonize and run the command line in the `Procfile` for the given named process, capture logging info, restarting the process if it dies, and forwarding signals to it as appropriate. It writes it's own pid as well as the port it was given at fork-time into a pidfile at `current/.dokuen/dokuen.<appname>.<process_name>.<index>.pid`.
+
 ## Rails
 
 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

data/data/templates/nginx.erb

@@ -7,13 +7,20 @@ upstream <%= name %> {
 
 server {
     listen   80;
+    <% if use_ssl %>
     listen   443 ssl;
+    <% end %>
 
     server_name <%= name %>.<%= config.base_domain_name %>;
+    <% additional_domains.each do |domain| %>
+    server_name <%= domain %>;
+    <% end %>
 
+    <% if use_ssl %>
     if ($ssl_protocol = "") {
        rewrite ^   https://$server_name$request_uri? permanent;
     }
+    <% end %>
 
     location / {
         proxy_pass http://<%= name %>;

data/dokuen.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rake')
   s.add_dependency('thor')
-  s.add_dependency('mason', ">= 0.1.0")
+  s.add_dependency('mason')
   s.add_dependency('foreman')
   
   s.homepage = 'https://github.com/peterkeen/dokuen'

data/lib/dokuen/application.rb

@@ -204,8 +204,6 @@ class Dokuen::Application
   def install_nginx_config
     puts "Installing nginx config"
     sleep 2
-    @ssl_on = get_env('USE_SSL') ? 'on' : 'off'
-    @listen_port = get_env('USE_SSL') ? 443 : 80
     conf = Dokuen.template('nginx', binding)
     File.open(File.join(config.dokuen_dir, "nginx", "#{name}.#{config.base_domain_name}.conf"), "w+") do |f|
       f.write(conf)
@@ -306,4 +304,13 @@ private
     end
     _ports
   end
+
+  def additional_domains
+    (env['ADDITIONAL_DOMAINS'] || '').split(',')
+  end
+
+  def use_ssl
+    env['USE_SSL']
+  end
+
 end

data/lib/dokuen/version.rb

@@ -1,3 +1,3 @@
 module Dokuen
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/lib/dokuen/wrapper.rb

@@ -107,8 +107,15 @@ class Dokuen::Wrapper
       if not process.kill(term_signal)
         raise "Failed to kill process #{process.pid}"
       end
+
       File.delete(pidfile)
       File.delete("../../../../ports/#{port}")
+      sleep 15
+
+      if process.alive?
+        process.kill("KILL")
+      end
+
       exit! 0
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dokuen
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -127,8 +127,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Personal Application Platform for Macs
 test_files: []
+has_rdoc: