fig 0.1.21 → 0.1.22

data/lib/fig/grammar.treetop

@@ -130,7 +130,7 @@ grammar Fig
   end
 
   rule url
-    (value:[a-zA-Z0-9:/\-\\._]+ ws) / ('"' value:[a-zA-Z0-9:/\-\\._]+ '"' ws)
+    (value:[a-zA-Z0-9:/\-\\._\*]+ ws) / ('"' value:[a-zA-Z0-9:/\-\\._]+ '"' ws)
   end
 
   rule ws

data/lib/fig/os.rb

@@ -104,7 +104,7 @@ module Fig
         # TODO need better way to do conditional download
         #       timestamp = `ssh #{uri.user + '@' if uri.user}#{uri.host} "ruby -e 'puts File.mtime(\\"#{uri.path}\\").to_i'"`.to_i
         timestamp = File.exist?(path) ? File.mtime(path).to_i : 0 
-        cmd = "fig-download #{timestamp} #{uri.path}"
+        cmd = `which fig-download`.strip + " #{timestamp} #{uri.path}"
         ssh_download(uri.user, uri.host, path, cmd)
       else
         raise "Unknown protocol: #{url}"
@@ -181,7 +181,7 @@ module Fig
     
     def copy(source, target)
       FileUtils.mkdir_p(File.dirname(target))
-      FileUtils.copy_file(source, target)
+      FileUtils.cp_r(source, target)
     end
 
     def move_file(dir, from, to)

data/lib/fig/repository.rb

@@ -91,6 +91,7 @@ module Fig
         end
       end
       if resources.size > 0
+        resources = expand_globs_from(resources)
         file = "resources.tar.gz"
         @os.create_archive(file, resources)
         new_package_statements.unshift(Archive.new(file))
@@ -195,6 +196,13 @@ module Fig
       end
     end
 
+    # 'resources' is an Array of filenames: ['tmp/foo/file1', 'tmp/foo/*.jar']
+    def expand_globs_from(resources)
+      expanded_files = []
+      resources.each {|f| expanded_files.concat(Dir.glob(f))}
+      expanded_files
+    end
+
     def is_url?(url)
       not (/ftp:\/\/|http:\/\/|file:\/\/|ssh:\/\// =~ url).nil?
     end

data/spec/fig_spec.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 1
-  - 21
-  version: 0.1.21
+  - 22
+  version: 0.1.22
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -06:00
+date: 2011-01-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency