fig 0.1.77 → 0.1.79

data/lib/fig/unparser/v0.rb

@@ -52,6 +52,10 @@ class Fig::Unparser::V0
     return
   end
 
+  def grammar_description()
+    return 'v0'
+  end
+
   private
 
   def asset(keyword, statement)

data/lib/fig/unparser/v1.rb

@@ -38,16 +38,16 @@ class Fig::Unparser::V1
     return
   end
 
+  def grammar_description()
+    return 'v1'
+  end
+
   private
 
   def asset(keyword, statement)
-    quote = %q<'>
-    path  = asset_path statement
-
-    if statement.glob_if_not_url?
-      quote = %q<">
-      path = path.gsub(/\\/, ('\\' * 4))
-    end
+    quote = statement.glob_if_not_url? ? %q<"> : %q<'>
+    path  =
+      asset_path(statement).gsub('\\', ('\\' * 4)).gsub(quote, "\\#{quote}")
 
     add_indent
     @text << keyword

data/lib/fig/url.rb

@@ -1,7 +1,18 @@
+require 'cgi'
+
 module Fig; end
 
 module Fig::URL
+  # From https://www.rfc-editor.org/rfc/rfc1738.txt
   def self.is_url?(url)
-    not (/ftp:\/\/|https?:\/\/|file:\/\/|ssh:\/\// =~ url).nil?
+    return !! ( url =~ %r< \A [a-z0-9+.-]+ : >ix )
+  end
+
+  # Encodes components and joins with slashes.
+  def self.append_path_components(base_url, components)
+    url     = base_url.sub(%r< / \z >x, '')
+    encoded = components.map { |component| CGI.escape component }
+
+    return [url, encoded].flatten.join('/')
   end
 end

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

@@ -1,8 +1,8 @@
 require 'fig/user_input_error'
 
 module Fig
-  # Configuration attempted to specify a URL outside of the whitelist.
-  class URLAccessError < UserInputError
+  # Package definition attempted to specify a URL outside of the whitelist.
+  class URLAccessDisallowedError < UserInputError
     attr_reader :urls, :descriptor
 
     def initialize(urls, descriptor)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.77
+  version: 0.1.79
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &15864160 !ruby/object:Gem::Requirement
+  requirement: &14642540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *15864160
+  version_requirements: *14642540
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &15863620 !ruby/object:Gem::Requirement
+  requirement: &14642080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *15863620
+  version_requirements: *14642080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &15862940 !ruby/object:Gem::Requirement
+  requirement: &14641600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *15862940
+  version_requirements: *14641600
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &15862100 !ruby/object:Gem::Requirement
+  requirement: &14641060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *15862100
+  version_requirements: *14641060
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &15861200 !ruby/object:Gem::Requirement
+  requirement: &14640580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *15861200
+  version_requirements: *14640580
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &15860680 !ruby/object:Gem::Requirement
+  requirement: &14846840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *15860680
+  version_requirements: *14846840
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &15773760 !ruby/object:Gem::Requirement
+  requirement: &14846280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *15773760
+  version_requirements: *14846280
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &15773240 !ruby/object:Gem::Requirement
+  requirement: &14845700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *15773240
+  version_requirements: *14845700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15772400 !ruby/object:Gem::Requirement
+  requirement: &14845200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *15772400
+  version_requirements: *14845200
 - !ruby/object:Gem::Dependency
   name: sys-admin
-  requirement: &15771860 !ruby/object:Gem::Requirement
+  requirement: &14844440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *15771860
+  version_requirements: *14844440
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &15771340 !ruby/object:Gem::Requirement
+  requirement: &14842400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *15771340
+  version_requirements: *14842400
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &15770600 !ruby/object:Gem::Requirement
+  requirement: &14841020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *15770600
+  version_requirements: *14841020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15769420 !ruby/object:Gem::Requirement
+  requirement: &14839780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.0.15
   type: :development
   prerelease: false
-  version_requirements: *15769420
+  version_requirements: *14839780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15768880 !ruby/object:Gem::Requirement
+  requirement: &14835860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *15768880
+  version_requirements: *14835860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15768340 !ruby/object:Gem::Requirement
+  requirement: &14834660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *15768340
+  version_requirements: *14834660
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &15767880 !ruby/object:Gem::Requirement
+  requirement: &14834120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 2.7.1
   type: :development
   prerelease: false
-  version_requirements: *15767880
+  version_requirements: *14834120
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &15767420 !ruby/object:Gem::Requirement
+  requirement: &14833560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *15767420
+  version_requirements: *14833560
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: &15766900 !ruby/object:Gem::Requirement
+  requirement: &14833000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *15766900
+  version_requirements: *14833000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &15766040 !ruby/object:Gem::Requirement
+  requirement: &14832360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *15766040
+  version_requirements: *14832360
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &15747020 !ruby/object:Gem::Requirement
+  requirement: &14831840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *15747020
+  version_requirements: *14831840
 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
@@ -244,121 +244,122 @@ extra_rdoc_files: []
 files:
 - Changes
 - bin/fig
-- bin/fig-download
-- bin/fig-debug
 - bin/fig.bat
+- bin/fig-debug
+- bin/fig-download
 - lib/fig.rb
-- lib/fig/parser_package_build_state.rb
-- lib/fig/unparser/v1.rb
-- lib/fig/unparser/v0.rb
 - lib/fig/logging/colorizable.rb
-- lib/fig/update_lock.rb
-- lib/fig/unparser.rb
-- lib/fig/url.rb
-- lib/fig/parser.rb
-- lib/fig/url_access_error.rb
-- lib/fig/package.rb
-- lib/fig/user_input_error.rb
-- lib/fig/log4r/outputter.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/log4r_config_error.rb
+- lib/fig/command.rb
+- lib/fig/include_backtrace.rb
+- lib/fig/tokenized_string.rb
+- lib/fig/string_tokenizer.rb
 - lib/fig/repository_package_publisher.rb
-- lib/fig/package_descriptor.rb
-- lib/fig/not_found_error.rb
 - lib/fig/application_configuration.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/v0_ish.rb
-- lib/fig/grammar/v1.treetop
-- lib/fig/grammar/v0_asset_location.rb
-- lib/fig/statement/path.rb
-- lib/fig/statement/set.rb
-- lib/fig/statement/grammar_version.rb
-- lib/fig/statement/asset.rb
-- lib/fig/statement/retrieve.rb
-- lib/fig/statement/include.rb
-- lib/fig/statement/override.rb
-- lib/fig/statement/configuration.rb
-- lib/fig/statement/resource.rb
-- lib/fig/statement/archive.rb
-- lib/fig/statement/command.rb
-- lib/fig/repository_error.rb
-- lib/fig/network_error.rb
+- lib/fig/package_parse_error.rb
+- lib/fig/file_not_found_error.rb
+- lib/fig/environment_variables.rb
+- lib/fig/url_access_disallowed_error.rb
+- lib/fig/unparser.rb
+- lib/fig/user_input_error.rb
 - lib/fig/package_descriptor_parse_error.rb
-- lib/fig/config_file_error.rb
-- lib/fig/operating_system.rb
-- lib/fig/command/action.rb
+- lib/fig/package.rb
+- lib/fig/network_error.rb
+- lib/fig/package_definition_text_assembler.rb
+- lib/fig/command/package_loader.rb
+- lib/fig/command/package_applier.rb
 - lib/fig/command/options/parser.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/option_error.rb
+- lib/fig/command/coverage_support.rb
+- lib/fig/command/action/list_local.rb
 - lib/fig/command/action/dump_package_definition_text.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/help.rb
 - lib/fig/command/action/help_long.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/options.rb
-- lib/fig/command/action/role/list_base_config.rb
+- lib/fig/command/action/list_variables/tree.rb
+- lib/fig/command/action/list_variables/all_configs.rb
+- lib/fig/command/action/list_variables/default.rb
+- lib/fig/command/action/list_variables/tree_all_configs.rb
 - lib/fig/command/action/role/list_dependencies_in_a_tree.rb
+- lib/fig/command/action/role/list_all_configs.rb
+- lib/fig/command/action/role/update.rb
 - lib/fig/command/action/role/list_walking_dependency_tree.rb
+- lib/fig/command/action/role/publish.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/list_base_config.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/role/list_dependencies_flat.rb
+- lib/fig/command/action/publish.rb
+- lib/fig/command/action/version.rb
+- lib/fig/command/action/publish_local.rb
 - lib/fig/command/action/dump_package_definition_parsed.rb
 - lib/fig/command/action/clean.rb
-- lib/fig/command/action/list_variables.rb
 - lib/fig/command/action/version_plain.rb
+- lib/fig/command/action/run_command_line.rb
+- lib/fig/command/action/update_if_missing.rb
+- lib/fig/command/action/list_remote.rb
+- lib/fig/command/action/list_variables.rb
+- lib/fig/command/action/list_configs.rb
 - lib/fig/command/action/get.rb
-- lib/fig/command/option_error.rb
+- lib/fig/command/action/run_command_statement.rb
+- lib/fig/command/action/list_dependencies/tree.rb
+- lib/fig/command/action/list_dependencies/all_configs.rb
+- lib/fig/command/action/list_dependencies/default.rb
+- lib/fig/command/action/list_dependencies/tree_all_configs.rb
+- lib/fig/command/action/list_dependencies.rb
+- lib/fig/command/action/options.rb
+- lib/fig/command/action.rb
 - lib/fig/command/options.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/log4r/outputter.rb
+- lib/fig/package_descriptor.rb
 - lib/fig/repository.rb
+- lib/fig/package_cache.rb
+- lib/fig/url.rb
+- lib/fig/working_directory_maintainer.rb
+- lib/fig/parser.rb
+- lib/fig/grammar/v0.treetop
+- lib/fig/grammar/v1.treetop
+- lib/fig/grammar/version.treetop
+- lib/fig/grammar/base.treetop
+- lib/fig/grammar/version_identification.treetop
+- lib/fig/config_file_error.rb
+- lib/fig/runtime_environment.rb
+- lib/fig/unparser/v0.rb
+- lib/fig/unparser/v1.rb
 - lib/fig/figrc.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/log4r_config_error.rb
+- lib/fig/repository_error.rb
+- lib/fig/statement/command.rb
+- lib/fig/statement/grammar_version.rb
+- lib/fig/statement/set.rb
+- lib/fig/statement/override.rb
+- lib/fig/statement/path.rb
+- lib/fig/statement/asset.rb
+- lib/fig/statement/configuration.rb
+- lib/fig/statement/resource.rb
+- lib/fig/statement/environment_variable.rb
+- lib/fig/statement/retrieve.rb
+- lib/fig/statement/archive.rb
+- lib/fig/statement/include.rb
+- lib/fig/tokenized_string/plain_segment.rb
+- lib/fig/tokenized_string/token.rb
+- lib/fig/update_lock.rb
+- lib/fig/parser_package_build_state.rb
 - lib/fig/environment_variables/case_insensitive.rb
-- lib/fig/command.rb
-- lib/fig/package_definition_text_assembler.rb
+- lib/fig/environment_variables/case_sensitive.rb
+- lib/fig/logging.rb
 - lib/fig/statement.rb
+- lib/fig/at_exit.rb
+- lib/fig/no_such_package_config_error.rb
+- lib/fig/operating_system.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
+- lib/fig/grammar/version.rb
+- lib/fig/grammar/base.rb
+- lib/fig/grammar/version_identification.rb
 homepage: http://github.com/mfoemmel/fig
 licenses: []
 post_install_message: