dg 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 234c76acedd6f84face44f9a29c93923a04879c3
-  data.tar.gz: e836e7ae1d03c488d0b66e0bf1a57e0ea25ee704
+  metadata.gz: 1046c9e937f5b5bd562829da8815c495de75681a
+  data.tar.gz: 6f0c35bc9ac501948bb1ac0a174f80ecc17b6427
 SHA512:
-  metadata.gz: ccdbffaba6590d41c26d2d934f1d4eaefba2e16cf3574fa069d8f73e0a4fa356a6736f175035e7b35fb4322105f7afff92c46692b36521e3344f1a666d9753cf
-  data.tar.gz: a0bf2a0885f20cfa91c70acf626d3c1e7c3e68eac102206bd3d3f626a1bad1b78de23f671c155cb043407b5c90734336f4f04360ecfdfffa9800ffe3fc27c672
+  metadata.gz: ec8a8ccd0430e36f83690f9925b40b04b5e583a26273a7504b55bebb382ff310e36a8757d0924941af45f84fd62331733960df9f027311da5665f187e3234585
+  data.tar.gz: 8e69e2a120db6cf26697f0356196b5129bd07e0cc609e6ce8900c749c922e5b541c389c2f680e94cc767a1b61d78e86627ea8caa5f48b19cb20d325990c0d2a7

data/lib/dg/docker.rb

@@ -1,6 +1,8 @@
 require 'pty'
 require 'uri'
 require 'net/http'
+require 'fileutils'
+require 'time'
 require 'dg/version'
 
 module DG
@@ -10,10 +12,17 @@ module DG
 
     FIG_YML_PATH = "#{BASEPATH}/fig.yml"
     FIG_GEN_PATH = "#{BASEPATH}/fig_gen.yml"
+    CACHE_FILES = %w(
+      bower.json
+      Gemfile
+      Gemfile.lock
+      package.json
+    )
 
     class << self
 
       def build
+        reset_mtimes
         build_docker_image_with_tag
       end
 
@@ -81,16 +90,16 @@ module DG
         exit 1
       end
 
-      def run_with_output(command, capture = false)
+      def run_with_output(command, capture = false, return_hash = false)
         sudo_command = SUDO ? "sudo -E bash -c '#{command}'" : command
-        puts "Running `#{sudo_command}` in #{Dir.pwd}"
+        puts "Running `#{sudo_command}` #{return_hash ? '(quietly)' : ''} in #{Dir.pwd}"
 
         begin
           buffer = ''
           PTY.spawn(sudo_command) do |stdin, stdout, pid|
             callback = capture ?
               ->(line) {
-                print line
+                print line unless return_hash
                 buffer << line
               } :
               ->(line) { print line }
@@ -99,8 +108,12 @@ module DG
           end
           status_code = $?.exitstatus
 
-          error!(RuntimeError.new("exit code was #{status_code}"), "executing #{command}") if status_code != 0
+          error!(
+            RuntimeError.new("exit code was #{status_code}"),
+            "executing #{command}"
+          ) if !return_hash && status_code != 0
 
+          return { stdout: buffer, status_code: status_code } if return_hash
           return capture ? buffer : status_code
         rescue PTY::ChildExited
           puts "The child process exited!"
@@ -138,6 +151,31 @@ module DG
         error!(e, "generating new fig.yml")
       end
 
+      def reset_mtimes
+        CACHE_FILES.each do |file|
+          next unless File.exist?(file)
+          revision = run_with_output(
+            %(git rev-list -n 1 HEAD '#{file}'),
+            capture = true,
+            return_hash = true
+          )
+          if revision[:status_code] == 0
+            # File exists, find out its last modified time from git
+            # FileUtils.touch('example.txt', mtime: Time.now)
+            time = Time.parse(
+              run_with_output(
+                %(git show --pretty=format:%ai --abbrev-commit #{
+                revision[:stdout].strip} | head -n 1),
+                capture = true,
+                return_hash = true
+              )[:stdout].strip
+            )
+            FileUtils.touch(file, mtime: time)
+            puts "Setting mtime for #{file} to #{time}"
+          end
+        end
+      end
+
       def build_docker_image_with_tag
         run_with_output("docker build -t #{git_image_name} #{BASEPATH}")
       rescue => e
@@ -191,7 +229,7 @@ module DG
 
         Commands:
             build     Build an image based on your fig.yml (tags with the project's Git commit hash)
-            debug     Debug a previously built image (!) THIS MUST BE RUN IN A SUBSHELL: `$(dim debug)`
+            debug     Debug a previously built image (!) THIS MUST BE RUN IN A SUBSHELL: `$(dg debug)`
             deploy    Trigger the GoCD pipeline for this project
             help      Display this help text
             purge     Remove ALL docker containers and images (not just for this project!)

data/lib/dg/version.rb

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

metadata

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