proctor 0.0.2 → 0.0.3

data/lib/proctor/presenter/show.rb

@@ -0,0 +1,71 @@
+module Proctor
+  module Presenter
+    class Show
+
+      def initialize(global, options, args)
+        @global  = global
+        @options = options
+        @args    = args
+        validate_handle(args[0])
+      end
+
+      def validate_handle(handle)
+        if handle.length != 3
+          raise "invalid handle (#{handle}) see 'proctor list for a valid handle'"
+        end
+      end
+
+      def xhandle(string)
+        Digest::MD5.hexdigest(string)[0..2]
+      end
+
+      def find_asset(handle)
+
+        result = @options[:templates].values.find {|x| xhandle(x) == handle}
+        return ['template', result] unless result.nil?
+
+        result = AppConfig.app_files(@global).find {|x| xhandle(x) == handle}
+        return ['appfile', result] unless result.nil?
+
+        result = @options[:app_config]['managers'].keys.find {|x| xhandle(x) == handle}
+        return ['manager', result] unless result.nil?
+
+        result = @options[:app_config]['services'].keys.find {|x| xhandle(x) == handle}
+        return ['service', result] unless result.nil?
+
+        raise "unknown handle (#{handle}) see 'proctor list' for a valid handle"
+
+      end
+
+      def show
+        type, asset = find_asset(@args[0])
+
+        case type
+          when "template"   then show_template(asset)
+          when "appfile"    then show_appfile(asset)
+          when "manager"    then show_manager(asset)
+          when "service"    then show_service(asset)
+        end
+      end
+
+      def show_template(asset)
+        puts "# Template #{asset}"
+        puts File.read(asset)
+      end
+
+      def show_appfile(asset)
+        puts "# AppFile #{asset}"
+        puts File.read(asset)
+      end
+
+      def show_manager(asset)
+        puts "# Manager #{asset}"
+      end
+
+      def show_service(asset)
+        puts "# Service #{asset}"
+      end
+
+    end
+  end
+end

data/lib/proctor/service.rb

@@ -0,0 +1,8 @@
+module Proctor
+  class Service
+    attr_reader :input_hash, :opts
+    def initialize(hash = {})
+      @input_hash = hash
+    end
+  end
+end

data/lib/proctor/template_config.rb

@@ -0,0 +1,22 @@
+module Proctor
+  class TemplateConfig
+
+    def self.load(global_options = {})
+      template_files = self.files(global_options)
+      template_files.reduce({}) do |a, v|
+        a.merge({File.basename(v) => v})
+      end
+    end
+
+    private
+
+    def self.files(global_options)
+      Dir.glob('proctor/templates/*').map {|f| File.expand_path(f)}
+    end
+
+    #def self.base_dir
+    #  File.expand_path(File.dirname(File.expand_path(__FILE__)) + '/../..')
+    #end
+
+  end
+end

data/lib/proctor/template_file.rb

@@ -0,0 +1,44 @@
+require 'yaml'
+
+module Proctor
+  class TemplateFile
+    attr_reader :config_data
+
+    def initialize(filename)
+      check_file_existence(filename)
+      @config_data = load_data(filename)
+      check_data_format(filename)
+    end
+
+    private
+
+    def load_data(file)
+      begin
+        @config_data = YAML.load_file(file)
+      rescue Psych::SyntaxError
+        error_msg = "invalid file format (expecting YAML - #{file})"
+        raise InvalidYamlException.new, error_msg
+      end
+    end
+
+    def check_data_format(file)
+      raise InvalidDataType, "expecting hash data (#{file})" unless @config_data.is_a?(Hash)
+    end
+
+    def check_file_existence(file)
+      error_msg = "missing app file (#{file})"
+      raise MissingFileException, error_msg unless File.exist?(file)
+    end
+
+  end
+  
+  class MissingFileException < RuntimeError
+  end
+  
+  class InvalidYamlException < RuntimeError
+  end
+
+  class InvalidDataType < RuntimeError
+  end
+  
+end

