fig 0.1.77 → 0.1.79

data/Changes

@@ -1,3 +1,60 @@
+v0.1.79
+
+  Backwards incompatibilities:
+
+  - Commands given via the command-line are no longer run through the shell if
+    given as multiple arguments.  This should be a pretty esoteric issue, but
+    if you're depending upon double interpolation of command-lines or joining
+    of quoted expressions, then this change will break your usage of fig.
+
+    Previously, running
+
+      fig -- javac -classpath '$SOMEPATH' whatever
+
+    would pass javac the value of the SOMEPATH environment variable after fig
+    had manipulated it.  If you still want the shell involved, pass a single
+    argument to fig by quoting, e.g.
+
+      fig -- 'javac -classpath $SOMEPATH whatever'
+
+  - Commands given via the command-line have the same "@" expansion done on
+    them that "command" statements in a package definition do, i.e. "@package"
+    gets replaced with the path to that package and "@" gets replaced by the
+    path to the base package.
+
+  New features:
+
+  - Commands given via the command-line are no longer run through the shell if
+    given as multiple arguments.  This means that there should be fewer
+    surprises in usage.
+
+    Note that command statements still go through splitting on whitespace and
+    reassembling with space characters.
+
+  - Commands given via the command-line have the same "@" expansion done on
+    them that "command" statements in a package definition do, i.e. "@package"
+    gets replaced with the path to that package and "@" gets replaced by the
+    path to the base package.
+
+  Bug fixes:
+
+  - For both environment variable and command statements, at signs that follow
+    escaped at signs are expanded.  Previously, if you had
+
+      set FOO=X\@Y@Z
+
+    then the value of FOO after expansion would be "X@Y@Z".  Now it would
+    (correctly) be "X@Ypackage-pathZ".
+
+  - Doing a --update after a --publish-local doesn't delete the local package.
+    Actually, updates handle failed downloads better in general and don't
+    delete local copies of packages.
+
+v0.1.78.beta.2
+v0.1.78.beta.1
+
+  - Test releases
+
 v0.1.77
 
   Bug fixes:
@@ -33,7 +90,7 @@ v0.1.77
     "another_symlink" will be copied to "somewhere" as a symlink.
 
   - Retrieves of symlinks will not occur if the symlink was previously
-    retrieved.  Previously, if you updates the same package multiple times and
+    retrieved.  Previously, if you updated the same package multiple times and
     that package contained symlinks, the symlinks would be recreated on every
     update, even though the regular files would not.
 

data/bin/fig

@@ -14,4 +14,4 @@ require 'rubygems'
 
 require 'fig/command'
 
-exit Fig::Command.new.run_with_exception_handling ARGV
+exit Fig::Command.new.run_fig_with_exception_handling ARGV

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '0.1.77'
+  VERSION = '0.1.79'
 end

data/lib/fig/command.rb

@@ -87,10 +87,10 @@ class Fig::Command
     return Fig::Command::Action::EXIT_SUCCESS
   end
 
-  def run_with_exception_handling(argv, options = nil)
+  def run_fig_with_exception_handling(argv, options = nil)
     begin
       return run_fig(argv, options)
-    rescue Fig::URLAccessError => error
+    rescue Fig::URLAccessDisallowedError => error
       urls = error.urls.join(', ')
       $stderr.puts \
         "Access to #{urls} in #{error.package}/#{error.version} not allowed."
@@ -386,7 +386,7 @@ class Fig::Command
       |statement|
 
       Fig::Logging.warn(
-        "Ignored #{statement.source_description} for #{statement.url}."
+        "Ignored #{statement.source_description} for #{statement.location}."
       )
     end
 

data/lib/fig/command/action/dump_package_definition_parsed.rb

@@ -1,6 +1,6 @@
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
-require 'fig/unparser/v0'
+require 'fig/package_definition_text_assembler'
 
 module  Fig; end
 class   Fig::Command; end
@@ -35,10 +35,11 @@ class Fig::Command::Action::DumpPackageDefinitionParsed
   end
 
   def execute()
-    unparser = Fig::Unparser::V0.new :emit_as_to_be_published
-    text = unparser.unparse(@execution_context.base_package.statements)
+    text_assembler = Fig::PackageDefinitionTextAssembler.new :emit_as_input
+    text_assembler.add_output @execution_context.base_package.statements
 
