fig 0.1.51 → 0.1.52

data/lib/fig/retriever.rb

@@ -3,12 +3,14 @@ require 'set'
 
 require 'fig/logging'
 
+module Fig; end
+
 # Copies files from the project directories in FIG_HOME to the user's working
 # directory. It keeps track of which files have already been copied, and which
 # package/versions they came from, and deletes files as necessary to ensure
 # that we never have files from two different versions of the same package in
 # the user's working directory.
-class Retriever
+class Fig::Retriever
   def initialize(base_dir)
     @base_dir = base_dir
     @configs = {}

data/lib/fig/statement.rb

@@ -0,0 +1,18 @@
+module Fig; end
+
+# A statement within a package configuration file (package.fig).
+module Fig::Statement
+  # Block will receive a Statement.
+  def walk_statements(&block)
+    return
+  end
+
+  # Block will receive a Package and a Statement.
+  def walk_statements_following_package_dependencies(repository, package, &block)
+    return
+  end
+
+  def urls
+    return []
+  end
+end

data/lib/fig/{package → statement}/archive.rb

@@ -1,15 +1,14 @@
 require 'fig/logging'
 require 'fig/packageerror'
-require 'fig/package/statement'
+require 'fig/statement'
 
 module Fig; end
-class Fig::Package; end
 
 # Specifies an archive file (possibly via a URL) that is part of the current package.
 #
 # Differs from a Resource in that the contents will be extracted.
-class Fig::Package::Archive
-  include Fig::Package::Statement
+class Fig::Statement::Archive
+  include Fig::Statement
 
   attr_reader :url
 

data/lib/fig/{package → statement}/command.rb

@@ -1,14 +1,13 @@
 require 'fig/logging'
 require 'fig/packageerror'
-require 'fig/package/statement'
+require 'fig/statement'
 
 module Fig; end
-class Fig::Package; end
 
 # Specifies a default command that will be executed for a given Configuration
 # if no command is specified on the command-line.
-class Fig::Package::Command
-  include Fig::Package::Statement
+class Fig::Statement::Command
+  include Fig::Statement
 
   attr_reader :command
 

data/lib/fig/{package → statement}/configuration.rb

@@ -1,14 +1,13 @@
 require 'fig/logging'
 require 'fig/packageerror'
-require 'fig/package/command'
-require 'fig/package/statement'
+require 'fig/statement'
+require 'fig/statement/command'
 
 module Fig; end
-class Fig::Package; end
 
 # A grouping of statements within a configuration.  May not be nested.
-class Fig::Package::Configuration
-  include Fig::Package::Statement
+class Fig::Statement::Configuration
+  include Fig::Statement
 
   attr_reader :name, :statements
 
@@ -23,10 +22,11 @@ class Fig::Package::Configuration
 
   def command
     return statements.find do
-      |statement| statement.is_a?(Fig::Package::Command)
+      |statement| statement.is_a?(Fig::Statement::Command)
     end
   end
 
+  # Block will receive a Statement.
   def walk_statements(&block)
     @statements.each do |statement|
       yield statement
@@ -34,6 +34,18 @@ class Fig::Package::Configuration
     end
   end
 
+  # Block will receive a Package and a Statement.
+  def walk_statements_following_package_dependencies(repository, package, &block)
+    @statements.each do |statement|
+      yield package, statement
+      statement.walk_statements_following_package_dependencies(
+        repository, package, &block
+      )
+    end
+
+    return
+  end
+
   def unparse(indent)
     unparse_statements(indent, "config #{@name}", @statements, 'end')
   end

data/lib/fig/statement/include.rb

@@ -0,0 +1,87 @@
+require 'fig/logging'
+require 'fig/packagedescriptor'
+require 'fig/packageerror'
+require 'fig/statement'
+
+module Fig; end
+
+# Dual role: "include :configname" incorporates one configuration into another;
+# "include package[/version]" declares a dependency upon another package.
+class Fig::Statement::Include
+  include Fig::Statement
+
+  attr_reader :descriptor, :overrides
+
+  def initialize(descriptor, overrides)
+    @descriptor = descriptor
+    @overrides = overrides
+  end
+
+  def package_name
+    return @descriptor.name
+  end
+
+  def version_name
+    return @descriptor.version
+  end
+
+  def config_name
+    return @descriptor.config
+  end
+
+  # Assume that this statement is part of the parameter and return a descriptor
+  # that represents the fully resolved dependency.
+  def resolved_dependency_descriptor(package)
+    return Fig::PackageDescriptor.new(
+      referenced_package_name(package),
+      referenced_version_name(package),
+      referenced_config_name()
+    )
+  end
+
+  # Block will receive a Package and a Statement.
+  def walk_statements_following_package_dependencies(
+    repository, package, &block
+  )
+    referenced_package = nil
+    if package_name()
+      referenced_package = repository.get_package(package_name, version_name)
+    else
+      referenced_package = package
+    end
+
+    configuration = referenced_package[referenced_config_name()]
+
+    yield referenced_package, configuration
+    configuration.walk_statements_following_package_dependencies(
+      repository, referenced_package, &block
+    )
+
+    return
+  end
+
+  def unparse(indent)
+    text = ''
+    text += package_name() if package_name()
+    text += "/#{version_name()}" if version_name()
+    text += ":#{config_name()}" if config_name()
+    @overrides.each do |override|
+      text += override.unparse
+    end
+    return "#{indent}include #{text}"
+  end
+
+  private
+
+  def referenced_package_name(package)
+    return package_name() || package.package_name()
+  end
+
+  def referenced_version_name(package)
+    return version_name() || package.version_name()
+  end
+
+  def referenced_config_name()
+    config_name() || Fig::Package::DEFAULT_CONFIG
+  end
+end