data/lib/proctor/version.rb

@@ -1,3 +1,3 @@
 module Proctor
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/proctor.rb

@@ -1,5 +1,5 @@
 BASE_DIR = File.expand_path(File.dirname(__FILE__))
-Dir[BASE_DIR + '/proctor/*'].each {|f| require f}
+Dir[BASE_DIR + '/proctor/**/*'].each {|f| require f unless Dir.exist?(f)}
 
 module Proctor
 end

data/proctor/Proctorfile

@@ -1,28 +1,52 @@
 # vim: set ft=yaml:
 ---
-# exports:
-#   upstart:
-#     start_command: "asdf"
-#     stop_command: "asdf"
-#   monit:
-#     reload_command: "asdf"
-# procs:
-#   web:
-#     start_command: "asdf"
-#     stop_command: "asdf"
-#   faye:
-#     start_command: "asdf"
 
-exports:
+managers:
+  init:
+    export_directory: "/etc/init.d"
   upstart:
-    start_command: "qwer"
-    stop_command: "qwer"
+    export_directory: "/etc/init"
+    start_command:    "/sbin/init start <%= app_name %>"
+    stop_command:     "/sbin/init stop <%= app_name %>"
+    status_command:   "/sbin/init status <%= app_name %>"
   monit:
-    reload_command: "qwer"
-procs:
-  web:
-    start_command: "qwer"
-    stop_command: "qwer"
+    export_directory: "/etc/monit/conf.d"
+    reload_command:   "monit reload"
+    stop_command:     "monit quit"
+    start_command:    "monit"
+    status_command:   "monit summary"
+    pidfile:          "/a/b/c"
+  foreman:
+    start_command:    "foreman start"
+    use_master_template: true
+    use_worker_template: false
+
+services:
+  unicorn:
+    start_command: "bin/unicorn --log_file shared/log/<%= name %>.log"
+    stop_command:  "qwer"
+  passenger:
+    start_command: "bin/passenger --log_file shared/log/<%= name %>.log"
+    stop_command:  "qwer"
   faye:
     start_command: "qwer"
+    export.monit.memory_limit:  "<%= ForemanEnv.production? ? '20MB' : '10MB' %>"
+    exports_to:            ['monit', 'upstart']
+    start_command: "script/faye_script.sh"
+    port: 2343
+
+nodes:
+  dev:
+    - passenger
+    - faye
+    - postgres-standalone
+    - jobq
+    - renderpro
+    - redis
+  production:
+    - unicorn
+    - faye
+    - postgres-shared
+  backup:
+    - postgres
 

data/proctor/templates/foreman_default_n.erb

@@ -0,0 +1,9 @@
+# Generated by Proctor at <%=  Time.now %>
+
+start on reboot
+expect daemon
+respawn
+pre-start script
+  emit starting_faye
+end
+exec <%= @start_command %> --port <%= port %>

data/proctor/templates/monit_default_s.erb

@@ -0,0 +1,6 @@
+% mon = managers['monit']
+# Generated by Proctor at <%=  Time.now %>
+
+check process <%= role_name %> with pidfile <%= pidfile %>
+  start program = "<%= start_command %>"
+  stop program = "<%= stop_command %>"

data/proctor/templates/monit_faye_s.erb

@@ -0,0 +1,7 @@
+# Generated by Proctor at <%=  Time.now %>
+
+check process <%= app_name %> with pidfile <%= pidfile %>
+  start program "/etc/init.d/<%= app_name %> start"
+  stop program  "/etc/init.d/<%= app_name %> stop"
+  if failed port <%= port %> then restart
+  if 5 restarts within 5 cycles then timeout

data/proctor/templates/upstart_default_s.erb

@@ -0,0 +1,7 @@
+# Generated by Proctor at <%= Time.now %>
+
+start on runlevel [2345]
+stop on runlevel  [!2345]
+expect daemon
+respawn
+exec <%= @start_command %>

