fpm-fry 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7a586c439b3d55bc4f79e6b913e2b263738b0777070e031fc475c7581693e90
-  data.tar.gz: 6dc98b7b8a5dba4bf15d3e6bb11c8c03cbd21a0bface5de566255aa75f966fe1
+  metadata.gz: 4911dfb40c91dd585e0ccbbad499a4d71eebadd4c00846b982ed100b186c963f
+  data.tar.gz: 7122bfa7728cb976d3b12010e63be177ccc23d00c360c4830317369f1d1012f1
 SHA512:
-  metadata.gz: e560d5ca908265f246ea5017e918b83a41485282c269808a4ee2cb243ffeb51723b7d09aaad27652773e424c29f2012ea61a79b761bbece9f04cdfd96e5b1403
-  data.tar.gz: 194b3169dedc54888baecd8a32e76ce830783219fc9814eef891cd760add2896242872f4e585a70552b27ec02e8ffc07a186c711edee07d2b4084e8518bc0dc3
+  metadata.gz: 9e1ef45f2c7b25b759e3f170b0a3a41d745e686a8a008da43494f6c53166f9695b241f3f2e45dab5fafacfd18a88ae5320e3e7831c4114d5a5e0cbbea08cf10c
+  data.tar.gz: fbe991bb53e481eab8293c0631079af94795f60dc6381635448fac81aaea0b879fe97e50860688654795a820d2813fab581bc06881223514c289bdd70b9dd42f

data/lib/fpm/fry/command/cook.rb

@@ -197,7 +197,7 @@ module FPM; module Fry
         )
 
         client.post(
-          path: client.url('containers',container,'attach?stderr=1&stdout=1&stream=1'),
+          path: client.url('containers',container,'attach?stderr=1&stdout=1&stream=1&logs=1'),
           body: '',
           expects: [200],
           middlewares: [

data/lib/fpm/fry/plugin/service.rb

@@ -10,11 +10,9 @@ module FPM::Fry::Plugin ; module Service
 
     def render(file)
       _erbout = ""
-      erb = ERB.new(
-        IO.read(File.join(File.dirname(__FILE__),'..','templates',file)),
-        0, "-"
-      )
-      eval(erb.src,nil,File.join(File.dirname(__FILE__),'..','templates',file))
+      path = File.join(File.dirname(__FILE__),'..','templates',file)
+      erb = ERB.new(IO.read(path), trim_mode: "-")
+      eval erb.src, nil, path
       return _erbout
     end
 

data/lib/fpm/fry/stream_parser.rb

@@ -16,38 +16,56 @@ module FPM; module Fry
         if datum[:response]
           # probably mocked
           if datum[:response][:body]
-            @parser.parse(StringIO.new(datum[:response][:body]))
+            headers = datum[:response][:headers]
+            fake_socket = StringIO.new(datum[:response][:body])
+            parse_response_data(fake_socket, headers)
           end
-          return @stack.response_call(datum)
         else
-          socket = datum[:connection].send(:socket)
-          begin
-            line = socket.readline
-            match = /^HTTP\/\d+\.\d+\s(\d{3})\s/.match(line)
-          end while !match
-          status = match[1].to_i
-
-          datum[:response] = {
-            :body          => '',
-            :headers       => Excon::Headers.new,
-            :status        => status,
-            :remote_ip     => socket.respond_to?(:remote_ip) && socket.remote_ip,
-          }
-          Excon::Response.parse_headers(socket, datum)
+          socket, headers = extract_socket_and_headers(datum)
+          parse_response_data(socket, headers)
+        end
+        @stack.response_call(datum)
+      end
+
+      private
+
+      def extract_socket_and_headers(datum)
+        socket = datum[:connection].send(:socket)
+        begin
+          line = socket.readline
+          match = /^HTTP\/\d+\.\d+\s(\d{3})\s/.match(line)
+        end while !match
+        status = match[1].to_i
+
+        headers = Excon::Headers.new
+        datum[:response] = {
+          :body          => '',
+          :headers       => headers,
+          :status        => status,
+          :remote_ip     => socket.respond_to?(:remote_ip) && socket.remote_ip,
+        }
+        Excon::Response.parse_headers(socket, datum)
+
+        [socket, headers]
+      end
 
+      def parse_response_data(socket, headers)
+        if headers["Transfer-Encoding"] == "chunked"
+          @parser.parse_chunked(socket)
+        else
           @parser.parse(socket)
-          return @stack.response_call(datum)
         end
       end
 
     end
 
-    attr :out, :err
+    attr :out, :err, :streams
 
     def initialize(out, err)
       @out, @err = out, err
       @state = :null
       @left = 0
+      @streams = { 1 => out, 2 => err }
     end
 
     def new(stack)
@@ -55,8 +73,6 @@ module FPM; module Fry
     end
 
     def parse(socket)
-      left  = 0
-      streams = {1 => out, 2 => err}
       loop do
         type = read_exactly(socket,4){|part|
           if part.bytesize == 0
@@ -94,5 +110,16 @@ module FPM; module Fry
       return buf
     end
 
+    def parse_chunked(socket)
+      loop do
+        line = socket.readline
+        chunk_size = line.chomp.to_i(16)
+        break if chunk_size.zero?
+        chunk = socket.read(chunk_size)
+        parse(StringIO.new(chunk))
+        line = socket.readline
+      end
+    end
+
   end
 end ; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Maxime Lagresle
@@ -95,28 +95,28 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: deep-fried package builder