fig 0.1.37 → 0.1.38

data/README.md

@@ -156,7 +156,7 @@ Configurations other than "default" can be specified using the "-c" option:
 
 Now let's say we want to share our little script with the rest of the team by bundling it into a package. The first thing we need to do is specify the location of the remote repository by defining the `FIG_REMOTE_URL` environment variable. If you just want to play around with fig, you can have it point to localhost:
 
-    $ export FIG_REMOTE_URL=ssh://localhost\`pwd\`/remote
+    $ export FIG_REMOTE_URL=ssh://localhost$(pwd)/remote
 
 Before we publish our package, we'll need to tell fig which files we want to include. We do this by using the "resource" statement in our "package.fig" file:
 

data/bin/fig

@@ -183,7 +183,7 @@ elsif shell_command
   env.execute_shell(shell_command) { |cmd| os.shell_exec cmd }
 elsif argv[0]
   package_name, config_name, version_name = parse_descriptor(argv.shift)
-  env.include_config(package, package_name, config_name, version_name, nil)
+  env.include_config(package, package_name, config_name, version_name, {}, nil)
   env.execute_config(package, package_name, config_name, nil, argv) { |cmd| os.shell_exec cmd }
 elsif input
   env.execute_config(package, nil, options[:config], nil, argv) { |cmd| os.shell_exec cmd }

data/lib/fig/backtrace.rb

@@ -1,9 +1,12 @@
 class Backtrace
+  attr_reader :overrides
+
   def initialize(parent, package_name, version_name, config_name)
     @parent = parent
     @package_name = package_name
     @version_name = version_name
     @config_name = config_name || "default"
+    @overrides = {}
   end
 
   def collect(stack)
@@ -23,6 +26,16 @@ class Backtrace
     stack << elem
   end
 
+  def add_override(package_name, version_name)
+    # Don't replace an existing override on the stack
+    return if get_override(package_name)
+    @overrides[package_name] = version_name
+  end
+
+  def get_override(package_name)
+    return @overrides[package_name] || (@parent ? @parent.get_override(package_name) : nil)
+  end
+
   def dump(out)
     stack = []
     collect(stack)

data/lib/fig/environment.rb

@@ -41,7 +41,8 @@ module Fig
       if (@applied_configs[package.package_name] ||= []).member?(config_name)
         return
       end
-      new_backtrace = Backtrace.new(backtrace, package.package_name, package.version_name, config_name)
+      new_backtrace = 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, new_backtrace) }
       @applied_configs[package.package_name] << config_name
@@ -73,7 +74,7 @@ module Fig
       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, backtrace)
+        include_config(base_package, statement.package_name, statement.config_name, statement.version_name, statement.overrides, backtrace)
       when Command
         # ignore
       else
@@ -81,10 +82,20 @@ module Fig
       end
     end
 
-    def include_config(base_package, package_name, config_name, version_name, backtrace)
+    def include_config(base_package, package_name, config_name, version_name, overrides, backtrace)
+      # Check to see if this include has been overridden
+      if backtrace
+        override = backtrace.get_override(package_name || base_package.package_name)
+        if override
+          version_name = override
+        end
+      end
       new_backtrace = Backtrace.new(backtrace, package_name, version_name, config_name)
+      overrides.each do |override|
+        new_backtrace.add_override(override.package_name, override.version_name)
+      end
       package = lookup_package(package_name || base_package.package_name, version_name, new_backtrace)
-      apply_config(package, config_name || "default", backtrace)
+      apply_config(package, config_name || "default", new_backtrace)
     end
 
     def direct_retrieve(package_name, source_path, target_path)

data/lib/fig/grammar.treetop

@@ -60,12 +60,20 @@ grammar Fig
   end
 
   rule include
