files 0.0.2 → 0.0.3

data/README.md

@@ -24,6 +24,7 @@ see `test/files_test.rb` for more examples
 
 * the directory will be removed at exit
   * unless you pass `:remove => false`
+* the directory name is based on the name of the source file you called Files from
 
 ## TODO
 

data/lib/files.rb

@@ -2,12 +2,21 @@ require "files/version"
 
 
 module Files
-  def self.create options = {:remove => true}, &block
+  
+  def self.default_options level = 2
+    {:remove => true, :name => called_from(level)}
+  end
+  
+  def self.called_from level = 1
+    File.basename caller[level].split(':').first, ".rb"
+  end
+  
+  def self.create options = default_options, &block
     require 'tmpdir'
     require 'fileutils'
 
-    called_from = File.basename caller.first.split(':').first, ".rb"
-    path = File.join(Dir::tmpdir, "#{called_from}_#{Time.now.to_i}_#{rand(1000)}")
+    name = options[:name]
+    path = File.join(Dir::tmpdir, "#{name}_#{Time.now.to_i}_#{rand(1000)}")
 
     files = Files.new path, block, options
 
@@ -25,13 +34,14 @@ module Files
       Dir.mkdir(path)
       at_exit {FileUtils.rm_rf(path) if File.exists?(path)} if options[:remove]
 
-      instance_eval &block
+      instance_eval &block if block
     end
 
     def dir name, &block
       Dir.mkdir "#{current}/#{name}"
       @dirs << name
-      instance_eval &block
+      instance_eval &block if block
+      @dirs.pop
     end
     
     def file name, contents = "contents of #{name}"
@@ -57,6 +67,6 @@ module Files
   end
 end
 
-def Files *args, &block
-  Files.create *args, &block
+def Files options = Files.default_options, &block
+  Files.create options, &block
 end

data/lib/files/version.rb

@@ -1,3 +1,3 @@
 module Files
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/files_test.rb

@@ -18,6 +18,8 @@ dir = Files.create do       # creates a temporary directory inside Dir.tmpdir
   end
 end
 
+assert { dir.split('/').last =~ /^files_test/ }
+
 assert { File.read("#{dir}/hello.txt") == "contents of hello.txt" }
 assert { File.read("#{dir}/web/snippet.html") == "<h1>File under F for fantastic!</h1>" }
 assert { 
@@ -35,3 +37,38 @@ dir = Files do
 end
 assert { File.read("#{dir}/hello.txt") == "contents of hello.txt" }
 assert { File.read("#{dir}/web/hello.html") == "contents of hello.html" }
+assert { dir.split('/').last =~ /^files_test/ }
+
+
+assert { Files.called_from(0) == "files_test" }
+
+
+dir = Files do
+  dir "foo" do
+    file "foo.txt"
+  end
+  dir "bar" do
+    file "bar.txt"
+    dir "baz" do
+      file "baz.txt"
+    end
+    dir "baf" do
+      file "baf.txt"
+    end
+  end
+end
+
+assert { File.read("#{dir}/foo/foo.txt") == "contents of foo.txt" }
+assert { File.read("#{dir}/bar/bar.txt") == "contents of bar.txt" }
+assert { File.read("#{dir}/bar/baz/baz.txt") == "contents of baz.txt" }
+assert { File.read("#{dir}/bar/baf/baf.txt") == "contents of baf.txt" }
+
+
+dir = Files()
+assert { File.exist? dir and File.directory? dir}
+
+dir = Files do
+  dir "a"
+end
+assert { File.exist? "#{dir}/a" and File.directory? "#{dir}/a"}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: files
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -45,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3051429508033972705
+      hash: 2467574349782494440
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3051429508033972705
+      hash: 2467574349782494440
 requirements: []
 rubyforge_project: files
 rubygems_version: 1.8.10