fig 0.1.35 → 0.1.36

data/bin/fig

@@ -5,6 +5,7 @@ $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'rubygems'
 require 'net/ftp'
 
+require 'fig/retriever'
 require 'fig/options'
 require 'fig/environment'
 require 'fig/repository'
@@ -59,16 +60,18 @@ end
 
 os = OS.new(options[:login])
 repos = Repository.new(os, File.expand_path(File.join(options[:home], 'repos')), remote_url, remote_user, options[:update], options[:update_if_missing])
-env = Environment.new(os, repos, vars)
+retriever = Retriever.new(".")
+at_exit { retriever.save }
+env = Environment.new(os, repos, vars, retriever)
 
 options[:modifiers].each do |modifier|
-  env.apply_config_statement(nil, modifier)
+  env.apply_config_statement(nil, modifier, nil)
 end
 
-if File.exist?(".fig")
-  $stderr.puts "The '.fig' file is deprecated. Please rename to 'package.fig'"
-  exit 1
-end
+#if File.exist?(".fig")
+#  $stderr.puts "The '.fig' file is deprecated. Please rename to 'package.fig'"
+#  exit 1
+#end
 
 DEFAULT_FIG_FILE = 'package.fig'
 
@@ -131,7 +134,7 @@ if input
   end
   unless options[:publish] || options[:list] || options[:publish_local]
     env.register_package(package)
-    env.apply_config(package, options[:config])
+    env.apply_config(package, options[:config], nil)
     direct_retrieves.each do |info|
       env.direct_retrieve(info[0], info[1], info[2])
     end

data/lib/fig/backtrace.rb

@@ -0,0 +1,37 @@
+class Backtrace
+  def initialize(parent, package_name, version_name, config_name)
+    @parent = parent
+    @package_name = package_name
+    @version_name = version_name
+    @config_name = config_name || "default"
+  end
+
+  def collect(stack)
+    if @parent
+      @parent.collect(stack)
+    end
+    elem = ""
+    if @package_name
+      elem = @package_name
+    end
+    if @version_name
+      elem += "/" + @version_name
+    end
+    if @config_name
+      elem += ":" + @config_name
+    end
+    stack << elem
+  end
+
+  def dump(out)
+    stack = []
+    collect(stack)
+    i=0
+    for elem in stack
+      indent=""
+      i.times { indent += "  " }
+      out.puts indent+elem
+      i += 1
+    end
+   end
+end

data/lib/fig/environment.rb

@@ -1,3 +1,5 @@
+require 'fig/backtrace'
+
 module Fig
 
   # This class manages the program's state, including the value of all environment 
@@ -5,13 +7,14 @@ module Fig
   class Environment
     DEFAULT_VERSION_NAME = "current"
 
-    def initialize(os, repository, variables)
+    def initialize(os, repository, variables, retriever)
       @os = os
       @repository = repository
       @variables = variables
       @retrieve_vars = {}
       @packages = {}
       @applied_configs = {}
+      @retriever = retriever
     end
 
     # Returns the value of an envirionment variable
@@ -34,12 +37,13 @@ module Fig
       @packages[name] = package
     end
 
-    def apply_config(package, config_name)
+    def apply_config(package, config_name, backtrace)
       if (@applied_configs[package.package_name] ||= []).member?(config_name)
         return
       end
+      new_backtrace = Backtrace.new(backtrace, package.package_name, package.version_name, config_name)
       config = package[config_name]
-      config.statements.each { |stmt| apply_config_statement(package, stmt) }
+      config.statements.each { |stmt| apply_config_statement(package, stmt, new_backtrace) }
       @applied_configs[package.package_name] << config_name
     end
 
@@ -50,7 +54,7 @@ module Fig
     end
 
     def execute_config(base_package, package_name, config_name, version_name, args)
-      package = lookup_package(package_name || base_package.package_name, version_name)
+      package = lookup_package(package_name || base_package.package_name, version_name, Backtrace.new(nil, package_name, version_name, config_name))
       result = nil
       commands = package[config_name || "default"].commands
       with_environment do
