docker-compose 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fd6f058df23b81e91fb41201f8e8f6c0b46a1f
-  data.tar.gz: 2b4fa470ffa68b8ede08591129e0135d548effe8
+  metadata.gz: 39373275b82cf434210606a3f6f11d69677db295
+  data.tar.gz: b504d7029a2a6150eb5a4e5994d87bf48fa1a03d
 SHA512:
-  metadata.gz: 708ea8165969cf7b7e6b91b8707ff4b89ba1af98101a6d7bfb43e8d3f6dbbf85607159e1b20f29a4af9615ea90409292d0df830c7915b4de2dbfd011ce69eb47
-  data.tar.gz: 17793d4f5899fbc76c238965f5990609b12cad7fb5a7866d6ac8c8d402dd43c61cc245642f3eb39b5894634450b0156c388fc131075a1fbc3354d9cdcd813153
+  metadata.gz: 652113dd63815d7e8261b02e5029d81fc49e6fb0edfd65ffd1f70aa03c3a3f068be1b4d8b361cbb048f7ffff2dd1018ce98ce20d5c82ce15b69df3dd65873f3c
+  data.tar.gz: 734de8b8783c44a666e6485b5bce36d5d81a9158d421f2721f27a165ed5fb6d7cf53de0027b1223960a2b7dc475a91fe2b1c9d7ae5d3defa4b4d258474d51df9

data/lib/docker/compose/session.rb

@@ -1,5 +1,3 @@
-require 'docker/compose/future/session'
-
 module Docker::Compose
   # A Ruby OOP interface to a docker-compose session. A session is bound to
   # a particular directory and docker-compose file (which are set at initialize
@@ -107,8 +105,5 @@ module Docker::Compose
         output
       end
     end
-
-    # Simulate behaviors from Docker 1.5
-    include Docker::Compose::Future::Session
   end
 end

data/lib/docker/compose/shell.rb

@@ -1,4 +1,5 @@
 require 'open3'
+require 'pty'
 
 module Docker::Compose
   # An easy-to-use interface for invoking commands and capturing their output.
@@ -16,8 +17,6 @@ module Docker::Compose
     # actual program, and bytes sent to stdin may not arrive until you send
     # a lot of them!
     #
-    # TODO: solve pipe buffering issues, perhaps with a pty...
-    #
     # @return [Boolean]
     attr_accessor :interactive
 
@@ -101,15 +100,65 @@ module Docker::Compose
       run(argv)
     end
 
-    # Run a shell command. Perform no translation or substitution. Return
-    # the program's exit status and stdout.
+    # Run a simple command.
+    #
+    # @param [Array] argv list of command words
+    # @return [Array] triple of integer exitstatus, string stdout, and stderr
+    private def run(argv)
+      if self.interactive
+        run_interactive(argv)
+      else
+        run_noninteractive(argv)
+      end
+    end
+
+    # Run a shell command. Use a pty to capture the unbuffered output.
+    #
+    # @param [Array] argv command to run; argv[0] is program name and the
+    #   remaining elements are parameters and flags
+    # @return [Array] an (Integer,String,String) triple of exitstatus, stdout and (empty) stderr
+    private def run_interactive(argv)
+      stdout, stdout_w = PTY.open
+      stdin_r, stdin = IO.pipe
+      stderr, stderr_w = IO.pipe
+      pid = spawn(*argv, in: stdin_r, out: stdout_w, err: stderr_w)
+      stdin_r.close
+      stdout_w.close
+      stderr_w.close
+
+      output, error = run_inner(stdin, stdout, stderr)
+
+      Process.waitpid(pid)
+
+      [$?.exitstatus, output, error]
+    end
+
+    # Run a shell command. Perform no translation or substitution. Use a pipe
+    # to read the output, which may be buffered by the OS. Return the program's
+    # exit status and stdout.
+    #
+    # TODO eliminate interactive path (it can't happen anymore) and move flourishes to run_interactive
     #
     # @param [Array] argv command to run; argv[0] is program name and the
     #   remaining elements are parameters and flags
     # @return [Array] an (Integer,String,String) triple of exitstatus, stdout and stderr
-    private def run(argv)
+    private def run_noninteractive(argv)
       stdin, stdout, stderr, thr = Open3.popen3(*argv)
 
