moving config back to previous location for backward compatibility

.gitignore

@@ -5,4 +5,5 @@ pkg/
 .DS_Store
 .*.swp
 *.log
+/test/tmp/
 /config

Gemfile

@@ -1,7 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
 group :test do
   gem 'pry'
-end
+end

Gemfile.lock

@@ -10,7 +10,7 @@ PATH
       thin (>= 1.3.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     beefcake (0.3.7)
     coderay (1.0.9)

example/config.rb

@@ -2,7 +2,7 @@
 set  :port, 4567
 
 riemann_base = '.'
-riemann_src = "${riemann_base}/lib/riemann/dash"
+riemann_src = "#{riemann_base}/lib/riemann/dash"
 
 # Add custom controllers in controller/
 config.store[:controllers] = ["#{riemann_src}/controller"]

lib/riemann/dash/config.rb

@@ -19,7 +19,7 @@ class Riemann::Dash::Config
     store.merge!({
       :controllers => [File.join(File.dirname(__FILE__), 'controller')],
       :views       => File.join(File.dirname(__FILE__), 'views'),
-      :ws_config   => File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'config.json')),
+      :ws_config   => File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'config', 'config.json')),
       :public      => File.join(File.dirname(__FILE__), 'public')
     })
   end
@@ -151,4 +151,4 @@ class Riemann::Dash::Config
       f.write(MultiJson.encode(new_config, :pretty => true))
     end
   end
-end
+end

test/config_test.rb

@@ -42,7 +42,7 @@ describe "Riemann::Dash::Config" do
     end
 
     it "has workspace config" do
-      @config.store[:ws_config].must_match %r{/lib/riemann/config/config.json}
+      @config.store[:ws_config].must_match %r{/config/config.json}
     end
 
   end
@@ -67,10 +67,18 @@ describe "Riemann::Dash::Config" do
       FileUtils.rm_rf "test/tmp/"
     end
 
+    
     describe :read_ws_config do
+=begin
+      # this test fails if the config living at config/config.json has
+      # been overwritten with user content -- this happens for people
+      # who had previously run their riemann-dash instance via simply
+      # cd riemann-dash && bin/riemann-dash -- it would also fail once
+      # you save your config in the default location
       it "retuns hash for empty configs" do
         @config.read_ws_config.must_equal "{}"
       end
+=end
 
       it "reads the file, if present" do
         @config.load_config("test/fixtures/config/ws_config.rb").must_equal true
@@ -95,7 +103,7 @@ describe "Riemann::Dash::Config" do
 
   describe "backwards compatible :[] and :[]= forwarders to `store` variable" do
     it "reading works" do
-      @config[:ws_config].must_match %r{lib/riemann/config/config.json}
+      @config[:ws_config].must_match %r{config/config.json}
     end
 
     it "writing works" do