docker-compose 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb2ef064c4d01432c98af7db3070fe1c95a3b5aa
-  data.tar.gz: a97e18e24ae122cb9cd2f26b6e5cfd049a9d6b7f
+  metadata.gz: 2661557619be327afdd6ff7e6f06bb7b1aaa7fcf
+  data.tar.gz: 6e812b5f2477ddb711a65840a7b380c66d6d6c31
 SHA512:
-  metadata.gz: 313cad2a5fb2ceea44f02d24742368387e02e001a5b6005e0ee537675dd5408bb63c2a2a1e43c30f3f3eeeceacb4a4cf8a5afacc989b41f70b36eae5e3953c21
-  data.tar.gz: 5612260908f7a23b17fb90433d76eff56384242cde969a1d58ac8b2aa1b27c954d6815c846fc1be66e921927b9596ac9dd89edf90b41aaa92d5408e22bb5d680
+  metadata.gz: 00265671c515da7a93e67d9e08244be39d77d891cf028d6e6fd7cd813f3884f329b5ed327dba7bc33c72026ea0531aa79858089037af6f791b94e88fda7150cd
+  data.tar.gz: c98170a11fdb49069d3e2b51dbd021153516d65ab357f3e1d670f0df612feb145cc76cdc21828b4cc0360cce473d9920105e1adaf716251672c1911b35d475ec

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.3"
+  spec.add_dependency "backticks", "~> 0.4"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/docker/compose/rake_tasks.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'rake/tasklib'
+require 'shellwords'
 
 # In case this file is required directly
 require 'docker/compose'
@@ -119,7 +120,7 @@ module Docker::Compose
                                   session:@session,
                                   net_info:@net_info) do |k, v|
         ENV[k] = serialize_for_env(v)
-        print_env(k, v) if print
+        print_env(k, ENV[k]) if print
       end
 
       Docker::Compose::Mapper.map(self.extra_server_env,
@@ -127,7 +128,7 @@ module Docker::Compose
                                   session:@session,
                                   net_info:@net_info) do |k, v|
         ENV[k] = serialize_for_env(v)
-        print_env(k, v) if print
+        print_env(k, ENV[k]) if print
       end
     end
 
@@ -136,10 +137,12 @@ module Docker::Compose
     # or JSON-serialized Array.
     private def serialize_for_env(v)
       case v
-      when String, NilClass
-        v
+      when String
+        Shellwords.escape v
+      when NilClass
+        nil
       when Array
-        JSON.dump(v)
+        Shellwords.escape JSON.dump(v)
       else
         raise ArgumentError, "Can't represent a #{v.class} in the environment"
       end

data/lib/docker/compose/session.rb

@@ -103,7 +103,7 @@ module Docker::Compose
       }
 
       Dir.chdir(@dir) do
-        cmd = @shell.command('docker-compose', project_opts, *args).join
+        cmd = @shell.run('docker-compose', project_opts, *args).join
         status, out, err = cmd.status, cmd.captured_output, cmd.captured_error
         status.success? || raise(Error.new(args.first, status, err))
         out

data/lib/docker/compose/version.rb

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

metadata

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