rf_footer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aba218fc675a0d62c21c9c705936d5ba4550953f
-  data.tar.gz: f6fc9f42770f265dd9cab7244b2cdd89a1cc9202
+  metadata.gz: 480efe2e8ac744e9aacd393f0429554e66c0cd84
+  data.tar.gz: 97845059417ab2014e7158eb02d284efd20c7797
 SHA512:
-  metadata.gz: 285609ecc5c1616588db5506986e9761e210e121b67109938653ab36eb4bad10989c53c83f0c247698e3e4989846f404b5ced92ea2080da5060d852dbe4bae4f
-  data.tar.gz: c8f4cd0c0de7bab643f50376da0f2988b4537f9ac242509f0ec0e7b5ac66520f54d987c6281e875a0fad963494fe7e84ef5e8d65af32d86e3b9e6ff26a2b0dcf
+  metadata.gz: 2c866908a9d574d9fc97904a15172592a9c8fff4f54717247d7ce3adb60a0e07abf75d199b8af1fa7bb4527631bf0e986a54d066ff86ba40abb4f44614607a83
+  data.tar.gz: 7df7add4b1d3ddf48204ac317ceddf2a02cd2aaa674ce7abd70b6770e6e4c44156377523f6b5684f057d1543fb116554aeb6598d534ff297fb31e0a9951c2eb2

data/lib/rf_footer/deployment_info.rb

@@ -1,12 +1,14 @@
 module RfFooter
   class DeploymentInfo
     class << self
+      include Git
+
       def revision
-        Git::REVISION || "unknown SHA"
+        sha || "unknown SHA"
       end
 
       def environment
-        ENV.fetch("RF_ENV", "undefined environment")
+        ENV["RF_ENV"] || ENV["RORY_ENV"] || ENV["RAILS_ENV"] || "undefined environment"
       end
     end
   end

data/lib/rf_footer/git.rb

@@ -1,3 +1,37 @@
-module Git
-  REVISION = `git log --pretty=format:'%h' -n 1`
+module RfFooter
+  module Git
+    def sha
+      sha_via_cap_vic || sha_via_git_repo
+    end
+
+  private
+
+    def sha_via_cap_vic
+      return unless root
+
+      File.read(path) if File.exists?(path)
+    end
+
+    def sha_via_git_repo
+      return if bash_response.empty?
+
+      bash_response
+    end
+
+    def path
+      @path ||= root.join("REVISION")
+    end
+
+    def bash_response
+      @bash_response ||= `git log --pretty=format:'%h' -n 1`
+    end
+
+    def root
+      if ENV["RAILS_ENV"]
+        Rails.root
+      elsif ENV["RORY_ENV"]
+        Rory.root
+      end
+    end
+  end
 end

data/lib/rf_footer/version.rb

@@ -1,3 +1,3 @@
 module RfFooter
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rf_footer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - jozw
@@ -88,6 +88,7 @@ files:
 - lib/rf_footer/notes.rb
 - lib/rf_footer/version.rb
 - rf_footer-0.1.0.gem
+- rf_footer-1.0.0.gem
 - rf_footer.gemspec
 homepage: https://github.com/projectdx/rf_footer
 licenses: []