fig 0.1.81 → 0.2.1

data/lib/fig/grammar/v1.treetop

@@ -21,7 +21,11 @@ module Fig
       include Fig::Grammar::Version
 
       rule package
-        optional_ws_or_comment grammar_version:grammar_version? statements:(package_statement_with_ws*) optional_ws_or_comment {
+        optional_ws_or_comment
+        grammar_version:grammar_version?
+        statements:(package_statement_with_ws*)
+        optional_ws_or_comment
+        {
           def to_package(directory, build_state)
             return build_state.new_package_statement(
               directory, grammar_version, statements
@@ -45,7 +49,10 @@ module Fig
       end
 
       rule archive
-        statement_start:'archive' ws_or_comment+ location:asset_location {
+        statement_start:'archive'
+        ws_or_comment+
+        location:quoted_or_bare_string
+        {
           def to_package_statement(build_state)
             return build_state.new_asset_statement(
               Statement::Archive, statement_start, location
@@ -55,7 +62,10 @@ module Fig
       end
 
       rule resource
-        statement_start:'resource' ws_or_comment+ location:asset_location {
+        statement_start:'resource'
+        ws_or_comment+
+        location:quoted_or_bare_string
+        {
           def to_package_statement(build_state)
             return build_state.new_asset_statement(
               Statement::Resource, statement_start, location
@@ -64,28 +74,27 @@ module Fig
         }
       end
 
-      rule asset_location
-        '"' ( [^"\\] / '\\' . )* '"' /
-        "'" ( [^'\\] / '\\' . )* "'" /
-        [^\s#]+
-      end
-
       rule retrieve
-        statement_start:'retrieve' ws_or_comment+ var:environment_variable_name '->' path:retrieve_path {
+        statement_start:'retrieve'
+        ws_or_comment+
+        variable:environment_variable_name '->' path:quoted_or_bare_string
+        {
           def to_package_statement(build_state)
-            return build_state.new_retrieve_statement(statement_start, var, path)
+            return build_state.new_retrieve_statement(
+              statement_start, variable, path
+            )
           end
         }
       end
 
-      rule retrieve_path
-        # TODO: this should match asset location rules, but handling of
-        # "[package]" substitution is going to be interesting.
-        [a-zA-Z0-9_/.\[\]-]+
-      end
-
       rule config
-        statement_start:'config' ws_or_comment+ config_name ws_or_comment+ statements:config_statement_with_ws* 'end' {
+        statement_start:'config'
+        ws_or_comment+
+        config_name
+        ws_or_comment+
+        statements:config_statement_with_ws*
+        'end'
+        {
           def to_package_statement(build_state)
             return build_state.new_configuration_statement(
               statement_start, config_name, statements
@@ -94,10 +103,6 @@ module Fig
         }
       end
 
-      rule config_name
-        [a-zA-Z0-9_.-]+
-      end
-
       # Shim between "config" and "config_statement" rules to allow the
       # compiled v0 and v1 grammars to have the same interface.
       rule config_statement_with_ws
@@ -132,10 +137,6 @@ module Fig
         }
       end
 
-      rule environment_variable_name
-        [a-zA-Z0-9_]+
-      end
-
       rule set
         statement_start:'set' ws_or_comment+ environment_variable_name_value {
           def to_config_statement(build_state)
@@ -147,7 +148,10 @@ module Fig
       end
 
       rule path
-        statement_start:('add' / 'append' / 'path') ws_or_comment+ environment_variable_name_value {
+        statement_start:('add' / 'append' / 'path')
+        ws_or_comment+
+        environment_variable_name_value
+        {
           def to_config_statement(build_state)
             return build_state.new_environment_variable_statement(
               Statement::Path, statement_start, environment_variable_name_value
@@ -156,31 +160,90 @@ module Fig
         }
       end
 
-      rule environment_variable_name_value
-        # Should result in somewhat reasonable handling by Treetop when
-        # encountering mis-quoted constructs.
-        [^\s#\\"]* '"' ( [^"\\] / '\\' . )* '"' /
-        [^\s#\\']* "'" ( [^'\\] / '\\' . )* "'" /
-        [^\s#]+
-      end
-
       rule command
-        statement_start:'command' ws_or_comment+ command_line {
+        statement_start:'command'
+        ws_or_comment+
+        command_line
+        ws_or_comment+
+        'end'
+        {
           def to_config_statement(build_state)
-            return build_state.new_command_statement(
-              statement_start, command_line
+            return build_state.new_v1_command_statement(
+              statement_start, gather_command_argument_nodes(command_line)
             )
           end
+
+          def gather_command_argument_nodes(node, arguments = [])
+            if node.respond_to? 'quoted_or_bare_string?'
+              arguments << node
+              return arguments
+            end
+
+            return arguments if not node.elements
+
+            node.elements.each do
+              |element|
+              gather_command_argument_nodes(element, arguments)
+            end
+
+            return arguments
+          end
         }
       end
 
       rule command_line
-        '"' value:[^"]* '"'
+        quoted_or_bare_string
+        ! { |sequence| sequence[-1].text_value == 'end' }
+        (
+          ws_or_comment+
+          quoted_or_bare_string
+          ! { |sequence| sequence[-1].text_value == 'end' }
+        )*
       end
 
+      # Terminals
+
       rule descriptor_string
         [^\s#]+
       end
+
+      rule config_name
+        [a-zA-Z0-9_.-]+
+      end
+
+      rule quoted_or_bare_string
+        # In order to deal with the hierarchy of nodes that the command_line
+        # rule above generates, we tag each of the expressions here so that
+        # they can be found in the syntax tree.
+        [^\s#\\"]* '"' ( [^"\\] / '\\' . )* '"'
+        { def quoted_or_bare_string?() return true end }
+
+        /
+
+        [^\s#\\']* "'" ( [^'\\] / '\\' . )* "'"
+        { def quoted_or_bare_string?() return true end }
+
+        /
+
+        [^\s#]+
+        { def quoted_or_bare_string?() return true end }
+      end
+
+      rule environment_variable_name
+        [a-zA-Z0-9_]+
+      end
+
+      rule environment_variable_name_value
+        # This is like quoted_or_bare_string, but allows for the unquoted
+        # variable name followed by equals sign prior to the quotation marks
+        # coming in.
+        #
+        # Should result in somewhat reasonable handling by Treetop when
+        # encountering mis-quoted constructs.
+        [^\s#\\'"]* '"' ( [^"\\] / '\\' . )* '"' /
+        [^\s#\\'"]* "'" ( [^'\\] / '\\' . )* "'" /
+        [^\s#]+
+      end
     end
   end
 end

data/lib/fig/grammar_monkey_patches.rb

@@ -0,0 +1,21 @@
+# The existence of this &!#%)(*!&% file makes me want to hurl, but it's the
+# simplest way to modify the classes generated by Treetop: the Treetop grammar
+# doesn't allow extensions at the grammar level, only the rule level.
+
+require 'fig/grammar/v0'
+require 'fig/grammar/v1'
+
+module Fig; end
+module Fig::Grammar; end
+
+class Fig::Grammar::V0Parser
+  def version()
+    return 0
+  end
+end
+
+class Fig::Grammar::V1Parser
+  def version()
+    return 1
+  end
+end

data/lib/fig/operating_system.rb

@@ -10,7 +10,6 @@ require 'net/sftp'
 require 'net/netrc'
 require 'rbconfig'
 require 'tempfile'
-require 'uri'
 
 require 'highline/import'
 
@@ -20,6 +19,8 @@ require 'fig/environment_variables/case_sensitive'
 require 'fig/file_not_found_error'
 require 'fig/logging'
 require 'fig/network_error'
+require 'fig/url'
+require 'fig/user_input_error'
 
 module Fig; end
 
@@ -119,40 +120,49 @@ class Fig::OperatingSystem
 
   def download_list(url)
     begin
-      uri = URI.parse(url)
+      uri = Fig::URL.parse(url)
     rescue
       Fig::Logging.fatal %Q<Unable to parse url: "#{url}">
       raise Fig::NetworkError.new
     end
-    case uri.scheme
-    when 'ftp'
-      ftp = Net::FTP.new(uri.host)
-      ftp_login(ftp, uri.host)
-      ftp.chdir(uri.path)
-      dirs = ftp.nlst
-      ftp.close
 
-      download_ftp_list(uri, dirs)
-    when 'ssh'
-      packages = []
-      Net::SSH.start(uri.host, uri.user) do |ssh|
-        ls = ssh.exec!("[ -d #{uri.path} ] && find #{uri.path}")
-        strip_paths_for_list(ls, packages, uri.path)
-      end
-      packages
-    when 'file'
-      packages = []
-      unescaped_path = CGI.unescape uri.path
-      return packages if ! File.exist?(unescaped_path)
+    begin
+      case uri.scheme
+      when 'ftp'
+        ftp = Net::FTP.new(uri.host)
+        ftp_login(ftp, uri.host)
+        ftp.chdir(uri.path)
+        dirs = ftp.nlst
+        ftp.close
 
-      ls = ''
-      Find.find(unescaped_path) { |file| ls << file.to_s; ls << "\n" }
+        download_ftp_list(uri, dirs)
+      when 'ssh'
+        packages = []
+        Net::SSH.start(uri.host, uri.user) do |ssh|
+          ls = ssh.exec!("[ -d #{uri.path} ] && find #{uri.path}")
+          strip_paths_for_list(ls, packages, uri.path)
+        end
+        packages
+      when 'file'
+        packages = []
+        unescaped_path = CGI.unescape uri.path
+        return packages if ! File.exist?(unescaped_path)
 
-      strip_paths_for_list(ls, packages, unescaped_path)
-      return packages
-    else
-      Fig::Logging.fatal "Protocol not supported: #{url}"
-      raise Fig::NetworkError.new("Protocol not supported: #{url}")
+        ls = ''
+        Find.find(unescaped_path) { |file| ls << file.to_s; ls << "\n" }
+
+        strip_paths_for_list(ls, packages, unescaped_path)
+        return packages
+      else
+        Fig::Logging.fatal "Protocol not supported: #{url}"
+        raise Fig::NetworkError.new "Protocol not supported: #{url}"
+      end
+    rescue SocketError => error
+      Fig::Logging.debug error.message
+      raise Fig::NetworkError.new "#{url}: #{error.message}"
+    rescue Errno::ETIMEDOUT => error
+      Fig::Logging.debug error.message
+      raise Fig::NetworkError.new "#{url}: #{error.message}"
     end
   end
 
@@ -200,7 +210,7 @@ class Fig::OperatingSystem
   def path_up_to_date?(url, path)
     return false if ! File.exist? path
 
-    uri = URI.parse(url)
+    uri = Fig::URL.parse(url)
     case uri.scheme
     when 'ftp'
       begin
@@ -242,7 +252,7 @@ class Fig::OperatingSystem
   # exists and is already up-to-date.
   def download(url, path)
     FileUtils.mkdir_p(File.dirname(path))
-    uri = URI.parse(url)
+    uri = Fig::URL.parse(url)
     case uri.scheme
     when 'ftp'
       begin
@@ -263,6 +273,9 @@ class Fig::OperatingSystem
       rescue SocketError => error
         Fig::Logging.debug error.message
         raise Fig::FileNotFoundError.new error.message, url
+      rescue Errno::ETIMEDOUT => error
+        Fig::Logging.debug error.message
+        raise Fig::FileNotFoundError.new error.message, url
       end
     when 'http'
       log_download(url, path)
@@ -303,7 +316,7 @@ class Fig::OperatingSystem
   def download_resource(url, download_directory)
     FileUtils.mkdir_p(download_directory)
 
-    basename = CGI.unescape URI.parse(url).path.split('/').last
+    basename = CGI.unescape Fig::URL.parse(url).path.split('/').last
     path     = File.join(download_directory, basename)
 
     download(url, path)
@@ -333,14 +346,14 @@ class Fig::OperatingSystem
 
   def upload(local_file, remote_file)
     Fig::Logging.debug "Uploading #{local_file} to #{remote_file}."
-    uri = URI.parse(remote_file)
+    uri = Fig::URL.parse(remote_file)
     case uri.scheme
     when 'ssh'
       ssh_upload(uri.user, uri.host, local_file, remote_file)
     when 'ftp'
       #      fail unless system "curl -T #{local_file} --create-dirs --ftp-create-dirs #{remote_file}"
       require 'net/ftp'
-      ftp_uri = URI.parse(ENV['FIG_REMOTE_URL'])
+      ftp_uri = Fig::URL.parse(ENV['FIG_REMOTE_URL'])
       ftp_root_path = ftp_uri.path
       ftp_root_dirs = ftp_uri.path.split('/')
       remote_publish_path = uri.path[0, uri.path.rindex('/')]
@@ -465,7 +478,11 @@ class Fig::OperatingSystem
       SimpleCov.at_exit.call
     end
 
-    Kernel.exec(*command)
+    begin
+      Kernel.exec(*command)
+    rescue SystemCallError => exception
+      raise Fig::UserInputError.new exception
+    end
   end
 
   # *sigh* Apparently Ruby < v1.9.3 does some wacko thing with single argument
@@ -520,7 +537,7 @@ class Fig::OperatingSystem
   end
 
   def ssh_upload(user, host, local_file, remote_file)
-    uri = URI.parse(remote_file)
+    uri = Fig::URL.parse(remote_file)
     dir = uri.path[0, uri.path.rindex('/')]
     Net::SSH.start(host, user) do |ssh|
       ssh.exec!("mkdir -p #{dir}")
@@ -544,7 +561,7 @@ class Fig::OperatingSystem
     when Net::HTTPRedirection then
       location = response['location']
       Fig::Logging.debug "Redirecting to #{location}."
-      download_via_http_get(location, file, limit - 1)
+      download_via_http_get(location, file, redirection_limit - 1)
     else
       Fig::Logging.debug "Download failed: #{response.code} #{response.message}."
       raise Fig::FileNotFoundError.new(

data/lib/fig/package_descriptor.rb

@@ -1,4 +1,5 @@
 require 'fig/package_descriptor_parse_error'
+require 'fig/statement'
 
 module Fig; end
 
@@ -64,7 +65,6 @@ class Fig::PackageDescriptor
     validate_component name,    'name',    :name,    options
     validate_component version, 'version', :version, options
     validate_component config,  'config',  :config,  options
-    validate_name      options
     validate_across_components options
   end
 
@@ -113,17 +113,6 @@ class Fig::PackageDescriptor
     )
   end
 
-  def validate_name(options)
-    return if @name.nil?
-
-    return if ! Fig::Parser.strict_keyword? @name
-
-    raise Fig::PackageDescriptorParseError.new(
-      %Q<Invalid package name; "#{@name}" is a keyword#{standard_exception_suffix(options)}>,
-      @original_string
-    )
-  end
-
   def throw_presence_exception(name, presence_requirement_symbol, options)
     presence = options[presence_requirement_symbol]
     raise Fig::PackageDescriptorParseError.new(

data/lib/fig/parser.rb

@@ -3,6 +3,7 @@ require 'set'
 require 'fig/grammar/version_identification'
 require 'fig/grammar/v0'
 require 'fig/grammar/v1'
+require 'fig/grammar_monkey_patches'
 require 'fig/logging'
 require 'fig/package_parse_error'
 require 'fig/parser_package_build_state'
@@ -16,19 +17,6 @@ module Fig; end
 # Parses .fig files (wrapping the Treetop-generated parser object) and deals
 # with a few restrictions on them.
 class Fig::Parser
-  # Keywords that we really want to lock down.
-  def self.strict_keyword?(string)
-    # "config" is considered too useful for users, so we allow that where we
-    # restrict other keywords.
-    return false if string == 'config'
-
-    return keyword? string
-  end
-
-  def self.keyword?(string)
-    return KEYWORDS.include? string
-  end
-
   def initialize(application_config, check_include_versions)
     @application_config     = application_config
     @check_include_versions = check_include_versions
@@ -48,21 +36,6 @@ class Fig::Parser
 
   private
 
-  KEYWORDS = Set.new
-  KEYWORDS << 'add'
-  KEYWORDS << 'append'
-  KEYWORDS << 'archive'
-  KEYWORDS << 'command'
-  KEYWORDS << 'config'
-  KEYWORDS << 'end'
-  KEYWORDS << 'include'
-  KEYWORDS << 'override'
-  KEYWORDS << 'path'
-  KEYWORDS << 'resource'
-  KEYWORDS << 'retrieve'
-  KEYWORDS << 'set'
-
-
   def get_grammar_version(
     descriptor, directory, source_description, unparsed_text
   )
@@ -77,7 +50,7 @@ class Fig::Parser
     end
 
     statement = result.get_grammar_version(
-      Fig::ParserPackageBuildState.new(descriptor, extended_description)
+      Fig::ParserPackageBuildState.new(nil, descriptor, extended_description)
     )
     return 0 if not statement
 
@@ -96,7 +69,7 @@ class Fig::Parser
 
     v0_parser = Fig::Grammar::V0Parser.new
 
-    return drive_parser(
+    return drive_treetop_parser(
       v0_parser,
       descriptor,
       directory,
@@ -109,7 +82,7 @@ class Fig::Parser
   def parse_v1(descriptor, directory, source_description, unparsed_text)
     v1_parser = Fig::Grammar::V1Parser.new
 
-    return drive_parser(
+    return drive_treetop_parser(
       v1_parser,
       descriptor,
       directory,
@@ -119,7 +92,7 @@ class Fig::Parser
     )
   end
 
-  def drive_parser(
+  def drive_treetop_parser(
     parser,
     descriptor,
     directory,
@@ -140,7 +113,9 @@ class Fig::Parser
 
     package = result.to_package(
       directory,
-      Fig::ParserPackageBuildState.new(descriptor, extended_description)
+      Fig::ParserPackageBuildState.new(
+        parser.version, descriptor, extended_description
+      )
     )
     package.unparsed_text = unparsed_text