data/lib/fig/{package → statement}/override.rb

@@ -1,9 +1,8 @@
 require 'fig/logging'
 require 'fig/packageerror'
-require 'fig/package/statement'
+require 'fig/statement'
 
 module Fig; end
-class Fig::Package; end
 
 # Overrides one package version dependency with another in an include
 # statement.
@@ -12,8 +11,8 @@ class Fig::Package; end
 #
 # indicates that, regardless of which version of somedependency the blah
 # package says it needs, the blah package will actually use v3.2.6.
-class Fig::Package::Override
-  include Fig::Package::Statement
+class Fig::Statement::Override
+  include Fig::Statement
 
   attr_reader :package_name, :version_name
 

data/lib/fig/{package → statement}/path.rb

@@ -1,14 +1,13 @@
 require 'fig/logging'
 require 'fig/packageerror'
-require 'fig/package/statement'
+require 'fig/statement'
 
 module Fig; end
-class Fig::Package; end
 
 # A statement that specifies or modifies a path environment variable, e.g.
 # "append", "path", "add" (though those are all synonyms).
-class Fig::Package::Path
-  include Fig::Package::Statement
+class Fig::Statement::Path
+  include Fig::Statement
 
   attr_reader :name, :value
 

data/lib/fig/{package → statement}/publish.rb

@@ -1,14 +1,13 @@
 require 'fig/logging'
 require 'fig/packageerror'
-require 'fig/package/statement'
+require 'fig/statement'
 
 module Fig; end
-class Fig::Package; end
 
 # Artificial statement (it's not in the grammar) used to handle default
 # publishing.
-class Fig::Package::Publish
-  include Fig::Package::Statement
+class Fig::Statement::Publish
+  include Fig::Statement
 
   attr_reader :local_name, :remote_name
 

data/lib/fig/{package → statement}/resource.rb

@@ -1,15 +1,14 @@
 require 'fig/logging'
 require 'fig/packageerror'
-require 'fig/package/statement'
+require 'fig/statement'
 
 module Fig; end
-class Fig::Package; end
 
 # Specifies a file (possibly via a URL) that is part of the current package.
 #
 # Differs from an Archive in that the contents will not be extracted.
-class Fig::Package::Resource
-  include Fig::Package::Statement
+class Fig::Statement::Resource
+  include Fig::Statement
 
   attr_reader :url
 

data/lib/fig/{package → statement}/retrieve.rb

@@ -1,13 +1,12 @@
 require 'fig/logging'
 require 'fig/packageerror'
-require 'fig/package/statement'
+require 'fig/statement'
 
 module Fig; end
-class Fig::Package; end
 
 # Specifies the destination to put a dependency into.
-class Fig::Package::Retrieve
-  include Fig::Package::Statement
+class Fig::Statement::Retrieve
+  include Fig::Statement
 
   attr_reader :var, :path
 

data/lib/fig/{package → statement}/set.rb

@@ -1,13 +1,12 @@
 require 'fig/logging'
 require 'fig/packageerror'
-require 'fig/package/statement'
+require 'fig/statement'
 
 module Fig; end
-class Fig::Package; end
 
 # A statement that sets the value of an environment variable.
