fig 0.1.65 → 0.1.67

data/lib/fig/{parserpackagebuildstate.rb → parser_package_build_state.rb}

@@ -1,4 +1,4 @@
-require 'fig/packageparseerror'
+require 'fig/package_parse_error'
 require 'fig/statement'
 
 module Fig; end

data/lib/fig/repository.rb

@@ -3,17 +3,18 @@ require 'socket'
 require 'sys/admin'
 require 'tmpdir'
 
-require 'fig/atexit'
+require 'fig'
+require 'fig/at_exit'
 require 'fig/command'
 require 'fig/logging'
-require 'fig/notfounderror'
-require 'fig/packagecache'
-require 'fig/packagedescriptor'
+require 'fig/not_found_error'
+require 'fig/package_cache'
+require 'fig/package_descriptor'
 require 'fig/parser'
-require 'fig/repositoryerror'
+require 'fig/repository_error'
 require 'fig/statement/archive'
 require 'fig/statement/resource'
-require 'fig/urlaccesserror'
+require 'fig/url_access_error'
 
 module Fig; end
 
@@ -34,16 +35,12 @@ class Fig::Repository
     local_repository_directory,
     application_config,
     remote_repository_user,
-    update,
-    update_if_missing,
     check_include_versions
   )
     @operating_system             = os
     @local_repository_directory   = local_repository_directory
     @application_config           = application_config
     @remote_repository_user       = remote_repository_user
-    @update                       = update
-    @update_if_missing            = update_if_missing
 
     @parser = Fig::Parser.new(application_config, check_include_versions)
 
@@ -160,8 +157,12 @@ class Fig::Repository
     return true
   end
 
-  def updating?
-    return @update || @update_if_missing
+  def update_unconditionally()
+    @update_condition = :unconditionally
+  end
+
+  def update_if_missing()
+    @update_condition = :if_missing
   end
 
   private
@@ -290,9 +291,9 @@ class Fig::Repository
   end
 
   def should_update?(descriptor)
-    return true if @update
+    return true if @update_condition == :unconditionally
 
-    return @update_if_missing && package_missing?(descriptor)
+    return @update_condition == :if_missing && package_missing?(descriptor)
   end
 
   def read_local_package(descriptor)
@@ -312,8 +313,7 @@ class Fig::Repository
 
       raise Fig::RepositoryError.new
     rescue StandardError => exception
-      Fig::Logging.debug exception
-      Fig::Logging.fatal 'Install failed, cleaning up.'
+      Fig::Logging.fatal %Q<Install failed, cleaning up: #{exception}>
 
       delete_local_package(descriptor)
 
@@ -493,7 +493,7 @@ class Fig::Repository
       %Q<#     User: #{Sys::Admin.get_login()}>,
       %Q<#     Host: #{Socket.gethostname()}>,
       %Q<#     Args: "#{ARGV.join %q[", "]}">,
-      %Q<#     Fig:  v#{Fig::Command.get_version()}>,
+      %Q<#     Fig:  v#{Fig::VERSION}>,
       asset_summary,
       %Q<\n>,
     ].flatten()

data/lib/fig/{repositoryerror.rb → repository_error.rb}

@@ -1,4 +1,4 @@
-require 'fig/userinputerror'
+require 'fig/user_input_error'
 
 module Fig
   # A problem within/related to a repository.

data/lib/fig/{environment.rb → runtime_environment.rb}

@@ -1,21 +1,21 @@
 require 'stringio'
 
-require 'fig/backtrace'
+require 'fig/include_backtrace'
 require 'fig/logging'
 require 'fig/package'
-require 'fig/repositoryerror'
+require 'fig/repository_error'
 require 'fig/statement/command'
 require 'fig/statement/include'
 require 'fig/statement/path'
 require 'fig/statement/set'
-require 'fig/userinputerror'
+require 'fig/user_input_error'
 
 module Fig; end
 
 # Manages the program's metadata, including packages and environment
 # variables, and sets things up for running commands (from "command"
 # statements in definition files or from the command-line).
-class Fig::Environment
+class Fig::RuntimeEnvironment
   # Note: when reading this code, understand that the word "retrieve" is a
   # noun and not a verb, e.g. "retrieve path" means the value of a retrieve
   # statement and not the action of retrieving a path.
@@ -79,13 +79,16 @@ class Fig::Environment
     if package.applied_config_names.member?(config_name)
       return
     end
+
     new_backtrace = backtrace ||
