From 0734fe8554e07ebdba96a8ac105b269563911c38 Mon Sep 17 00:00:00 2001 From: Kevin Musiorski Date: Tue, 8 May 2018 10:42:48 -0500 Subject: [PATCH 1/5] add xray rails to look at pretty views --- Gemfile | 1 + Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 3a7d9c8..edab756 100644 --- a/Gemfile +++ b/Gemfile @@ -60,6 +60,7 @@ group :development, :test do gem 'rspec-rails' gem 'selenium-webdriver' gem 'solr_wrapper', '>= 0.3' + gem 'xray-rails' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 1f28a5d..fd2cd1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -812,6 +812,8 @@ GEM xml-simple (1.1.5) xpath (3.0.0) nokogiri (~> 1.8) + xray-rails (0.3.1) + rails (>= 3.1.0) PLATFORMS ruby @@ -852,6 +854,7 @@ DEPENDENCIES tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) + xray-rails BUNDLED WITH 1.16.1 From f4c74d2fbf58cc7ffccb5582eea873ce95d0f687 Mon Sep 17 00:00:00 2001 From: Kevin Musiorski Date: Tue, 8 May 2018 11:29:33 -0500 Subject: [PATCH 2/5] overrides hyrax footer and turns constant into a link to github with the env var that capistrano sets on deploy. --- app/views/shared/_footer.html.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 app/views/shared/_footer.html.erb diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb new file mode 100644 index 0000000..4137933 --- /dev/null +++ b/app/views/shared/_footer.html.erb @@ -0,0 +1,14 @@ +
+
+
+

<%= t('hyrax.footer.service_html') %>

+

<%= t('hyrax.product_name') %> v<%= link_to(Hyrax::VERSION, "https://github.com/RepoCamp/ascteam2/commit/#{ENV['branch']}", target: "_blank") %>

+
+
+
+

<%= t('hyrax.footer.copyright_html') %>

+

<%= t('hyrax.background_attribution_html') %>

+
+
+
+
From 92cbc1c92512f06e6dbcfa26b1e12f0fea5541fb Mon Sep 17 00:00:00 2001 From: Kevin Musiorski Date: Tue, 8 May 2018 11:53:23 -0500 Subject: [PATCH 3/5] looks at the actual issue on asc repo and sees links to help articles on not reinventing the wheel :( --- app/views/shared/_footer.html.erb | 2 +- config/initializers/git_sha.rb | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 config/initializers/git_sha.rb diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index 4137933..c6c9fa2 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -2,7 +2,7 @@

<%= t('hyrax.footer.service_html') %>

-

<%= t('hyrax.product_name') %> v<%= link_to(Hyrax::VERSION, "https://github.com/RepoCamp/ascteam2/commit/#{ENV['branch']}", target: "_blank") %>

+

<%= t('hyrax.product_name') %> v<%= link_to(Hyrax::VERSION, "https://github.com/RepoCamp/ascteam2/commit/#{GIT_SHA}", target: "_blank") %>

diff --git a/config/initializers/git_sha.rb b/config/initializers/git_sha.rb new file mode 100644 index 0000000..d693855 --- /dev/null +++ b/config/initializers/git_sha.rb @@ -0,0 +1,26 @@ +revisions_logfile = "/opt/#{ENV['PROJECT_NAME']}/revisions.log" +GIT_SHA = + if Rails.env.production? && File.exist?(revisions_logfile) + `tail -1 #{revisions_logfile}`.chomp.split(" ")[3].gsub(/\)$/, '') + elsif Rails.env.development? || Rails.env.test? + `git rev-parse HEAD`.chomp + else + "Unknown SHA" + end + +BRANCH = + if Rails.env.production? && File.exist?(revisions_logfile) + `tail -1 #{revisions_logfile}`.chomp.split(" ")[1] + elsif Rails.env.development? || Rails.env.test? + `git rev-parse --abbrev-ref HEAD`.chomp + else + "Unknown branch" + end + +LAST_DEPLOYED = + if Rails.env.production? && File.exist?(revisions_logfile) + deployed = `tail -1 #{revisions_logfile}`.chomp.split(" ")[7] + Date.parse(deployed).strftime("%d %B %Y") + else + "Not in deployed environment" + end \ No newline at end of file From 920cb6b4f0adabfa8673bb35dc0ffc606a5e9429 Mon Sep 17 00:00:00 2001 From: Kevin Musiorski Date: Tue, 8 May 2018 13:51:07 -0500 Subject: [PATCH 4/5] * adds version info to template * sets height on footer to accomodate new version info --- app/assets/stylesheets/application.css | 4 ++++ app/views/shared/_footer.html.erb | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 2f00280..95ef542 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,3 +14,7 @@ *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap *= require_self */ + +.site-footer { + height: initial; + } \ No newline at end of file diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index c6c9fa2..b03c917 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -2,13 +2,19 @@

<%= t('hyrax.footer.service_html') %>

-

<%= t('hyrax.product_name') %> v<%= link_to(Hyrax::VERSION, "https://github.com/RepoCamp/ascteam2/commit/#{GIT_SHA}", target: "_blank") %>

+

<%= t('hyrax.product_name') %> v<%= Hyrax::VERSION %>

<%= t('hyrax.footer.copyright_html') %>

<%= t('hyrax.background_attribution_html') %>

+
TEAM2 Version +
ENV: <%= Rails.env %> +
SHA: <%= link_to(GIT_SHA, "https://github.com/RepoCamp/ascteam2/commit/#{GIT_SHA}") %> +
Branch: <%= BRANCH %> +
Updated: <%= LAST_DEPLOYED %>
+
From 99ed811ba2cff6ed00388bcbd50007b02413a9bb Mon Sep 17 00:00:00 2001 From: Kevin Musiorski Date: Tue, 8 May 2018 13:51:40 -0500 Subject: [PATCH 5/5] adds bug fix from Bess --- config/deploy.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/deploy.rb b/config/deploy.rb index 71e930e..27a27f2 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -21,6 +21,7 @@ append :linked_dirs, "db" append :linked_dirs, "public/assets" append :linked_files, "config/secrets.yml" +append :linked_files, ".env.production" # We have to re-define capistrano-sidekiq's tasks to work with # systemctl in production. Note that you must clear the previously-defined