sha_header 0.0.2 → 0.0.3

data/.rvmrc

@@ -1 +1,52 @@
-rvm gemset use sha_header
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p327@sha_header"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.16.20 (version)" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+  if [[ $- == *i* ]] # check for interactive shells
+  then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+  else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create use  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
+# fi

data/README.md

@@ -0,0 +1,41 @@
+# SHAHeader
+
+SHAHeader is a simple Rack middleware gem for Rails 3.  When required, it
+will instruct Rails to automatically insert its middleware into the Rack
+stack and inject your current git SHA hash into all of your dynamic
+response headers.
+
+## Compatibility
+
+The SHAHeader gem is both Ruby 1.8.7 and 1.9.2 compatible.  Currently,
+it is compatible with Rails 3.x.
+
+## Installation
+
+In Rails 3, modify your `Gemfile` to add the following line:
+
+    gem 'sha_header'
+
+That's it.  It is distributed with a `Railtie` to instruct Rails on how
+to set it up, so no other coding is required.
+
+## Example
+
+Here's a simple example for a Rails application running locally.  The
+application has added the above `Gemfile` line.  Using curl:
+
+    curl -I http://localhost:3000/
+
+And, the following response is received:
+
+    HTTP/1.1 200 OK 
+    Content-Type: text/html; charset=utf-8
+    ETag: "25ec427afba8daa376f309559b1b3c5c"
+    Cache-Control: max-age=0, private, must-revalidate
+    X-Git-SHA: 8c139c519c731be597d0c37a6e5ce46a27bab174
+    X-UA-Compatible: IE=Edge
+    X-Runtime: 0.120340
+    Content-Length: 0
+    Connection: Keep-Alive
+
+(Notice the `X-Git-SHA` header)

data/Rakefile

@@ -4,6 +4,8 @@ Bundler::GemHelper.install_tasks
 require 'rake'
 require 'rspec/core/rake_task'
 
+task :default => :spec
+
 desc "Run all examples"
 RSpec::Core::RakeTask.new('spec') do |t|
   t.pattern = 'spec/**/*_spec.rb'

data/lib/sha_header/middleware.rb

@@ -1,10 +1,7 @@
 require 'active_support/core_ext/object/blank'
-require 'active_support/memoizable'
 
 module SHAHeader
   class Middleware
-    extend ::ActiveSupport::Memoizable
-
     def initialize(app, options = {})
       @app = app
     end
@@ -28,14 +25,15 @@ module SHAHeader
     end
 
     def current_git_sha
-      if revision_present?
-        File.read(::Rails.root.join('REVISION'))
-      elsif on_heroku?
-        ENV['COMMIT_HASH']
-      else
-        `cd "#{::Rails.root}" && git rev-parse HEAD 2>/dev/null`.strip
+      @current_git_sha ||= begin
+        if revision_present?
+          File.read(::Rails.root.join('REVISION')).strip
+        elsif on_heroku?
+          ENV['COMMIT_HASH'].strip
+        else
+          `cd "#{::Rails.root}" && git rev-parse HEAD 2>/dev/null`.strip
+        end
       end
     end
-    memoize :current_git_sha
   end
 end

data/lib/sha_header/version.rb

@@ -1,3 +1,3 @@
 module SHAHeader
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/sha_header.gemspec

@@ -12,12 +12,10 @@ Gem::Specification.new do |s|
   s.summary     = %q{Add a header to the response of your Rails 3 application containing the current commit SHA.}
   s.description = %q{This library adds a new, custom X-Git-SHA header to your Rails 3 application's response which contains the SHA hash that your application is currently running.}
 
-  s.rubyforge_project = 'sha_header'
+  s.add_dependency 'railties', '~>3.0'
 
-  s.add_dependency 'rails', '~>3.0.0'
-
-  s.add_development_dependency 'rspec', '~>2.5.0'
-  s.add_development_dependency 'fakefs', '~>0.3.0'
+  s.add_development_dependency 'rspec', '~>2.5'
+  s.add_development_dependency 'fakefs', '~>0.4'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/models/middleware_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe SHAHeader::Middleware do
-  include FakeFS::SpecHelpers
-
   let(:parent_app) {lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['Hello']] }}
   let(:middleware) { SHAHeader::Middleware.new(parent_app) }
   let(:env) { Rack::MockRequest.env_for('/hello') }
@@ -21,14 +19,14 @@ describe SHAHeader::Middleware do
       it { should == 'ABCDEFG' }
     end
 
-    context 'with a REVISION file' do
-      use_fakefs
-
-      let(:path) { Rails.root.join('REVISION') }
-      before(:each) { File.open(path, 'w') { |file| file.write 'HIJKLMNO' }}
-      after(:each) { File.delete(path) }
+    context 'with a REVISION file', :fakefs do
+      use_fakefs(self) do
+        let(:path) { Rails.root.join('REVISION') }
+        before(:each) { File.open(path, 'w') { |file| file.write 'HIJKLMNO' }}
+        after(:each) { File.delete(path) }
 
-      it { should == 'HIJKLMNO' }
+        it { should == 'HIJKLMNO' }
+      end
     end
 
     context 'when querying git' do

data/spec/spec_helper.rb

@@ -1,11 +1,15 @@
-$:.unshift(File.expand_path('../', __FILE__))
-$:.unshift(File.expand_path('../../lib', __FILE__))
-
-require 'rspec'
-require 'rack'
 require 'sha_header'
 
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |support|
-  require support
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
 end
 
+Dir[File.expand_path("../support/*.rb", __FILE__)].each { |f| require f }

data/spec/support/fakefs.rb

@@ -1,18 +1,5 @@
-require 'fakefs'
-
-module FakeFS::SpecHelpers
-  def use_fakefs
-    before(:each) do
-      FakeFS.activate!
-    end
-
-    after(:each) do
-      FakeFS.deactivate!
-      FakeFS::FileSystem.clear
-    end
-  end
-end
+require 'fakefs/spec_helpers'
 
 RSpec.configure do |config|
-  config.extend FakeFS::SpecHelpers
+  config.include FakeFS::SpecHelpers, :fakefs
 end

data/spec/support/rack.rb

@@ -0,0 +1 @@
+require 'rack'

metadata

@@ -1,84 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sha_header
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Nathaniel Bibler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-31 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id003
-description: This library adds a new, custom X-Git-SHA header to your Rails 3 application's response which contains the SHA hash that your application is currently running.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+description: This library adds a new, custom X-Git-SHA header to your Rails 3 application's
+  response which contains the SHA hash that your application is currently running.
+email:
 - gem@nathanielbibler.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
+- README.md
 - Rakefile
 - lib/sha_header.rb
 - lib/sha_header/middleware.rb
@@ -88,43 +80,36 @@ files:
 - spec/models/middleware_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakefs.rb
+- spec/support/rack.rb
 - spec/support/rails.rb
-has_rdoc: true
 homepage: https://github.com/nbibler/sha_header
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: sha_header
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Add a header to the response of your Rails 3 application containing the current commit SHA.
-test_files: 
+summary: Add a header to the response of your Rails 3 application containing the current
+  commit SHA.
+test_files:
 - spec/models/middleware_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakefs.rb
+- spec/support/rack.rb
 - spec/support/rails.rb