fig 1.4.0 → 1.5.0

data/lib/fig/repository_package_publisher.rb

@@ -130,7 +130,8 @@ class Fig::RepositoryPackagePublisher
     begin
       unparsed_package = Fig::NotYetParsedPackage.new
       unparsed_package.descriptor         = @descriptor
-      unparsed_package.working_directory  = unparsed_package.base_directory =
+      unparsed_package.working_directory  =
+        unparsed_package.include_file_base_directory =
         @runtime_for_package
       unparsed_package.source_description = '<package to be published>'
       unparsed_package.unparsed_text      = file_content
@@ -177,7 +178,7 @@ class Fig::RepositoryPackagePublisher
   def add_publish_comment
     return if ! @options.publish_comment
 
-    comment = @options.publish_comment.strip.gsub /[ \t]*\n/, "\n# "
+    comment = @options.publish_comment.strip.gsub(/[ \t]*\n/, "\n# ")
     @text_assembler.add_header %Q<# #{comment}>
     @text_assembler.add_header %q<#>
     @text_assembler.add_header %q<#>

data/lib/fig/runtime_environment.rb

@@ -1,5 +1,6 @@
 require 'stringio'
 
+require 'fig/deparser'
 require 'fig/include_backtrace'
 require 'fig/logging'
 require 'fig/not_yet_parsed_package'
@@ -11,7 +12,6 @@ require 'fig/statement/include_file'
 require 'fig/statement/override'
 require 'fig/statement/path'
 require 'fig/statement/set'
-require 'fig/unparser'
 require 'fig/user_input_error'
 
 module Fig; end
@@ -130,7 +130,7 @@ class Fig::RuntimeEnvironment
 
     expanded_command_line =
       command_line.map {
-        |argument| expand_command_line_argument(argument, base_package)
+        |argument| expand_command_line_argument(argument, package)
       }
 
     @variables.with_environment { yield expanded_command_line }
@@ -184,7 +184,7 @@ class Fig::RuntimeEnvironment
 
       statement = @retrieves[name]
       if statement.loaded_but_not_referenced?
-        text, * = Fig::Unparser.determine_version_and_unparse(
+        text, * = Fig::Deparser.determine_version_and_deparse(
           [statement], :emit_as_input
         )
         Fig::Logging.warn \
@@ -262,7 +262,8 @@ class Fig::RuntimeEnvironment
   def include_file_config(including_package, path, config_name, backtrace)
     return if @suppress_includes
 
-    full_path = File.absolute_path(path, including_package.base_directory)
+    full_path =
+      File.absolute_path(path, including_package.include_file_base_directory)
 
     descriptor =
       Fig::PackageDescriptor.new(nil, nil, nil, :description => full_path)
@@ -363,7 +364,8 @@ class Fig::RuntimeEnvironment
 
     unparsed_package = Fig::NotYetParsedPackage.new
     unparsed_package.descriptor         = descriptor
-    unparsed_package.working_directory  = unparsed_package.base_directory =
+    unparsed_package.working_directory  =
+      unparsed_package.include_file_base_directory =
       File.dirname(full_path)
     unparsed_package.source_description = full_path
     unparsed_package.unparsed_text      = content

data/lib/fig/statement.rb

@@ -47,7 +47,7 @@ class Fig::Statement
     return
   end
 
-  def unparse_as_version(unparser)
+  def deparse_as_version(deparser)
     raise NotImplementedError.new self.class.name
   end
 

data/lib/fig/statement/archive.rb

@@ -25,7 +25,7 @@ class Fig::Statement::Archive < Fig::Statement
     return standard_asset_name()
   end
 
-  def unparse_as_version(unparser)
-    return unparser.archive(self)
+  def deparse_as_version(deparser)
+    return deparser.archive(self)
   end
 end

data/lib/fig/statement/command.rb

@@ -26,8 +26,8 @@ class Fig::Statement::Command < Fig::Statement
     return 'command'
   end
 
-  def unparse_as_version(unparser)
-    return unparser.command(self)
+  def deparse_as_version(deparser)
+    return deparser.command(self)
   end
 
   def minimum_grammar_for_emitting_input()

data/lib/fig/statement/configuration.rb

@@ -41,12 +41,12 @@ class Fig::Statement::Configuration < Fig::Statement
   def walk_statements(&block)
     @statements.each do |statement|
       yield statement
-      statement.walk_statements &block
+      statement.walk_statements(&block)
     end
   end
 
-  def unparse_as_version(unparser)
-    return unparser.configuration(self)
+  def deparse_as_version(deparser)
+    return deparser.configuration(self)
   end
 
   def minimum_grammar_for_emitting_input()

data/lib/fig/statement/grammar_version.rb

@@ -16,8 +16,8 @@ class Fig::Statement::GrammarVersion < Fig::Statement
     return 'grammar'
   end
 
-  def unparse_as_version(unparser)
-    return unparser.grammar_version(self)
+  def deparse_as_version(deparser)
+    return deparser.grammar_version(self)
   end
 
   def minimum_grammar_for_emitting_input()

data/lib/fig/statement/include.rb

@@ -75,8 +75,8 @@ class Fig::Statement::Include < Fig::Statement
     )
   end
 
