fig 0.1.76 → 0.1.77

data/lib/fig/working_directory_maintainer.rb

@@ -3,6 +3,7 @@ require 'set'
 require 'fig/logging'
 require 'fig/logging/colorizable'
 require 'fig/package_descriptor'
+require 'fig/repository_error'
 require 'fig/working_directory_metadata'
 
 module Fig; end
@@ -37,8 +38,33 @@ class Fig::WorkingDirectoryMaintainer
     return
   end
 
+  SYMLOOP_MAX = 20 # https://duckduckgo.com/html?q=posix_symloop_max
+
   def retrieve(source, relpath)
-    copy(source, relpath)
+    resolved_source = source
+
+    # When recursing through a retrieve, if we encounter a symlink that doesn't
+    # point to a directory, we copy it as a symlink.  However, if the retrieve
+    # path itself is a symlink, we copy the target of the symlink, not the
+    # symlink itself.
+    if File.exist? resolved_source
+      # Ruby v1.8 does not have File.realdirpath().
+      traversal_count = 0
+      while File.symlink? resolved_source
+        resolved_source = File.join(
+          File.dirname(resolved_source), File.readlink(resolved_source)
+        )
+        traversal_count += 1
+
+        if traversal_count > SYMLOOP_MAX
+          raise Fig::RepositoryError.new(
+            %Q<Could not resolve symlink "#{source}"; symlink chain exceeded #{SYMLOOP_MAX}.>
+          )
+        end
+      end
+    end
+
+    copy(resolved_source, relpath)
 
     return
   end
@@ -174,6 +200,10 @@ class Fig::WorkingDirectoryMaintainer
 
   def should_copy_file?(source, target)
     if File.symlink?(target)
+      if File.symlink?(source) && File.readlink(source) == File.readlink(target)
+        return false
+      end
+
       FileUtils.rm(target)
       return true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.76
+  version: 0.1.77
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &18129660 !ruby/object:Gem::Requirement
+  requirement: &15864160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *18129660
+  version_requirements: *15864160
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &18129120 !ruby/object:Gem::Requirement
+  requirement: &15863620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *18129120
+  version_requirements: *15863620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &18128560 !ruby/object:Gem::Requirement
+  requirement: &15862940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *18128560
+  version_requirements: *15862940
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &18128000 !ruby/object:Gem::Requirement
+  requirement: &15862100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *18128000
+  version_requirements: *15862100
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &18127400 !ruby/object:Gem::Requirement
+  requirement: &15861200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *18127400
+  version_requirements: *15861200
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &18126620 !ruby/object:Gem::Requirement
+  requirement: &15860680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *18126620
+  version_requirements: *15860680
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &18125720 !ruby/object:Gem::Requirement
+  requirement: &15773760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *18125720
+  version_requirements: *15773760
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &18040400 !ruby/object:Gem::Requirement
+  requirement: &15773240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *18040400
+  version_requirements: *15773240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18039900 !ruby/object:Gem::Requirement
+  requirement: &15772400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *18039900
+  version_requirements: *15772400
 - !ruby/object:Gem::Dependency
   name: sys-admin
-  requirement: &18039420 !ruby/object:Gem::Requirement
+  requirement: &15771860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *18039420
+  version_requirements: *15771860
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &18038680 !ruby/object:Gem::Requirement
+  requirement: &15771340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *18038680
+  version_requirements: *15771340
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &18038020 !ruby/object:Gem::Requirement
+  requirement: &15770600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *18038020
+  version_requirements: *15770600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18036920 !ruby/object:Gem::Requirement
+  requirement: &15769420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.0.15
   type: :development
   prerelease: false
-  version_requirements: *18036920
+  version_requirements: *15769420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18036100 !ruby/object:Gem::Requirement
+  requirement: &15768880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *18036100
+  version_requirements: *15768880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18035560 !ruby/object:Gem::Requirement
+  requirement: &15768340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *18035560
+  version_requirements: *15768340
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &18035080 !ruby/object:Gem::Requirement
+  requirement: &15767880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 2.7.1
   type: :development
   prerelease: false
-  version_requirements: *18035080
+  version_requirements: *15767880
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &18034600 !ruby/object:Gem::Requirement
+  requirement: &15767420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *18034600
+  version_requirements: *15767420
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: &18034100 !ruby/object:Gem::Requirement
+  requirement: &15766900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *18034100
+  version_requirements: *15766900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &18033600 !ruby/object:Gem::Requirement
+  requirement: &15766040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *18033600
+  version_requirements: *15766040
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &18033140 !ruby/object:Gem::Requirement
+  requirement: &15747020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *18033140
+  version_requirements: *15747020
 description: Fig is a utility for configuring environments and managing dependencies
   across a team of developers. Given a list of packages and a command to run, Fig
   builds environment variables named in those packages (e.g., CLASSPATH), then executes
@@ -270,16 +270,15 @@ files:
 - lib/fig/package_descriptor.rb
 - lib/fig/not_found_error.rb
 - lib/fig/application_configuration.rb
-- lib/fig/grammar/version.rb
+- lib/fig/grammar/v1_asset_location.rb
 - lib/fig/grammar/base.treetop
+- lib/fig/grammar/v2.rb
 - lib/fig/grammar/version.treetop
 - lib/fig/grammar/v0.treetop
 - lib/fig/grammar/version_identification.treetop
-- lib/fig/grammar/v1.rb
-- lib/fig/grammar/base.rb
-- lib/fig/grammar/v0.rb
+- lib/fig/grammar/v0_ish.rb
 - lib/fig/grammar/v1.treetop
-- lib/fig/grammar/version_identification.rb
+- lib/fig/grammar/v0_asset_location.rb
 - lib/fig/statement/path.rb
 - lib/fig/statement/set.rb
 - lib/fig/statement/grammar_version.rb
@@ -355,6 +354,11 @@ files:
 - lib/fig/statement.rb
 - LICENSE
 - README.md
+- lib/fig/grammar/base.rb
+- lib/fig/grammar/version.rb
+- lib/fig/grammar/v0.rb
+- lib/fig/grammar/version_identification.rb
+- lib/fig/grammar/v1.rb
 homepage: http://github.com/mfoemmel/fig
 licenses: []
 post_install_message: