@@ -11,29 +11,36 @@ module Rubysermon

 	MOD_PATH = "#{LIB_PATH}/rubysermon/mod"

 	class App

+		attr_accessor :config_path

-		#todo: refactor

 		def initialize

-			@config = {repeat: 60}

-			@running_mods = []

-			@config_path = "#{LIB_PATH}/rubysermon/config.json"

+			@config 		= {repeat: 60}

+			@running_mods	= []

+			@config_path	= "#{LIB_PATH}/rubysermon/config.json"

+			@enabled_mods	= []

+		end

-			config()

-			@enabled_mods = @config[:modules].to_a

+		def run

+			read_config()

+			enable_and_start_mods()

+

+			if (msg = cannot_start_fetch_process_sleep_cycle?)

+				abort(msg)

+			end

-			start_mods()

 			start_fetch_process_sleep_cycle()

 		end

 		private

-		def config

+		def read_config

 			configurator = Configurator.new(@config_path)

 			config = configurator.get_settings()

 			@config.merge!(config)

 		end

-		def start_mods

+		def enable_and_start_mods

+			@enabled_mods = @config[:modules].to_a

 			@enabled_mods.each do |mod| load_mod(mod) end

 		end

@@ -42,15 +49,21 @@ module Rubysermon

 				mod = ModLoader.load(mod_name)

 				@running_mods.push(mod)

 			rescue ModLoaderException => e

-				$stderr = e.message

+				$stderr.puts e.message

 			end

 		end

-		def start_fetch_process_sleep_cycle

-			if (msg = cannot_start_fetch_process_sleep_cycle?)

-				abort(msg)

+		def cannot_start_fetch_process_sleep_cycle?

+			if @config[:repeat].to_i < 1

+				return "Repeat cycle is too short"

+			elsif @running_mods.empty?

+				return "There are no enabled modules"

 			end

+			false

+		end

+

+		def start_fetch_process_sleep_cycle

 			while true

 				current_time = DateTime.now()

 				@running_mods.each do |mod|

@@ -60,13 +73,5 @@ module Rubysermon

 				sleep @config[:repeat]

 			end

 		end

-

-		def cannot_start_fetch_process_sleep_cycle?

-			if @config[:repeat].to_i < 1

-				return "Repeat cycle too short"

-			end

-

-			false

-		end

 	end

 end

new file mode 100644

@@ -0,0 +1 @@

+{}

\ No newline at end of file

new file mode 100644

new file mode 100644

@@ -0,0 +1,3 @@

+{

+  "modules" : []

+}

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,7 @@

+{

+  "modules" : [

+    "cpu"

+  ],

+

+  "repeat": 0

+}

\ No newline at end of file

@@ -2,4 +2,39 @@ require_relative 'test_helper.rb'

 class Rubysermon_test < MiniTest::Unit::TestCase

+	def setup

+		@app = Rubysermon::App.new

+	end

+

+	def test_wrong_refresh_time

+		@app.config_path = "#{TEST_PATH}/fixtures/short_repeat_period.json"

+

+		assert_raises(SystemExit) do

+			@app.run()

+		end

+	end

+

+	def test_empty_modules

+		@app.config_path = "#{TEST_PATH}/fixtures/empty_modules.json"

+

+		assert_raises(SystemExit) do

+			@app.run()

+		end

+	end

+

+	def test_empty_config1

+		@app.config_path = "#{TEST_PATH}/fixtures/empty1.json"

+

+		assert_raises(SystemExit) do

+			@app.run()

+		end

+	end

+

+	def test_empty_config2

+		@app.config_path = "#{TEST_PATH}/fixtures/empty2.json"

+

+		assert_raises(SystemExit) do

+			@app.run()

+		end

+	end

 end

\ No newline at end of file

@@ -2,4 +2,6 @@ require 'minitest/autorun'

 require 'minitest/reporters'

 MiniTest::Reporters.use!

-require File.expand_path('../../lib/rubysermon.rb', __FILE__)

\ No newline at end of file

+require File.expand_path('../../lib/rubysermon.rb', __FILE__)

+

+TEST_PATH = File.expand_path(File.dirname(__FILE__))

\ No newline at end of file