v0.0.12

build_tests/build_dir/build.rb

@@ -1,5 +1,5 @@
 Rscons::Environment.new do |env|
   env.append('CPPPATH' => Dir['src/**/*/'])
-  env.build_dir('src', 'build')
+  env.build_dir(%r{^src/([^/]+)/}, 'build_\\1/')
   env.Program('build_dir', Dir['src/**/*.c'])
 end

build_tests/custom_builder/build.rb

@@ -1,5 +1,5 @@
 class MySource < Rscons::Builder
-  def run(target, sources, cache, env)
+  def run(target, sources, cache, env, vars = {})
     File.open(target, 'w') do |fh|
       fh.puts <<EOF
 #define THE_VALUE 5678
@@ -9,8 +9,7 @@ EOF
   end
 end
 
-Rscons::Environment.new(echo: :short) do |env|
-  env.add_builder(MySource.new)
+Rscons::Environment.new(echo: :short, builders: [MySource.new]) do |env|
   env.MySource('inc.h', [])
   env.Program('program', Dir['*.c'])
 end

build_tests/library/build.rb

@@ -0,0 +1,4 @@
+Rscons::Environment.new(echo: :command) do |env|
+  env.Program('library', ['lib.a', 'three.c'])
+  env.Library("lib.a", ['one.c', 'two.c'], 'CPPFLAGS' => ['-Dmake_lib'])
+end

build_tests/library/one.c

@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+#ifdef make_lib
+int main(int argc, char *argv[])
+{
+    printf("Library\n");
+}
+#endif

build_tests/two_sources/build.rb

@@ -0,0 +1,4 @@
+Rscons::Environment.new(echo: :command) do |env|
+  env.Object("one.o", "one.c", 'CPPFLAGS' => ['-DONE'])
+  env.Program('two_sources', ['one.o', 'two.c'])
+end

build_tests/two_sources/one.c

@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+#ifdef ONE
+int main(int argc, char *argv[])
+{
+    printf("This is a C program with two sources.\n");
+}
+#endif

build_tests/two_sources/two.c

@@ -0,0 +1,3 @@
+#ifdef ONE
+#error ONE should not be defined
+#endif

lib/rscons.rb

@@ -8,16 +8,35 @@ require "rscons/monkey/module"
 require "rscons/monkey/string"
 
 # default builders
+require "rscons/builders/library"
 require "rscons/builders/object"
 require "rscons/builders/program"
 
 # Namespace module for rscons classes
 module Rscons
   DEFAULT_BUILDERS = [
+    Library,
     Object,
     Program,
   ]
 
   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|
+      next unless File.directory?(directory)
+      if (Dir.entries(directory) - ['.', '..']).empty?
+        Dir.rmdir(directory) rescue nil
+      end
+    end
+    Cache.clear
+  end
 end

lib/rscons/builder.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 module Rscons
   # Class to hold an object that knows how to build a certain type of file.
   class Builder
@@ -16,5 +18,18 @@ module Rscons
     def produces?(target, source, env)
       false
     end
+
+    # Check if the cache is up to date for the target and if not execute the
+    # build command.
+    # 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)
+        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)
+      end
+      target
+    end
   end
 end

lib/rscons/builders/library.rb

@@ -0,0 +1,28 @@
+require 'fileutils'
+
+module Rscons
+  # A default RScons builder that produces a static library archive.
+  class Library < Builder
+    def default_variables(env)
+      {
+        'AR' => 'ar',
+        'LIBSUFFIX' => '.a',
+        'ARFLAGS' => [],
+        'ARCOM' => ['$AR', 'rcs', '$ARFLAGS', '$_TARGET', '$_SOURCES']
+      }
+    end
+
+    def run(target, sources, cache, env, vars = {})
+      # build sources to linkable objects
+      objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars)
+      if objects
+        vars = vars.merge({
+          '_TARGET' => target,
+          '_SOURCES' => objects,
+        })
+        command = env.build_command(env['ARCOM'], vars)
+        standard_build("AR #{target}", target, command, objects, env, cache)
+      end
+    end
+  end
+end

lib/rscons/builders/object.rb

