gorgon 0.11.0 → 0.11.1

data/lib/gorgon/callback_handler.rb

@@ -1,35 +1,37 @@
-class CallbackHandler
-  def initialize(config)
-    @config = config || {}
-    load(@config[:callbacks_class_file]) if @config[:callbacks_class_file]
-  end
+module Gorgon
+  class CallbackHandler
+    def initialize(config)
+      @config = config || {}
+      load(@config[:callbacks_class_file]) if @config[:callbacks_class_file]
+    end
 
-  def before_originate
-    cluster_id = Gorgon.callbacks.before_originate
-    return cluster_id if cluster_id.is_a?(String)
-  end
+    def before_originate
+      cluster_id = Gorgon.callbacks.before_originate
+      return cluster_id if cluster_id.is_a?(String)
+    end
 
-  def after_sync
-    Gorgon.callbacks.after_sync
-  end
+    def after_sync
+      Gorgon.callbacks.after_sync
+    end
 
-  def before_creating_workers
-    Gorgon.callbacks.before_creating_workers
-  end
+    def before_creating_workers
+      Gorgon.callbacks.before_creating_workers
+    end
 
-  def before_start
-    Gorgon.callbacks.before_start
-  end
+    def before_start
+      Gorgon.callbacks.before_start
+    end
 
-  def after_creating_workers
-    Gorgon.callbacks.after_creating_workers
-  end
+    def after_creating_workers
+      Gorgon.callbacks.after_creating_workers
+    end
 
-  def after_complete
-    Gorgon.callbacks.after_complete
-  end
+    def after_complete
+      Gorgon.callbacks.after_complete
+    end
 
-  def after_job_finishes
-    Gorgon.callbacks.after_job_finishes
+    def after_job_finishes
+      Gorgon.callbacks.after_job_finishes
+    end
   end
 end

data/lib/gorgon/colors.rb

@@ -1,5 +1,7 @@
-module Colors
-  FILENAME = :light_cyan
-  HOST = :light_blue
-  COMMAND = :yellow
+module Gorgon
+  module Colors
+    FILENAME = :light_cyan
+    HOST = :light_blue
+    COMMAND = :yellow
+  end
 end

data/lib/gorgon/command.rb

@@ -0,0 +1,145 @@
+require "rubygems"
+require 'gorgon'
+require 'gorgon/originator'
+require 'gorgon/listener'
+require 'gorgon/rsync_daemon'
+require 'gorgon/worker_manager'
+require 'gorgon/ping_service'
+require 'gorgon/gem_service'
+require 'gorgon/version'
+require 'gorgon/listener_installer'
+require 'gorgon/settings/initial_files_creator'
+
+module Gorgon
+  class Command
+    WELCOME_MESSAGE = "Welcome to Gorgon #{Gorgon::VERSION}"
+    USAGE = <<-EOT
+USAGE: gorgon <command> [<args>]
+
+COMMANDS:
+  start                       remotely run all tests specified in gorgon.json
+  listen                      start a listener process using the settings in gorgon_listener.json
+  ping                        ping listeners and show hosts and gorgon's version they are running
+  init [<framework>]          create initial files for current project
+  install_listener            run gorgon listener as a daemon process
+  start_rsync <directory>     start rsync daemon. Run this command in File Server
+  stop_rsync                  stop rsync daemon.
+  gem command [<options>...]  execute the gem command on every listener and shutdown listener.
+                              (e.g. 'gorgon gem install bunny --version 1.0.0')
+
+OPTIONS:
+  -h, --help       print this message
+  -v, --version    print gorgon version
+    EOT
+
+    COMMAND_WHITELIST = %w(help version start listen start_rsync stop_rsync manage_workers ping gem init install_listener)
+
+    attr_reader :argv
+
+    def initialize(argv)
+      if argv.empty?
+        @argv = ['start']
+      else
+        @argv = argv
+      end
+    end
+
+    def self.run(argv = ARGV)
+      new(argv).run_command
+    end
+
+    def run_command
+      command = parse(argv.shift)
+      if COMMAND_WHITELIST.include?(command)
+        puts WELCOME_MESSAGE unless ['version', 'help'].include?(command)
+        send(command)
+      else
+        write_error_message(command)
+      end
+    end
+
+    def help
+      write_usage
+      exit(0)
+    end
+
+    def version
+      puts Gorgon::VERSION
+      exit(0)
+    end
+
+    def start
+      o = Originator.new
+      exit o.originate
+    end
+
+    def listen
+      l = Listener.new
+      l.listen
+    end
+
+    def start_rsync
+      puts "Starting rsync daemon..."
+      directory = argv[0]
+      exit 1 unless RsyncDaemon.start directory
+      puts "Rsync Daemon is running. Use 'gorgon stop_rsync' to kill it."
+    end
+
+    def stop_rsync
+      puts "Stopping rsync daemon..."
+      exit 1 unless RsyncDaemon.stop
+      puts "Done"
+    end
+
+    def manage_workers
+      config_path = ENV["GORGON_CONFIG_PATH"]
+
+      manager = WorkerManager.build config_path
+      manager.manage
+
+      # For some reason I have to 'exit' here, otherwise WorkerManager process crashes
+      exit
+    end
+
+    def ping
+      PingService.new.ping_listeners
+    end
+
+    def gem
+      gem_opts = argv.join(" ")
+      GemService.new.run(gem_opts)
+    end
+
+    def init
+      framework = argv[0]
+      Settings::InitialFilesCreator.run(framework)
+    end
+
+    def install_listener
+      ListenerInstaller.install
+    end
+
+    private
+
+    def write_usage
+      puts USAGE
+    end
+
+    def parse(command)
+      case command
+      when '--version', '-v'
+        'version'
+      when 'help', '--help', '-h'
+        'help'
+      else
+        command
+      end
+    end
+
+    def write_error_message(command)
+      puts "Error: Command '#{command}' not recognized"
+      write_usage
+      exit(1)
+    end
+  end
+end

