v0.0.9

lib/rscons.rb

@@ -22,4 +22,20 @@ module Rscons
 
   class BuildError < Exception
   end
+
+  # Remove all generated files
+  def self.clean
+    cache = Cache.new
+    # remove all built files
+    cache.targets.each do |target|
+      FileUtils.rm_f(target)
+    end
+    # remove all created directories if they are empty
+    cache.directories.sort {|a, b| b.size <=> a.size}.each do |directory|
+      if (Dir.entries(directory) - ['.', '..']).empty?
+        Dir.rmdir(directory) rescue nil
+      end
+    end
+    Cache.clear
+  end
 end

lib/rscons/builder.rb

@@ -24,7 +24,7 @@ module Rscons
     # Return the name of the target or false on failure.
     def standard_build(short_cmd_string, target, command, sources, env, cache)
       unless cache.up_to_date?(target, command, sources)
-        FileUtils.mkdir_p(File.dirname(target))
+        cache.mkdir_p(File.dirname(target))
         FileUtils.rm_f(target)
         return false unless env.execute(short_cmd_string, command)
         cache.register_build(target, command, sources)

lib/rscons/builders/object.rb

@@ -55,7 +55,7 @@ module Rscons
                    end
       command = env.build_command(env["#{com_prefix}COM"], vars)
       unless cache.up_to_date?(target, command, sources)
-        FileUtils.mkdir_p(File.dirname(target))
+        cache.mkdir_p(File.dirname(target))
         FileUtils.rm_f(target)
         return false unless env.execute("#{com_prefix} #{target}", command)
         deps = sources

lib/rscons/cache.rb

@@ -36,6 +36,11 @@ module Rscons
   #         ]
   #       }
   #     }
+  #     directories: {
+  #       'build' => true,
+  #       'build/one' => true,
+  #       'build/two' => true,
+  #     }
   #   }
   class Cache
     #### Constants
@@ -55,10 +60,10 @@ module Rscons
     # Create a Cache object and load in the previous contents from the cache
     # file.
     def initialize
-      @cache = YAML.load(File.read(CACHE_FILE)) rescue {
-        targets: {},
-        version: VERSION,
-      }
+      @cache = YAML.load(File.read(CACHE_FILE)) rescue {}
+      @cache[:targets] ||= {}
+      @cache[:directories] ||= {}
+      @cache[:version] ||= VERSION
       @lookup_checksums = {}
     end
 
@@ -132,6 +137,31 @@ module Rscons
       }
     end
 
+    # Return a list of targets that have been built
+    def targets
+      @cache[:targets].keys
+    end
+
+    # Make any needed directories and record the ones that are created for
+    # removal upon a "clean" operation.
+    def mkdir_p(path)
+      parts = path.split(/[\\\/]/)
+      (0..parts.size).each do |i|
+        subpath = File.join(*parts[0, i + 1])
+        unless File.exists?(subpath)
+          FileUtils.mkdir(subpath)
+          unless @cache[:directories].include?(subpath)
+            @cache[:directories][subpath] = true
+          end
+        end
+      end
+    end
+
+    # Return a list of directories which were created as a part of the build
+    def directories
+      @cache[:directories].keys
+    end
+
     # Private Instance Methods
     private
 

lib/rscons/environment.rb

@@ -96,7 +96,6 @@ module Rscons
         end
         build_fname.gsub!('\\', '/')
       end
-      FileUtils.mkdir_p(File.dirname(build_fname))
       build_fname
     end
 

lib/rscons/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # gem version
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

spec/build_tests_spec.rb

@@ -120,6 +120,35 @@ describe Rscons do
     File.exists?('build/two/two.o').should be_true
   end
 
+  it 'cleans built files' do
+    lines = test_dir('build_dir')
+    `./build_dir`.should == "Hello from two()\n"
+    File.exists?('build/one/one.o').should be_true
+    File.exists?('build/two/two.o').should be_true
+    Rscons.clean
+    File.exists?('build/one/one.o').should be_false
+    File.exists?('build/two/two.o').should be_false
+    File.exists?('build/one').should be_false
+    File.exists?('build/two').should be_false
+    File.exists?('build').should be_false
+    File.exists?('src/one/one.c').should be_true
+  end
+
+  it 'does not clean created directories if other non-rscons-generated files reside there' do
+    lines = test_dir('build_dir')
+    `./build_dir`.should == "Hello from two()\n"
+    File.exists?('build/one/one.o').should be_true
+    File.exists?('build/two/two.o').should be_true
+    File.open('build/two/tmp', 'w') { |fh| fh.puts "dum" }
+    Rscons.clean
+    File.exists?('build/one/one.o').should be_false
+    File.exists?('build/two/two.o').should be_false
+    File.exists?('build/one').should be_false
+    File.exists?('build/two').should be_true
+    File.exists?('build').should be_true
+    File.exists?('src/one/one.c').should be_true
+  end
+
   it 'allows Ruby classes as custom builders to be used to construct files' do
     lines = test_dir('custom_builder')
     lines.should == ['CC program.o', 'LD program']