barkeep 0.2.3 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6c1d538a93aa89e6669467682442091dd61eddc4
+  data.tar.gz: 02d2cd3bfb771bbbaa843051a39f47d81a3199a5
+SHA512:
+  metadata.gz: f064783e33b5768021a3ab970b97c5bfc5f5df962fc3a14dd7c660aaab43a6e8b80d6752a9abce6095c925aee68cd7e046139b8f9be63e60278da3572e2f05e4
+  data.tar.gz: 48a15b47f101b868299ef12855b5c40c6facc5bc596fcf8bbbdcceaa7d202f74054af0cc2a7097f6734af9a2e70f3b1dfe60511d457636ba1a6142dc8427e18a

data/.gitignore

@@ -11,32 +11,8 @@ doc
 # bundler
 .bundle
 
-# jeweler generated
+# Built gem
 pkg
 
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
-#
-# For TextMate
-#*.tmproj
-#tmtags
-#
-# For emacs:
-#*~
-#\#*
-#.\#*
-#
-# For vim:
-#*.swp
+# Shouldn't commit Gemfile.lock to gem repos
+Gemfile.lock

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## Version 0.3.0 - February 20, 2014
+
+* Drop the dependency on grit (which is abandoned) in favor of calling git on the command line
+* Drop the dependency on rcov (which is also abandoned) in favor of nada
+* Allow barkeep to be rendered from within controller or view context
+* Allow partials to access Rails helpers if present

data/Rakefile

@@ -7,13 +7,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
 require 'rdoc/task'

data/barkeep.gemspec

@@ -19,10 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency     "grit"
   spec.add_runtime_dependency     "json"
   spec.add_development_dependency "mocha", ">= 0.9.12"
   spec.add_development_dependency "shoulda"
-  spec.add_development_dependency "rcov"
   spec.add_development_dependency "rake"
 end

data/lib/barkeep.rb

@@ -1,15 +1,18 @@
 require 'json'
-require 'grit_wrapper'
+require 'git_wrapper'
 
 module Barkeep
 
   def barkeep
     @@barkeep ||= Barkeeper.new
+    @@barkeep.dup.tap { |barkeep| barkeep.renderer = self }
   end
 
 end
 
 class Barkeeper
+  
+  attr_accessor :renderer
 
   def config
     @config ||= JSON.parse(File.read("config/barkeep.json"))
@@ -37,7 +40,11 @@ class Barkeeper
       #{
         config['panes'].map do |name|
           if name =~ /^(p|partial) (.*)/
-            renderer.send(:render_to_string, {:partial => $2})
+            if renderer.respond_to?(:render_to_string)
+              renderer.send(:render_to_string, {:partial => $2})
+            else
+              renderer.send(:render, {:partial => $2})  
+            end
           else
             send(name)
           end
@@ -51,7 +58,7 @@ class Barkeeper
   end
 
   def renderer
-    @@renderer ||= ApplicationController.new
+    @renderer ||= ApplicationController.new
   end
 
   def branch_info
@@ -82,7 +89,7 @@ class Barkeeper
   end
 
   def grit_info
-    GritWrapper.instance
+    GitWrapper.instance
   end
 
   def branch_link_attributes

data/lib/barkeep/version.rb

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

data/lib/{grit_wrapper.rb → git_wrapper.rb}

@@ -1,44 +1,45 @@
-require 'grit'
-
 # A singleton refreshes on every request in development but
 # caches in environments where class caching is enabled.
 require 'singleton'
 require 'ostruct'
 
-class GritWrapper
+class GitWrapper
   include Singleton
 
   def repository
-    @repository ||= Grit::Repo.new('.')
-  rescue Grit::InvalidGitRepositoryError
-    # not in a directory that contains .git
-    @repository = :invalid
+    @repository = (Dir.new('./.git') rescue :invalid)
   end
 
   def repository?
     !repository.nil? && repository != :invalid
   end
 
