warehouse_supervisor 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+CHANGELOG
+=========
+
+0.0.2
+-----
+* Added rake rasks
+* Output from supervisor in console instead of log files when run with `start` 
+
+0.0.1
+-----
+* Initial release

data/README.md

@@ -18,25 +18,37 @@ Or install it yourself as:
 
 ## Usage
 
-There are 2 basic commands:
+Warehouse Supervisor may be used either from its own CLI interface or from rake, both provide the same commands:
 
 ### print
 
     warehouse_supervisor print -g production -c config.yml processes.conf.erb
+
+or
+
+    rake warehouse_supervisor:print WS_GROUP=production CONFIG=config.yml TEMPLATES=processes.conf.erb
     
-This will print your config file according to config.yml and processes.conf.erb
+This will print the programs in config.yml, using the templates in processes.conf.erb. 
+
+Note that only [program:x] sections are printed. The result of this command is intended to be redirected to a file to be
+[included in your main supervisord.conf file](http://supervisord.org/configuration.html#include-section-settings)
 
 ### start
 
     warehouse_supervisor start -g production -c config.yml processes.conf.erb
 
+or
+
+    rake warehouse_supervisor:start WS_GROUP=production CONFIG=config.yml TEMPLATES=processes.conf.erb
+
+
 This will start a supervisor instance running in the foreground with the config you specified
 
 Both these commands take the following options:
 
-  * --group | -g: Group to use
-  * --config | -c: Definition file
-  * --log-dir | -q (only in `start`): Log directory
+  * `--group | -g`, `WS_GROUP=` Group to use.
+  * `--config | -c`, `CONFIG=` Definition file.
+  * ` `, `TEMPLATES=` Templates file.
 
 ## Files
 
@@ -50,10 +62,10 @@ Warehouse Supervisor needs 2 files to work:
 This is an erb file where you'll define the different *program templates* that your app uses, for example:
 
     <% template :resque_web do %>
-    user = <%= user || ENV["USER"] %>
-    directory = <%=dir || ENV["RAILS_ROOT"]%>
-    command = bundle exec resque-web -F -L -p 5678 config/resque_config.rb 
-    environment = HOME='<%=home || ENV["HOME"]%>',USER=<%=user || ENV["USER"]%>
+      user = <%= user || ENV["USER"] %>
+      directory = <%=dir || ENV["RAILS_ROOT"]%>
+      command = bundle exec resque-web -F -L -p 5678 config/resque_config.rb 
+      environment = HOME='<%=home || ENV["HOME"]%>',USER=<%=user || ENV["USER"]%>
     <% end %>
 
 Each program template that you need will be define in a `template` block.

data/Rakefile

@@ -1 +1,2 @@
 require "bundler/gem_tasks"
+require 'warehouse_supervisor/tasks'

data/bin/warehouse_supervisor

@@ -1,5 +1,5 @@
 #! /usr/bin/env ruby
 
-require 'lib/warehouse_supervisor/warehouse_supervisor_cli'
+require 'warehouse_supervisor/warehouse_supervisor_cli'
 
 WarehouseSupervisor::WarehouseSupervisorCli.start(ARGV)

data/example/processes.conf.erb

@@ -23,3 +23,11 @@
   environment = HOME='<%=home || ENV["HOME"]%>',USER=<%=user || ENV["USER"]%>, RAILS_ENV=<%=rails_env || ENV["RAILS_ENV"]%>, VERBOSE=1
 <% end %>
 
+<% template :ls do %>
+  user = <%= user || ENV["USER"] %>
+  directory = <%=dir || ENV["HOME"]%>
+  command = ls
+  environment = HOME='<%=home || ENV["HOME"]%>',USER=<%=user || ENV["USER"]%>
+  redirect_stderr = true
+<% end %>
+

data/example/warehouse_supervisor.yml

@@ -29,4 +29,8 @@ production:
   resque_web:
     template: resque_web
 
+test:
+  ls:
+   template: ls
+
 

data/lib/warehouse_supervisor.rb

@@ -1,4 +1,5 @@
 require "warehouse_supervisor/version"
+require "warehouse_supervisor/main"
 
 module WarehouseSupervisor
   # Your code goes here...

data/lib/warehouse_supervisor/main.rb

@@ -0,0 +1,46 @@
+require 'yaml'
+require 'tempfile'
+require 'warehouse_supervisor/renderer'
+
+module WarehouseSupervisor
+  class Main
+    def initialize(erb_file, options={})
+      @erb_file = erb_file
+      @options = options
+    end
+
+    def generate_contents
+      unless File.exist?(@options[:config])
+        STDERR.puts "Bad file '#{@options[:config]}'"
+        exit 1
+      end
+      unless File.exist?(@erb_file)
+        STDERR.puts "Bad file '#{@erb_file}'"
+        exit 1
+      end
+      definitions = YAML.load(File.read(@options[:config]))[@options[:group].to_s]
+      unless definitions
+        STDERR.puts "Bad group '#{@options[:group]}'"
+        exit 1
+      end
+      erb_content = File.read(@erb_file)
+      Renderer.new(definitions, erb_content).render
+    end
+
+    def start
+      Tempfile.open("supervisord.conf") do |f|
+        Tempfile.open("supervisord.log") do |l|
+          f.puts "[supervisord]"
+          f.puts "nodaemon = true"
+          f.puts "logfile = #{l.path}"
+          f.puts "loglevel = debug"
+          f.write self.generate_contents
+          f.flush
+          command = "supervisord -c '#{f.path}'"
+          puts command
+          exec command
+        end
+      end
+    end
+  end
+end

data/lib/warehouse_supervisor/program_renderer.rb

@@ -12,6 +12,7 @@ module WarehouseSupervisor
     def render(program_name)
       program_definition = TemplateBinding.new(program_name, @definitions[program_name])
       ERB.new(@erb_content, nil, nil, "@output").result(program_definition.get_binding).gsub(/^$\n/, "").gsub(/^[\s]+/, "")
+      program_definition._output.gsub(/^$\n/, "").gsub(/^[\s]+/, "")
     end
   end
 

data/lib/warehouse_supervisor/tasks.rb

@@ -0,0 +1,22 @@
+require 'warehouse_supervisor'
+
+namespace :warehouse_supervisor do
+
+  def get_opts
+    erb_file = ENV['TEMPLATES'] || raise("required TEMPLATES file")
+    config_file = ENV['CONFIG']|| raise("required CONFIG file")
+    group = ENV['WS_GROUP'] || raise("required configuration WS_GROUP")
+    [erb_file, {:group => group, :config => config_file}]
+  end
+
+  desc "output the file acording to the config"
+  task :print do
+    puts WarehouseSupervisor::Main.new(*get_opts()).generate_contents
+  end
+
+  desc "start an undemonized supervisor with file"
+  task :start do
+    puts WarehouseSupervisor::Main.new(*get_opts()).start
+  end
+
+end

data/lib/warehouse_supervisor/template_binding.rb

@@ -1,6 +1,9 @@
 module WarehouseSupervisor
 
   class TemplateBinding 
+
+    attr_reader :_output
+
     def initialize(program_name, hash)
       @program_name = program_name
       @template = hash["template"]
@@ -12,8 +15,9 @@ module WarehouseSupervisor
 
     def template(t)
       if @template == t.to_s
-        @output << "[program:#{@program_name}]"
+        @output = "[program:#{@program_name}]"
         yield
+        @_output = @output.dup
       end
     end
 

data/lib/warehouse_supervisor/version.rb

@@ -1,3 +1,3 @@
 module WarehouseSupervisor
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/warehouse_supervisor/warehouse_supervisor_cli.rb

@@ -1,46 +1,19 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'yaml'
-require 'tempfile'
-require 'fileutils'
 require 'thor'
-require 'warehouse_supervisor/renderer'
+require 'warehouse_supervisor'
 
 module WarehouseSupervisor
   class WarehouseSupervisorCli < Thor
-    class_option :group, :aliases => :g, :default => "development"
+    class_option :group, :aliases => :g, :required => true
     class_option :config, :aliases => :c, :required => true
 
     desc "print file", "output the file acording to the config"
     def print(erb_file)
-      puts generate_contents(options[:group], options[:config], erb_file)
+      puts WarehouseSupervisor::Main.new(erb_file, options).generate_contents
     end
 
     desc "start file", "start an undemonized supervisor with file"
-    option :log_dir, :aliases => :q, :default => "log"
     def start(erb_file)
-      Tempfile.open("supervisord.conf") do |f|
-        log_dir = options[:log_dir]
-        f.puts "[supervisord]"
-        f.puts "logfile = #{File.join(log_dir, "supervisord.log")}"
-        f.puts "childlogdir = #{log_dir}"
-        f.puts "nodaemon = true"
-        f.puts
-        f.write generate_contents(options[:group], options[:config], erb_file)
-        f.flush
-        FileUtils.mkdir_p options[:log_dir]
-        command = "supervisord -c '#{f.path}'"
-        puts command
-        exec command
-      end
-    end
-
-    private 
-
-    def generate_contents(group, definitions_file, erb_file)
-      definitions = YAML.load(File.read(definitions_file))[group.to_s]
-      erb_content = File.read(erb_file)
-      Renderer.new(definitions, erb_content).render
+      WarehouseSupervisor::Main.new(erb_file, options).start
     end
 
   end

data/spec/warehouse_supervisor/program_renderer_spec.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'bundler/setup'
 require 'yaml'
 require 'warehouse_supervisor/program_renderer'
 
@@ -34,4 +32,17 @@ describe ProgramRenderer do
     pr = ProgramRenderer.new(definitions["development"], erb_content).render("resque_web")
     pr.should_not include "^\s+"
   end
+
+  it "should not print stuff outside of the template" do
+    erb_content =  %q{
+      I should not appear (upper)
+
+      <% template :tal do %>
+        awambabaluba
+      <% end %>
+
+      I should not appear (downer)
+    }
+    pr = ProgramRenderer.new({"cual" => {"template" => "tal"}}, erb_content).render("cual").should_not =~ /appear/
+  end
 end

data/spec/warehouse_supervisor/renderer_spec.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'bundler/setup'
 require 'yaml'
 require 'warehouse_supervisor/renderer'
 

data/spec/warehouse_supervisor/template_binding_spec.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'bundler/setup'
 require 'yaml'
 require 'warehouse_supervisor/template_binding'
 

data/warehouse_supervisor.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'rake'
   gem.add_dependency 'thor'
   gem.add_development_dependency 'rspec'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warehouse_supervisor
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Diego Guerra
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-28 00:00:00 Z
+date: 2013-05-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: thor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,24 +31,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,7 +44,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: Easily create and run supervisord configuration files
 email: 
 - diego.guerra.suarez@gmail.com
@@ -70,6 +56,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -78,8 +65,10 @@ files:
 - example/processes.conf.erb
 - example/warehouse_supervisor.yml
 - lib/warehouse_supervisor.rb
+- lib/warehouse_supervisor/main.rb
 - lib/warehouse_supervisor/program_renderer.rb
 - lib/warehouse_supervisor/renderer.rb
+- lib/warehouse_supervisor/tasks.rb
 - lib/warehouse_supervisor/template_binding.rb
 - lib/warehouse_supervisor/version.rb
 - lib/warehouse_supervisor/warehouse_supervisor_cli.rb