Simplified requiring files in specs

spec/spec_helper.rb

@@ -1,13 +1,12 @@
-$LOAD_PATH << File.join(File.dirname(__FILE__),"..","lib")
+require 'tempfile'
+require 'tmpdir'
+require 'date'
+require 'yaml'
 require 'rspec'
 # Following require is needed for rcov to provide valid results
 require 'rspec/autorun'
-require 'yaml'
-require 'astute'
 
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
+require_relative '../lib/astute'
 
 # NOTE(mihgen): I hate to wait for unit tests to complete,
 #               resetting time to sleep significantly increases tests speed
@@ -15,6 +14,10 @@ Astute.config.PUPPET_DEPLOY_INTERVAL = 0
 Astute.config.PUPPET_FADE_INTERVAL = 0
 Astute.config.MC_RETRY_INTERVAL = 0
 
+RSpec.configure do |c|
+  c.mock_with :mocha
+end
+
 module SpecHelpers
   def mock_rpcclient(discover_nodes=nil, timeout=nil)
     rpcclient = mock('rpcclient') do

spec/unit/logparser_spec.rb

@@ -1,9 +1,4 @@
-#!/usr/bin/env rspec
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
-require 'tempfile'
-require 'tmpdir'
-require 'date'
-
+require_relative '../spec_helper'
 include Astute
 
 describe LogParser do

spec/unit/mclient_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env rspec
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require_relative '../spec_helper'
 include Astute
 
 describe MClient do
   include SpecHelpers
+
   before(:each) do
     @ctx = mock('context')
     @ctx.stubs(:task_id)

spec/unit/nailyfact_deploy_spec.rb

@@ -1,5 +1,4 @@
-#!/usr/bin/env rspec
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require_relative '../spec_helper'
 
 describe "NailyFact DeploymentEngine" do
   context "When deploy is called, " do

spec/unit/node_spec.rb

@@ -1,5 +1,4 @@
-#!/usr/bin/env rspec
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require_relative '../spec_helper'
 
 describe Astute::Node do
   it "accepts hash for initialization" do
@@ -46,7 +45,10 @@ end
 
 describe Astute::NodesHash do
   it "accepts array of hashes or nodes for initialization and allows accessing by uid" do
-    nodes = Astute::NodesHash.build([{'uid' => 123, 'info' => 'blabla1'}, Astute::Node.new({'uid' => 'abc', 'info' => 'blabla2'})])
+    nodes = Astute::NodesHash.build(
+      [{'uid' => 123, 'info' => 'blabla1'},
+      Astute::Node.new({'uid' => 'abc', 'info' => 'blabla2'})])
+
     nodes['123'].info.should == 'blabla1'
     nodes['abc'].info.should == 'blabla2'
     nodes[123].info.should == 'blabla1'
@@ -64,7 +66,10 @@ describe Astute::NodesHash do
   end
 
   it "introduces meaningful aliases" do
-    nodes = Astute::NodesHash.build([{'uid' => 123, 'info' => 'blabla1'}, Astute::Node.new({'uid' => 'abc', 'info' => 'blabla2'})])
+    nodes = Astute::NodesHash.build(
+      [{'uid' => 123, 'info' => 'blabla1'},
+      Astute::Node.new({'uid' => 'abc', 'info' => 'blabla2'})])
+
     nodes.uids.should  == nodes.keys
     nodes.nodes.should == nodes.values
   end
@@ -72,4 +77,4 @@ describe Astute::NodesHash do
   it "denies direct accessors" do
     expect{ Astute::NodesHash.new['fake-uid'] = {'bla' => 'bla'} }.to raise_error(NoMethodError)
   end
-end
+end

spec/unit/orchestrator_spec.rb

@@ -1,8 +1,8 @@
-#!/usr/bin/env rspec
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require_relative '../spec_helper'
 
 describe Astute::Orchestrator do
   include SpecHelpers
+
   before(:each) do
     @orchestrator = Astute::Orchestrator.new
     @reporter = mock('reporter')

spec/unit/puppetd_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env rspec
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require_relative '../spec_helper'
 include Astute
 
 describe "Puppetd" do
   include SpecHelpers
+
   context "PuppetdDeployer" do
     before :each do
       @ctx = mock
@@ -39,7 +39,7 @@ describe "Puppetd" do
           returns([rpcclient_valid_result]).then.
           returns([rpcclient_new_res]).then.
           returns([rpcclient_finished_res])
-          
+
       rpcclient.expects(:runonce).at_least_once.returns([rpcclient_valid_result])
 
       Astute::PuppetdDeployer.deploy(@ctx, nodes, retries=0)
@@ -71,7 +71,7 @@ describe "Puppetd" do
           returns([rpcclient_valid_result]).then.
           returns([rpcclient_new_res]).then.
           returns([rpcclient_finished_res])
-          
+
       rpcclient.expects(:runonce).at_least_once.returns([rpcclient_valid_result])
 
       Astute::PuppetdDeployer.deploy(@ctx, nodes, retries=0, change_node_status=false)

spec/unit/reporter_spec.rb

@@ -1,5 +1,4 @@
-#!/usr/bin/env rspec
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require_relative '../spec_helper'
 include Astute
 
 describe "ProxyReporter" do

spec/unit/simplepuppet_deploy_spec.rb

@@ -1,5 +1,4 @@
-#!/usr/bin/env rspec
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require_relative '../spec_helper'
 
 describe "SimplePuppet DeploymentEngine" do
   context "When deploy is called, " do