overlay 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40209f5a3f90eb0e0d419a56852c206682fc018b
-  data.tar.gz: 557e94ab77d1ad47dc2b2e2ce8e600b4d9e936dd
+  metadata.gz: c2bc51314c212122ad2b8a7f1f1af525045c8093
+  data.tar.gz: 806a0956d020d9bd06228358cfa1aea205d8d91a
 SHA512:
-  metadata.gz: 01e8a094a9f4495bf35db856de6bdfb916adcd2b4102bb6bc2c4f665b8f6a1b122b5b5c0e9a7afbc78ec9cc779cc230e01b0d65dc0001e7822a07c08f798f130
-  data.tar.gz: 6b903dbab503768ccb890c4a3b673ea49fb77c611d20ee9f1fce780cbfa8720fc9b0498ebb230a3b72743a889bf084c04035a6ce0f01b73261e1488f0306791e
+  metadata.gz: 6adeb5747620b6fb44bcbaf1274e37249bcfb7ea479a0647e2a842e458a336b6f3111062b157399769627e4f49ee45a26e7ada9bd671c97ed37392a14b005ed8
+  data.tar.gz: 426de9370d852845485014a2d963f764c93a9e47fa22de7d87260500b4cd7d675933a7a288cfdfd1ad7a7786af5a479efe81f7258d22d80cf0eb8a8b79787b10

data/README.rdoc

@@ -1,29 +1,24 @@
 Overlay
-====================
-
-Rails engine that allows for overlaying external templates onto an existing Rails application.  Overlayed directories are prepended to the view path to allow overwriting of deployed templates.
+---------------------
+Rails engine that allows for overlaying external files onto an existing Rails application.  Overlayed directories are prepended to the view path to allow overwriting of deployed templates. A post overlay hook is provided to allow for cache invalidation and processing to run after a file is updated.
 
 Features
-====================
-
-GithubRepo Features
 ---------------------
-
+GithubRepo Features
+====================
 * Overlay separate directories in a single repo to specific places in your Rails application.
 * Update files in realtime utilizing self registering post commit webhooks on github.
 * Run code on file update via the GithubRepo #after_process_hook block.
 * Utilize an OverlayPublisher application and a redis server to centralize hook management and publish changes to a fleet of servers.
 
 Installation
-====================
-
+---------------------
 Add the gem to your Gemfile:
 
     gem 'overlay'
 
 Configuration
-====================
-
+---------------------
 Add an initializer to your Rails `config/initializers` directory.  This file should configure your repositories and launch the initial overlay.  Here is a sample initializer:
 
     require 'overlay'
@@ -31,14 +26,13 @@ Add an initializer to your Rails `config/initializers` directory.  This file sho
     Overlay.configure do |config|
       config.relative_root_url  = Rails.application.config.relative_url_root
 
-      github_repo = Overlay::GithubRepo.new(
-          'repo_org',
-          'repo_name',
-          'repo_user_user:repo_password',
-          'source_root_directory',
-          'source_destination_path'
-        )
-      config.repositories << repo_config
+      config.repositories << Overlay::GithubRepo.new({
+                      org: '<repo organization name>',
+                      repo: '<repo name>',
+                      auth: '<repo user>:<user password>',
+                      root_source_path: '<repository source directory>',
+                      root_dest_path: '<overlay destination directory>'
+                    })
     end
 
     # Overlay files after rails is initialized
@@ -47,10 +41,16 @@ Add an initializer to your Rails `config/initializers` directory.  This file sho
       Overlay::Github.instance.process_overlays
     end
 
-Usage
-====================
+Overlay also supports an external OverLay publisher installation for use with larger fleets.  Per repo, this functionality can be anabled by adding the following config to your repository configuration:
+
+    repo_config.use_publisher         = true
+    repo_config.redis_server          = '<redis server>'
+    repo_config.redis_port            = <redis server port>
+    repo_config.registration_server   = 'http://<OverlayPublisher server and port>'
 
-Once Overlay is configured, on startup, a process will be forked to run the initial pull-down of files from the repository.  Overlay will update specific files on change in the repo through use of Github webhooks.
+Usage
+---------------------
+Once Overlay is configured, a call to Overlay::Github.instance.process_overlays wil fork a process to run the initial pull-down of files from the repository.  Overlay will update specific files on change in the repo through use of Github webhooks.
 
 If you are using unicorn, you need to be sure to provide host_name and host_port if using self-subscription for Github webhooks.
 

data/lib/overlay/github.rb

@@ -19,6 +19,7 @@ module Overlay
 
     def initialize
       @subscribed_configs = []
+      @master_pid         = $$
     end
 
     # Cycle through all configured repositories and overlay
@@ -256,12 +257,20 @@ module Overlay
     end
 
     # Process the passed in function symbol and args in a fork
+    # Add at exit hook to insure we kill our process.  Insure we only do this
+    # from the master process
     def fork_it method, *args
       pid = Process.fork do
-        send(method, *args)
-        Process.exit
+        begin
+          send(method, *args)
+        ensure
+          Process.exit
+        end
       end
       Process.detach(pid)
+      at_exit do
+        Process.kill(:QUIT, pid) if @master_pid == $$
+      end
     end
   end
 end

data/lib/overlay/version.rb

@@ -1,3 +1,3 @@
 module Overlay
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overlay
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Steve Saarinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails