fig 0.1.17 → 0.1.18

data/lib/fig/repository.rb

@@ -45,6 +45,8 @@ module Fig
     def publish_package(package_statements, package_name, version_name, local_only) 
       temp_dir = temp_dir_for_package(package_name, version_name)
       @os.clear_directory(temp_dir)
+      local_dir = local_dir_for_package(package_name, version_name)
+      @os.clear_directory(local_dir)
       fig_file = File.join(temp_dir, ".fig")
       content = bundle_resources(package_statements).map do |statement| 
         if statement.is_a?(Publish)
@@ -64,9 +66,9 @@ module Fig
             archive_local = statement.url
           end
           @os.upload(archive_local, archive_remote, @remote_repository_user) unless local_only
-          @os.copy(archive_local, local_dir_for_package(package_name, version_name) + "/" + archive_name)
+          @os.copy(archive_local, local_dir + "/" + archive_name)
           if statement.is_a?(Archive)
-            @os.unpack_archive(local_dir_for_package(package_name, version_name), archive_name)
+            @os.unpack_archive(local_dir, archive_name)
           end
           statement.class.new(archive_name).unparse('')
         else

data/spec/fig_spec.rb

@@ -173,7 +173,7 @@ describe "Fig" do
     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"
-    fail unless fig('-m -i foo/1.2.3 -- hello')[0].should == 'bar'
+    fig('-m -i foo/1.2.3 -- hello')[0].should == 'bar'
   end
 
   it "retrieve resource" do
@@ -225,4 +225,21 @@ describe "Fig" do
     File.read("tmp/lib2/foo/hello").should == "some library"
     File.read("tmp/lib2/foo/hello2").should == "some other 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

metadata

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