hoc 0.3 → 0.4

data/.rultor.yml

@@ -5,6 +5,11 @@ assets:
 install: |
   sudo gem install pdd
   sudo apt-get install -y subversion diffstat
+  sudo apt-get install -y software-properties-common
+  sudo add-apt-repository -y ppa:git-core/ppa
+  sudo apt-get update
+  sudo apt-get remove -y git
+  sudo apt-get install -y git
 
 release:
   script: |

data/.travis.yml

@@ -6,8 +6,11 @@ branches:
 install:
   - travis_retry sudo apt-get update
   - travis_retry sudo apt-get install -y diffstat
-  - travis_retry sudo apt-get install -y subversion
-  - travis_retry sudo apt-get upgrade subversion
+  - travis_retry sudo apt-get remove -y subversion git
+  - travis_retry sudo add-apt-repository "deb http://ppa.launchpad.net/svn/ppa/ubuntu precise main"
+  - travis_retry sudo add-apt-repository -y ppa:git-core/ppa
+  - travis_retry sudo apt-get update
+  - travis_retry sudo apt-get install -y subversion git
   - travis_retry bundle install
 script:
   - rake

data/README.md

@@ -7,6 +7,11 @@
 [![Code Climate](http://img.shields.io/codeclimate/github/teamed/hoc.svg)](https://codeclimate.com/github/teamed/hoc)
 [![Coverage Status](https://img.shields.io/coveralls/teamed/hoc.svg)](https://coveralls.io/r/teamed/hoc)
 
+It is a command line tool to calculate Hits-of-Code metric
+in a source code repository (at the moment we support Git 2+ and Subversion 1.7+).
+You can read more about Hits-of-Code metric in this blog post:
+[Hits-of-Code Instead of SLoC](http://www.yegor256.com/2014/11/14/hits-of-code.html).
+
 Install it first:
 
 ```bash
@@ -18,3 +23,5 @@ Run it locally and read its output:
 ```bash
 $ hoc --help
 ```
+
+

data/lib/hoc/git.rb

@@ -32,16 +32,18 @@ module HOC
     end
 
     def hits
-      log = `git '--git-dir=#{@dir}/.git' log --pretty=format:%ci --numstat`
-      log.split(/\n\n/).map do |c|
-        lines = c.split(/\n/)
+      version = `git --version`.split(/ /)[2]
+      fail "git version #{version} is too old, upgrade it to 2.0+" unless
+        Gem::Version.new(version) >= Gem::Version.new('2.0')
+      log = `git '--git-dir=#{@dir}/.git' log --pretty=tformat: --numstat`
+      [
         Hits.new(
-          Date.parse(lines[0]),
-          lines.drop(1).map do |f|
-            f.split(/\t/).take(2).map { |s| s.to_i }.inject(:+)
+          Time.now,
+          log.split(/\n/).map do |t|
+            t.split(/\t/).take(2).map { |s| s.to_i }.inject(:+)
           end.inject(:+)
         )
-      end
+      ]
     end
   end
 end

data/lib/hoc/svn.rb

@@ -33,9 +33,10 @@ module HOC
 
     def hits
       version = `svn --version --quiet`
-      fail "svn version #{version} is too old" unless
+      fail "svn version #{version} is too old, upgrade it to 1.7+" unless
         Gem::Version.new(version) >= Gem::Version.new('1.7')
-      fail 'diffstat is not installed' if `diffstat -V`.index('version').nil?
+      fail 'diffstat is not installed' if
+        `diffstat -V`.index('version').nil?
       log = `cd '#{@dir}'; svn log --diff | diffstat`
       [
         Hits.new(

data/lib/hoc/version.rb

@@ -26,5 +26,5 @@
 # Copyright:: Copyright (c) 2014 Yegor Bugayenko
 # License:: MIT
 module HOC
-  VERSION = '0.3'
+  VERSION = '0.4'
 end

data/test/test_git.rb

@@ -32,7 +32,7 @@ require 'tmpdir'
 class TestGit < Minitest::Test
   def test_parsing
     Dir.mktmpdir 'test' do |dir|
-      system("
+      fail unless system("
         set -e
         cd '#{dir}'
         git init .
@@ -47,10 +47,8 @@ class TestGit < Minitest::Test
         git commit -am 'delete line'
       ")
       hits = HOC::Git.new(dir).hits
-      assert_equal 3, hits.size
-      assert_equal 1, hits[0].total
-      assert_equal 2, hits[1].total
-      assert_equal 1, hits[2].total
+      assert_equal 1, hits.size
+      assert_equal 4, hits[0].total
     end
   end
 end

data/test/test_hoc.rb

@@ -33,7 +33,7 @@ require 'slop'
 class TestHOC < Minitest::Test
   def test_basic_git
     Dir.mktmpdir 'test' do |dir|
-      system("
+      fail unless system("
         set -e
         cd '#{dir}'
         git init .
@@ -49,7 +49,7 @@ class TestHOC < Minitest::Test
 
   def test_basic_svn
     Dir.mktmpdir 'test' do |dir|
-      system("
+      fail unless system("
         set -e
         cd '#{dir}'
         svnadmin create base

data/test/test_svn.rb

@@ -32,7 +32,7 @@ require 'tmpdir'
 class TestSvn < Minitest::Test
   def test_parsing
     Dir.mktmpdir 'test' do |dir|
-      system("
+      fail unless system("
         set -e
         cd '#{dir}'
         svnadmin create base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoc
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors: