fixed some expand_paths to handle symlinks right

infochimps-labs · Feb 18, 2012 · 9e21b58 · 9e21b58
1 parent a58a3ae
commit 9e21b58
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/cookbooks/silverware/spec/aspect_spec.rb b/cookbooks/silverware/spec/aspect_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 require SILVERWARE_DIR("libraries/silverware")
 require SILVERWARE_DIR("libraries/aspects")
 

diff --git a/cookbooks/silverware/spec/aspects_spec.rb b/cookbooks/silverware/spec/aspects_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 require SILVERWARE_DIR("libraries/silverware")
 require SILVERWARE_DIR("libraries/aspects")
 

diff --git a/cookbooks/silverware/spec/attr_struct_spec.rb b/cookbooks/silverware/spec/attr_struct_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 require SILVERWARE_DIR("libraries/silverware.rb")
 
 describe Ironfan::AttrStruct do

diff --git a/cookbooks/silverware/spec/component_spec.rb b/cookbooks/silverware/spec/component_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 require SILVERWARE_DIR("libraries/silverware.rb")
 require SILVERWARE_DIR("libraries/aspects")
 

diff --git a/cookbooks/silverware/spec/discovery_spec.rb b/cookbooks/silverware/spec/discovery_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 require SILVERWARE_DIR("libraries/silverware")
 require SILVERWARE_DIR("libraries/aspects")
 

diff --git a/cookbooks/silverware/spec/spec_helper.rb b/cookbooks/silverware/spec/spec_helper.rb
@@ -1,6 +1,6 @@
 require 'rspec'
 
-SILVERWARE_DIR = File.expand_path(File.dirname(__FILE__)+'/..') unless defined?(SILVERWARE_DIR)
+SILVERWARE_DIR = File.expand_path("..", File.realdirpath(File.dirname(__FILE__))) unless defined?(SILVERWARE_DIR)
 def SILVERWARE_DIR(*paths) File.join(SILVERWARE_DIR, *paths); end
 
 require 'chef/node'

diff --git a/tasks/chef_config.rake b/tasks/chef_config.rake
@@ -32,7 +32,7 @@ NEW_COOKBOOK_LICENSE = :apachev2
 ###
 
 # The top of the repository checkout
-TOPDIR = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+TOPDIR = File.expand_path("..", File.realdirpath(File.dirname(__FILE__)))
 
 # Where to store certificates generated with ssl_cert
 CADIR = File.expand_path(File.join(TOPDIR, "certificates"))