-  def unparse_as_version(unparser)
-    return unparser.include(self)
+  def deparse_as_version(deparser)
+    return deparser.include(self)
   end
 
   def minimum_grammar_for_emitting_input()
@@ -113,7 +113,7 @@ class Fig::Statement::Include < Fig::Statement
 
   def minimum_grammar()
     if included_package
-      raise 'Cannot unparse synthetic include statement with directly referenced package.'
+      raise 'Cannot deparse synthetic include statement with directly referenced package.'
     end
 
     return [0]

data/lib/fig/statement/include_file.rb

@@ -68,8 +68,8 @@ class Fig::Statement::IncludeFile < Fig::Statement
     return 'include-file'
   end
 
-  def unparse_as_version(unparser)
-    return unparser.include_file(self)
+  def deparse_as_version(deparser)
+    return deparser.include_file(self)
   end
 
   def minimum_grammar_for_emitting_input()

data/lib/fig/statement/override.rb

@@ -37,8 +37,8 @@ class Fig::Statement::Override < Fig::Statement
     return 'override'
   end
 
-  def unparse_as_version(unparser)
-    return unparser.override(self)
+  def deparse_as_version(deparser)
+    return deparser.override(self)
   end
 
   def minimum_grammar_for_emitting_input()

data/lib/fig/statement/path.rb

@@ -55,8 +55,8 @@ class Fig::Statement::Path < Fig::Statement
     return true
   end
 
-  def unparse_as_version(unparser)
-    return unparser.path(self)
+  def deparse_as_version(deparser)
+    return deparser.path(self)
   end
 
   private

data/lib/fig/statement/resource.rb

@@ -32,7 +32,7 @@ class Fig::Statement::Resource < Fig::Statement
     return nil
   end
 
-  def unparse_as_version(unparser)
-    return unparser.resource(self)
+  def deparse_as_version(deparser)
+    return deparser.resource(self)
   end
 end

data/lib/fig/statement/retrieve.rb

@@ -58,8 +58,8 @@ class Fig::Statement::Retrieve < Fig::Statement
     @referenced = yea_or_nay
   end
 
-  def unparse_as_version(unparser)
-    return unparser.retrieve(self)
+  def deparse_as_version(deparser)
+    return deparser.retrieve(self)
   end
 
   def minimum_grammar_for_emitting_input()

data/lib/fig/statement/set.rb

@@ -35,8 +35,8 @@ class Fig::Statement::Set < Fig::Statement
     return true
   end
 
-  def unparse_as_version(unparser)
-    return unparser.set(self)
+  def deparse_as_version(deparser)
+    return deparser.set(self)
   end
 
   private

data/lib/fig/statement/synthetic_raw_text.rb

@@ -16,8 +16,8 @@ class Fig::Statement::SyntheticRawText < Fig::Statement
     return nil
   end
 