-    print text.gsub(/\n{3,}/, "\n\n").strip
+    unparsed, explanations = text_assembler.assemble_package_definition
+    print unparsed
 
     return EXIT_SUCCESS
   end

data/lib/fig/command/action/list_variables/all_configs.rb

@@ -45,11 +45,8 @@ class Fig::Command::Action::ListVariables::AllConfigs
       |package, config_name, depth|
 
       package[config_name].walk_statements() do |statement|
-        case statement
-          when Fig::Statement::Path
-            variable_names << statement.name()
-          when Fig::Statement::Set
-            variable_names << statement.name()
+        if statement.is_environment_variable?
+          variable_names << statement.name()
         end
       end
     end

data/lib/fig/command/action/publish_local.rb

@@ -19,7 +19,7 @@ class Fig::Command::Action::PublishLocal
   def execute()
     publish_preflight()
 
-    Fig::Logging.info "Publishing #{@descriptor.to_string()}."
+    Fig::Logging.info "Publishing #{@descriptor.to_string()} locally."
     @execution_context.repository.publish_package(
       @publish_statements,
       @descriptor,

data/lib/fig/command/action/role/list_variables_in_a_tree.rb

@@ -83,11 +83,8 @@ module Fig::Command::Action::Role::ListVariablesInATree
   def gather_variable_statements(config_statement)
     variable_statements = []
     config_statement.walk_statements() do |statement|
-      case statement
-        when Fig::Statement::Path
-          variable_statements << statement
-        when Fig::Statement::Set
-          variable_statements << statement
+      if statement.is_environment_variable?
+        variable_statements << statement
       end
     end
 

data/lib/fig/command/action/run_command_line.rb

@@ -39,15 +39,22 @@ class Fig::Command::Action::RunCommandLine
 
   def configure(options)
     @command_line = options.shell_command
+    @descriptor   = options.descriptor
 
     return
   end
 
   def execute()
-    @execution_context.environment.execute_shell(@command_line) do
-      |command| @execution_context.operating_system.shell_exec command
+    environment   = @execution_context.environment
+    base_package  = @execution_context.base_package
+    base_config   = @execution_context.base_config
+
+    environment.execute_command_line(
+      base_package, base_config, @descriptor, @command_line
+    ) do
+      |command| @execution_context.operating_system.plain_or_shell_exec command
     end
 
-    return EXIT_SUCCESS
+    # Will never get here.
   end
 end

data/lib/fig/command/action/run_command_statement.rb

@@ -53,6 +53,6 @@ class Fig::Command::Action::RunCommandStatement
       base_package, base_config, @descriptor, @extra_argv || []
     ) { |command| @execution_context.operating_system.shell_exec command }
 
-    return EXIT_SUCCESS
+    # Will never get here.
   end
 end

data/lib/fig/command/options.rb

@@ -159,8 +159,6 @@ class Fig::Command::Options
 
   def strip_shell_command(argv)
     argv.each_with_index do |arg, i|
-      terminating_option = nil
-
       case arg
         when '--'
           set_base_action(Fig::Command::Action::RunCommandLine)
@@ -592,13 +590,16 @@ class Fig::Command::Options
     return statement_class.new(nil, "#{option} option", variable, value)
   end
 
-  def new_content_statement(option, path, statement_class)
-    need_to_glob = statement_class.validate_and_process_escapes_in_url!(path) {
-      |error_description|
+  def new_content_statement(option, raw_path, statement_class)
+    tokenized_path =
+      statement_class.validate_and_process_escapes_in_location(raw_path) do
+        |error_description|
 
-      @parser.raise_invalid_argument(option, path, error_description)
-    }
+        @parser.raise_invalid_argument(option, raw_path, error_description)
+      end
 
+    path = tokenized_path.to_expanded_string
+    need_to_glob = ! tokenized_path.single_quoted?
     return statement_class.new(nil, "#{option} option", path, need_to_glob)
   end
 

data/lib/fig/command/options/parser.rb

@@ -207,7 +207,7 @@ Environment variables:
     end
 
     raise Fig::Command::OptionError.new(
-      %Q<Invalid value for #{option}: "#{value}".#{description}>
+      %Q<Invalid value for #{option}: "#{value}"#{description}>
     )
   end
 

data/lib/fig/environment_variables/case_insensitive.rb

@@ -1,7 +1,7 @@
 require 'fig/environment_variables'
 
 module Fig; end;