-class Fig::Package::Set
-  include Fig::Package::Statement
+class Fig::Statement::Set
+  include Fig::Statement
 
   attr_reader :name, :value
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.52
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &260685620 !ruby/object:Gem::Requirement
+  requirement: &17230600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *260685620
+  version_requirements: *17230600
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &260606860 !ruby/object:Gem::Requirement
+  requirement: &17230060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *260606860
+  version_requirements: *17230060
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &260605860 !ruby/object:Gem::Requirement
+  requirement: &17229540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *260605860
+  version_requirements: *17229540
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &260604640 !ruby/object:Gem::Requirement
+  requirement: &17229000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *260604640
+  version_requirements: *17229000
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &260603600 !ruby/object:Gem::Requirement
+  requirement: &17228460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *260603600
+  version_requirements: *17228460
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &260602700 !ruby/object:Gem::Requirement
+  requirement: &17227980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *260602700
+  version_requirements: *17227980
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &260601440 !ruby/object:Gem::Requirement
+  requirement: &17227460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *260601440
+  version_requirements: *17227460
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &260600440 !ruby/object:Gem::Requirement
+  requirement: &17226920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +98,32 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *260600440
+  version_requirements: *17226920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &260599500 !ruby/object:Gem::Requirement
+  requirement: &17226400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *260599500
+  version_requirements: *17226400
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &17225820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *17225820
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &260593160 !ruby/object:Gem::Requirement
+  requirement: &17224700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,21 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *260593160
+  version_requirements: *17224700
+- !ruby/object:Gem::Dependency
+  name: ftp
+  requirement: &17240060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.69'
+  type: :runtime
+  prerelease: false
+  version_requirements: *17240060
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &260592040 !ruby/object:Gem::Requirement
+  requirement: &17238760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,21 +153,21 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *260592040
+  version_requirements: *17238760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &260591040 !ruby/object:Gem::Requirement
+  requirement: &17237680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *260591040
+  version_requirements: *17237680
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &260590100 !ruby/object:Gem::Requirement
+  requirement: &17236560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +175,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *260590100
+  version_requirements: *17236560
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &260589080 !ruby/object:Gem::Requirement
+  requirement: &17235340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +186,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *260589080
+  version_requirements: *17235340
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &260588060 !ruby/object:Gem::Requirement
+  requirement: &17233980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +197,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *260588060
+  version_requirements: *17233980
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &260586720 !ruby/object:Gem::Requirement
+  requirement: &17232840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +208,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *260586720
+  version_requirements: *17232840
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &260527840 !ruby/object:Gem::Requirement
+  requirement: &17248240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +219,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *260527840
+  version_requirements: *17248240
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &260526660 !ruby/object:Gem::Requirement
+  requirement: &17247740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +230,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *260526660
+  version_requirements: *17247740
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &260525460 !ruby/object:Gem::Requirement
+  requirement: &17247260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +241,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *260525460
+  version_requirements: *17247260
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &260524660 !ruby/object:Gem::Requirement
+  requirement: &17246700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,21 +252,32 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *260524660
+  version_requirements: *17246700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &260523720 !ruby/object:Gem::Requirement
+  requirement: &17246160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *260523720
+  version_requirements: *17246160
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &17245540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *17245540
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &260522460 !ruby/object:Gem::Requirement
+  requirement: &17244980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +285,21 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *260522460
+  version_requirements: *17244980
+- !ruby/object:Gem::Dependency
+  name: ftp
+  requirement: &17244460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.69'
+  type: :runtime
+  prerelease: false
+  version_requirements: *17244460
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &260521740 !ruby/object:Gem::Requirement
+  requirement: &17243900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,18 +307,18 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *260521740
+  version_requirements: *17243900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &260520660 !ruby/object:Gem::Requirement
+  requirement: &17243340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *260520660
+  version_requirements: *17243340
 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
@@ -287,14 +331,15 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 - README.md
+- TODO
 files:
 - Changes
 - VERSION
 - bin/fig
 - bin/fig-download
-- lib/fig.rb
 - lib/fig/applicationconfiguration.rb
 - lib/fig/backtrace.rb
+- lib/fig/command.rb
 - lib/fig/configfileerror.rb
 - lib/fig/environment.rb
 - lib/fig/figrc.rb
@@ -303,31 +348,33 @@ files:
 - lib/fig/logging.rb
 - lib/fig/networkerror.rb
 - lib/fig/notfounderror.rb
+- lib/fig/operatingsystem.rb
 - lib/fig/options.rb
-- lib/fig/os.rb
 - lib/fig/package.rb
-- lib/fig/package/archive.rb
-- lib/fig/package/command.rb
-- lib/fig/package/configuration.rb
-- lib/fig/package/include.rb
-- lib/fig/package/install.rb
-- lib/fig/package/override.rb
-- lib/fig/package/path.rb
-- lib/fig/package/publish.rb
-- lib/fig/package/resource.rb
-- lib/fig/package/retrieve.rb
-- lib/fig/package/set.rb
-- lib/fig/package/statement.rb
+- lib/fig/packagecache.rb
+- lib/fig/packagedescriptor.rb
 - lib/fig/packageerror.rb
 - lib/fig/parser.rb
 - lib/fig/repository.rb
 - lib/fig/repositoryerror.rb
 - lib/fig/retriever.rb
+- lib/fig/statement.rb
+- lib/fig/statement/archive.rb
+- lib/fig/statement/command.rb
+- lib/fig/statement/configuration.rb
+- lib/fig/statement/include.rb
+- lib/fig/statement/override.rb
+- lib/fig/statement/path.rb
+- lib/fig/statement/publish.rb
+- lib/fig/statement/resource.rb
+- lib/fig/statement/retrieve.rb
+- lib/fig/statement/set.rb
 - lib/fig/urlaccesserror.rb
 - lib/fig/userinputerror.rb
 - lib/fig/windows.rb
 - LICENSE
 - README.md
+- TODO
 homepage: http://github.com/mfoemmel/fig
 licenses: []
 post_install_message: 
@@ -348,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Fig is a utility for configuring environments and managing dependencies across