-  def unparse_as_version(unparser)
-    return unparser.synthetic_raw_text(self)
+  def deparse_as_version(deparser)
+    return deparser.synthetic_raw_text(self)
   end
 
   def minimum_grammar_for_emitting_input()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &22715240 !ruby/object:Gem::Requirement
+  requirement: &16892200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *22715240
+  version_requirements: *16892200
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &22714240 !ruby/object:Gem::Requirement
+  requirement: &16891640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *22714240
+  version_requirements: *16891640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &22713360 !ruby/object:Gem::Requirement
+  requirement: &16891140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *22713360
+  version_requirements: *16891140
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &22712400 !ruby/object:Gem::Requirement
+  requirement: &16890560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *22712400
+  version_requirements: *16890560
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &22711660 !ruby/object:Gem::Requirement
+  requirement: &16890060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *22711660
+  version_requirements: *16890060
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &22729260 !ruby/object:Gem::Requirement
+  requirement: &16889560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *22729260
+  version_requirements: *16889560
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &22728800 !ruby/object:Gem::Requirement
+  requirement: &16889100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *22728800
+  version_requirements: *16889100
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &22728280 !ruby/object:Gem::Requirement
+  requirement: &16888560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *22728280
+  version_requirements: *16888560
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &22727560 !ruby/object:Gem::Requirement
+  requirement: &16887700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *22727560
+  version_requirements: *16887700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &22726460 !ruby/object:Gem::Requirement
+  requirement: &16886940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *22726460
+  version_requirements: *16886940
 - !ruby/object:Gem::Dependency
   name: sys-admin
-  requirement: &22725320 !ruby/object:Gem::Requirement
+  requirement: &16885760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *22725320
+  version_requirements: *16885760
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &22724620 !ruby/object:Gem::Requirement
+  requirement: &16955660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *22724620
+  version_requirements: *16955660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &22724120 !ruby/object:Gem::Requirement
+  requirement: &16955140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.0.15
   type: :development
   prerelease: false
-  version_requirements: *22724120
+  version_requirements: *16955140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22723520 !ruby/object:Gem::Requirement
+  requirement: &16954540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *22723520
+  version_requirements: *16954540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22723020 !ruby/object:Gem::Requirement
+  requirement: &16953620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *22723020
+  version_requirements: *16953620
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &22722560 !ruby/object:Gem::Requirement
+  requirement: &16952940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 2.7.1
   type: :development
   prerelease: false
-  version_requirements: *22722560
+  version_requirements: *16952940
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &22722100 !ruby/object:Gem::Requirement
+  requirement: &16952300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *22722100
+  version_requirements: *16952300
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: &22721640 !ruby/object:Gem::Requirement
+  requirement: &16951820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *22721640
+  version_requirements: *16951820
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &22803380 !ruby/object:Gem::Requirement
+  requirement: &16951220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *22803380
+  version_requirements: *16951220
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &22802900 !ruby/object:Gem::Requirement
+  requirement: &16950680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *22802900
+  version_requirements: *16950680
 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
@@ -304,6 +304,11 @@ files:
 - lib/fig/command/package_applier.rb
 - lib/fig/command/package_loader.rb
 - lib/fig/config_file_error.rb
+- lib/fig/deparser.rb
+- lib/fig/deparser/v0.rb
+- lib/fig/deparser/v1.rb
+- lib/fig/deparser/v1_base.rb
+- lib/fig/deparser/v2.rb
 - lib/fig/environment_variables.rb
 - lib/fig/environment_variables/case_insensitive.rb
 - lib/fig/environment_variables/case_sensitive.rb
@@ -364,11 +369,6 @@ files:
 - lib/fig/tokenized_string.rb
 - lib/fig/tokenized_string/plain_segment.rb
 - lib/fig/tokenized_string/token.rb
-- lib/fig/unparser.rb
-- lib/fig/unparser/v0.rb
-- lib/fig/unparser/v1.rb
-- lib/fig/unparser/v1_base.rb
-- lib/fig/unparser/v2.rb
 - lib/fig/update_lock.rb
 - lib/fig/url.rb
 - lib/fig/url_access_disallowed_error.rb