fig 0.1.54 → 0.1.55

data/Changes

@@ -1,3 +1,8 @@
+v0.1.55
+
+  - "include" of another package without specifying a version is now a warning
+    about its ability to work is dependent upon include ordering.
+
 v0.1.54
 
   - Emits an error when you've got an "include" of another package without

data/VERSION

@@ -1 +1 @@
-0.1.54
+0.1.55

data/lib/fig/command/listing.rb

@@ -66,21 +66,27 @@ module Fig::Command::Listing
     return
   end
 
-  def display_dependencies_in_tree(package, config_names, indent = 0)
+  def display_dependencies_in_tree(base_package, config_names, indent = 0)
     config_names.each do
       |config_name|
 
       print ' ' * (indent * 4)
-      puts package.to_s_with_config(config_name)
+      puts base_package.to_s_with_config(config_name)
 
-      package.package_dependencies(config_name).each do
+      base_package.package_dependencies(config_name).each do
         |descriptor|
 
-        display_dependencies_in_tree(
-          @repository.get_package(descriptor.name, descriptor.version),
-          [descriptor.config],
-          indent + 1
-        )
+        package = nil
+        if descriptor.name
+          package =
+            @repository.get_package(
+              descriptor.name, descriptor.version, false, :allow_any_version
+            )
+        else
+          package = base_package
+        end
+
+        display_dependencies_in_tree(package, [descriptor.config], indent + 1)
       end
     end
 

data/lib/fig/packagecache.rb

@@ -25,6 +25,14 @@ class Fig::PackageCache
     return versions[version]
   end
 
+  # Don't care which one, just gimme.
+  def get_any_version_of_package(name)
+    versions = @packages[name]
+    return if not versions
+
+    return versions.values.first()
+  end
+
   def remove_package(name, version)
     versions = @packages[name]
     return if not versions

data/lib/fig/repository.rb

