fig 0.1.18 → 0.1.19

data/lib/fig/environment.rb

@@ -131,7 +131,14 @@ module Fig
       return value unless base_package && base_package.package_name
       file = value.gsub(/\@/, base_package.directory)
       if @retrieve_vars.member?(name)
-        target = File.join(@retrieve_vars[name].gsub(/\[package\]/, base_package.package_name), File.basename(file))
+        # A '//' in the source file's path tells us to preserve path information
+        # after the '//' when doing a retrieve.
+        if file.split('//').size > 1
+          preserved_path = file.split('//').last
+          target = File.join(@retrieve_vars[name].gsub(/\[package\]/, base_package.package_name), preserved_path)
+        else
+          target = File.join(@retrieve_vars[name].gsub(/\[package\]/, base_package.package_name), File.basename(file))
+        end
         unless @os.exist?(target) && @os.mtime(target) >= @os.mtime(file)
           @os.log_info("retrieving #{target}")
           @os.copy(file, target)

data/spec/fig_spec.rb

@@ -199,6 +199,35 @@ describe "Fig" do
     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)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 1
-  - 18
-  version: 0.1.18
+  - 19
+  version: 0.1.19
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +01:00
+date: 2010-11-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency