hello_goodbye 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/hello_goodbye.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'eventmachine'
 require 'json'
 
-require File.expand_path('../hello_goodbye/foremen_manager',__FILE__)
+require 'hello_goodbye/foremen_manager'
 
 module HelloGoodbye
 

data/lib/hello_goodbye/console.rb

@@ -7,10 +7,11 @@ module HelloGoodbye
   #                Responds with 'goodbye'.
   class Console < EventMachine::Connection
 
-    require File.expand_path('../../hello_goodbye/consoles/foreman_console',__FILE__)
-    require File.expand_path('../../hello_goodbye/consoles/manager_console',__FILE__)
-    require File.expand_path('../../hello_goodbye/json/request',__FILE__)
-    require File.expand_path('../../hello_goodbye/json/response',__FILE__)
+    require 'hello_goodbye/consoles/foreman_console'
+    require 'hello_goodbye/consoles/foreman_console'
+    require 'hello_goodbye/consoles/manager_console'
+    require 'hello_goodbye/json/request'
+    require 'hello_goodbye/json/response'
 
     # :foreman
     #   A reference to the Foreman object that instantiated the console, so that
@@ -48,17 +49,17 @@ module HelloGoodbye
       when "hello"
         send_response :success => true,
           :message => "hello"
-        return true
+        true
       when "goodbye"
         send_response :success => true,
           :message => "goodbye"
         close_connection
-        return true
+        true
       else
         send_response :success => false,
           :message => "unknown command"
+        false
       end
-      false
     end
 
     # Parameters:

data/lib/hello_goodbye/foreman.rb

@@ -28,6 +28,7 @@ module HelloGoodbye
     def initialize(options={})
       self.server = options[:server]
       self.port = options[:port]
+
       @foreman_started = false
     end
 
@@ -46,10 +47,12 @@ module HelloGoodbye
     # that may need to be done.
     def start!
       raise RuntimeError, "Foreman already started!" if @foreman_started == true
+
       start_with_reactor do
         self.start_console
         yield if block_given?
       end
+
       @foreman_started = true
     end
 

data/lib/hello_goodbye/foremen_manager.rb

@@ -1,6 +1,6 @@
 module HelloGoodbye
-  require File.expand_path('../../hello_goodbye/console',__FILE__)
-  require File.expand_path('../../hello_goodbye/foreman',__FILE__)
+  require 'hello_goodbye/console'
+  require 'hello_goodbye/foreman'
   class ForemenManager < Foreman
 
     DEFAULT_MANAGER_PORT = 8080

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
-require File.expand_path('../../lib/hello_goodbye',__FILE__)
-require File.expand_path('../../spec/test_foreman',__FILE__)
-require File.expand_path('../../spec/test_console',__FILE__)
-require File.expand_path('../../lib/hello_goodbye/json/request',__FILE__)
-require File.expand_path('../../lib/hello_goodbye/json/response',__FILE__)
+require 'hello_goodbye'
+require 'spec/test_foreman'
+require 'spec/test_console'
+require 'hello_goodbye/json/request'
+require 'hello_goodbye/json/response'
 
 require 'rspec'
 

data/spec/test_console.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../lib/hello_goodbye',__FILE__)
-
 module HelloGoodbye
   class TestConsole < ForemanConsole
     def receive_command(command)

data/spec/test_foreman.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../lib/hello_goodbye',__FILE__)
-
 module HelloGoodbye
   class TestForeman < Foreman
     set_console_type :test

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Joshua Murray