+      output, error = run_inner(stdin, stdout, stderr)
+
+      # This blocks until the process exits (which probably already happened,
+      # given that we have received EOF on its output streams).
+      status = thr.value.exitstatus
+
+      [status, output, error]
+    rescue Interrupt
+      # Proxy Ctrl+C to our child process
+      Process.kill('INT', thr.pid) rescue nil
+      raise
+    end
+
+    private def run_inner(stdin, stdout, stderr)
       streams = [stdout, stderr]
 
       if @interactive
@@ -155,15 +204,7 @@ module Docker::Compose
         end
       end
 
-      # This blocks until the process exits (which probably already happened,
-      # given that we have received EOF on its output streams).
-      status = thr.value.exitstatus
-
-      [status, output, error]
-    rescue Interrupt
-      # Proxy Ctrl+C to our child process
-      Process.kill('INT', thr.pid) rescue nil
-      raise
+      [output, error]
     end
   end
 end

data/lib/docker/compose/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Compose
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,6 @@ files:
 - docker-compose.gemspec
 - lib/docker/compose.rb
 - lib/docker/compose/error.rb
-- lib/docker/compose/future/session.rb
 - lib/docker/compose/mapper.rb
 - lib/docker/compose/net_info.rb
 - lib/docker/compose/rake_tasks.rb

data/lib/docker/compose/future/session.rb

@@ -1,90 +0,0 @@
-require 'yaml'
-
-module Docker::Compose::Future
-  module Session
-    # Pattern that matches an environment substitution in a docker-compose YML
-    # file.
-    # @see #substitute
-    SUBSTITUTION = /\$\{([A-Z0-9:_-]+)\}/
-
-    # Hook in env-var substitution by aliasing a method chain for run!
-    def self.included(host)
-      done = host.instance_methods.include?(:run_without_substitution!)
-      host.instance_eval do
-        alias_method :run_without_substitution!, :run!
-        alias_method :run!, :run_with_substitution!
-      end unless done
-    end
-
-    # Read docker-compose YML; perform environment variable substitution;
-    # write a temp file; invoke run! with the new file; delete the temp
-    # file afterward.
-    #
-    # This is a complete reimplementation of run! and we only alias the original
-    # to be good citizens.
-    def run_with_substitution!(*cmd)
-      temp = nil
-      project = File.basename(@dir)
-
-      # Find and purge the 'file' flag if it exists; otherwise assume we will
-      # substitute our default (session) file.
-      fn = nil
-      cmd.each do |item|
-        fn ||= item.delete(:file) if item.is_a?(Hash)
-      end
-      fn ||= @file
-
-      # Rewrite YML if the file exists and the file:false "flag" wasn't
-      # explicitly passed to us.
-      Dir.chdir(@dir) do
-        yml = YAML.load(File.read(fn))
-        yml = substitute(yml)
-        temp = Tempfile.new(fn, @dir)
-        temp.write(YAML.dump(yml))
-        temp.close
-
-        project_opts = {
-          file: temp.path,
-          project: File.basename(@dir)
-        }
-
-        result, output, error =
-          @shell.command('docker-compose', project_opts, *cmd)
-        (result == 0) ||
-          raise(Docker::Compose::Error.new(cmd.first, result, error))
-        output
-      end
-    ensure
-      temp.unlink if temp
-    end
-
-    # Simulate the behavior of docker-compose 1.5: replace "${VAR}" sequences
-    # with the values of environment variables. Perform this recursively if
-    # data is a Hash or Array.
-    #
-    #
-    # @param [Hash,Array,String,Object] data
-    # @return [Hash,Array,String,Object] data with all ${ENV} references substituted
-    private def substitute(data)
-      case data
-      when Hash
-        result = {}
-        data.each_pair { |k, v| result[k] = substitute(v) }
-      when Array
-        result = []
-        data.each { |v| result << substitute(v) }
-      when String
-        result = data
-        while (match = SUBSTITUTION.match(result))
-          var = match[1]
-          repl = format("${%s}", var)
-          result.gsub!(repl, ENV[var])
-        end
-      else
-        result = data
-      end
-
-      result
-    end
-  end
-end