barkeep 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c1d538a93aa89e6669467682442091dd61eddc4
-  data.tar.gz: 02d2cd3bfb771bbbaa843051a39f47d81a3199a5
+  metadata.gz: 3bc22ae0334bd062994f2f3ba6f35a7f827fe434
+  data.tar.gz: a44a8ee5ba696dfff887227e8e9540c577352eec
 SHA512:
-  metadata.gz: f064783e33b5768021a3ab970b97c5bfc5f5df962fc3a14dd7c660aaab43a6e8b80d6752a9abce6095c925aee68cd7e046139b8f9be63e60278da3572e2f05e4
-  data.tar.gz: 48a15b47f101b868299ef12855b5c40c6facc5bc596fcf8bbbdcceaa7d202f74054af0cc2a7097f6734af9a2e70f3b1dfe60511d457636ba1a6142dc8427e18a
+  metadata.gz: 9b695eeb570ab938298fdca879914e9701615e2eb8e5444a5d9a7ed70ff37b41e38dfea8d3ba5d235fb2153a90d0382bcbd7c177d0d0ba2f999c569242e2ee8e
+  data.tar.gz: 5caf5c8cd0cef36f1630f4419372f725cc7d760c3eae118ee2da8a70494800cb0a4ea0e22c561eb9c124a8a9559a35e38a57630ce9c3802fe4094c513df85c8b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.3.1 - November 20, 2015
+
+* Work in situations where you haven't deployed into a git repository
+
 ## Version 0.3.0 - February 20, 2014
 
 * Drop the dependency on grit (which is abandoned) in favor of calling git on the command line

data/lib/barkeep.rb

@@ -11,7 +11,7 @@ module Barkeep
 end
 
 class Barkeeper
-  
+
   attr_accessor :renderer
 
   def config
@@ -33,7 +33,7 @@ class Barkeeper
   end
 
   def render_toolbar
-    return unless load? && grit_info.repository?
+    return unless load?
 
     %(
       <dl id="barkeep">
@@ -43,7 +43,7 @@ class Barkeeper
             if renderer.respond_to?(:render_to_string)
               renderer.send(:render_to_string, {:partial => $2})
             else
-              renderer.send(:render, {:partial => $2})  
+              renderer.send(:render, {:partial => $2})
             end
           else
             send(name)
@@ -62,20 +62,31 @@ class Barkeeper
   end
 
   def branch_info
-    %(<dt>Branch:</dt><dd><a href="#{branch_link_attributes[:href]}">#{grit_info[:branch]}</a></dd>)
+    if grit_info.repository?
+      %(<dt>Branch:</dt><dd><a href="#{branch_link_attributes[:href]}">#{grit_info[:branch]}</a></dd>)
+    end
   end
 
   def commit_sha_info
-    %(<dt>Commit:</dt><dd><a href="#{commit_link_attributes[:href]}" title="#{commit_link_attributes[:title]}">#{(grit_info[:commit] || "").slice(0,8)}</a></dd>)
+    if grit_info.repository?
+      %(<dt>Commit:</dt><dd><a href="#{commit_link_attributes[:href]}" title="#{commit_link_attributes[:title]}">#{(grit_info[:commit] || "").slice(0,8)}</a></dd>)
+    elsif File.exist?(Rails.root.join('REVISION'))
+      commit = Rails.root.join('REVISION').read.strip
+      %(<dt>Commit:</dt><dd><a href="#{commit_link(commit)}">#{commit.slice(0,8)}</a></dd>)
+    end
   end
 
   def commit_author_info
-    %(<dt>Who:</dt><dd>#{grit_info[:last_author]}</dd>)
+    if grit_info.repository?
+      %(<dt>Who:</dt><dd>#{grit_info[:last_author]}</dd>)
+    end
   end
 
   def commit_date_info
-    short_date = (grit_info[:date].respond_to?(:strftime) ? grit_info[:date].strftime("%d %B, %H:%M") : short_date.to_s)
-    %(<dt>When:</dt><dd title="#{grit_info[:date].to_s}">#{short_date}</dd>)
+    if grit_info.repository?
+      short_date = (grit_info[:date].respond_to?(:strftime) ? grit_info[:date].strftime("%d %B, %H:%M") : short_date.to_s)
+      %(<dt>When:</dt><dd title="#{grit_info[:date].to_s}">#{short_date}</dd>)
+    end
   end
 
   def rpm_request_info
@@ -99,9 +110,13 @@ class Barkeeper
     }
   end
 
+  def commit_link(commit_hash)
+    "#{github_url}/commit/#{commit_hash}"
+  end
+
   def commit_link_attributes
     {
-      :href => "#{github_url}/commit/#{grit_info[:commit]}",
+      :href => commit_link(grit_info[:commit]),
       :title => "committed #{grit_info[:date]} by #{grit_info[:last_author]}"
     }
   end

data/lib/barkeep/version.rb

@@ -1,3 +1,3 @@
 module Barkeep
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barkeep
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - PatientsLikeMe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: an extensible developer's status bar to track your current deployed commit
@@ -116,4 +116,3 @@ summary: an extensible developer's status bar to track your current deployed com
 test_files:
 - test/helper.rb
 - test/test_barkeep.rb
-has_rdoc: