fig 1.22.0 → 1.22.1.beta.1

data/lib/fig/grammar/v2.rb

@@ -56,7 +56,7 @@ module Fig
         if node_cache[:package].has_key?(index)
           cached = node_cache[:package][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:package][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -110,7 +110,7 @@ module Fig
         if node_cache[:config_statement].has_key?(index)
           cached = node_cache[:config_statement][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:config_statement][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -119,26 +119,32 @@ module Fig
         i0 = index
         r1 = _nt_override
         if r1
+          r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
           r0 = r1
         else
           r2 = _nt_include
           if r2
+            r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
             r0 = r2
           else
             r3 = _nt_include_file
             if r3
+              r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
               r0 = r3
             else
               r4 = _nt_command
               if r4
+                r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
                 r0 = r4
               else
                 r5 = _nt_path
                 if r5
+                  r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
                   r0 = r5
                 else
                   r6 = _nt_set
                   if r6
+                    r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                     r0 = r6
                   else
                     @index = i0
@@ -193,16 +199,16 @@ module Fig
         if node_cache[:include_file].has_key?(index)
           cached = node_cache[:include_file][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:include_file][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
         i0, s0 = index, []
-        if has_terminal?('include-file', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 12))
-          @index += 12
+        if (match_len = has_terminal?('include-file', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('include-file')
           r1 = nil
@@ -230,9 +236,9 @@ module Fig
             s0 << r4
             if r4
               i6, s6 = index, []
-              if has_terminal?(':', false, index)
-                r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?(':', false, index))
+                r7 = true
+                @index += match_len
               else
                 terminal_parse_failure(':')
                 r7 = nil
@@ -289,7 +295,7 @@ module Fig
         if node_cache[:file_path].has_key?(index)
           cached = node_cache[:file_path][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:file_path][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -297,9 +303,9 @@ module Fig
 
         i0 = index
         i1, s1 = index, []
-        if has_terminal?('"', false, index)
-          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?('"', false, index))
+          r2 = true
+          @index += match_len
         else
           terminal_parse_failure('"')
           r2 = nil
@@ -309,19 +315,21 @@ module Fig
           s3, i3 = [], index
           loop do
             i4 = index
-            if has_terminal?('\G[^"\\\\]', true, index)
+            if has_terminal?(@regexps[gr = '\A[^"\\\\]'] ||= Regexp.new(gr), :regexp, index)
               r5 = true
               @index += 1
             else
+              terminal_parse_failure('[^"\\\\]')
               r5 = nil
             end
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r4 = r5
             else
               i6, s6 = index, []
-              if has_terminal?('\\', false, index)
-                r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?('\\', false, index))
+                r7 = true
+                @index += match_len
               else
                 terminal_parse_failure('\\')
                 r7 = nil
@@ -329,7 +337,7 @@ module Fig
               s6 << r7
               if r7
                 if index < input_length
-                  r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                  r8 = true
                   @index += 1
                 else
                   terminal_parse_failure("any character")
@@ -345,6 +353,7 @@ module Fig
                 r6 = nil
               end
               if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r4 = r6
               else
                 @index = i4
@@ -360,9 +369,9 @@ module Fig
           r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
           s1 << r3
           if r3
-            if has_terminal?('"', false, index)
-              r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?('"', false, index))
+              r9 = true
+              @index += match_len
             else
               terminal_parse_failure('"')
               r9 = nil
@@ -378,12 +387,13 @@ module Fig
           r1 = nil
         end
         if r1
+          r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
           r0 = r1
         else
           i10, s10 = index, []
-          if has_terminal?("'", false, index)
-            r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?("'", false, index))
+            r11 = true
+            @index += match_len
           else
             terminal_parse_failure("'")
             r11 = nil
@@ -393,19 +403,21 @@ module Fig
             s12, i12 = [], index
             loop do
               i13 = index
-              if has_terminal?('\G[^\'\\\\]', true, index)
+              if has_terminal?(@regexps[gr = '\A[^\'\\\\]'] ||= Regexp.new(gr), :regexp, index)
                 r14 = true
                 @index += 1
               else
+                terminal_parse_failure('[^\'\\\\]')
                 r14 = nil
               end
               if r14
+                r14 = SyntaxNode.new(input, (index-1)...index) if r14 == true
                 r13 = r14
               else
                 i15, s15 = index, []
-                if has_terminal?('\\', false, index)
-                  r16 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if (match_len = has_terminal?('\\', false, index))
+                  r16 = true
+                  @index += match_len
                 else
                   terminal_parse_failure('\\')
                   r16 = nil
