hoc 0.4.2 → 0.5

data/.rultor.yml

@@ -3,7 +3,7 @@ assets:
   s3cfg: "yegor256/home#assets/s3cfg"
 
 install: |
-  sudo gem install pdd
+  sudo gem install --no-ri --no-rdoc 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
@@ -17,6 +17,7 @@ release:
     rake
     rm -rf *.gem
     sed -i "s/1\.0\.snapshot/${tag}/g" lib/hoc/version.rb
+    git commit -m "${tag}" lib/hoc/version.rb
     gem build hoc.gemspec
     chmod 0600 ../rubygems.yml
     gem push *.gem --config-file ../rubygems.yml

data/README.md

@@ -5,7 +5,7 @@
 [![Gem Version](https://badge.fury.io/rb/hoc.svg)](http://badge.fury.io/rb/hoc)
 [![Dependency Status](https://gemnasium.com/teamed/hoc.svg)](https://gemnasium.com/teamed/hoc)
 [![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)
+[![Coverage Status](https://coveralls.io/repos/teamed/hoc/badge.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+).

data/bin/hoc

@@ -28,10 +28,26 @@ require 'hoc'
 require 'slop'
 require 'hoc/version'
 
-opts = Slop.parse(ARGV, strict: true, help: true) do
+args = []
+args.push(*File.read('.hoc').split(/\s+/).map(&:strip)) if File.exist?('.hoc')
+args.push(*ARGV)
+
+opts = Slop.parse(args, strict: true, help: true) do
   banner "Usage (#{HOC::VERSION}): hoc [options]"
-  on 'f', 'format', 'Output format (text|xml|json|int)',
-     default: 'int', argument: :required
+  on(
+    'f',
+    'format',
+    'Output format (text|xml|json|int)',
+    default: 'int',
+    argument: :required
+  )
+  on(
+    'e',
+    'exclude',
+    'Glob pattern to exclude files/dirs, e.g. "vendor/**"',
+    as: Array,
+    argument: :required
+  )
 end
 
 if opts.help?
@@ -42,4 +58,4 @@ end
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-puts HOC::Base.new(Dir.pwd, opts[:format]).report
+puts HOC::Base.new(Dir.pwd, opts).report

data/features/git_excludes.feature

@@ -0,0 +1,21 @@
+Feature: Exclude dirs from Git counting
+  As a source code writer I want to be able to
+  exclude certain files from counting
+
+  Scenario: Simple git repo
+    Given I run bash:
+    """
+    set -e
+    git init .
+    git config user.email test@teamed.io
+    git config user.name test
+    mkdir x
+    echo 'hello, world!' > x/invalid.txt
+    echo 'hello, world!' > valid.txt
+    git add .
+    git commit -am test
+    """
+    When I run bin/hoc with "-e x/** -e a.txt"
+    Then Exit code is zero
+    And Stdout contains "1"
+

data/features/uses_config.feature

@@ -0,0 +1,15 @@
+Feature: Using .hoc config file
+  As a source code writer I want to be able to
+  call HOC as a command line tool and configure
+  it via .hoc configuration file
+
+  Scenario: Simple hoc counting
+    Given I run bash:
+    """
+    set -e
+    echo '--help' > .hoc
+    """
+    When I run bin/hoc with "-f int"
+    Then Exit code is zero
+    And Stdout contains "[options]"
+

data/lib/hoc/git.rb

@@ -27,8 +27,9 @@ require 'hoc/hits'
 module HOC
   # Git source code base.
   class Git
-    def initialize(dir)
+    def initialize(dir, exclude)
       @dir = dir
+      @exclude = exclude
     end
 
     def hits
@@ -41,7 +42,9 @@ module HOC
         'log', '--pretty=tformat:', '--numstat',
         '--ignore-space-change', '--ignore-all-space',
         '--ignore-submodules', '--no-color',
-        '--find-copies-harder', '-M', '--diff-filter=ACDM'
+        '--find-copies-harder', '-M', '--diff-filter=ACDM',
+        '--', '.',
+        @exclude.map { |e| "':(exclude,glob)#{e}'" }.join(' ')
       ].join(' ')
       [
         Hits.new(

data/lib/hoc/version.rb

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

data/lib/hoc.rb

@@ -33,18 +33,19 @@ module HOC
   class Base
     # Ctor.
     # +dir+:: Directory to read from
-    # +format+:: Format (xml, json, text)
-    def initialize(dir, format)
+    # +opts+:: Options
+    def initialize(dir, opts)
       @dir = dir
-      @format = format
-      fail "only int format is supported (#{@format})" unless @format == 'int'
+      fail "only \"int\" format is supported now" unless
+        opts[:format].nil? || opts[:format] == 'int'
+      @exclude = opts[:exclude].nil? ? [] : opts[:exclude]
     end
 
     # Generate report.
     def report
       repo = nil
       if File.exist?(File.join(@dir, '.git'))
-        repo = Git.new(@dir)
+        repo = Git.new(@dir, @exclude)
       elsif File.exist?(File.join(@dir, '.svn'))
         repo = Svn.new(@dir)
       else

data/test/test_git.rb

@@ -46,21 +46,41 @@ class TestGit < Minitest::Test
         rm test.txt
         git commit -am 'delete line'
       ")
-      hits = HOC::Git.new(dir).hits
+      hits = HOC::Git.new(dir, []).hits
       assert_equal 1, hits.size
       assert_equal 4, hits[0].total
     end
   end
 
   def test_parsing_with_empty_git
-    skip('fails now')
     Dir.mktmpdir 'test' do |dir|
       fail unless system("
         set -e
         cd '#{dir}'
         git init .
       ")
-      hits = HOC::Git.new(dir).hits
+      hits = HOC::Git.new(dir, []).hits
+      assert_equal 1, hits.size
+      assert_equal 0, hits[0].total
+    end
+  end
+
+  def test_ignores_binary_files
+    Dir.mktmpdir 'test' do |dir|
+      fail unless system("
+        set -e
+        cd '#{dir}'
+        git init .
+        git config user.email test@teamed.io
+        git config user.name test
+        dd if=/dev/random of=test.dat bs=1 count=65536
+        git add test.dat
+        git commit -am 'binary file'
+        dd if=/dev/random of=test.dat bs=1 count=65536
+        git add test.dat
+        git commit -am 'binary file modified'
+      ")
+      hits = HOC::Git.new(dir, []).hits
       assert_equal 1, hits.size
       assert_equal 0, hits[0].total
     end

data/test/test_hoc.rb

@@ -43,7 +43,7 @@ class TestHOC < Minitest::Test
         git add test.txt
         git commit -am test
       ")
-      assert HOC::Base.new(dir, 'int').report > 0
+      assert HOC::Base.new(dir, exclude: ['a/**']).report > 0
     end
   end
 
@@ -64,14 +64,22 @@ class TestHOC < Minitest::Test
         svn ci -m 'third commit'
         svn up
       ")
-      assert HOC::Base.new(File.join(dir, 'repo'), 'int').report > 0
+      assert HOC::Base.new(File.join(dir, 'repo'), {}).report > 0
     end
   end
 
   def test_fails_if_not_repo
     Dir.mktmpdir 'test' do |dir|
       assert_raises RuntimeError do
-        HOC::Base.new(dir, 'int').report
+        HOC::Base.new(dir, {}).report
+      end
+    end
+  end
+
+  def test_fails_if_not_int
+    Dir.mktmpdir 'test' do |dir|
+      assert_raises RuntimeError do
+        HOC::Base.new(dir, format: 'text').report
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoc
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -164,7 +164,6 @@ extra_rdoc_files:
 - README.md
 - LICENSE.txt
 files:
-- .coveralls.yml
 - .gitignore
 - .rubocop.yml
 - .rultor.yml
@@ -178,8 +177,10 @@ files:
 - cucumber.yml
 - features/cli.feature
 - features/gem_package.feature
+- features/git_excludes.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- features/uses_config.feature
 - hoc.gemspec
 - lib/hoc.rb
 - lib/hoc/git.rb
@@ -219,8 +220,10 @@ summary: Hits Of Code
 test_files:
 - features/cli.feature
 - features/gem_package.feature
+- features/git_excludes.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- features/uses_config.feature
 - test/test__helper.rb
 - test/test_git.rb
 - test/test_hoc.rb

data/.coveralls.yml

@@ -1,2 +0,0 @@
-service_name: travis-pro
-repo_token: E8h8J4kUBHZNPsh2leUD2UzW02VCGftrU