@@ -11,8 +11,8 @@ module Rscons
         'ASSUFFIX' => '.S',
         'ASPPPATH' => '$CPPPATH',
         'ASPPFLAGS' => '$CPPFLAGS',
-        'ASDEPGEN' => ['-MMD', '-MF', '$DEPFILE'],
-        'ASCOM' => ['$AS', '-c', '-o', '$TARGET', '$ASDEPGEN', '-I$[ASPPPATH]', '$ASPPFLAGS', '$ASFLAGS', '$SOURCES'],
+        'ASDEPGEN' => ['-MMD', '-MF', '$_DEPFILE'],
+        'ASCOM' => ['$AS', '-c', '-o', '$_TARGET', '$ASDEPGEN', '-I$[ASPPPATH]', '$ASPPFLAGS', '$ASFLAGS', '$_SOURCES'],
 
         'CPPFLAGS' => [],
         'CPPPATH' => [],
@@ -20,14 +20,14 @@ module Rscons
         'CC' => 'gcc',
         'CFLAGS' => [],
         'CSUFFIX' => '.c',
-        'CCDEPGEN' => ['-MMD', '-MF', '$DEPFILE'],
-        'CCCOM' => ['$CC', '-c', '-o', '$TARGET', '$CCDEPGEN', '-I$[CPPPATH]', '$CPPFLAGS', '$CFLAGS', '$SOURCES'],
+        'CCDEPGEN' => ['-MMD', '-MF', '$_DEPFILE'],
+        'CCCOM' => ['$CC', '-c', '-o', '$_TARGET', '$CCDEPGEN', '-I$[CPPPATH]', '$CPPFLAGS', '$CFLAGS', '$_SOURCES'],
 
         'CXX' => 'g++',
         'CXXFLAGS' => [],
         'CXXSUFFIX' => '.cc',
-        'CXXDEPGEN' => ['-MMD', '-MF', '$DEPFILE'],
-        'CXXCOM' =>['$CXX', '-c', '-o', '$TARGET', '$CXXDEPGEN', '-I$[CPPPATH]', '$CPPFLAGS', '$CXXFLAGS', '$SOURCES'],
+        'CXXDEPGEN' => ['-MMD', '-MF', '$_DEPFILE'],
+        'CXXCOM' =>['$CXX', '-c', '-o', '$_TARGET', '$CXXDEPGEN', '-I$[CPPPATH]', '$CPPFLAGS', '$CXXFLAGS', '$_SOURCES'],
       }
     end
 
@@ -38,12 +38,12 @@ module Rscons
         source.has_suffix?(env['CXXSUFFIX']))
     end
 
-    def run(target, sources, cache, env)
-      vars = {
-        'TARGET' => target,
-        'SOURCES' => sources,
-        'DEPFILE' => target.set_suffix('.mf'),
-      }
+    def run(target, sources, cache, env, vars = {})
+      vars = vars.merge({
+        '_TARGET' => target,
+        '_SOURCES' => sources,
+        '_DEPFILE' => target.set_suffix('.mf'),
+      })
       com_prefix = if sources.first.has_suffix?(env['ASSUFFIX'])
                      'AS'
                    elsif sources.first.has_suffix?(env['CSUFFIX'])
@@ -55,11 +55,13 @@ module Rscons
                    end
       command = env.build_command(env["#{com_prefix}COM"], vars)
       unless cache.up_to_date?(target, command, sources)
+        cache.mkdir_p(File.dirname(target))
+        FileUtils.rm_f(target)
         return false unless env.execute("#{com_prefix} #{target}", command)
         deps = sources
-        if File.exists?(vars['DEPFILE'])
-          deps += env.parse_makefile_deps(vars['DEPFILE'], target)
-          FileUtils.rm_f(vars['DEPFILE'])
+        if File.exists?(vars['_DEPFILE'])
+          deps += env.parse_makefile_deps(vars['_DEPFILE'], target)
+          FileUtils.rm_f(vars['_DEPFILE'])
         end
         cache.register_build(target, command, deps.uniq)
       end

lib/rscons/builders/program.rb

@@ -10,38 +10,25 @@ module Rscons
         'LDFLAGS' => [],
         'LIBPATH' => [],
         'LIBS' => [],