@@ -413,7 +425,7 @@ module Fig
                 s15 << r16
                 if r16
                   if index < input_length
-                    r17 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                    r17 = true
                     @index += 1
                   else
                     terminal_parse_failure("any character")
@@ -429,6 +441,7 @@ module Fig
                   r15 = nil
                 end
                 if r15
+                  r15 = SyntaxNode.new(input, (index-1)...index) if r15 == true
                   r13 = r15
                 else
                   @index = i13
@@ -444,9 +457,9 @@ module Fig
             r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
             s10 << r12
             if r12
-              if has_terminal?("'", false, index)
-                r18 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?("'", false, index))
+                r18 = true
+                @index += match_len
               else
                 terminal_parse_failure("'")
                 r18 = nil
@@ -462,14 +475,16 @@ module Fig
             r10 = nil
           end
           if r10
+            r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
             r0 = r10
           else
             s19, i19 = [], index
             loop do
-              if has_terminal?('\G[^\\s#:]', true, index)
+              if has_terminal?(@regexps[gr = '\A[^\\s#:]'] ||= Regexp.new(gr), :regexp, index)
                 r20 = true
                 @index += 1
               else
+                terminal_parse_failure('[^\\s#:]')
                 r20 = nil
               end
               if r20
@@ -485,6 +500,7 @@ module Fig
               r19 = instantiate_node(SyntaxNode,input, i19...index, s19)
             end
             if r19
+              r19 = SyntaxNode.new(input, (index-1)...index) if r19 == true
               r0 = r19
             else
               @index = i0

data/lib/fig/grammar/version.rb

@@ -41,16 +41,16 @@ module Fig
         if node_cache[:grammar_version].has_key?(index)
           cached = node_cache[:grammar_version][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:grammar_version][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
         end
 
         i0, s0 = index, []
-        if has_terminal?('grammar', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 7))
-          @index += 7
+        if (match_len = has_terminal?('grammar', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('grammar')
           r1 = nil
@@ -74,9 +74,9 @@ module Fig
           end
           s0 << r2
           if r2
-            if has_terminal?('v', false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?('v', false, index))
+              r4 = true
+              @index += match_len
             else
               terminal_parse_failure('v')
               r4 = nil
@@ -85,10 +85,11 @@ module Fig
             if r4
               s5, i5 = [], index
               loop do
-                if has_terminal?('\G[\\d]', true, index)
+                if has_terminal?(@regexps[gr = '\A[\\d]'] ||= Regexp.new(gr), :regexp, index)
                   r6 = true
                   @index += 1
                 else
+                  terminal_parse_failure('[\\d]')
                   r6 = nil
                 end
                 if r6

data/lib/fig/grammar/version_identification.rb

@@ -43,7 +43,7 @@ module Fig
         if node_cache[:everything].has_key?(index)
           cached = node_cache[:everything][index]
           if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            node_cache[:everything][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
           end
           return cached
@@ -73,7 +73,7 @@ module Fig
             s5, i5 = [], index
             loop do
               if index < input_length
-                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                r6 = true
                 @index += 1
               else
                 terminal_parse_failure("any character")

data/lib/fig/protocol/netrc_enabled.rb

@@ -1,6 +1,7 @@
 require 'highline'
 require 'net/netrc'
 
+require 'fig/logging'
 require 'fig/user_input_error'
 
 module Fig; end
@@ -67,11 +68,23 @@ module Fig::Protocol::NetRCEnabled
   end
 
   def get_authentication_from_user(host)
-    username = HighLine.new.ask("Username for #{host}: ") { |q| q.echo = true }
-    password = HighLine.new.ask("Password for #{username}@#{host}: ") {
-      |q| q.echo = false
-    }
+    # This defaults to true, but Net::SSH::Prompt turns it off.  Unfortunately,
+    # this causes HighLine to barf when there's no input on STDIN, e.g. when
+    # running on a continuous integration server.
+    HighLine.track_eof = true
+
+    begin
+      username =
+        HighLine.new.ask("Username for #{host}: ") { |q| q.echo = true }
+      password = HighLine.new.ask("Password for #{username}@#{host}: ") {
+        |q| q.echo = false
+      }
 
-    return NetRCEntry.new username, password
+      return NetRCEntry.new username, password
+    rescue EOFError => error
+      Fig::Logging.debug(error)
+
+      return nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.22.1.beta.1
 platform: ruby
 authors:
 - Matthew Foemmel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -404,9 +404,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2