docker-compose 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03253ecae7a727eaba835a5042ec07bd4af06aee
-  data.tar.gz: f82b24d7ade2a1621eab41bb8dc8da1188b7afef
+  metadata.gz: fb2ef064c4d01432c98af7db3070fe1c95a3b5aa
+  data.tar.gz: a97e18e24ae122cb9cd2f26b6e5cfd049a9d6b7f
 SHA512:
-  metadata.gz: 49ae1c849beb8c5b9623faea4fd73057be4660979f1ea570e4ce013deb4d4e6807498090ae741859a530036ce420b068a587153514aa7b77b9c41072e7d72f59
-  data.tar.gz: 3350c7abbd3ae4fcefba35661b82abc314de369f8b7105b0430c10fd7b7031efc9e10e550d47da23898250fc00d76c9bb715d224fe8ebcf0cfbace0623f00d54
+  metadata.gz: 313cad2a5fb2ceea44f02d24742368387e02e001a5b6005e0ee537675dd5408bb63c2a2a1e43c30f3f3eeeceacb4a4cf8a5afacc989b41f70b36eae5e3953c21
+  data.tar.gz: 5612260908f7a23b17fb90433d76eff56384242cde969a1d58ac8b2aa1b27c954d6815c846fc1be66e921927b9596ac9dd89edf90b41aaa92d5408e22bb5d680

data/README.md