@@ -56,7 +56,28 @@ module Fig
       return paths.reject { |path| path =~ %r< ^ #{METADATA_SUBDIRECTORY} / >xs }
     end
 
-    def get_package(package_name, version_name, disable_updating = false)
+    def get_package(
+      package_name,
+      version_name,
+      disable_updating = false,
+      allow_any_version = false
+    )
+      if not version_name
+        if allow_any_version
+          package = @packages.get_any_version_of_package(package_name)
+          if package
+            Logging.warn(
+              "Picked version #{package.version_name} of #{package.package_name} at random."
+            )
+            return package
+          end
+        end
+
+        raise RepositoryError.new(
+          %Q<Cannot retrieve "#{package_name}" without a version.>
+        )
+      end
+
       package = @packages.get_package(package_name, version_name)
       return package if package
 

data/lib/fig/statement/include.rb

@@ -1,6 +1,5 @@
 require 'fig/logging'
 require 'fig/packagedescriptor'
-require 'fig/packageerror'
 require 'fig/statement'
 
 module Fig; end
@@ -15,13 +14,13 @@ class Fig::Statement::Include
   def initialize(descriptor, overrides, containing_package_name)
     if descriptor.name && ! descriptor.version
       message =
-        %Q<Must specify a version in the package descriptor of "#{descriptor.name}" for an include statement>
+        %Q<No version in the package descriptor of "#{descriptor.name}" in an include statement>
       if containing_package_name
         message += %Q< in the .fig file for "#{containing_package_name}">
       end
-      message += '.'
+      message += '. Whether or not the include statement will work is dependent upon the recursive dependency load order.'
 
-      raise Fig::PackageError.new(message)
+      Fig::Logging.warn(message)
     end
 
     @descriptor = descriptor
@@ -89,6 +88,10 @@ class Fig::Statement::Include
   end
 
   def referenced_version_name(package)
+    if package_name()
+      return version_name()
+    end
+
     return version_name() || package.version_name()
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.54
+  version: 0.1.55
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &24818540 !ruby/object:Gem::Requirement
+  requirement: &15742480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24818540
+  version_requirements: *15742480
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &24818040 !ruby/object:Gem::Requirement
+  requirement: &15758360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *24818040
+  version_requirements: *15758360
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &24817520 !ruby/object:Gem::Requirement
+  requirement: &15757860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *24817520
+  version_requirements: *15757860
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &24817000 !ruby/object:Gem::Requirement
+  requirement: &15757360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *24817000
+  version_requirements: *15757360
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &24816480 !ruby/object:Gem::Requirement
+  requirement: &15756840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *24816480
+  version_requirements: *15756840
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &24815960 !ruby/object:Gem::Requirement
+  requirement: &15756320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *24815960
+  version_requirements: *15756320
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &24815420 !ruby/object:Gem::Requirement
+  requirement: &15755800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *24815420
+  version_requirements: *15755800
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &24814880 !ruby/object:Gem::Requirement
+  requirement: &15755280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *24814880
+  version_requirements: *15755280
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24814360 !ruby/object:Gem::Requirement
+  requirement: &15754740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *24814360
+  version_requirements: *15754740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &24813840 !ruby/object:Gem::Requirement
+  requirement: &15754200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *24813840
+  version_requirements: *15754200
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &24813320 !ruby/object:Gem::Requirement
+  requirement: &15753680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *24813320
+  version_requirements: *15753680
 - !ruby/object:Gem::Dependency
   name: ftp
-  requirement: &24812820 !ruby/object:Gem::Requirement
+  requirement: &15753160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0.69'
   type: :runtime
   prerelease: false
-  version_requirements: *24812820
+  version_requirements: *15753160
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &24812320 !ruby/object:Gem::Requirement
+  requirement: &15752640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *24812320
+  version_requirements: *15752640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24811840 !ruby/object:Gem::Requirement
+  requirement: &15752140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *24811840
+  version_requirements: *15752140
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &24811300 !ruby/object:Gem::Requirement
+  requirement: &15751640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24811300
+  version_requirements: *15751640
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &24818940 !ruby/object:Gem::Requirement
+  requirement: &15751160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *24818940
+  version_requirements: *15751160
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &24818140 !ruby/object:Gem::Requirement
+  requirement: &15750620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *24818140
+  version_requirements: *15750620
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &24817400 !ruby/object:Gem::Requirement
+  requirement: &15758200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *24817400
+  version_requirements: *15758200
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &24816580 !ruby/object:Gem::Requirement
+  requirement: &15757440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *24816580
+  version_requirements: *15757440
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &24815840 !ruby/object:Gem::Requirement
+  requirement: &15756700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *24815840
+  version_requirements: *15756700
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &24815000 !ruby/object:Gem::Requirement
+  requirement: &15755880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *24815000
+  version_requirements: *15755880
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &24814220 !ruby/object:Gem::Requirement
+  requirement: &15755120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *24814220
+  version_requirements: *15755120
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24813420 !ruby/object:Gem::Requirement
+  requirement: &15754300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *24813420
+  version_requirements: *15754300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &24812680 !ruby/object:Gem::Requirement
+  requirement: &15753520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *24812680
+  version_requirements: *15753520
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &24811940 !ruby/object:Gem::Requirement
+  requirement: &15752720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *24811940
+  version_requirements: *15752720
 - !ruby/object:Gem::Dependency
   name: ftp
-  requirement: &24809300 !ruby/object:Gem::Requirement
+  requirement: &15751980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: '0.69'
   type: :runtime
   prerelease: false
-  version_requirements: *24809300
+  version_requirements: *15751980
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &24808520 !ruby/object:Gem::Requirement
+  requirement: &15751240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *24808520
+  version_requirements: *15751240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24807920 !ruby/object:Gem::Requirement
+  requirement: &15749240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,7 +318,7 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *24807920
+  version_requirements: *15749240
 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