-module EnvironmentVariables; end
+module Fig::EnvironmentVariables; end
 
 # Manager of a set of environment variables where the variable names are
 # case-insensitive, e.g. on MS Windows.

data/lib/fig/environment_variables/case_sensitive.rb

@@ -1,7 +1,7 @@
 require 'fig/environment_variables'
 
 module Fig; end;
-module EnvironmentVariables; end
+module Fig::EnvironmentVariables; end
 
 # Manager of a set of environment variables where the variable names are
 # case-sensitive, e.g. on *nix.

data/lib/fig/figrc.rb

@@ -2,6 +2,7 @@ require 'json'
 
 require 'fig/application_configuration'
 require 'fig/config_file_error'
+require 'fig/file_not_found_error'
 require 'fig/operating_system'
 require 'fig/repository'
 
@@ -43,9 +44,10 @@ class Fig::FigRC
   def self.handle_override_configuration(configuration, override_path)
     begin
       if not override_path.nil?
-        configuration.push_dataset(
-          JSON.parse(File::open(override_path).read)
-        )
+        configuration_text = File::open(override_path).read
+        if configuration_text.length > 0
+          configuration.push_dataset JSON.parse(configuration_text)
+        end
       end
     rescue JSON::ParserError => exception
       translate_parse_error(exception, override_path)
@@ -59,9 +61,8 @@ class Fig::FigRC
     return if not File.exists? user_figrc_path
 
     begin
-      configuration.push_dataset(
-        JSON.parse(File::open(user_figrc_path).read)
-      )
+      configuration_text = File::open(user_figrc_path).read
+      configuration.push_dataset JSON.parse(configuration_text)
     rescue JSON::ParserError => exception
       translate_parse_error(exception, user_figrc_path)
     end
@@ -90,16 +91,15 @@ class Fig::FigRC
     begin
       os.download( figrc_url, repo_figrc_path )
       repo_config_exists = true
-    rescue Fig::NotFoundError => e
+    rescue Fig::FileNotFoundError
       repo_config_exists = false
     end
 
     return if not repo_config_exists
 
     begin
-      configuration.push_dataset(
-        JSON.parse(File.open(repo_figrc_path).read)
-      )
+      configuration_text = File.open(repo_figrc_path).read
+      configuration.push_dataset JSON.parse(configuration_text)
     rescue JSON::ParserError => exception
       translate_parse_error(exception, figrc_url)
     end

data/lib/fig/{not_found_error.rb → file_not_found_error.rb}

@@ -2,7 +2,7 @@ module Fig
   # A (possibly remote) file that was looked for was not found.  This may or
   # may not actually be a problem; i.e. this may be the result of an existence
   # test.
-  class NotFoundError < StandardError
+  class FileNotFoundError < StandardError
     attr_reader :path
 
     def initialize(message, path)

data/lib/fig/grammar/v0.rb

@@ -168,7 +168,7 @@ module Fig
           elements[0]
         end
 
-        def url
+        def location
           elements[2]
         end
       end
@@ -176,7 +176,7 @@ module Fig
       module Archive1
         def to_package_statement(build_state)
           return build_state.new_asset_statement(
-            Statement::Archive, statement_start, url.url
+            Statement::Archive, statement_start, location.location
           )
         end
       end
@@ -219,7 +219,7 @@ module Fig
           end
           s0 << r2
           if r2
-            r4 = _nt_asset_url
+            r4 = _nt_asset_location
             s0 << r4
           end
         end
@@ -242,7 +242,7 @@ module Fig
           elements[0]
         end
 
-        def url
+        def location
           elements[2]
         end
       end
@@ -250,7 +250,7 @@ module Fig
       module Resource1
         def to_package_statement(build_state)
           return build_state.new_asset_statement(
-            Statement::Resource, statement_start, url.url
+            Statement::Resource, statement_start, location.location
           )
         end
       end
@@ -293,7 +293,7 @@ module Fig
           end
           s0 << r2
           if r2
-            r4 = _nt_asset_url
+            r4 = _nt_asset_location
             s0 << r4
           end
         end
@@ -311,8 +311,8 @@ module Fig
         r0
       end
 
-      module AssetUrl0
-        def url
+      module AssetLocation0
+        def location
           elements[0]
         end
 
@@ -321,8 +321,8 @@ module Fig
         end
       end
 
-      module AssetUrl1
-        def url
+      module AssetLocation1
+        def location
           elements[1]
         end
 