-        'LDCOM' => ['$LD', '-o', '$TARGET', '$LDFLAGS', '$SOURCES', '-L$[LIBPATH]', '-l$[LIBS]']
+        'LDCOM' => ['$LD', '-o', '$_TARGET', '$LDFLAGS', '$_SOURCES', '-L$[LIBPATH]', '-l$[LIBS]']
       }
     end
 
-    def run(target, sources, cache, env)
-      # convert sources to object file names
-      objects = sources.map do |source|
-        if source.has_suffix?([env['OBJSUFFIX'], env['LIBSUFFIX']])
-          source
-        else
-          o_file = env.get_build_fname(source, env['OBJSUFFIX', :string])
-          builder = env.builders.values.find { |b| b.produces?(o_file, source, env) }
-          builder or raise "No builder found to convert input source #{source.inspect} to an object file."
-          builder.run(o_file, [source], cache, env) or break
-        end
-      end
+    def run(target, sources, cache, env, vars = {})
+      # build sources to linkable objects
+      objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars)
       if objects
         use_cxx = sources.map do |s|
           s.has_suffix?(env['CXXSUFFIX'])
         end.any?
         ld_alt = use_cxx ? env['CXX'] : env['CC']
-        vars = {
-          'TARGET' => target,
-          'SOURCES' => objects,
+        vars = vars.merge({
+          '_TARGET' => target,
+          '_SOURCES' => objects,
           'LD' => env['LD'] || ld_alt,
-        }
+        })
         command = env.build_command(env['LDCOM'], vars)
-        unless cache.up_to_date?(target, command, objects)
-          return false unless env.execute("LD #{target}", command)
-          cache.register_build(target, command, objects)
-        end
-        target
+        standard_build("LD #{target}", target, command, objects, env, cache)
       end
     end
   end

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,14 @@ 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 {}
+      unless @cache.is_a?(Hash)
+        $stderr.puts "Warning: #{CACHE_FILE} was corrupt. Contents:\n#{@cache.inspect}"
+        @cache = {}
+      end
+      @cache[:targets] ||= {}
+      @cache[:directories] ||= {}
+      @cache[:version] ||= VERSION
       @lookup_checksums = {}
     end
 
@@ -120,18 +129,43 @@ module Rscons
     # @param command [Array] The command used to build the target.
     # @param deps [Array] List of dependencies for the target.
     def register_build(target, command, deps)
-      @cache[:targets][target] = {
+      @cache[:targets][target.encode(__ENCODING__)] = {
         command: command,
         checksum: calculate_checksum(target),
         deps: deps.map do |dep|
           {
-            fname: dep,
+            fname: dep.encode(__ENCODING__),
             checksum: lookup_checksum(dep),
           }
         end
       }
     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]).encode(__ENCODING__)
+        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

@@ -6,14 +6,15 @@ module Rscons
   # contains a collection of construction variables, options, builders, and
   # rules for building targets.
   class Environment
-    # [Array] of {Builder} objects.
+    # [Hash] of {"builder_name" => builder_object} pairs.
     attr_reader :builders
 
     # Create an Environment object.
     # @param variables [Hash]
-    #   The variables hash can contain both construction variables, which are
-    #   uppercase strings (such as "CC" or "LDFLAGS"), and RScons options,
-    #   which are lowercase symbols (such as :echo).
+    #   The variables hash can contain construction variables, which are
+    #   uppercase strings (such as "CC" or "LDFLAGS"), user variables, which
+    #   are lowercase strings (such as "sources"), and RScons options, which
+    #   are lowercase symbols (such as :echo).
     # If a block is given, the Environment object is yielded to the block and
     # when the block returns, the {#process} method is automatically called.
     def initialize(variables = {})
@@ -52,7 +53,7 @@ module Rscons
       @builders.each do |builder_name, builder|
         env.add_builder(builder)
       end
-      env.append(@varset)
+      env.append(@varset.clone)
       env.append(variables)
 
       if block_given?
@@ -77,7 +78,6 @@ module Rscons
     # Source files from src_dir will produce object files under obj_dir.
     def build_dir(src_dir, obj_dir)
       src_dir = src_dir.gsub('\\', '/') if src_dir.is_a?(String)