data/proctor/templates/upstart_faye_s.erb

@@ -0,0 +1,9 @@
+# Generated by Proctor at <%=  Time.now %>
+
+start on reboot
+expect daemon
+respawn
+pre-start script
+  emit starting_faye
+end
+exec <%= @start_command %> --port <%= port %>

data/proctor.gemspec

@@ -18,10 +18,12 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('gli')
   gem.add_dependency('foreman')
+  gem.add_dependency('hash-deep-merge')
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('aruba')
+  gem.add_development_dependency('debugger')
 
 end

data/spec/acceptance/help_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'start/help' do
+describe 'start/help', :acceptance do
 
   it 'returns text' do
     start_simple
@@ -9,6 +9,7 @@ describe 'start/help' do
 
   it 'does not have an error' do
     start_simple
+    last_exit_status.should == 0
     all_output.should_not include('Error')
   end
 
@@ -17,4 +18,19 @@ describe 'start/help' do
     all_output.should include('start')
   end
 
+end
+
+describe "checking existence of App file" do
+  it "returns an error w/o the app file" do
+    clear_app_file do
+      start_simple "list", false
+      last_exit_status.should_not == 0
+      all_output.should include('error: missing app file')
+    end
+  end
+  it "returns an error when specifying an alternative proctorfile" do
+    start_simple "list -f Nofile", false
+    last_exit_status.should_not == 0
+    all_output.should include('error: missing app file')
+  end
 end

data/spec/acceptance/list_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'list', :acceptance do
+
+  it 'returns help text' do
+    start_simple "help list"
+    all_output.should include('list')
+  end
+
+  it 'raises an error with an unknown type' do
+    start_simple "list -t whatexxver", false
+    last_exit_status.should_not == 0
+    all_output.should include('error')
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -13,12 +13,15 @@ RSpec.configure do |config|
   config.color_enabled = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
   config.include Aruba::Api, :example_group => {
       :file_path => /spec\/acceptance/
   }
-  config.before(:suite, :example_group => {
-      :file_path => /spec\/unit/
-  }) { $in_unit_spec_suite = true }
 
 end
+
+def clear_app_file(&block)
+    system "mv Proctorfile /tmp/Proctorfile.#{$$}" if File.exist?("Proctorfile")
+    yield
+    system "rm -f Proctorfile"
+    system "mv /tmp/Proctorfile.#{$$} Proctorfile" if File.exist?("/tmp/Proctorfile.#{$$}")
+end

data/spec/support/aruba.rb

@@ -3,6 +3,6 @@ def start_interactive
   run_interactive './../../bin/proctor'
 end
 
-def start_simple(args = "")
-  run_simple "./../../bin/proctor " + args
+def start_simple(args = "", fail_on_error = true)
+  run_simple("./../../bin/proctor " + args, fail_on_error)
 end

data/spec/unit/app_config_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require_relative "../../lib/proctor/app_config"
+
+include Proctor
+
+describe AppConfig do
+  it "loads data and generates a hash" do
+    result = AppConfig.load
+    result.should_not be_nil
+    result.should be_a(Hash)
+  end
+  it "has default values" do
+    app_data = "---\nmanagers:\n  newstart:\n    export_directory: '/tmp/test'"
+    clear_app_file do
+      File.open("Proctorfile", 'w') {|f| f.puts "#{app_data}"}
+      result = AppConfig.load
+      tst_value = result["managers"]["upstart"]["export_directory"]
+      tst_value.should == "/etc/init"
+    end
+  end
+  it "overwrites default values with local values" do
+    app_data = "---\nmanagers:\n  upstart:\n    export_directory: '/tmp/test'"
+    clear_app_file do
+      File.open("Proctorfile", 'w') {|f| f.puts "#{app_data}"}
+      result = AppConfig.load
+      tst_value = result["managers"]["upstart"]["export_directory"]
+      tst_value.should == "/tmp/test"
+    end
+  end
+end

