fig 0.1.81 → 0.2.1

data/lib/fig/command/package_applier.rb

@@ -5,6 +5,8 @@ module Fig; end
 class Fig::Command; end
 
 class Fig::Command::PackageApplier
+  attr_reader :synthetic_package_for_command_line
+
   def initialize(
     base_package,
     environment,
@@ -37,10 +39,10 @@ class Fig::Command::PackageApplier
 
   def apply_config_to_environment(ignore_base_config)
     begin
+      @synthetic_package_for_command_line =
+        synthesize_package_for_command_line_options(ignore_base_config)
       @environment.apply_config(
-        synthesize_package_for_command_line_options(ignore_base_config),
-        Fig::Package::DEFAULT_CONFIG,
-        nil
+        @synthetic_package_for_command_line, Fig::Package::DEFAULT_CONFIG, nil
       )
     rescue Fig::NoSuchPackageConfigError => exception
       make_no_such_package_exception_descriptive(exception)

data/lib/fig/grammar/v0.rb

@@ -311,146 +311,12 @@ module Fig
         r0
       end
 
-      module AssetLocation0
-        def location
-          elements[0]
-        end
-
-        def ws
-          elements[1]
-        end
-      end
-
-      module AssetLocation1
-        def location
-          elements[1]
-        end
-
-        def ws
-          elements[3]
-        end
-      end
-
-      def _nt_asset_location
-        start_index = 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
-          end
-          return cached
-        end
-
-        i0 = index
-        i1, s1 = index, []
-        s2, i2 = [], index
-        loop do
-          if has_terminal?('\G[^@\'"<>|\\s]', true, index)
-            r3 = true
-            @index += 1
-          else
-            r3 = nil
-          end
-          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
-        s1 << r2
-        if r2
-          r4 = _nt_ws
-          s1 << r4
-        end
-        if s1.last
-          r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-          r1.extend(AssetLocation0)
-        else
-          @index = i1
-          r1 = nil
-        end
-        if r1
-          r0 = r1
-        else
-          i5, s5 = index, []
-          if has_terminal?('"', false, index)
-            r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
-          else
-            terminal_parse_failure('"')
-            r6 = nil
-          end
-          s5 << r6
-          if r6
-            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
-            s5 << r7
-            if r7
-              if has_terminal?('"', false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
-              else
-                terminal_parse_failure('"')
-                r9 = nil
-              end
-              s5 << r9
-              if r9
-                r10 = _nt_ws
-                s5 << r10
-              end
-            end
-          end
-          if s5.last
-            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-            r5.extend(AssetLocation1)
-          else
-            @index = i5
-            r5 = nil
-          end
-          if r5
-            r0 = r5
-          else
-            @index = i0
-            r0 = nil
-          end
-        end
-
-        node_cache[:asset_location][start_index] = r0
-
-        r0
-      end
-
       module Retrieve0
         def statement_start
           elements[0]
         end
 
-        def var
+        def variable
           elements[2]
         end
 
@@ -462,7 +328,9 @@ module Fig
 
       module Retrieve1
         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
 
@@ -554,43 +422,6 @@ module Fig
         r0
       end
 
-      def _nt_retrieve_path
-        start_index = index
-        if node_cache[:retrieve_path].has_key?(index)
-          cached = node_cache[:retrieve_path][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[:retrieve_path][start_index] = r0
-
-        r0
-      end
-
       module Config0
         def statement_start
           elements[0]
@@ -729,43 +560,6 @@ module Fig
         r0
       end
 
-      def _nt_config_name
-        start_index = index
-        if node_cache[:config_name].has_key?(index)
-          cached = node_cache[:config_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[:config_name][start_index] = r0
-
-        r0
-      end
-
       def _nt_config_statement
         start_index = index
         if node_cache[:config_statement].has_key?(index)
@@ -997,43 +791,6 @@ 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]
@@ -1249,43 +1006,6 @@ module Fig
         r0
       end
 
-      def _nt_environment_variable_name_value
-        start_index = 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
-          end
-          return cached
-        end
-
-        s0, i0 = [], index
-        loop do
-          if has_terminal?('\G[\\S]', 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_value][start_index] = r0
-
-        r0
-      end
-
       module Command0
         def statement_start
           elements[0]
@@ -1299,7 +1019,7 @@ module Fig
 
       module Command1
         def to_config_statement(build_state)
-          return build_state.new_command_statement(
+          return build_state.new_v0_command_statement(
             statement_start, command_line
           )
         end
@@ -1380,10 +1100,6 @@ module Fig
       end
 
       module CommandLine0
-        def value
-          elements[1]
-        end
-
       end
 
       def _nt_command_line
@@ -1484,6 +1200,288 @@ module Fig
         r0
       end
 
+      def _nt_config_name
+        start_index = index
+        if node_cache[:config_name].has_key?(index)
+          cached = node_cache[:config_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[:config_name][start_index] = r0
+
+        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
+
+      def _nt_environment_variable_name_value
+        start_index = 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
+          end
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          if has_terminal?('\G[\\S]', 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_value][start_index] = r0
+
+        r0
+      end
+
+      module AssetLocation0
+        def location
+          elements[0]
+        end
+
+        def ws
+          elements[1]
+        end
+      end
+
+      module AssetLocation1
+        def location
+          elements[1]
+        end
+
+        def ws
+          elements[3]
+        end
+      end
+
+      def _nt_asset_location
+        start_index = 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
+          end
+          return cached
+        end
+
+        i0 = index
+        i1, s1 = index, []
+        s2, i2 = [], index
+        loop do
+          if has_terminal?('\G[^@\'"<>|\\s]', true, index)
+            r3 = true
+            @index += 1
+          else
+            r3 = nil
+          end
+          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
+        s1 << r2
+        if r2
+          r4 = _nt_ws
+          s1 << r4
+        end
+        if s1.last
+          r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+          r1.extend(AssetLocation0)
+        else
+          @index = i1
+          r1 = nil
+        end
+        if r1
+          r0 = r1
+        else
+          i5, s5 = index, []
+          if has_terminal?('"', false, index)
+            r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('"')
+            r6 = nil
+          end
+          s5 << r6
+          if r6
+            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
+            s5 << r7
+            if r7
+              if has_terminal?('"', false, index)
+                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure('"')
+                r9 = nil
+              end
+              s5 << r9
+              if r9
+                r10 = _nt_ws
+                s5 << r10
+              end
+            end
+          end
+          if s5.last
+            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+            r5.extend(AssetLocation1)
+          else
+            @index = i5
+            r5 = nil
+          end
+          if r5
+            r0 = r5
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+
+        node_cache[:asset_location][start_index] = r0
+
+        r0
+      end
+
+      def _nt_retrieve_path
+        start_index = index
+        if node_cache[:retrieve_path].has_key?(index)
+          cached = node_cache[:retrieve_path][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[:retrieve_path][start_index] = r0
+
+        r0
+      end
+
     end
 
     class V0Parser < Treetop::Runtime::CompiledParser