-    "include" ws descriptor {
+    "include" ws descriptor overrides:(override*) {
       def to_config_statement
         package = descriptor.respond_to?(:package) ? descriptor.package.text_value : nil
         config = descriptor.get_config
         version = descriptor.get_version
-        Include.new(package, config, version)
+        Include.new(package, config, version, overrides.elements.map{ |e| e.to_override })
+      end
+    }
+  end
+
+  rule override
+    "override" ws package_name "/" version_name ws {
+      def to_override
+        return Override.new(package_name.text_value, version_name.text_value)
       end
     }
   end
@@ -99,7 +107,7 @@ grammar Fig
   end
 
   rule descriptor
-    ((package:[a-zA-Z0-9.-]+ ("/" version:[a-zA-Z0-9_\-.]+)? (":" config:config_name)? ws) / 
+    ((package:package_name ("/" version:version_name)? (":" config:config_name)? ws) / 
     (":" config:config_name ws)) {
       def get_version
         elements.each do |element|
@@ -121,6 +129,14 @@ grammar Fig
     }
   end
 
+  rule package_name
+    [a-zA-Z0-9.-]+
+  end
+
+  rule version_name
+    [a-zA-Z0-9_\-.]+
+  end
+
   rule config_name
     [a-zA-Z0-9_\-.]+
   end

data/lib/fig/options.rb

@@ -74,9 +74,14 @@ module Fig
 
       opts.on('-i', '--include PKG', 'include package in environment') do |descriptor| 
         package_name, config_name, version_name = parse_descriptor(descriptor)
-        options[:modifiers] << Include.new(package_name, config_name, version_name) 
+        options[:modifiers] << Include.new(package_name, config_name, version_name, {}) 
       end
 
+#      opts.on('-o', '--override PKG', 'override version of included package') do |descriptor| 
+#        package_name, config_name, version_name = parse_descriptor(descriptor)
+#        options[:modifiers] << Include.new(package_name, config_name, version_name, {}) 
+#      end
+
       opts.on('-s', '--set VAR=VAL', 'set environment variable') do |var_val| 
         var, val = var_val.split('=')
         options[:modifiers] << Set.new(var, val) 

data/lib/fig/package.rb

@@ -165,12 +165,13 @@ module Fig
   end
 
   class Include
-    attr_reader :package_name, :config_name, :version_name
+    attr_reader :package_name, :config_name, :version_name, :overrides
 
-    def initialize(package_name, config_name, version_name)
+    def initialize(package_name, config_name, version_name, overrides)
       @package_name = package_name
       @config_name = config_name
       @version_name = version_name
+      @overrides = overrides
     end
 
     def unparse(indent)
@@ -178,7 +179,23 @@ module Fig
       descriptor += @package_name if @package_name
       descriptor += "/#{@version_name}" if @version_name
       descriptor += ":#{@config_name}" if @config_name
-      "#{indent}include #{descriptor}"
+      @overrides.each do |override|
+        descriptor += override.unparse
+      end
+      return "#{indent}include #{descriptor}"
+    end
+  end
+
+  class Override
+    attr_reader :package_name, :version_name
+    
+    def initialize(package_name, version_name)
+      @package_name = package_name
+      @version_name = version_name
+    end
+
+    def unparse()
+      return " override " + @package_name + "/" + @version_name
     end
   end
 

data/lib/fig/retriever.rb

@@ -99,7 +99,7 @@ private
       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)
+        FileUtils.cp(source, target, :preserve => true)
       end
       @config.files << relpath if @config
     end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  version: 0.1.37
+  prerelease: 
+  version: 0.1.38
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,99 +10,229 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 -05:00
+date: 2011-10-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: libarchive
+  name: libarchive-static
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: libarchive-static
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
-    version: 
+        version: 2.0.15
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: net-sftp
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.5
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: net-netrc
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.2
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: polyglot
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.9
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: treetop
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.2
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.6.2
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.3"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: libarchive-static
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: libarchive-static
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.0.15
-    version: 
+  type: :runtime
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: net-sftp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.0.5
-    version: 
+  type: :runtime
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: net-netrc
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: polyglot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.2.9
-    version: 
+  type: :runtime
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: treetop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.6.2
-    version: 
+  type: :runtime
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.3"
-    version: 
+  type: :development
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: open4
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.1
-    version: 
+  type: :development
+  version_requirements: *id020
 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: 
@@ -133,31 +264,28 @@ homepage: http://github.com/mfoemmel/fig
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Fig is a utility for configuring environments and managing dependencies across a team of developers..
-test_files: 
-- spec/fig_spec.rb
-- spec/retriever_spec.rb
-- spec/spec_helper.rb
-- spec/win_spec.rb
+test_files: []
+

data/spec/fig_spec.rb

@@ -1,331 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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

@@ -1,9 +0,0 @@
-$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

@@ -1,21 +0,0 @@
-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