dg 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea454cd0784d6c489275883291af104a9ea7b1f
-  data.tar.gz: 1ed46c4d42a64c437a8afbbadb68a961f6a9fc11
+  metadata.gz: 1f2697a1942c1cec67fa2f558092e415ab6f258e
+  data.tar.gz: d024cc464d6141114383cc7ecc26707d167bfc1b
 SHA512:
-  metadata.gz: bd252529938d78224bffeaa4e024610c3000d899839572e2bbdd7671f0ee86c46acbedb4e0017b812e29e88cb4365984588726371c5a0386c2638001579161f2
-  data.tar.gz: 20b50abd57ee7caccf42e2346734fdec9eaf8a4c3fb8b7fe81183095a1d485db2b14761c013c05c5ca8c982663aa8fa83e99185c6ef46d71a50128b8c3f7bb60
+  metadata.gz: b0f8de197ce927c3ed31cf783f4636b63e514d194133f4bbe0c2ad2382f8ecc7dc23ca51e7231a9e372d0538609fd110390d66419c71203e5e68d89d85872089
+  data.tar.gz: aee5dfefd7f72ad46b6a677a22329a3fe4af32c0593e01adbcfa3b5754373c8819977241489f4c7d1944b1456e54f08fb6fa05e1940ef90db1a7ab85e4a32140

data/lib/dg/docker.rb

@@ -45,30 +45,13 @@ module DG
       end
 
       def deploy_stages
-        candidates = Dir['deploy-to*']
-        if candidates.size == 1
-          script = candidates.first
-          if File.executable?(script)
-            branch = ENV['GIT_BRANCH'] ||
-              `git symbolic-ref --short -q HEAD`.strip
-            return `./#{script} #{branch}`.strip.split(',')
-          else
-            error!(
-              RuntimeError.new(
-                %(Deploy-to script: "#{script}" must be executable! (e.g. chmod +x #{script}))
-              ),
-              "determining stage to deploy to"
-            )
-          end
-        else
-          error!(
-            RuntimeError.new(
-              "There must be a deploy-to* script " +
-              "(e.g. deploy-to.{rb|sh|js}): #{candidates.size} found"
-            ),
-            "determining stage to deploy to"
-          )
-        end
+        generate_fig_yaml
+        branch = ENV['GIT_BRANCH'] ||
+          `git symbolic-ref --short -q HEAD`.strip
+
+        run_with_output(
+          "fig -f #{FIG_GEN_PATH} run deployto", capture = true
+        ).strip.split(',')
       end
 
       def run
@@ -93,18 +76,26 @@ module DG
         exit 1
       end
 
-      def run_with_output(command)
+      def run_with_output(command, capture = false)
         sudo_command = SUDO ? "sudo -E bash -c '#{command}'" : command
         puts "Running `#{sudo_command}` in #{Dir.pwd}"
-        PTY.spawn(sudo_command) do |stdin, stdout, pid|
-          stdin.each { |line| print line } rescue Errno::EIO
-          Process.wait(pid)
+        if capture
+          return `#{command}`
+        else
+          begin
+            PTY.spawn(sudo_command) do |stdin, stdout, pid|
+              stdin.each { |line| print line } rescue Errno::EIO
+              Process.wait(pid)
+            end
+            status_code = $?.exitstatus
+
+            error!(RuntimeError.new("exit code was #{status_code}"), "executing #{command}") if status_code != 0
+
+            return status_code
+          rescue PTY::ChildExited
+            puts "The child process exited!"
+          end
         end
-        status_code = $?.exitstatus
-
-        error!(RuntimeError.new("exit code was #{status_code}"), "executing #{command}") if status_code != 0
-      rescue PTY::ChildExited
-        puts "The child process exited!"
       end
 
       def fig_yml
@@ -125,7 +116,7 @@ module DG
       # Add the git commit hash to the image name
       def git_image_name
         @@git_image_name ||=
-          "#{image_name}:#{ENV['GO_REVISION_BITBUCKET'] ||
+          "#{image_name}:#{ENV['GO_REVISION_#{MATERIAL_NAME}'] ||
           `git rev-parse HEAD`.strip}"
       end
 

data/lib/dg/version.rb

@@ -1,3 +1,3 @@
 module DG
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dg
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Michael Malet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies: []
 description: |
   DockerGo (DG)
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Provides integration between Docker and GoCD.