@@ -4,7 +4,7 @@ This is a Ruby OOP wrapper for the [docker-compose](https://github.com/docker/co
 container orchestration tool from Docker Inc. 
 
 In addition to wrapping the CLI, this gem provides an environment-variable mapping 
-featurie that allows you to export environment variables into your _host_ that point
+feature that allows you to export environment variables into your _host_ that point
 to network services exposed by containers. This allows you to run an application on
 your host for quicker and easier development, but run all of its architectural
 dependencies -- database, cache, adjacent microservices -- in containers. The

data/docker-compose.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "backticks", "~> 0.1"
+  spec.add_dependency "backticks", "~> 0.3"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/docker/compose/rake_tasks.rb

@@ -43,6 +43,9 @@ module Docker::Compose
     # depends on them and is properly linked to them.
     attr_accessor :server
 
+    # Namespace to define the rake tasks under. Defaults to "docker:compose'.
+    attr_accessor :rake_namespace
+
     # Construct Rake wrapper tasks for docker-compose. If a block is given,
     # yield self to the block before defining any tasks so their behavior
     # can be configured by calling #server_env=, #file= and so forth.
@@ -51,6 +54,7 @@ module Docker::Compose
       self.file = 'docker-compose.yml'
       self.server_env = {}
       self.extra_server_env = {}
+      self.rake_namespace = 'docker:compose'
       yield self if block_given?
 
       @shell = Backticks::Runner.new
@@ -63,48 +67,46 @@ module Docker::Compose
     end
 
     private def define
-      namespace :docker do
-        namespace :compose do
-          desc 'Print bash exports with IP/ports of running services'
-          task :env do
-            @shell.interactive = false # suppress useless 'port' output
-
-            if Rake.application.top_level_tasks.include? 'docker:compose:env'
-              # This task is being run as top-level task; set process
-              # environment _and_ print bash export commands to stdout.
-              # Also print usage hints if user invoked rake directly vs.
-              # eval'ing it's output
-              print_usage
-              export_env(print:true)
-            else
-              # This task is a dependency of something else; just export the
-              # environment variables for use in-process by other Rake tasks.
-              export_env(print:false)
-            end
-
-            @shell.interactive = true
+      namespace self.rake_namespace do
+        desc 'Print bash exports with IP/ports of running services'
+        task :env do
+          @shell.interactive = false # suppress useless 'port' output
+
+          if Rake.application.top_level_tasks.include? 'docker:compose:env'
+            # This task is being run as top-level task; set process
+            # environment _and_ print bash export commands to stdout.
+            # Also print usage hints if user invoked rake directly vs.
+            # eval'ing it's output
+            print_usage
+            export_env(print:true)
+          else
+            # This task is a dependency of something else; just export the
+            # environment variables for use in-process by other Rake tasks.
+            export_env(print:false)
           end
 
-          desc 'Launch services (ONLY=a,b,...)'
-          task :up do
-            only = (ENV['ONLY'] || '').split(',').compact.uniq
-            @session.up(*only, detached:true)
-          end
+          @shell.interactive = true
+        end
 
-          desc 'Tail logs of all running services'
-          task :logs do
-            @session.logs
-          end
+        desc 'Launch services (ONLY=a,b,...)'
+        task :up do
+          only = (ENV['ONLY'] || '').split(',').compact.uniq
+          @session.up(*only, detached:true)
+        end
 
-          desc 'Stop services'
-          task :stop do
-            @session.stop
-          end
+        desc 'Tail logs of all running services'
+        task :logs do
+          @session.logs
+        end
 
-          desc 'Run application on the host, linked to services in containers'
-          task :server => ['docker:compose:up', 'docker:compose:env'] do
-            exec(self.server)
-          end
+        desc 'Stop services'
+        task :stop do
+          @session.stop
+        end
+
+        desc 'Run application on the host, linked to services in containers'
+        task :server => ['docker:compose:up', 'docker:compose:env'] do
+          exec(self.server)
         end
       end
     end

data/lib/docker/compose/session.rb

@@ -15,7 +15,7 @@ module Docker::Compose
   class Session
     attr_reader :dir, :file
 
-    def initialize(shell=Backticks::Runner.new,
+    def initialize(shell=Backticks::Runner.new(interactive:true),
                    dir:Dir.pwd, file:'docker-compose.yml')
       @shell = shell
       @dir = dir
@@ -25,7 +25,7 @@ module Docker::Compose
     # Monitor the logs of one or more containers.
     # @param [Array] services list of String service names to show logs for
     # @return [true] always returns true
-    # @raise [RuntimeError] if command fails
+    # @raise [Error] if command fails
     def logs(*services)
       run!('logs', services)
       true
@@ -41,7 +41,7 @@ module Docker::Compose
     # @param [Boolean] no_deps if true, just run specified services without
     #   running the services that they depend on
     # @return [true] always returns true
-    # @raise [RuntimeError] if command fails
+    # @raise [Error] if command fails
     def up(*services,
            detached:false, timeout:10, no_build:false, no_deps:false)
       run!('up',
@@ -53,6 +53,7 @@ module Docker::Compose
     # Stop running services.
     # @param [Array] services list of String service names to stop
     # @param [Integer] timeout how long to wait for each service to stop
+    # @raise [Error] if command fails
     def stop(*services, timeout:10)
       run!('stop', {timeout:timeout}, services)
     end
@@ -62,6 +63,7 @@ module Docker::Compose
     # @param [Integer] port number of port
     # @param [String] protocol 'tcp' or 'udp'
     # @param [Integer] index of container (if multiple instances running)
+    # @raise [Error] if command fails
     def port(service, port, protocol:'tcp', index:1)
       run!('port', {protocol:protocol, index:index}, service, port)
     end
@@ -69,15 +71,15 @@ module Docker::Compose
     # Determine the installed version of docker-compose.
     # @param [Boolean] short whether to return terse version information
     # @return [String, Hash] if short==true, returns a version string;
-    #   otherwise, returns a Hash of component names to version strings
-    # @raise [RuntimeError] if command fails
+    #   otherwise, returns a Hash of component-name strings to version strings
+    # @raise [Error] if command fails
     def version(short:false)
       result = run!('version', short:short, file:false, dir:false)
 
       if short
         result.strip
       else
-        lines = result.split("\n")
+        lines = result.split(/[\r\n]+/)
         lines.inject({}) do |h, line|
           kv = line.split(/: +/, 2)
           h[kv.first] = kv.last
@@ -94,7 +96,7 @@ module Docker::Compose
     # @param [Array] args command-line arguments in the format accepted by
     #   Backticks::Runner#command
     # @return [String] output of the command
-    # @raise [RuntimeError] if command fails
+    # @raise [Error] if command fails
     def run!(*args)
       project_opts = {
         file: @file
@@ -102,7 +104,7 @@ module Docker::Compose
 
       Dir.chdir(@dir) do
         cmd = @shell.command('docker-compose', project_opts, *args).join
-        status, out, err= cmd.status, cmd.captured_output, cmd.captured_error
+        status, out, err = cmd.status, cmd.captured_output, cmd.captured_error
         status.success? || raise(Error.new(args.first, status, err))
         out
       end

data/lib/docker/compose/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Compose
-    VERSION = "0.3.1"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backticks
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement