kapnismology 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02f52858c157f4316cdcdf714508cb931e63e84d
-  data.tar.gz: c06b4a9f6cf659980ed86dd96791344aad4dbbb7
+  metadata.gz: 6c0e774535593967181d8b1fd490b470a95a41e0
+  data.tar.gz: 87a3a37511698208882a899de4631f8a69af9b77
 SHA512:
-  metadata.gz: 3274e8f47fac57a7c9af202a9fdb48d84519d9a7833636dfa2d13884ee93332a879d0e314d57cc1a2b3218a44e5fa93b52ecdfeb2e02266819e4aad19cb55ade
-  data.tar.gz: 7b9bad1cee8c6200450b6312df2adbc3b7d89170cb5c1085e0bd481ac6dd3f09507307e8ba5987d5fd45cb64c0d83f59f45f2f077d255da8f15eb7eeb94f01c8
+  metadata.gz: 1ce123b813acda1e6b3994d7b522532aa24ebf34ae815df6b5f09f9bdf776ae70402d9905024e7c1ec908fab7f31cb0d8d4ee4756b5577237389fb1c6bcc8504
+  data.tar.gz: daa53a22ae581bd33231406a4755108729eab9ee5eb04853103c3510b7212b47fd43b8434d4938eddbac6a664591a02d17ad4e8c22c6a051aa61e19070e0b859

data/lib/kapnismology/application_information.rb

@@ -1,22 +1,47 @@
+require "json"
+
 module Kapnismology
   # This class provides information about the running environment the smoketest is being
   # executed under.
   class ApplicationInformation
-    INFO_UNKNOWN = ''
+    GIT_SHOW_COMMAND = "git show HEAD --abbrev-commit --oneline".freeze
+    ECS_CONTAINER_METADATA_FILE = ENV["ECS_CONTAINER_METADATA_FILE"].freeze
+    INFO_UNKNOWN = "".freeze
 
     def trace_id
       Object.const_defined?(:Trace) ? Trace.id.trace_id.to_s : INFO_UNKNOWN
     end
 
     def codebase_revision
-      latest_commit_info.split(/\s/).first || INFO_UNKNOWN
+      ref = latest_commit_info
+      ref ? ref.split(/\s/).first : INFO_UNKNOWN
     rescue Errno::ENOENT, StandardError
-     INFO_UNKNOWN
+      INFO_UNKNOWN
     end
 
     private
+
     def latest_commit_info
-      `git show HEAD --abbrev-commit --oneline`
+      latest_ref_from_git || latest_ref_from_ecs_metadata || nil
+    end
+
+    def latest_ref_from_git
+      result = `#{GIT_SHOW_COMMAND}`
+      $?.success? ? result : nil
+    end
+
+    # This assumes the ImageName features the git ref as the last part of a string delimited by dots.
+    # See spec/support/ecs_metadata.json as well as
+    # https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container-metadata.html
+    def latest_ref_from_ecs_metadata
+      return if ECS_CONTAINER_METADATA_FILE.nil?
+      return unless !ECS_CONTAINER_METADATA_FILE.strip.empty? && File.readable?(ECS_CONTAINER_METADATA_FILE)
+
+      begin
+        JSON.parse(File.read(ECS_CONTAINER_METADATA_FILE))["ImageName"].split(".").last[0...7]
+      rescue JSON::ParserError
+        nil
+      end
     end
   end
 end

data/lib/kapnismology/version.rb

@@ -1,3 +1,3 @@
 module Kapnismology
-  VERSION = '2.3.2'.freeze
+  VERSION = '2.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapnismology
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Jordi Polo Carres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 description: Engine for smoke tests and base classes
 email:
 - mumismo@gmail.com
@@ -201,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.8
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -209,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Engine for smoke tests.