[ARVADOS] updated: 54f9295f630357859e747538487c11c747b11361

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/lib/app_version.rb          | 4 ++--
 services/api/lib/app_version.rb            | 2 +-
 services/api/test/unit/app_version_test.rb | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

       via  54f9295f630357859e747538487c11c747b11361 (commit)
       via  2785f0ea4e826c53002fbfc7738820399fea1a03 (commit)
      from  965c5b34d9a535a9b45553f07f360d5fea2f6492 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 54f9295f630357859e747538487c11c747b11361
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Oct 8 14:46:22 2015 -0400

    6967: More helpful comment & assertion failure message

diff --git a/apps/workbench/lib/app_version.rb b/apps/workbench/lib/app_version.rb
index bf50ee4..48cb8f6 100644
--- a/apps/workbench/lib/app_version.rb
+++ b/apps/workbench/lib/app_version.rb
@@ -1,5 +1,5 @@
 # If you change this file, you'll probably also want to make the same
-# changes in apps/workbench/lib/app_version.rb.
+# changes in services/api/lib/app_version.rb.
 
 class AppVersion
   def self.git(*args, &block)
diff --git a/services/api/test/unit/app_version_test.rb b/services/api/test/unit/app_version_test.rb
index eaf9cbb..e8c8374 100644
--- a/services/api/test/unit/app_version_test.rb
+++ b/services/api/test/unit/app_version_test.rb
@@ -29,7 +29,8 @@ class AppVersionTest < ActiveSupport::TestCase
 
   test 'override with file' do
     path = Rails.root.join 'git-commit.version'
-    assert !File.exists?(path)
+    assert(!File.exists?(path),
+           "Packaged version file found in source tree: #{path}")
     begin
       File.open(path, 'w') do |f|
         f.write "0.1.abc123\n"

commit 2785f0ea4e826c53002fbfc7738820399fea1a03
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Oct 8 14:45:33 2015 -0400

    6967: Use git status --porcelain to isolate from user config

diff --git a/apps/workbench/lib/app_version.rb b/apps/workbench/lib/app_version.rb
index 05b9f26..bf50ee4 100644
--- a/apps/workbench/lib/app_version.rb
+++ b/apps/workbench/lib/app_version.rb
@@ -30,7 +30,7 @@ class AppVersion
     if @hash.nil? or @hash.empty?
       begin
         local_modified = false
-        git("status", "-s") do |git_pipe|
+        git("status", "--porcelain") do |git_pipe|
           git_pipe.each_line do |_|
             STDERR.puts _
             local_modified = true
diff --git a/services/api/lib/app_version.rb b/services/api/lib/app_version.rb
index 2f235d1..769f4e5 100644
--- a/services/api/lib/app_version.rb
+++ b/services/api/lib/app_version.rb
@@ -30,7 +30,7 @@ class AppVersion
     if @hash.nil? or @hash.empty?
       begin
         local_modified = false
-        git("status", "-s") do |git_pipe|
+        git("status", "--porcelain") do |git_pipe|
           git_pipe.each_line do |_|
             local_modified = true
             # Continue reading the pipe so git doesn't get SIGPIPE.

-----------------------------------------------------------------------


hooks/post-receive
--