-      Fig::Backtrace.new(
+      Fig::IncludeBacktrace.new(
         nil,
         Fig::PackageDescriptor.new(package.name, package.version, config_name)
       )
 
     config = package[config_name]
+
+    Fig::Logging.debug("Applying #{package}:#{config_name}.")
     config.statements.each do
       |statement|
       apply_config_statement(package, statement, new_backtrace)
@@ -111,7 +114,7 @@ class Fig::Environment
     package = lookup_package(
       name,
       descriptor.version,
-      Fig::Backtrace.new(
+      Fig::IncludeBacktrace.new(
         nil,
         Fig::PackageDescriptor.new(name, descriptor.version, config_name)
       )
@@ -168,7 +171,7 @@ class Fig::Environment
     end
     resolved_descriptor ||= descriptor
 
-    new_backtrace = Fig::Backtrace.new(backtrace, resolved_descriptor)
+    new_backtrace = Fig::IncludeBacktrace.new(backtrace, resolved_descriptor)
     package = lookup_package(
       resolved_descriptor.name || base_package.name,
       resolved_descriptor.version,
@@ -252,7 +255,11 @@ class Fig::Environment
       package.backtrace = backtrace
       @packages[name] = package
     elsif version && version != package.version
-      raise_repository_error("Version mismatch: #{name}", backtrace, package)
+      raise_repository_error(
+        "Version mismatch for package #{name} (#{version} vs #{package.version}).",
+        backtrace,
+        package
+      )
     end
 
     return package

data/lib/fig/statement/include.rb

@@ -1,4 +1,4 @@
-require 'fig/packagedescriptor'
+require 'fig/package_descriptor'
 require 'fig/statement'
 
 module Fig; end

data/lib/fig/statement/override.rb

@@ -1,4 +1,4 @@
-require 'fig/packagedescriptor'
+require 'fig/package_descriptor'
 require 'fig/statement'
 
 module Fig; end

data/lib/fig/{urlaccesserror.rb → url_access_error.rb}

@@ -1,4 +1,4 @@
-require 'fig/userinputerror'
+require 'fig/user_input_error'
 
 module Fig
   # Configuration attempted to specify a URL outside of the whitelist.

data/lib/fig/{workingdirectorymaintainer.rb → working_directory_maintainer.rb}

@@ -2,8 +2,8 @@ require 'set'
 
 require 'fig/logging'
 require 'fig/logging/colorizable'
-require 'fig/packagedescriptor'
-require 'fig/workingdirectorymetadata'
+require 'fig/package_descriptor'
+require 'fig/working_directory_metadata'
 
 module Fig; end
 
@@ -74,7 +74,7 @@ class Fig::WorkingDirectoryMaintainer
         end
         package_meta.add_file(target)
       else
-        raise "parse error in #{file}: #{line}"
+        raise "parse error in #{@metadata_file}: #{line}"
       end
     end
 
@@ -123,7 +123,7 @@ class Fig::WorkingDirectoryMaintainer
 
         # If the source is a dangling symlink, then there's no time, etc. to
         # preserve.
-        preserve = File.exist?(source)
+        preserve = File.exist?(source) && ! File.symlink?(source)
 
         FileUtils.copy_entry(
           source, target, preserve, false, :remove_destination

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.65
+  version: 0.1.67
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &21150360 !ruby/object:Gem::Requirement
+  requirement: &14165080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *21150360
+  version_requirements: *14165080
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &21149880 !ruby/object:Gem::Requirement
+  requirement: &14164620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *21149880
+  version_requirements: *14164620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21149420 !ruby/object:Gem::Requirement
+  requirement: &14164100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *21149420
+  version_requirements: *14164100
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &21148960 !ruby/object:Gem::Requirement
+  requirement: &14163260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *21148960
+  version_requirements: *14163260
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &21148500 !ruby/object:Gem::Requirement
+  requirement: &14162740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *21148500
+  version_requirements: *14162740
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &21148040 !ruby/object:Gem::Requirement
+  requirement: &14162260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *21148040
+  version_requirements: *14162260
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &21147580 !ruby/object:Gem::Requirement
+  requirement: &14161780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *21147580
+  version_requirements: *14161780
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &21147100 !ruby/object:Gem::Requirement
+  requirement: &14210340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *21147100
+  version_requirements: *14210340
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &21146620 !ruby/object:Gem::Requirement
+  requirement: &14209760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *21146620
+  version_requirements: *14209760
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21146140 !ruby/object:Gem::Requirement
+  requirement: &14209240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *21146140
+  version_requirements: *14209240
 - !ruby/object:Gem::Dependency
   name: sys-admin
-  requirement: &21145660 !ruby/object:Gem::Requirement
+  requirement: &14208780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *21145660
+  version_requirements: *14208780
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &21145160 !ruby/object:Gem::Requirement
+  requirement: &14208240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *21145160
+  version_requirements: *14208240
 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
@@ -155,33 +155,27 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Changes
-- VERSION
 - bin/fig
 - bin/fig-download
 - bin/fig-debug
 - bin/fig.bat
+- lib/fig.rb
+- lib/fig/parser_package_build_state.rb
 - lib/fig/logging/colorizable.rb
-- lib/fig/workingdirectorymetadata.rb
-- lib/fig/workingdirectorymaintainer.rb
-- lib/fig/environment.rb
-- lib/fig/configfileerror.rb
-- lib/fig/urlaccesserror.rb
-- lib/fig/repositoryerror.rb
 - lib/fig/parser.rb
+- lib/fig/url_access_error.rb
 - lib/fig/package.rb
-- lib/fig/environmentvariables/casesensitive.rb
-- lib/fig/environmentvariables/caseinsensitive.rb
+- lib/fig/user_input_error.rb
 - lib/fig/log4r/outputter.rb
-- lib/fig/packagecache.rb
-- lib/fig/packageparseerror.rb
-- lib/fig/backtrace.rb
-- lib/fig/notfounderror.rb
-- lib/fig/applicationconfiguration.rb
+- lib/fig/runtime_environment.rb
+- lib/fig/package_cache.rb
+- lib/fig/package_parse_error.rb
+- lib/fig/working_directory_maintainer.rb
 - lib/fig/logging.rb
-- lib/fig/userinputerror.rb
-- lib/fig/nosuchpackageconfigerror.rb
-- lib/fig/networkerror.rb
-- lib/fig/log4rconfigerror.rb
+- lib/fig/log4r_config_error.rb
+- lib/fig/package_descriptor.rb
+- lib/fig/not_found_error.rb
+- lib/fig/application_configuration.rb
 - lib/fig/statement/path.rb
 - lib/fig/statement/set.rb
 - lib/fig/statement/asset.rb
@@ -192,20 +186,60 @@ files:
 - lib/fig/statement/resource.rb
 - lib/fig/statement/archive.rb
 - lib/fig/statement/command.rb
-- lib/fig/atexit.rb
+- lib/fig/repository_error.rb
+- lib/fig/network_error.rb
+- lib/fig/package_descriptor_parse_error.rb
+- lib/fig/config_file_error.rb
+- lib/fig/operating_system.rb
 - lib/fig/grammar.treetop
-- lib/fig/packagedescriptorparseerror.rb
-- lib/fig/command/listing.rb
-- lib/fig/command/optionerror.rb
-- lib/fig/command/coveragesupport.rb
+- lib/fig/command/action.rb
+- lib/fig/command/action/help.rb
+- lib/fig/command/action/list_dependencies/tree_all_configs.rb
+- lib/fig/command/action/list_dependencies/default.rb
+- lib/fig/command/action/list_dependencies/all_configs.rb
+- lib/fig/command/action/list_dependencies/tree.rb
+- lib/fig/command/action/version.rb
+- lib/fig/command/action/list_variables/tree_all_configs.rb
+- lib/fig/command/action/list_variables/default.rb
+- lib/fig/command/action/list_variables/all_configs.rb
+- lib/fig/command/action/list_variables/tree.rb
+- lib/fig/command/action/list_remote.rb
+- lib/fig/command/action/list_configs.rb
+- lib/fig/command/action/list_dependencies.rb
+- lib/fig/command/action/update.rb
+- lib/fig/command/action/list_local.rb
+- lib/fig/command/action/update_if_missing.rb
+- lib/fig/command/action/publish_local.rb
+- lib/fig/command/action/run_command_line.rb
+- lib/fig/command/action/publish.rb
+- lib/fig/command/action/run_command_statement.rb
+- lib/fig/command/action/role/list_base_config.rb
+- lib/fig/command/action/role/list_dependencies_in_a_tree.rb
+- lib/fig/command/action/role/list_walking_dependency_tree.rb
+- lib/fig/command/action/role/list_variables_in_a_tree.rb
+- lib/fig/command/action/role/list_dependencies_flat.rb
+- lib/fig/command/action/role/has_sub_action.rb
+- lib/fig/command/action/role/update.rb
+- lib/fig/command/action/role/publish.rb
+- lib/fig/command/action/role/has_no_sub_action.rb
+- lib/fig/command/action/role/list_all_configs.rb
+- lib/fig/command/action/clean.rb
+- lib/fig/command/action/list_variables.rb
+- lib/fig/command/action/get.rb
+- lib/fig/command/option_error.rb
 - lib/fig/command/options.rb
-- lib/fig/command/packageload.rb
-- lib/fig/packagedescriptor.rb
-- lib/fig/environmentvariables.rb
-- lib/fig/operatingsystem.rb
+- lib/fig/command/coverage_support.rb
+- lib/fig/command/package_applier.rb
+- lib/fig/command/package_loader.rb
+- lib/fig/no_such_package_config_error.rb
+- lib/fig/at_exit.rb
 - lib/fig/repository.rb
 - lib/fig/figrc.rb
-- lib/fig/parserpackagebuildstate.rb
+- lib/fig/environment_variables.rb
+- lib/fig/working_directory_metadata.rb
+- lib/fig/include_backtrace.rb
+- lib/fig/environment_variables/case_sensitive.rb
+- lib/fig/environment_variables/case_insensitive.rb
 - lib/fig/command.rb
 - lib/fig/statement.rb
 homepage: http://github.com/mfoemmel/fig