git-version 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7abd95f02647559aa6cec401e08d2c2edbe2da8f
+  data.tar.gz: b0663e91d71fac7848102c35f5dce9a45f9dbac3
+SHA512:
+  metadata.gz: 1181dbe9d831a2b2a38d558c36078a7c7ad9e56370fdb12834611ee2efad293608af8372a4d67292761422b5b87679cbf9a0fb1aeb34db22d20ffbb8c767f6bd
+  data.tar.gz: 5f8c2d3914404c44335beb0938de6c5c743dcd9a77c918aafd0c2af638153ee5db4cd8d2f2b4962eba7b56c96b7b6d39bebf3092d2adc4b3ca36b1deeff71692

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.md

@@ -10,7 +10,7 @@ I also wanted to play around with rails engines.
 
 Prerequisites
 -------------
-- Rails 3
+- Rails > 3.1.0
 - Using git for deployment
 
 Installation

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+
+task :default => :spec
+

data/config/routes.rb

@@ -1,7 +1,5 @@
-require 'grit'
-
 GitVersion::Engine.routes.draw do
-  root :to => proc {|env| [200, {}, [ENV['COMMIT_HASH'] || Grit::Repo.new(Rails.root + '.git').commits.first.id[0...7]]]}
+  root :to => proc {|env| [200, {'Content-Type' => 'text/plain'}, [GitVersion::Finder.new.find]]}
 end
 
 Rails.application.routes.draw do

data/git-version.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "grit"
+  s.add_development_dependency "rspec"
 end

data/lib/generators/git_version/install/install_generator.rb

@@ -0,0 +1,24 @@
+module GitVersion
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+
+      desc <<DESC
+Description:
+    Copy git-version files to your application.
+DESC
+
+      def self.source_root
+        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+      def copy_gitattributes
+        template 'gitattributes', '.gitattributes'
+      end
+
+      def copy_version
+        template 'config/version.txt'
+      end
+    end
+  end
+end
+

data/lib/generators/git_version/install/templates/config/version.txt

@@ -0,0 +1 @@
+$Id$

data/lib/generators/git_version/install/templates/gitattributes

@@ -0,0 +1,2 @@
+config/version.txt ident
+

data/lib/git-version.rb

@@ -1,5 +1,7 @@
-require "git-version/version"
-require "git-version/engine"
+require 'git-version/version'
+require 'git-version/engine'
+require 'git-version/finder'
 
 module GitVersion
 end
+

data/lib/git-version/engine.rb

@@ -3,3 +3,4 @@ module GitVersion
     isolate_namespace GitVersion
   end
 end
+

data/lib/git-version/finder.rb

@@ -0,0 +1,26 @@
+module GitVersion
+  class Finder
+    def find
+      from_environment || from_config_file || from_git_repo
+    end
+
+    private
+
+    def from_environment
+      ENV['COMMIT_HASH']
+    end
+
+    def from_config_file
+      version_file = File.join(Rails.root, 'config', 'version.txt')
+
+      if File.exists? version_file
+        File.read(version_file).match(/\$Id: ([a-zA-Z0-9]*) \$/)[1] rescue nil
+      end
+    end
+
+    def from_git_repo
+      `git rev-parse HEAD`
+    end
+  end
+end
+

data/lib/git-version/version.rb

@@ -1,3 +1,4 @@
 module GitVersion
-  VERSION = "0.0.2"
+  VERSION = '0.0.3'
 end
+

data/spec/git-version/finder_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'git-version/finder'
+require 'tmpdir'
+require 'fileutils'
+
+describe GitVersion::Finder do
+  after(:each) do
+    ENV['COMMIT_HASH'] = nil
+  end
+
+  it 'uses the COMMIT_HASH environment variable' do
+    ENV['COMMIT_HASH'] = '12345'
+
+    expect(subject.find).to eq('12345')
+  end
+
+  it 'uses the config/version.txt file if it exists' do
+    Dir.mktmpdir do |root|
+      Rails.root = root
+      FileUtils.mkdir(File.join(root, 'config'))
+      File.open(File.join(root, 'config', 'version.txt'), 'w') do |file|
+        file.write('$Id: 055c8729cdcc372500a08db659c045e16c4409fb $')
+      end
+
+      expect(subject.find).to eq('055c8729cdcc372500a08db659c045e16c4409fb')
+    end
+  end
+
+  it 'uses the git repo if one is found' do
+    expect(subject.find).to eq(`git rev-parse HEAD`)
+  end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'bundler/setup'
+Bundler.setup
+
+class Rails
+  class << self
+    attr_accessor :root
+  end
+end
+
+RSpec.configure do |config|
+end
+

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git-version
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Darrin Holst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
-  requirement: &70345732445180 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70345732445180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Add current git commit hash as a rails endpoint bound to /version
 email:
 - darrinholst@gmail.com
@@ -29,44 +31,46 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - config/routes.rb
 - git-version.gemspec
+- lib/generators/git_version/install/install_generator.rb
+- lib/generators/git_version/install/templates/config/version.txt
+- lib/generators/git_version/install/templates/gitattributes
 - lib/git-version.rb
 - lib/git-version/engine.rb
+- lib/git-version/finder.rb
 - lib/git-version/version.rb
+- spec/git-version/finder_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 55499764461789626
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 55499764461789626
 requirements: []
 rubyforge_project: git-version
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add current git commit as a rails endpoint
-test_files: []
+test_files:
+- spec/git-version/finder_spec.rb
+- spec/spec_helper.rb