fig 0.1.59 → 0.1.61

data/Changes

@@ -1,3 +1,24 @@
+v0.1.61
+
+  New features:
+
+  - Constraints on the values of "resource", "append", "path", "add", and "set"
+    statements greatly relaxed (prompted by C++ libraries with "++" in their
+    names).
+
+  - The package name can now include a "_" for parsing. Previously you could
+    publish a package with an underscore in the name but would be unable to
+    subsequently use it.
+
+  Bug fixes:
+
+  - Removed dependency on the 'ftp' gem.
+
+v0.1.60.alpha.2
+v0.1.60.alpha.1
+
+  - Test releases
+
 v0.1.59
 
   Backwards incompatibilities:

data/VERSION

@@ -1 +1 @@
-0.1.59
+0.1.61

data/lib/fig/environment.rb

@@ -291,11 +291,12 @@ module Fig
 
     def expand_named_package_references(arg)
       return arg.gsub(
+        # TODO: Refactor package name regex into PackageDescriptor constant.
         %r<
           (?: ^ | \G)           # Zero-width anchor.
           ( [^\\@]* (?:\\{2})*) # An even number of leading backslashes
           \@                    # The package indicator
-          ( [a-zA-Z0-9.-]+ )    # Package name
+          ( [a-zA-Z0-9_.-]+ )   # Package name
         >x
       ) do |match|
         backslashes = $1 || ''

data/lib/fig/grammar.treetop

@@ -36,27 +36,27 @@ grammar Fig
   end
 
   rule archive
-    statement_start:"archive" ws url {
+    statement_start:"archive" ws resource_url {
       def to_package_statement(descriptor)
         Statement::Archive.new(
-          Parser.node_location(statement_start), url.value.text_value
+          Parser.node_location(statement_start), resource_url.value.text_value
         )
       end
     }
   end
 
   rule resource
-    statement_start:"resource" ws url {
+    statement_start:"resource" ws resource_url {
       def to_package_statement(descriptor)
         Statement::Resource.new(
-          Parser.node_location(statement_start), url.value.text_value
+          Parser.node_location(statement_start), resource_url.value.text_value
         )
       end
     }
   end
 
   rule retrieve
-    statement_start:"retrieve" ws var:retrieve_variable "->" path:retrieve_path ws {
+    statement_start:"retrieve" ws var:retrieve_variable_name "->" path:retrieve_path ws {
       def to_package_statement(descriptor)
         Statement::Retrieve.new(
           Parser.node_location(statement_start),
@@ -67,7 +67,7 @@ grammar Fig
     }
   end
 
-  rule retrieve_variable
+  rule retrieve_variable_name
     [@a-zA-Z0-9/._]+
   end
 
@@ -120,7 +120,7 @@ grammar Fig
   end
 
   rule path
-    statement_start:("append" / "path" / "add") ws name:path_name "=" value:path_value ws {
+    statement_start:("append" / "path" / "add") ws name:environment_variable_name "=" value:path_value ws {
       def to_config_statement(descriptor)
         Statement::Path.new(
           Parser.node_location(statement_start),
@@ -131,16 +131,20 @@ grammar Fig
     }
   end
 
-  rule path_name
+  rule environment_variable_name
     [a-zA-Z0-9_]+
   end
 
   rule path_value
-    [@a-zA-Z0-9/\\._-]+
+    # Characters blocked in the value:
+    #    ;:     - Windows/*nix path separators
+    #    "<>|   - Characters not allowed in filenames on Windows
+    #    \s     - Necessary for the "ws" token to work
+    [^;:"<>|\s]+
   end
 
   rule set
-    statement_start:"set" ws name:set_name "=" value:set_value ws {
+    statement_start:"set" ws name:environment_variable_name "=" value:set_value ws {
       def to_config_statement(descriptor)
         Statement::Set.new(
           Parser.node_location(statement_start),
@@ -151,12 +155,8 @@ grammar Fig
     }
   end
 
-  rule set_name
-    [a-zA-Z0-9_]+
-  end
-
   rule set_value
-    [@a-zA-Z0-9/\\._-]*
+    [\S]*
   end
 
   rule command
@@ -197,7 +197,7 @@ grammar Fig
   end
 
   rule package_name
-    [a-zA-Z0-9.-]+
+    [a-zA-Z0-9_.-]+
   end
 
   rule version_name
@@ -208,8 +208,21 @@ grammar Fig
     [a-zA-Z0-9_.-]+
   end
 
-  rule url
-    (value:[a-zA-Z0-9:/\\._*-]+ ws) / ('"' value:[a-zA-Z0-9:/\\._-]+ '"' ws)
+  rule resource_url
+    # Unquoted allows globbing for files, quoted does not.
+    #
+    # Unquoted, anything but:
+    #    @      - To allow for package substitution
+    #    "<>|   - Characters not allowed in filenames on Windows
+    #    \s     - Necessary for the "ws" token to work
+    (value:[^@"<>|\s]+ ws)
+
+    # Unquoted, anything but:
+    #    @        - To allow for package substitution
+    #    "<>|     - Characters not allowed in filenames on Windows
+    #    *?\[\]{} - Characters significant to Dir.glob()
+    #    \s       - We just don't want these. :]  (May need to allow space.)
+    / ('"' value:[^@"<>|*?\[\]{}\s]+ '"' ws)
   end
 
   rule ws

data/lib/fig/packagedescriptor.rb

@@ -37,6 +37,10 @@ class Fig::PackageDescriptor
   end
 
   def initialize(name, version, config)
+    validate_component name, 'name'
+    validate_component version, 'version'
+    validate_component config, 'config'
+
     @name     = name
     @version  = version
     @config   = config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.59
+  version: 0.1.61
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-admin
-  requirement: &2152136260 !ruby/object:Gem::Requirement
+  requirement: &2153612420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152136260
+  version_requirements: *2153612420
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &2152133060 !ruby/object:Gem::Requirement
+  requirement: &2153611940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152133060
+  version_requirements: *2153611940
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2152131860 !ruby/object:Gem::Requirement
+  requirement: &2153611480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152131860
-- !ruby/object:Gem::Dependency
-  name: ftp
-  requirement: &2152129320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.69'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152129320
+  version_requirements: *2153611480
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2152127980 !ruby/object:Gem::Requirement
+  requirement: &2153611000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152127980
+  version_requirements: *2153611000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152126840 !ruby/object:Gem::Requirement
+  requirement: &2153610480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152126840
+  version_requirements: *2153610480
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &2152125760 !ruby/object:Gem::Requirement
+  requirement: &2153609680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152125760
+  version_requirements: *2153609680
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &2152117680 !ruby/object:Gem::Requirement
+  requirement: &2153609220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152117680
+  version_requirements: *2153609220
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &2152116660 !ruby/object:Gem::Requirement
+  requirement: &2153608240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152116660
+  version_requirements: *2153608240
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2152115460 !ruby/object:Gem::Requirement
+  requirement: &2153606760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *2152115460
+  version_requirements: *2153606760
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &2152114440 !ruby/object:Gem::Requirement
+  requirement: &2153605840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *2152114440
+  version_requirements: *2153605840
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152113380 !ruby/object:Gem::Requirement
+  requirement: &2153605380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +131,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *2152113380
+  version_requirements: *2153605380
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &2152112540 !ruby/object:Gem::Requirement
+  requirement: &2153604920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +142,7 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152112540
+  version_requirements: *2153604920
 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
@@ -233,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Fig is a utility for configuring environments and managing dependencies across