@@ -62,14 +66,14 @@ module Fig
       result
     end
 
-    def apply_config_statement(base_package, statement)
+    def apply_config_statement(base_package, statement, backtrace)
       case statement
       when Path
         append_variable(base_package, statement.name, statement.value)
       when Set
         set_variable(base_package, statement.name, statement.value)
       when Include
-        include_config(base_package, statement.package_name, statement.config_name, statement.version_name)
+        include_config(base_package, statement.package_name, statement.config_name, statement.version_name, backtrace)
       when Command
         # ignore
       else
@@ -77,13 +81,14 @@ module Fig
       end
     end
 
-    def include_config(base_package, package_name, config_name, version_name)
-      package = lookup_package(package_name || base_package.package_name, version_name)
-      apply_config(package, config_name || "default")
+    def include_config(base_package, package_name, config_name, version_name, backtrace)
+      new_backtrace = Backtrace.new(backtrace, package_name, version_name, config_name)
+      package = lookup_package(package_name || base_package.package_name, version_name, new_backtrace)
+      apply_config(package, config_name || "default", backtrace)
     end
 
     def direct_retrieve(package_name, source_path, target_path)
-      package = lookup_package(package_name, nil)
+      package = lookup_package(package_name, nil, nil)
       FileUtils.mkdir_p(target_path)
       FileUtils.cp_r(File.join(package.directory, source_path, '.'), target_path)
     end
@@ -123,13 +128,16 @@ module Fig
       end
     end
 
-    def lookup_package(package_name, version_name)
+    def lookup_package(package_name, version_name, backtrace)
       package = @packages[package_name]
       if package.nil?
         package = @repository.load_package(package_name, version_name || DEFAULT_VERSION_NAME)
+        package.backtrace = backtrace
         @packages[package_name] = package
       elsif version_name && version_name != package.version_name
         $stderr.puts "Version mismatch: #{package_name}" 
+        backtrace.dump($stderr) if backtrace
+        package.backtrace.dump($stderr) if package.backtrace
         exit 10
       end
       package
@@ -151,7 +159,9 @@ module Fig
             target = File.join(target, File.basename(file))
           end
         end
-        @os.copy(file, target, "retrieving")
+        @retriever.with_config(base_package.package_name, base_package.version_name) do
+          @retriever.retrieve(file, target)
+        end
         file = target
       end
       file

data/lib/fig/grammar.treetop

@@ -32,7 +32,7 @@ grammar Fig
   end
 
   rule retrieve