@@ -331,10 +331,10 @@ module Fig
         end
       end
 
-      def _nt_asset_url
+      def _nt_asset_location
         start_index = index
-        if node_cache[:asset_url].has_key?(index)
-          cached = node_cache[:asset_url][index]
+        if node_cache[:asset_location].has_key?(index)
+          cached = node_cache[:asset_location][index]
           if cached
             cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
@@ -371,7 +371,7 @@ module Fig
         end
         if s1.last
           r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-          r1.extend(AssetUrl0)
+          r1.extend(AssetLocation0)
         else
           @index = i1
           r1 = nil
@@ -427,7 +427,7 @@ module Fig
           end
           if s5.last
             r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-            r5.extend(AssetUrl1)
+            r5.extend(AssetLocation1)
           else
             @index = i5
             r5 = nil
@@ -440,7 +440,7 @@ module Fig
           end
         end
 
-        node_cache[:asset_url][start_index] = r0
+        node_cache[:asset_location][start_index] = r0
 
         r0
       end
@@ -997,12 +997,142 @@ module Fig
         r0
       end
 
+      def _nt_environment_variable_name
+        start_index = index
+        if node_cache[:environment_variable_name].has_key?(index)
+          cached = node_cache[:environment_variable_name][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          if has_terminal?('\G[a-zA-Z0-9_]', true, index)
+            r1 = true
+            @index += 1
+          else
+            r1 = nil
+          end
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        if s0.empty?
+          @index = i0
+          r0 = nil
+        else
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        end
+
+        node_cache[:environment_variable_name][start_index] = r0
+
+        r0
+      end
+
+      module Set0
+        def statement_start
+          elements[0]
+        end
+
+        def environment_variable_name_value
+          elements[2]
+        end
+
+      end
+
+      module Set1
+        def to_config_statement(build_state)
+          return build_state.new_environment_variable_statement(
+            Statement::Set, statement_start, environment_variable_name_value
+          )
+        end
+      end
+
+      def _nt_set
+        start_index = index
+        if node_cache[:set].has_key?(index)
+          cached = node_cache[:set][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        i0, s0 = index, []
+        if has_terminal?('set', false, index)
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 3))
+          @index += 3
+        else
+          terminal_parse_failure('set')
+          r1 = nil
+        end
+        s0 << r1
+        if r1
+          s2, i2 = [], index
+          loop do
+            r3 = _nt_ws
+            if r3
+              s2 << r3
+            else
+              break
+            end
+          end
+          if s2.empty?
+            @index = i2
+            r2 = nil
+          else
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+          end
+          s0 << r2
+          if r2
+            r4 = _nt_environment_variable_name_value
+            s0 << r4
+            if r4
+              s5, i5 = [], index
+              loop do
+                r6 = _nt_ws
+                if r6
+                  s5 << r6
+                else
+                  break
+                end
+              end
+              if s5.empty?
+                @index = i5
+                r5 = nil
+              else
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+              end
+              s0 << r5
+            end
+          end
+        end
+        if s0.last
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+          r0.extend(Set0)
+          r0.extend(Set1)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:set][start_index] = r0
+
+        r0
+      end
+
       module Path0
         def statement_start
           elements[0]
         end
 
-        def name_value
+        def environment_variable_name_value
           elements[2]
         end
 
@@ -1011,7 +1141,7 @@ module Fig
       module Path1
         def to_config_statement(build_state)
           return build_state.new_environment_variable_statement(
-            Statement::Path, statement_start, name_value
+            Statement::Path, statement_start, environment_variable_name_value
           )
         end
       end
@@ -1083,44 +1213,25 @@ module Fig
           end
           s0 << r5
           if r5
-            s7, i7 = [], index
-            loop do
-              if has_terminal?('\G[\\S]', true, index)
-                r8 = true
-                @index += 1
-              else
-                r8 = nil
-              end
-              if r8
-                s7 << r8
-              else
-                break
-              end
-            end
-            if s7.empty?
-              @index = i7
-              r7 = nil
-            else
-              r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-            end
+            r7 = _nt_environment_variable_name_value
             s0 << r7
             if r7
-              s9, i9 = [], index
+              s8, i8 = [], index
               loop do
-                r10 = _nt_ws
-                if r10
-                  s9 << r10
+                r9 = _nt_ws
+                if r9
+                  s8 << r9
                 else
                   break
                 end
               end