-  def head
-    @head ||= repository.head
-  end
-
   def last_commit_hash
-    @last_commit_hash ||= head.commit.to_s
+    @last_commit_hash ||= `git rev-parse HEAD`.strip
   end
 
   def last_commit
-    @last_commit ||= repository.commit(last_commit_hash) || OpenStruct.new
+    @last_commit ||= begin
+      if repository?
+        OpenStruct.new(
+          author: `git show -s --format='format:%an <%ae>'`.strip,
+          message: `git show -s --format='%s'`.strip,
+          authored_date: Time.at(`git show -s --format='format:%at'`.to_i)
+        )
+      else
+        OpenStruct.new()
+      end
+    end
   end
 
   def to_hash
     return {
       :branch => 'Not currently on a branch.',
       :commit => (File.read("REVISION").strip rescue nil)
-    } if head.nil?
-
+    } unless repository?
+    
     @hash ||= {
-      :branch => head.name,
+      :branch => `git rev-parse --abbrev-ref HEAD`.strip,
       :commit => last_commit_hash,
       :last_author => last_commit.author,
       :message => last_commit.message,

data/test/helper.rb

@@ -10,6 +10,7 @@ end
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
+require 'mocha/test_unit'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_barkeep.rb

@@ -15,11 +15,11 @@ class TestBarkeep < Test::Unit::TestCase
 
   should "render a style tag filled with css" do
     css = File.read(File.expand_path(File.dirname(__FILE__) + "/../lib/default.css"))
-    assert_equal "<style>#{css}</style>", barkeep.styles
+    assert_equal "<style>#{css}</style>", @barkeep.styles
   end
 
   should "render the barkeep bar" do
-    GritWrapper.instance.stubs(:repository? => true, :to_hash => {:branch => 'new_branch', :commit => 'abcdef', :last_author => 'Johnny', :date => '2/11/2012'})
+    GitWrapper.instance.stubs(:repository? => true, :to_hash => {:branch => 'new_branch', :commit => 'abcdef', :last_author => 'Johnny', :date => '2/11/2012'})
     expected = %(
       <dl id="barkeep">
         <dt>Branch:</dt>
@@ -29,7 +29,7 @@ class TestBarkeep < Test::Unit::TestCase
         <dd class="close"><a href="#" onclick="c = document.getElementById('barkeep'); c.parentNode.removeChild(c); return false" title="Close me!">&times;</a></dd>
       </dl>
     )
-    assert_equal expected.gsub(/\s+/, ''), barkeep.render_toolbar.gsub(/\s+/, '')
+    assert_equal expected.gsub(/\s+/, ''), @barkeep.render_toolbar.gsub(/\s+/, '')
   end
 end
 

metadata

@@ -1,112 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: barkeep
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - PatientsLikeMe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: grit
-  type: :runtime
-  prerelease: false
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: json
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.12
-    none: false
-  name: mocha
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.12
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
   name: shoulda
-  type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rcov
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: an extensible developer's status bar to track your current deployed commit
   & more
 email:
@@ -115,47 +74,46 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - barkeep.gemspec
 - lib/barkeep.rb
 - lib/barkeep/version.rb
 - lib/default.css
-- lib/grit_wrapper.rb
+- lib/git_wrapper.rb
 - test/helper.rb
 - test/test_barkeep.rb
 homepage: https://github.com/patientslikeme/barkeep
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: an extensible developer's status bar to track your current deployed commit
   & more
 test_files:
 - test/helper.rb
 - test/test_barkeep.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: .
-  specs:
-    barkeep (0.2.3)
-      grit
-      json
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.4)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-    json (1.7.7)
-    mime-types (1.23)
-    mocha (0.9.12)
-    posix-spawn (0.3.6)
-    rake (10.0.4)
-    rcov (0.9.9)
-    shoulda (2.11.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  barkeep!
-  mocha (>= 0.9.12)
-  rake
-  rcov
-  shoulda

data/VERSION

@@ -1 +0,0 @@
-0.2.2