data/lib/gorgon/configuration.rb

@@ -1,9 +1,49 @@
+require "gorgon/core_ext/hash/deep_merge"
 require "yajl"
 
-module Configuration
-  extend self
-  def load_configuration_from_file(filename)
-    file = File.new(filename, "r")
-    Yajl::Parser.new(:symbolize_keys => true).parse(file)
+module Gorgon
+  module Configuration
+    extend self
+
+    def load_configuration_from_file(first_filename, merge: nil, file_loader: FileLoader)
+      ConfigurationParser.new(
+        file_loader: file_loader
+      ).load_from_files(
+        first_filename: first_filename,
+        merge_filename: merge
+      )
+    end
+
+    class ConfigurationParser
+      def initialize(file_loader:)
+        @file_loader = file_loader
+      end
+
+      def load_from_files(first_filename:, merge_filename:)
+        if merge_filename && @file_loader.exists?(merge_filename)
+          load_file(first_filename).deep_merge(load_file(merge_filename))
+        else
+          load_file(first_filename)
+        end
+      end
+
+      private
+
+      def load_file(filename)
+        @file_loader.parse(filename)
+      end
+    end
+
+    module FileLoader
+      def self.parse(filename)
+        file = File.new(filename, "r")
+        Yajl::Parser.new(symbolize_keys: true).parse(file)
+      end
+
+      def self.exists?(filename)
+        File.exists?(filename)
+      end
+    end
   end
 end
+

data/lib/gorgon/core_ext/hash/deep_merge.rb

@@ -0,0 +1,21 @@
+# Algorithm from 'activesupport/core_ext/hash/deep_merge'
+
+class Hash
+  def deep_merge(other_hash)
+    dup.deep_merge!(other_hash)
+  end
+
+  def deep_merge!(other_hash)
+    other_hash.each_pair do |current_key, other_value|
+      this_value = self[current_key]
+
+      self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
+        this_value.deep_merge(other_value)
+      else
+        other_value
+      end
+    end
+
+    self
+  end
+end

data/lib/gorgon/crash_reporter.rb

@@ -1,19 +1,21 @@
-module CrashReporter
-  OUTPUT_LINES_TO_REPORT = 70
+module Gorgon
+  module CrashReporter
+    OUTPUT_LINES_TO_REPORT = 70
 
-  def report_crash reply_exchange, info
-    stdout = `tail -n #{OUTPUT_LINES_TO_REPORT} #{info[:out_file]}`
-    stderr = `cat #{info[:err_file]}` + \
-    info[:footer_text]
+    def report_crash reply_exchange, info
+      stdout = `tail -n #{OUTPUT_LINES_TO_REPORT} #{info[:out_file]}`
+      stderr = `cat #{info[:err_file]}` + \
+        info[:footer_text]
 