-    "retrieve" ws var:[@a-zA-Z0-9/\._]+ "->" path:[a-zA-Z0-9/\.\-\[\]]+ ws {
+    "retrieve" ws var:[@a-zA-Z0-9/\._]+ "->" path:[a-zA-Z0-9_/\.\-\[\]]+ ws {
       def to_package_statement
         Retrieve.new(var.text_value, path.text_value)
       end

data/lib/fig/os.rb

@@ -255,10 +255,11 @@ module Fig
           end
         end
       else
-        if !FileUtils.uptodate?(target, [source])
+        if !File.exist?(target) || File.mtime(source) != File.mtime(target)
           log_info "#{msg} #{target}" if msg
           FileUtils.mkdir_p(File.dirname(target))
           FileUtils.cp(source, target)
+          File.utime(File.atime(source), File.mtime(source), target)
         end
       end
     end

data/lib/fig/package.rb

@@ -1,14 +1,16 @@
 module Fig
   class Package
     attr_reader :package_name, :version_name, :directory, :statements
+    attr_accessor :backtrace
     
     def initialize(package_name, version_name, directory, statements) 
       @package_name = package_name
       @version_name = version_name
       @directory = directory
       @statements = statements
+      @backtrace = nil
     end
-
+    
     def [](config_name)
       @statements.each do |stmt|
         return stmt if stmt.is_a?(Configuration) && stmt.name == config_name
@@ -42,6 +44,10 @@ module Fig
     def ==(other)
       @package_name == other.package_name && @version_name == other.version_name && @statements.to_yaml == other.statements.to_yaml
     end
+
+    def to_s
+      @package_name + "/" + @version_name
+    end
   end
   
   class Archive

data/lib/fig/retriever.rb

@@ -0,0 +1,107 @@
+require 'ostruct'
+require 'set'
+
+# This class copies files from the project directories in ~/.fighome to the 
+# user's working directory. It keeps track of which files have already been copied, and which 
+# package/versions they came from, and deletes files as necessary to ensure that
+# we never have files from two different versions of the same package in the user's 
+# working directory. 
+class Retriever
+  def initialize(base_dir)
+    @base_dir = base_dir
+    @configs = {}
+    @fig_dir = File.join(@base_dir, ".fig")
+
+    file = File.join(@fig_dir, "retrieve")
+    if File.exist?(file)
+      load(file)
+    end
+  end
+
+  def with_config(name, version)
+    if name and version
+      @config = @configs[name]
+      if @config && @config.version != version
+        @config.files.each do |relpath|
+          $stderr.puts "\033[31m- [#{@config.name}/#{@config.version}] #{relpath}\033[0m" 
+          FileUtils.rm_f(File.join(@base_dir, relpath))
+        end
+        @config = nil
+      end
+      if not @config
+        @config = new_config(name, version)
+        @configs[name] = @config
+      end
+    else
+      @config = nil
+    end
+    yield
+  end
+
+  def retrieve(source, relpath)
+    copy(source, relpath)
+  end
+
+  def save
+    FileUtils.mkdir_p(@fig_dir)
+    File.open(File.join(@fig_dir, "retrieve"), 'w') do |f|
+      @configs.each do |name,config|
+        config.files.each do |target|
+          f << target << "=" << config.name << "/" << config.version << "\n"
+        end
+      end
+    end
+  end
+
+private
+
+  def load(file)
+    File.open(file).each_line do |line|
+      line = line.strip()
+      if line =~ /^(.+)=(.+)\/(.+)$/
+        target = $1
+        config_name = $2
+        config_version = $3
+        config = @configs[config_name]
+        if config
+          if config.version != config_version
+            raise "version mismatch in .figretrieve"
+          end
+        else
+          config = new_config(config_name, config_version)
+          @configs[config_name] = config
+        end
+        config.files << target
+      else
+        raise "parse error in #{file}: #{line}"
+      end
+    end
+  end
+
+  def new_config(name, version) 
+    config = OpenStruct.new
+    config.name = name
+    config.version = version
+    config.files = Set.new()
+    return config
+  end
+
+  def copy(source, relpath)
+    target = File.join(@base_dir, relpath)
+    if File.directory?(source)
+      FileUtils.mkdir_p(target)
+      Dir.foreach(source) do |child|
+        if child != "." and child != ".."
+          copy(File.join(source, child), File.join(relpath, child))
+        end
+      end
+    else
+      if !File.exist?(target) || File.mtime(source) > File.mtime(target)
+        $stderr.puts "\033[32m+ [#{@config.name}/#{@config.version}] #{relpath}\033[0m" 
+        FileUtils.mkdir_p(File.dirname(target))
+        FileUtils.cp(source, target)
+      end
+      @config.files << relpath if @config
+    end
+  end
+end

data/spec/fig_spec.rb

@@ -0,0 +1,331 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'rubygems'
+require 'fig/os'
+require 'rake'
+require 'fileutils'
+
+class Popen
+  if Fig::OS.windows?
+    require 'win32/open3'
+    def self.popen(*cmd)
+      Open3.popen3(*cmd) { |stdin,stdout,stderr|
+        yield stdin, stdout, stderr
+      }
+    end
+  elsif Fig::OS.java?
+    require 'open3'
+    def self.popen(*cmd)
+      Open3.popen3(*cmd) { |stdin,stdout,stderr|
+        yield stdin, stdout, stderr
+      }
+    end
+  else
+    require 'open4'
+    def self.popen(*cmd)
+      Open4::popen4(*cmd) { |pid, stdin, stdout, stderr|
+        yield stdin, stdout, stderr
+      }
+    end
+  end
+end
+
+FIG_HOME = File.expand_path(File.dirname(__FILE__) + '/../tmp/fighome')
+FileUtils.mkdir_p(FIG_HOME)
+ENV['FIG_HOME'] = FIG_HOME
+
+FIG_REMOTE_DIR = File.expand_path(File.dirname(__FILE__) + '/../tmp/remote')
+FileUtils.mkdir_p(FIG_REMOTE_DIR)
+ENV['FIG_REMOTE_URL'] = "ssh://#{ENV['USER']}@localhost#{FIG_REMOTE_DIR}"
+
+FIG_EXE = File.expand_path(File.dirname(__FILE__) + '/../bin/fig')
+
+def fig(args, input=nil)
+  args = "--file - #{args}" if input
+  out = nil
+  err = nil
+  Popen.popen("#{RUBY} #{FIG_EXE} #{args}") do |stdin, stdout, stderr|
+    if input
+      stdin.puts input
+      stdin.close
+    end
+    err = stderr.read.strip
+    out = stdout.read.strip
+    if err != ""
+      $stderr.puts err
+    end
+  end
+  return out, err, $?.exitstatus
+end
+
+describe "Fig" do
+  it "set environment variable from command line" do
+    fig('-s FOO=BAR -g FOO')[0].should == 'BAR'
+    fig('--set FOO=BAR -g FOO')[0].should == 'BAR'
+  end
+
+  it "set environment variable from fig file" do
+    input = <<-END
+      config default
+        set FOO=BAR
+      end
+    END
+    fig('-g FOO', input)[0].should == 'BAR'
+  end
+
+  it "append environment variable from command line" do
+    fig('-p PATH=foo -g PATH').should == ["foo#{File::PATH_SEPARATOR}#{ENV['PATH']}","",0]
+  end
+
+  it "append environment variable from fig file" do
+    input = <<-END
+      config default
+        add PATH=foo
+      end
+    END
+    fig('-g PATH', input).should == ["foo#{File::PATH_SEPARATOR}#{ENV['PATH']}","",0]
+  end
+
+  it "append empty environment variable" do
+    fig('-p XYZZY=foo -g XYZZY').should == ["foo","",0]
+  end
+
+  it "should ignore comments" do
+    input = <<-END
+      #/usr/bin/env fig
+
+      # Some comment
+      config default
+        set FOO=BAR # Another comment
+      end
+    END
+    fig('-g FOO', input)[0].should == 'BAR'
+  end
+
+  it "publish to remote repository" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    input = <<-END
+      config default
+        set FOO=BAR
+      end
+    END
+    fig('--publish foo/1.2.3', input)
+    fail unless File.exists? FIG_HOME + "/repos/foo/1.2.3/.fig"
+    fail unless File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
+    fig('-u -i foo/1.2.3 -g FOO')[0].should == 'BAR'
+  end
+
+  it "publish resource to remote repository" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.mkdir_p("tmp/bin")
+    File.open("tmp/bin/hello", "w") { |f| f << "echo bar" }
+    fail unless system "chmod +x tmp/bin/hello"
+    input = <<-END
+      resource tmp/bin/hello
+      config default
+        append PATH=@/tmp/bin
+      end
+    END
+    fig('--publish foo/1.2.3', input)
+    fail unless File.exists? FIG_HOME + "/repos/foo/1.2.3/.fig"
+    fail unless File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
+    fig('-u -i foo/1.2.3 -- hello')[0].should == 'bar'
+  end
+
+  it "publish resource to remote repository using command line" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.mkdir_p("tmp/bin")
+    File.open("tmp/bin/hello", "w") { |f| f << "echo bar" }
+    fail unless system "chmod +x tmp/bin/hello"
+    fig('--publish foo/1.2.3 --resource tmp/bin/hello --append PATH=@/tmp/bin')
+    fail unless File.exists? FIG_HOME + "/repos/foo/1.2.3/.fig"
+    fail unless File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
+    fig('-u -i foo/1.2.3 -- hello')[0].should == 'bar'
+  end
+
+  it "refuses to overwrite existing version in remote repository without being forced" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    input = <<-END
+      config default
+        set FOO=SHEEP
+      end
+    END
+    fig('--publish foo/1.2.3', input)
+    fail unless File.exists? FIG_HOME + "/repos/foo/1.2.3/.fig"
+    fail unless File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
+    fig('-u -i foo/1.2.3 -g FOO')[0].should == 'SHEEP'
+
+    input = <<-END
+      config default
+        set FOO=CHEESE
+      end
+    END
+    (out, err, exitstatus) = fig('--publish foo/1.2.3', input)
+    exitstatus.should == 1
+    fig('-u -i foo/1.2.3 -g FOO')[0].should == 'SHEEP'
+
+    (out, err, exitstatus) = fig('--publish foo/1.2.3 --force', input)
+    exitstatus.should == 0
+    fig('-u -i foo/1.2.3 -g FOO')[0].should == 'CHEESE'
+  end
+
+  it "publishes to the local repo only when told to" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.mkdir_p("tmp/bin")
+    File.open("tmp/bin/hello", "w") { |f| f << "echo bar" }
+    fail unless system "chmod +x tmp/bin/hello"
+    fig('--publish-local foo/1.2.3 --resource tmp/bin/hello --append PATH=@/tmp/bin')
+    fail if File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
+    fig('-m -i foo/1.2.3 -- hello')[0].should == 'bar'
+  end
+
+  it "retrieve resource" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.rm_rf("tmp")
+    FileUtils.mkdir_p("tmp/lib")
+    File.open("tmp/lib/hello", "w") { |f| f << "some library" }
+    input = <<-END
+      resource tmp/lib/hello
+      config default
+        append FOOPATH=@/tmp/lib/hello
+      end
+    END
+    fig('--publish foo/1.2.3', input)
+    input = <<-END
+      retrieve FOOPATH->tmp/lib2/[package]
+      config default
+        include foo/1.2.3
+      end
+    END
+    fig('-m', input)
+    File.read("tmp/lib2/foo/hello").should == "some library"
+  end
+
+  it "retrieves resource that is a directory" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.rm_rf("tmp")
+    FileUtils.mkdir_p("tmp/lib")
+    File.open("tmp/lib/hello", "w") { |f| f << "some library" }
+    # To copy the contents of a directory, instead of the directory itself,
+    # use '/.' as a suffix to the directory name in 'append'.
+    input = <<-END
+      resource tmp/lib/hello
+      config default
+        append FOOPATH=@/tmp/lib/.
+      end
+    END
+    fig('--publish foo/1.2.3', input)
+    input = <<-END
+      retrieve FOOPATH->tmp/lib2/[package]
+      config default
+        include foo/1.2.3
+      end
+    END
+    fig('-m', input)
+    File.read("tmp/lib2/foo/hello").should == "some library"
+  end
+
+  it "retrieve preserves the path after '//' when copying files into your project directory" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.rm_rf("tmp")
+    FileUtils.mkdir_p("tmp/include")
+    File.open("tmp/include/hello.h", "w") { |f| f << "a header file" }
+    File.open("tmp/include/hello2.h", "w") { |f| f << "another header file" }
+    input = <<-END
+      resource tmp/include/hello.h
+      resource tmp/include/hello2.h
+      config default
+        append INCLUDE=@/tmp//include/hello.h
+        append INCLUDE=@/tmp//include/hello2.h
+      end
+    END
+    fig('--publish foo/1.2.3', input)
+
+    input = <<-END
+      retrieve INCLUDE->tmp/include2/[package]
+      config default
+        include foo/1.2.3
+      end
+    END
+    fig('-u', input)
+
+    File.read("tmp/include2/foo/include/hello.h").should == "a header file"
+    File.read("tmp/include2/foo/include/hello2.h").should == "another header file"
+  end
+
+  it "package multiple resources" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.rm_rf("tmp")
+    FileUtils.mkdir_p("tmp/lib")
+    File.open("tmp/lib/hello", "w") { |f| f << "some library" }
+    File.open("tmp/lib/hello2", "w") { |f| f << "some other library" }
+    input = <<-END
+      resource tmp/lib/hello
+      resource tmp/lib/hello2
+      config default
+        append FOOPATH=@/tmp/lib/hello
+        append FOOPATH=@/tmp/lib/hello2
+      end
+    END
+    fig('--publish foo/1.2.3', input)
+    input = <<-END
+      retrieve FOOPATH->tmp/lib2/[package]
+      config default
+        include foo/1.2.3
+      end
+    END
+    fig('-m', input)
+    File.read("tmp/lib2/foo/hello").should == "some library"
+    File.read("tmp/lib2/foo/hello2").should == "some other library"
+  end
+
+  it "packages multiple resources with wildcards" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.rm_rf("tmp")
+    FileUtils.mkdir_p("tmp/lib")
+    File.open("tmp/lib/foo.jar", "w") { |f| f << "some library" }
+    File.open("tmp/lib/bar.jar", "w") { |f| f << "some other library" }
+    input = <<-END
+      resource tmp/**/*.jar
+      config default
+        append FOOPATH=@/tmp/lib/foo.jar
+      end
+    END
+    fig('--publish foo/1.2.3', input)
+    input = <<-END
+      retrieve FOOPATH->tmp/lib2/[package]
+      config default
+        include foo/1.2.3
+      end
+    END
+    fig('-m', input)
+    File.read("tmp/lib2/foo/foo.jar").should == "some library"
+  end
+
+  it "update local packages if they already exist" do
+    FileUtils.rm_rf(FIG_HOME)
+    FileUtils.rm_rf(FIG_REMOTE_DIR)
+    FileUtils.mkdir_p("tmp/bin")
+    File.open("tmp/bin/hello", "w") { |f| f << "echo sheep" }
+    fail unless system "chmod +x tmp/bin/hello"
+    fig('--publish-local foo/1.2.3 --resource tmp/bin/hello --append PATH=@/tmp/bin')
+    fail if File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
+    fig('-m -i foo/1.2.3 -- hello')[0].should == 'sheep'
+    
+    File.open("tmp/bin/hello", "w") { |f| f << "echo cheese" }
+    fail unless system "chmod +x tmp/bin/hello"
+    fig('--publish-local foo/1.2.3 --resource tmp/bin/hello --append PATH=@/tmp/bin')
+    fail if File.exists? FIG_REMOTE_DIR + "/foo/1.2.3/.fig"
+    fig('-m -i foo/1.2.3 -- hello')[0].should == 'cheese'
+  end
+end

data/spec/retriever_spec.rb

@@ -0,0 +1,47 @@
+require 'fig/retriever'
+
+describe "Retriever" do
+  it "retrieves single file" do
+
+    # Set up some test files
+    test_dir = "tmp/retrieve-test"
+    FileUtils.rm_rf(test_dir)
+    FileUtils.mkdir_p(test_dir)
+
+    File.open("tmp/foo.txt", 'w') {|f| f << "FOO"}
+    File.open("tmp/bar.txt", 'w') {|f| f << "BAR"}
+    File.open("tmp/baz.txt", 'w') {|f| f << "BAZ"}
+
+    # Retrieve files A and B
+    r = Retriever.new(test_dir)
+    r.with_config("foo", "1.2.3") do
+      r.retrieve("tmp/foo.txt", "foo.txt")
+      r.retrieve("tmp/bar.txt", "bar.txt")
+      File.read(File.join(test_dir, "foo.txt")).should == "FOO"
+      File.read(File.join(test_dir, "bar.txt")).should == "BAR"
+    end
+
+    # Retrieve files B and C for a different version
+    r.with_config("foo", "4.5.6") do
+      r.retrieve("tmp/bar.txt", "bar.txt")
+      r.retrieve("tmp/baz.txt", "baz.txt")
+      File.read(File.join(test_dir, "bar.txt")).should == "BAR"
+      File.read(File.join(test_dir, "baz.txt")).should == "BAZ"
+      File.exist?(File.join(test_dir, "foo.txt")).should == false
+    end
+
+    # Save and reload
+    r.save
+    r = Retriever.new(test_dir)
+
+    # Switch back to original version
+    r.with_config("foo", "1.2.3") do
+      r.retrieve("tmp/foo.txt", "foo.txt")
+      r.retrieve("tmp/bar.txt", "bar.txt")
+
+      File.read(File.join(test_dir, "foo.txt")).should == "FOO"
+      File.read(File.join(test_dir, "bar.txt")).should == "BAR"
+      File.exist?(File.join(test_dir, "baz.txt")).should == false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'fig'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+end

data/spec/win_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'fig/os'
+require 'fig/windows'
+
+
+# Only run on Windows...
+if Fig::OS.windows?
+  describe "Fig on Windows" do
+    it "batch script should exist" do
+      Fig::Windows.with_generated_batch_script(["echo", "Hello World"]) do |filename|
+        File.exist?(filename).should == true
+      end
+    end
+
+    it "batch script should say 'Hello World' when executed" do
+      Fig::Windows.with_generated_batch_script(["echo", "Hello World"]) do |filename|
+        %x[#{filename}].should == "Hello World\n"
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  hash: 93
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 35
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -15,152 +9,99 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -05:00
+date: 2011-09-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libarchive
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
         version: 0.1.1
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 0
-        - 15
         version: 2.0.15
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-sftp
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 0
-        - 5
         version: 2.0.5
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-netrc
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
         version: 0.2.2
-  type: :runtime
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: polyglot
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 2
-        - 9
         version: 0.2.9
-  type: :runtime
-  version_requirements: *id005
+    version: 
 - !ruby/object:Gem::Dependency 
   name: treetop
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
         version: 1.4.2
-  type: :runtime
-  version_requirements: *id006
+    version: 
 - !ruby/object:Gem::Dependency 
   name: highline
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
         version: 1.6.2
-  type: :runtime
-  version_requirements: *id007
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
         version: "1.3"
-  type: :development
-  version_requirements: *id008
+    version: 
 - !ruby/object:Gem::Dependency 
   name: open4
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
-  type: :development
-  version_requirements: *id009
+    version: 
 description: Fig is a utility for configuring environments and managing dependencies across a team of developers. You give it a list of packages and a shell command to run; it creates an environment that includes those packages, then executes the shell command in it (the caller's environment is not affected).
 email: git@foemmel.com
 executables: 
@@ -175,6 +116,7 @@ files:
 - bin/fig
 - bin/fig-download
 - lib/fig.rb
+- lib/fig/backtrace.rb
 - lib/fig/environment.rb
 - lib/fig/grammar.treetop
 - lib/fig/options.rb
@@ -182,6 +124,7 @@ files:
 - lib/fig/package.rb
 - lib/fig/parser.rb
 - lib/fig/repository.rb
+- lib/fig/retriever.rb
 - lib/fig/windows.rb
 - LICENSE
 - README.md
@@ -190,34 +133,31 @@ homepage: http://github.com/mfoemmel/fig
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Fig is a utility for configuring environments and managing dependencies across a team of developers..
-test_files: []
-
+test_files: 
+- spec/fig_spec.rb
+- spec/retriever_spec.rb
+- spec/spec_helper.rb
+- spec/win_spec.rb