Testing now in lib/, added a supporting Gemfile and Rakefile

Gemfile.lock

@@ -9,6 +9,7 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
+    diff-lcs (1.1.3)
     directory_watcher (1.4.1)
     fast-stemmer (1.0.1)
     fssm (0.2.9)
@@ -39,6 +40,14 @@ GEM
     rb-fsevent (0.9.3)
     rdiscount (1.6.8)
     redcarpet (2.2.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
     rubypants (0.2.0)
     sass (3.2.4)
     sinatra (1.3.3)
@@ -67,6 +76,7 @@ DEPENDENCIES
   rb-fsevent (~> 0.9.3)
   rdiscount (~> 1.6.8)
   redcarpet (~> 2.2.2)
+  rspec
   rubypants (~> 0.2.0)
   sinatra (~> 1.3.3)
   stringex (~> 1.4.0)

lib/Gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rake", "~> 10.0"
+
+group :test do
+  gem "rspec"
+end
+

lib/Gemfile.lock

@@ -0,0 +1,20 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake (~> 10.0)
+  rspec

lib/Rakefile

@@ -0,0 +1,9 @@
+$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
+
+require "rubygems"
+require 'octopress'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.pattern = "spec/**/*_spec.rb"
+end

lib/spec/octopress/configuration_spec.rb

@@ -1,15 +1,15 @@
 require 'minitest/autorun'
-require_relative '../../lib/octopress'
+require_relative '../../octopress'
 
 describe Octopress::Configuration do
-  describe '.read_configuration' do
-    subject do
-      Octopress::Configuration.read_configuration
-    end
-
+  describe '#read_configuration' do
     describe "when no override" do
       before do
-        Octopress::Configuration::CONFIG_DIR = File.join(File.dirname(__FILE__), '../', 'fixtures', 'no_override')
+        @octo_config = Octopress::Configuration.new(File.join(File.dirname(__FILE__), '../', 'fixtures', 'no_override'))
+      end
+      
+      subject do
+        @octo_config.read_configuration
       end
 
       it "returns the default config with keys as symbols" do
@@ -25,7 +25,11 @@ describe Octopress::Configuration do
 
     describe "when override" do
       before do
-        Octopress::Configuration::CONFIG_DIR = File.join(File.dirname(__FILE__), '../', 'fixtures', 'override')
+        @octo_config = Octopress::Configuration.new(File.join(File.dirname(__FILE__), '../', 'fixtures', 'override'))
+      end
+      
+      subject do
+        @octo_config.read_configuration
       end
 
       it "returns the default config with keys as symbols" do