-      obj_dir = obj_dir.gsub('\\', '/')
       @build_dirs << [src_dir, obj_dir]
     end
 
@@ -91,11 +91,10 @@ module Rscons
         if src_dir.is_a?(Regexp)
           build_fname.sub!(src_dir, obj_dir)
         else
-          build_fname.sub!(/^#{src_dir}\//, "#{obj_dir}/")
+          build_fname.sub!(%r{^#{src_dir}/}, "#{obj_dir}/")
         end
         build_fname.gsub!('\\', '/')
       end
-      FileUtils.mkdir_p(File.dirname(build_fname))
       build_fname
     end
 
@@ -141,7 +140,7 @@ module Rscons
                                          @targets[target][:source],
                                          cache,
                                          self,
-                                         *@targets[target][:args])
+                                         @targets[target][:vars] || {})
         else
           false
         end
@@ -193,11 +192,15 @@ module Rscons
     alias_method :orig_method_missing, :method_missing
     def method_missing(method, *args)
       if @builders.has_key?(method.to_s)
-        target, source, *rest = args
+        target, source, vars, *rest = args
+        unless vars.nil? or vars.is_a?(Hash) or vars.is_a?(VarSet)
+          raise "Unexpected construction variable set: #{vars.inspect}"
+        end
         source = [source] unless source.is_a?(Array)
         @targets[target] = {
           builder: @builders[method.to_s],
           source: source,
+          vars: vars,
           args: rest,
         }
       else
@@ -228,5 +231,32 @@ module Rscons
       end
       deps
     end
+
+    # Build a list of source files into files containing one of the suffixes
+    # given by suffixes.
+    # This method is used internally by RScons builders.
+    # @param sources [Array] List of source files to build.
+    # @param suffixes [Array] List of suffixes to try to convert source files into.
+    # @param cache [Cache] The Cache.
+    # Return a list of the converted file names.
+    def build_sources(sources, suffixes, cache, vars = {})
+      sources.map do |source|
+        if source.has_suffix?(suffixes)
+          source
+        else
+          converted = nil
+          suffixes.each do |suffix|
+            converted_fname = get_build_fname(source, suffix)
+            builder = @builders.values.find { |b| b.produces?(converted_fname, source, self) }
+            if builder
+              converted = builder.run(converted_fname, [source], cache, self, vars)
+              return nil unless converted
+              break
+            end
+          end
+          converted or raise "Could not find a builder to handle #{source.inspect}."
+        end
+      end
+    end
   end
 end

lib/rscons/varset.rb

@@ -8,7 +8,11 @@ module Rscons
     # Create a VarSet
     # @param vars [Hash] Optional initial variables.
     def initialize(vars = {})
-      @vars = vars
+      if vars.is_a?(VarSet)
+        @vars = vars.clone.vars
+      else
+        @vars = vars
+      end
     end
 
     # Access the value of variable as a particular type
@@ -20,9 +24,9 @@ module Rscons
     #   returned.
     def [](key, type = nil)
       val = @vars[key]
-      if type == :array and val.is_a?(String)
+      if type == :array and not val.is_a?(Array)
         [val]
-      elsif type == :string and val.is_a?(Array)
+      elsif type == :scalar and val.is_a?(Array)
         val.first
       else
         val

lib/rscons/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # gem version
-  VERSION = "0.0.5"
+  VERSION = "0.0.12"
 end

spec/build_tests_spec.rb

@@ -13,12 +13,30 @@ describe Rscons do
 
   def build_testdir
     if File.exists?("build.rb")
-      system("ruby -I #{@owd}/lib -r rscons build.rb > build.out")
+      build_rb = File.read("build.rb")
+      File.open("build.rb", "w") do |fh|
+        fh.puts(<<EOF + build_rb)
+require "simplecov"
+
+SimpleCov.start do
+  root("#{@owd}")
+  command_name("build_test_#{@build_test_name}")
+  add_filter("spec")
+end
+
+require "rscons"
+EOF
+      end
+      IO.popen(%{ruby -I #{@owd}/lib build.rb}) do |io|
+        io.readlines.reject do |line|
+          line =~ /^Coverage report/
+        end
+      end.map(&:strip)
     end
-    get_build_output
   end
 
   def test_dir(build_test_directory)
+    @build_test_name = build_test_directory
     FileUtils.cp_r("build_tests/#{build_test_directory}", 'build_tests_run')
     Dir.chdir("build_tests_run")
     build_testdir
@@ -35,10 +53,6 @@ describe Rscons do
     end
   end
 
-  def get_build_output
-    File.read('build.out').lines.map(&:strip)
-  end
-
   ###########################################################################
   # Tests
   ###########################################################################
@@ -116,8 +130,35 @@ describe Rscons do
   it 'builds object files in a different build directory' 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.exists?('build_one/one.o').should be_true
+    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?('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?('src/one/one.c').should be_true
   end
 
   it 'allows Ruby classes as custom builders to be used to construct files' do
@@ -143,4 +184,27 @@ describe Rscons do
     `./simple`.should == "This is a simple C++ program\n"
   end
 
+  it 'allows overriding construction variables for individual builder calls' do
+    lines = test_dir('two_sources')
+    lines.should == [
+      'gcc -c -o one.o -MMD -MF one.mf -DONE one.c',
+      'gcc -c -o two.o -MMD -MF two.mf two.c',
+      'gcc -o two_sources one.o two.o',
+    ]
+    File.exists?('two_sources').should be_true
+    `./two_sources`.should == "This is a C program with two sources.\n"
+  end
+
+  it 'builds a static library archive' do
+    lines = test_dir('library')
+    lines.should == [
+      'gcc -c -o one.o -MMD -MF one.mf -Dmake_lib one.c',
+      'gcc -c -o two.o -MMD -MF two.mf -Dmake_lib two.c',
+      'ar rcs lib.a one.o two.o',
+      'gcc -c -o three.o -MMD -MF three.mf three.c',
+      'gcc -o library lib.a three.o',
+    ]
+    File.exists?('library').should be_true
+    `ar t lib.a`.should == "one.o\ntwo.o\n"
+  end
 end

spec/rscons/environment_spec.rb

@@ -1,5 +1,16 @@
 module Rscons
   describe Environment do
+    describe '.clone' do
+      it 'should create unique copies of each construction variable' do
+        env = Environment.new
+        env["CPPPATH"] << "path1"
+        env2 = env.clone
+        env2["CPPPATH"] << "path2"
+        env["CPPPATH"].should == ["path1"]
+        env2["CPPPATH"].should == ["path1", "path2"]
+      end
+    end
+
     describe '.parse_makefile_deps' do
       it 'handles dependencies on one line' do
         File.should_receive(:read).with('makefile').and_return(<<EOS)

spec/rscons/monkey/module_spec.rb

@@ -0,0 +1,6 @@
+describe "Module#short_name" do
+  it "returns the inner name of the module" do
+    Rscons::Environment.short_name.should == "Environment"
+    Rscons::Object.short_name.should == "Object"
+  end
+end

spec/rscons/varset_spec.rb

@@ -0,0 +1,114 @@
+module Rscons
+  describe VarSet do
+    describe '.initialize' do
+      it "initializes variables from a Hash" do
+        v = VarSet.new({"one" => 1, "two" => :two})
+        v["one"].should == 1
+        v["two"].should == :two
+      end
+      it "initializes variables from another VarSet" do
+        v = VarSet.new({"one" => 1})
+        v2 = VarSet.new(v)
+        v2["one"].should == 1
+      end
+      it "makes a deep copy of the given VarSet" do
+        v = VarSet.new({"array" => [1, 2, 3]})
+        v2 = VarSet.new(v)
+        v["array"] << 4
+        v["array"].should == [1, 2, 3, 4]
+        v2["array"].should == [1, 2, 3]
+      end
+    end
+
+    describe :[] do
+      v = VarSet.new({"fuz" => "a string", "foo" => 42, "bar" => :baz,
+                      "qax" => [3, 6], "qux" => {a: :b}})
+      it "allows accessing a variable with its verbatim value if type is not specified" do
+        v["fuz"].should == "a string"
+        v["foo"].should == 42
+        v["bar"].should == :baz
+        v["qax"].should == [3, 6]
+        v["qux"].should == {a: :b}
+      end
+      it "allows accessing a non-array converted to an array" do
+        v["fuz", :array].should == ["a string"]
+      end
+      it "allows accessing an array as a single value" do
+        v["qax", :scalar].should == 3
+      end
+    end
+
+    describe :[]= do
+      it "allows assigning to variables" do
+        v = VarSet.new("CFLAGS" => ["-Wall", "-O3"])
+        v["CPPPATH"] = ["one", "two"]
+        v["CFLAGS"].should == ["-Wall", "-O3"]
+        v["CPPPATH"].should == ["one", "two"]
+      end
+    end
+
+    describe '.append' do
+      it "adds values from a Hash to the VarSet" do
+        v = VarSet.new("LDFLAGS" => "-lgcc")
+        v.append("LIBS" => "gcc", "LIBPATH" => ["mylibs"])
+        v.vars.keys.should =~ ["LDFLAGS", "LIBS", "LIBPATH"]
+      end
+      it "adds values from another VarSet to the VarSet" do
+        v = VarSet.new("CPPPATH" => ["mydir"])
+        v2 = VarSet.new("CFLAGS" => ["-O0"], "CPPPATH" => ["different_dir"])
+        v.append(v2)
+        v.vars.keys.should =~ ["CPPPATH", "CFLAGS"]
+        v["CPPPATH"].should == ["different_dir"]
+      end
+    end
+
+    describe '.merge' do
+      it "returns a new VarSet merged with the given Hash" do
+        v = VarSet.new("foo" => "yoda")
+        v2 = v.merge("baz" => "qux")
+        v.vars.keys.should == ["foo"]
+        v2.vars.keys.should =~ ["foo", "baz"]
+      end
+      it "returns a new VarSet merged with the given VarSet" do
+        v = VarSet.new("foo" => ["a", "b"], "bar" => 42)
+        v2 = v.merge(VarSet.new("bar" => 33, "baz" => :baz))
+        v2["foo"] << "c"
+        v["foo"].should == ["a", "b"]
+        v["bar"].should == 42
+        v2["foo"].should == ["a", "b", "c"]
+        v2["bar"].should == 33
+      end
+    end
+
+    describe '.expand_varref' do
+      v = VarSet.new("CFLAGS" => ["-Wall", "-O2"],
+                     "CC" => "gcc",
+                     "CPPPATH" => ["dir1", "dir2"],
+                     "compiler" => "$CC",
+                     "cmd" => ["$CC", "-c", "$CFLAGS", "-I$[CPPPATH]"])
+      it "expands to the string itself if the string is not a variable reference" do
+        v.expand_varref("CC").should == "CC"
+        v.expand_varref("CPPPATH").should == "CPPPATH"
+        v.expand_varref("str").should == "str"
+      end
+      it "expands a single variable reference beginning with a '$'" do
+        v.expand_varref("$CC").should == "gcc"
+        v.expand_varref("$CPPPATH").should == ["dir1", "dir2"]
+      end
+      it "expands a single variable reference in $[arr] notation" do
+        v.expand_varref("prefix$[CFLAGS]suffix").should == ["prefix-Wallsuffix", "prefix-O2suffix"]
+        v.expand_varref(v["cmd"]).should == ["gcc", "-c", "-Wall", "-O2", "-Idir1", "-Idir2"]
+      end
+      it "expands a variable reference recursively" do
+        v.expand_varref("$compiler").should == "gcc"
+        v.expand_varref("$cmd").should == ["gcc", "-c", "-Wall", "-O2", "-Idir1", "-Idir2"]
+      end
+      it "raises an error when array notation is applied to a non-array variable" do
+        expect { v.expand_varref("$[CC]") }.to raise_error /Array.expected/
+      end
+      it "raises an error when a variable reference refers to a non-existent variable" do
+        expect { v.expand_varref("$not_here") }.to raise_error /Could.not.find.variable..not_here/
+      end
+    end
+  end
+end

spec/spec_helper.rb

@@ -1 +1,5 @@
+require "simplecov"
+
+SimpleCov.start
+
 require "rscons"