data/spec/unit/app_file_spec.rb

@@ -1,9 +1,40 @@
 require 'spec_helper'
 require_relative "../../lib/proctor/app_file"
 
-describe Proctor::AppFile do
-  it "should raise an error on bad format"
-  it "should have a list of valid object types"
-  it "should raise warnings for invalid objects"
-  it "should support a --no-warn field"
+include Proctor
+
+describe AppFile do
+
+  describe "#new" do
+    it "reports an error if the app file is missing" do
+      lambda { AppFile.new("Unknown") }.should raise_error(MissingFileException)
+    end
+
+    it "reports an error if the app file YAML has a parser error" do
+      file = "/tmp/test.#{$$}"
+      system "echo '\007\012\043' > #{file}"
+      lambda { AppFile.new(file) }.should raise_error(InvalidYamlException)
+      system "rm #{file}"
+    end
+
+    it "reports an error if the data isn't a hash" do
+      file = "/tmp/test.#{$$}"
+      system "echo 'hello world' > #{file}"
+      lambda { AppFile.new(file) }.should raise_error(InvalidDataType)
+      system "rm #{file}"
+    end
+
+    it "works ok if the file has valid data" do
+      file = "/tmp/test.#{$$}"
+      system "echo '---\na:\n  b: 1' > #{file}"
+      lambda { AppFile.new(file) }.should_not raise_error
+      system "rm #{file}"
+    end
+
+  end
+
+  #it "should have a list of valid object types"
+  #it "should raise warnings for invalid objects"
+  #it "should handle embedded ERB tags"
+  #it "reports if there is an ERB rendering error"
 end

data/spec/unit/manager_spec.rb

@@ -1,11 +1,20 @@
 require 'spec_helper'
 require_relative "../../lib/proctor/manager"
 
-describe Proctor::Manager do
-  it "should support a standard set of commands (export, cleanup, start, stop, reload, restart, status)"
-  it "should have a field 'support' which list valid commands"
-  it "should know a format and an app"
-  it "should support a default type for app"
-  it "should know the target directory for deploying"
-  it "should know about dependencies" # run depends on export
+include Proctor
+
+describe Manager do
+  before(:each) do
+    @obj = Manager.new
+  end
+
+  it "exists" do
+    @obj.should_not be_nil
+  end
+
+  it "has an input hash" do
+    @obj.should respond_to(:input_hash)
+    @obj.input_hash.should be_a(Hash)
+  end
+
 end

data/spec/unit/service_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require_relative "../../lib/proctor/service"
+
+include Proctor
+
+describe Service do
+  before(:each) do
+    @obj = Service.new
+  end
+
+  it "should exist" do
+    @obj.should_not be_nil
+  end
+
+  it "should have an input hash" do
+    @obj.should respond_to(:input_hash)
+    @obj.input_hash.should be_a(Hash)
+  end
+
+end

data/spec/unit/template_config_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require_relative "../../lib/proctor/template_config"
+
+include Proctor
+
+describe TemplateConfig do
+  it "loads data and generates a hash" do
+    result = TemplateConfig.load
+    result.should_not be_nil
+    result.should be_a(Hash)
+  end
+end

data/spec/unit/template_file_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require_relative "../../lib/proctor/template_file"
+
+include Proctor
+
+describe TemplateFile do
+
+  describe "#new" do
+
+  end
+
+  #it "should have a list of valid object types"
+  #it "should raise warnings for invalid objects"
+  #it "should handle embedded ERB tags"
+  #it "reports if there is an ERB rendering error"
+end

data/spec/unit/template_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require_relative "../../lib/proctor/template"
 
 describe Proctor::Template do
-  it "should support template lookup"
-  it "should return an error if the template isn't found"
+  #it "should support template lookup"
+  #it "should return an error if the template isn't found"
+  #it "should report if there is a template rendering error"
 end