dg 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1046c9e937f5b5bd562829da8815c495de75681a
-  data.tar.gz: 6f0c35bc9ac501948bb1ac0a174f80ecc17b6427
+  metadata.gz: d54a7630e338fb23a616e729563b508007dcf3a8
+  data.tar.gz: 8e6462693033f4269257d4946874b58c7fa13923
 SHA512:
-  metadata.gz: ec8a8ccd0430e36f83690f9925b40b04b5e583a26273a7504b55bebb382ff310e36a8757d0924941af45f84fd62331733960df9f027311da5665f187e3234585
-  data.tar.gz: 8e69e2a120db6cf26697f0356196b5129bd07e0cc609e6ce8900c749c922e5b541c389c2f680e94cc767a1b61d78e86627ea8caa5f48b19cb20d325990c0d2a7
+  metadata.gz: 41d35b4af2f4f186c1a23f3056473e2783267098f2cc781898492104ae2118a06bf7293bad463356f7eb614366710594b3e2ca93b40805e824329e30a21290ac
+  data.tar.gz: 9e8c585f0659e82971c1b01473d30fa41491e6b200e9b7c4c97bfc33da135ac07a5a2c19d0d467544e639f8eb6496f11046e902ffdd3bb78fda68c836a0cc79b

data/lib/dg/docker.rb

@@ -85,6 +85,12 @@ module DG
 
     private
 
+      def fig_binary
+        @@fig_binary_cached ||= %w(docker-compose fig).detect do |binary|
+          run_with_output(%(which #{binary}), false, return_hash = true)[:status_code] == 0
+        end
+      end
+
       def error!(e, step = "executing")
         STDERR.puts "An error occurred while #{step}: #{e.message}"
         exit 1
@@ -97,7 +103,7 @@ module DG
         begin
           buffer = ''
           PTY.spawn(sudo_command) do |stdin, stdout, pid|
-            callback = capture ?
+            callback = (capture || return_hash) ?
               ->(line) {
                 print line unless return_hash
                 buffer << line
@@ -183,13 +189,13 @@ module DG
       end
 
       def run_tests
-        run_with_output("fig -f #{FIG_GEN_PATH} run --rm test")
+        run_with_output("#{fig_binary} -f #{FIG_GEN_PATH} run --rm test")
       rescue => e
         error!(e, "running tests")
       end
 
       def run_app
-        run_with_output("fig -f #{FIG_GEN_PATH} up -d web")
+        run_with_output("#{fig_binary} -f #{FIG_GEN_PATH} up -d web")
       end
 
       def debug_app

data/lib/dg/version.rb

@@ -1,3 +1,3 @@
 module DG
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dg
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Michael Malet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies: []
 description: |
   DockerGo (DG)