-    send_crash_message reply_exchange, stdout, stderr
+      send_crash_message reply_exchange, stdout, stderr
 
-    "#{stdout}\n#{stderr}"
-  end
+      "#{stdout}\n#{stderr}"
+    end
 
-  def send_crash_message reply_exchange, output, error
-    reply = {:type => :crash, :hostname => Socket.gethostname,
-      :stdout => output, :stderr => error}
-    reply_exchange.publish(Yajl::Encoder.encode(reply))
+    def send_crash_message reply_exchange, output, error
+      reply = {:type => :crash, :hostname => Socket.gethostname,
+               :stdout => output, :stderr => error}
+      reply_exchange.publish(Yajl::Encoder.encode(reply))
+    end
   end
 end

data/lib/gorgon/failures_printer.rb

@@ -1,40 +1,41 @@
 require 'yajl'
 
-class FailuresPrinter
-  DEFAULT_OUTPUT_FILE = "/tmp/gorgon-failed-files.json"
+module Gorgon
+  class FailuresPrinter
+    DEFAULT_OUTPUT_FILE = "/tmp/gorgon-failed-files.json"
 
-  attr_reader :output_file
+    attr_reader :output_file
 
-  def initialize(configuration, job_state)
-    @job_state = job_state
-    @job_state.add_observer(self)
-    @output_file = configuration.fetch(:failed_files) { DEFAULT_OUTPUT_FILE }
-  end
+    def initialize(configuration, job_state)
+      @job_state = job_state
+      @job_state.add_observer(self)
+      @output_file = configuration.fetch(:failed_files) { DEFAULT_OUTPUT_FILE }
+    end
 
-  def update payload
-    return unless @job_state.is_job_complete? || @job_state.is_job_cancelled?
+    def update payload
+      return unless @job_state.is_job_complete? || @job_state.is_job_cancelled?
 
-    File.open(@output_file, 'w+') do |fd|
-      fd.write(Yajl::Encoder.encode(failed_files + unfinished_files))
+      File.open(@output_file, 'w+') do |fd|
+        fd.write(Yajl::Encoder.encode(failed_files + unfinished_files))
+      end
     end
-  end
 
-  private
+    private
 
-  def failed_files
-    failed_files = []
-    @job_state.each_failed_test do |test|
-      failed_files << "#{test[:filename]}"
+    def failed_files
+      failed_files = []
+      @job_state.each_failed_test do |test|
+        failed_files << "#{test[:filename]}"
+      end
+      failed_files
     end
-    failed_files
-  end
 
-  def unfinished_files
-    unfinished_files = []
-    @job_state.each_running_file do |hostname, filename|
-      unfinished_files << "#{filename}"
+    def unfinished_files
+      unfinished_files = []
+      @job_state.each_running_file do |hostname, filename|
+        unfinished_files << "#{filename}"
+      end
+      unfinished_files
     end
-    unfinished_files
   end
 end
-

data/lib/gorgon/g_logger.rb

@@ -1,24 +1,26 @@
 require "logger"
 
-module GLogger
-  SIZE_1_MB = 1048576
+module Gorgon
+  module GLogger
+    SIZE_1_MB = 1048576
 
-  def initialize_logger log_file
-    return unless log_file
-    @logger =
-      if log_file == "-"
-        Logger.new($stdout)
-      else
-        Logger.new(log_file, 1, SIZE_1_MB)
-      end
-    @logger.datetime_format = "%Y-%m-%d %H:%M:%S "
-  end
+    def initialize_logger log_file
+      return unless log_file
+      @logger =
+        if log_file == "-"
+          Logger.new($stdout)
+        else
+          Logger.new(log_file, 1, SIZE_1_MB)
+        end
+      @logger.datetime_format = "%Y-%m-%d %H:%M:%S "
+    end
 
-  def log text
-    @logger.info(text) if @logger
-  end
+    def log text
+      @logger.info(text) if @logger
+    end
 
-  def log_error text
-    @logger.error(text) if @logger
+    def log_error text
+      @logger.error(text) if @logger
+    end
   end
 end