-              if s9.empty?
-                @index = i9
-                r9 = nil
+              if s8.empty?
+                @index = i8
+                r8 = nil
               else
-                r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+                r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
               end
-              s0 << r9
+              s0 << r8
             end
           end
         end
@@ -1138,10 +1249,10 @@ module Fig
         r0
       end
 
-      def _nt_environment_variable_name
+      def _nt_environment_variable_name_value
         start_index = index
-        if node_cache[:environment_variable_name].has_key?(index)
-          cached = node_cache[:environment_variable_name][index]
+        if node_cache[:environment_variable_name_value].has_key?(index)
+          cached = node_cache[:environment_variable_name_value][index]
           if cached
             cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
@@ -1151,7 +1262,7 @@ module Fig
 
         s0, i0 = [], index
         loop do
-          if has_terminal?('\G[a-zA-Z0-9_]', true, index)
+          if has_terminal?('\G[\\S]', true, index)
             r1 = true
             @index += 1
           else
@@ -1170,119 +1281,7 @@ module Fig
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         end
 
-        node_cache[:environment_variable_name][start_index] = r0
-
-        r0
-      end
-
-      module Set0
-        def statement_start
-          elements[0]
-        end
-
-        def name_value
-          elements[2]
-        end
-
-      end
-
-      module Set1
-        def to_config_statement(build_state)
-          return build_state.new_environment_variable_statement(
-            Statement::Set, statement_start, name_value
-          )
-        end
-      end
-
-      def _nt_set
-        start_index = index
-        if node_cache[:set].has_key?(index)
-          cached = node_cache[:set][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        i0, s0 = index, []
-        if has_terminal?('set', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 3))
-          @index += 3
-        else
-          terminal_parse_failure('set')
-          r1 = nil
-        end
-        s0 << r1
-        if r1
-          s2, i2 = [], index
-          loop do
-            r3 = _nt_ws
-            if r3
-              s2 << r3
-            else
-              break
-            end
-          end
-          if s2.empty?
-            @index = i2
-            r2 = nil
-          else
-            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-          end
-          s0 << r2
-          if r2
-            s4, i4 = [], index
-            loop do
-              if has_terminal?('\G[\\S]', true, index)
-                r5 = true
-                @index += 1
-              else
-                r5 = nil
-              end
-              if r5
-                s4 << r5
-              else
-                break
-              end
-            end
-            if s4.empty?
-              @index = i4
-              r4 = nil
-            else
-              r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-            end
-            s0 << r4
-            if r4
-              s6, i6 = [], index
-              loop do
-                r7 = _nt_ws
-                if r7
-                  s6 << r7
-                else
-                  break
-                end
-              end
-              if s6.empty?
-                @index = i6
-                r6 = nil
-              else
-                r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-              end
-              s0 << r6
-            end
-          end
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(Set0)
-          r0.extend(Set1)
-        else
-          @index = i0
-          r0 = nil
-        end
-
-        node_cache[:set][start_index] = r0
+        node_cache[:environment_variable_name_value][start_index] = r0
 
         r0
       end
@@ -1292,7 +1291,7 @@ module Fig
           elements[0]
         end
 
-        def string
+        def command_line
           elements[2]
         end
 
@@ -1300,7 +1299,9 @@ module Fig
 
       module Command1
         def to_config_statement(build_state)
-          return build_state.new_command_statement(statement_start, string)
+          return build_state.new_command_statement(
+            statement_start, command_line
+          )
         end
       end
 
@@ -1342,7 +1343,7 @@ module Fig
           end
           s0 << r2
           if r2
-            r4 = _nt_string
+            r4 = _nt_command_line
             s0 << r4
             if r4
               s5, i5 = [], index
@@ -1378,17 +1379,17 @@ module Fig
         r0
       end
 
-      module String0
+      module CommandLine0
         def value
           elements[1]
         end
 
       end
 
-      def _nt_string
+      def _nt_command_line
         start_index = index
-        if node_cache[:string].has_key?(index)
-          cached = node_cache[:string][index]
+        if node_cache[:command_line].has_key?(index)
+          cached = node_cache[:command_line][index]
           if cached
             cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
@@ -1435,13 +1436,13 @@ module Fig
         end
         if s0.last
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(String0)
+          r0.extend(CommandLine0)
         else
           @index = i0
           r0 = nil
         end
 
-        node_cache[:string][start_index] = r0
+        node_cache[:command_line][start_index] = r0
 
         r0
       end