@@ -8,18 +8,28 @@ class Sandbox # Executes the block and yields the path to the sandbox directory. # Cleans up the sandbox after the block is complete. - def self.play(path = nil, &block) - sandbox = Sandbox.new(path) - + # == Options + # [+:path+] the path to use. default: generate one in Dir.tmpdir + # [+:cd+] change directory with Dir.chdir to the temp directory + def self.play(options = {}, &block) + sandbox = Sandbox.new(options[:path]) + begin - yield sandbox.path + if options[:cd] + Dir.chdir(sandbox.path) do + yield sandbox.path + end + else + yield sandbox.path + end ensure sandbox.close end end - # Creates a new Sandbox with an optional path. Generates a random - # path in Dir.tmpdir if path is unspecified. + # Creates a new Sandbox with an optional path. + # == Parameters + # [+path+] The path to use. default: generate one in Dir.tmpdir def initialize(path = nil) self.path = path || generate_path lib/sandbox.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/spec_helper' describe "Sandbox" do - context "no errors" do + context "when there are no errors in the block" do it "cleans up after itself" do path = Sandbox.play do |p| File.exist?(p).should be_true @@ -11,9 +11,29 @@ describe "Sandbox" do File.exist?(path).should be_false end + + it "changes directories when :cd => true is specified" do + path = Sandbox.play(:cd => true) do |p| + File.exist?(p).should be_true + File.ftype(p).should == 'directory' + File::Stat.new(Dir.pwd).ino.should == File::Stat.new(p).ino + p + end + + File.exist?(path).should be_false + end + + it "uses the specified path when :path is specified" do + tmp = Dir.tmpdir + path = File.join(tmp, 'sandbox-test') + + Sandbox.play(:path => path) do |p| + p.should == path + end + end end - context "exception raised" do + context "when an exception is raised" do it "cleans up after itself" do lambda { Sandbox.play do |p| @@ -26,15 +46,4 @@ describe "Sandbox" do File.exist?(@path).should be_false end end - - context "optional path supplied" do - it "uses the specified path" do - tmp = Dir.tmpdir - path = File.join(tmp, 'sandbox-test') - - Sandbox.play(path) do |p| - p.should == path - end - end - end end spec/sandbox_spec.rb f0ce286fc7f0e91cb68f4c5def63e4cb35716794 Brandon Dimcheff bdimchef-git@wieldim.com http://github.com/bdimcheff/sandbox/commit/a819b90852b81c1ef61893e54a08bf19ec4d9a51 a819b90852b81c1ef61893e54a08bf19ec4d9a51 2009-03-04T18:45:28-08:00 2009-03-04T18:45:28-08:00 automatic directory changing option 817158bf8474cf50b3b43032d154343865b98fad Brandon Dimcheff bdimchef-git@wieldim.com