hoc 0.6 → 0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 59d2fc6efb9c42e103f219afab3f30b6c7795237
+  data.tar.gz: 909b0ab272d89db5b746080964033de01e5b03ba
+SHA512:
+  metadata.gz: 033ae8f9c36c4e29919f935f62c74c758ae6ee7820c07870af05c8de68165b92f986115d2feca8795f4df7c350307bd0d3bcf517e2e61302cb94d70e8629280a
+  data.tar.gz: acc93df060da6ce96b1b955256e774aeaa5047fa6d31112ee0e914c7cd7eb8a5ff12d66715c386e666f517493d1a066a180873571ce19ee02072b11ee707e750

data/.gitattributes

@@ -0,0 +1,7 @@
+# Check out all text files in UNIX format, with LF as end of line
+# Don't change this file. If you have any ideas about it, please
+# submit a separate issue about it and we'll discuss.
+
+* text=auto eol=lf
+*.java ident
+*.xml ident

data/.simplecov

@@ -23,12 +23,22 @@
 
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+if Gem.win_platform? then
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter
+  ]
+  SimpleCov.start do
+    add_filter "/test/"
+    add_filter "/features/"
+  end
+else
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
     SimpleCov::Formatter::HTMLFormatter,
     Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start do
-  add_filter "/test/"
-  add_filter "/features/"
-  minimum_coverage 100
+  ]
+  SimpleCov.start do
+    add_filter "/test/"
+    add_filter "/features/"
+    minimum_coverage 100
+  end
 end

data/.travis.yml

@@ -1,17 +1,25 @@
 language: ruby
+rvm:
+  - 2.0.0
 cache: bundler
 branches:
   only:
     - master
+addons:
+  apt:
+    packages:
+      - diffstat
 install:
   - travis_retry sudo apt-get update
-  - travis_retry sudo apt-get install -y diffstat
   - 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
+  - svn --version
+  - git --version
+  - diffstat --version
 script:
   - rake
 

data/README.md

@@ -2,6 +2,8 @@
 [![DevOps By Rultor.com](http://www.rultor.com/b/teamed/hoc)](http://www.rultor.com/p/teamed/hoc)
 
 [![Build Status](https://travis-ci.org/teamed/hoc.svg)](https://travis-ci.org/teamed/hoc)
+[![Build status](https://ci.appveyor.com/api/projects/status/yww1brb4xy80jh11?svg=true)](https://ci.appveyor.com/project/yegor256/hoc)
+
 [![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)
@@ -24,4 +26,27 @@ Run it locally and read its output:
 $ hoc --help
 ```
 
+For Subversion statistics you must have
+[diffstat](http://sourceforge.net/projects/mingw/files/MSYS/Extension/diffstat/)
+installed.
+
+## Questions?
+
+If you have any questions about the tool, or something doesn't work as expected,
+please [submit an issue here](https://github.com/teamed/hoc/issues/new).
+
+## How to contribute?
+
+Fork the repository, make changes, submit a pull request.
+We promise to review your changes same day and apply to
+the `master` branch, if they look correct.
+
+Please run Rake build before submitting a pull request (make sure you
+have [bundler](http://bundler.io/) installed):
+
+```
+$ bundle install
+$ rake
+```
 
+Make sure you're using Ruby 2.0+.

data/Rakefile

@@ -66,6 +66,7 @@ end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features) do |t|
   t.profile = 'travis'
+  t.cucumber_opts = '--format pretty --no-color'
 end
 Cucumber::Rake::Task.new(:'features:html') do |t|
   t.profile = 'html_report'

data/appveyor.yml

@@ -0,0 +1,22 @@
+version: '{build}'
+skip_tags: true
+clone_depth: 10
+branches:
+  only:
+    - master
+  except:
+    - gh-pages
+os: Windows Server 2012
+install:
+  - cmd: SET PATH=C:\Ruby200\bin;%PATH%
+  - cmd: ruby --version
+  - cmd: svn --version
+  - cmd: git --version
+build_script:
+  - bundle update
+  - bundle install
+test_script:
+  - rake
+cache:
+  - C:\Ruby200\bin -> hoc.gemspec
+  - C:\Ruby200\lib\ruby\gems\2.0.0 -> hoc.gemspec

data/bin/hoc

@@ -48,6 +48,13 @@ opts = Slop.parse(args, strict: true, help: true) do
     as: Array,
     argument: :required
   )
+  on(
+    'd',
+    'dir',
+    'Directory to scan',
+    default: '.',
+    argument: :required
+  )
 end
 
 if opts.help?
@@ -58,4 +65,4 @@ end
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-puts HOC::Base.new(Dir.pwd, opts).report
+puts HOC::Base.new(opts).report

data/features/cli.feature

@@ -6,28 +6,3 @@ Feature: Command Line Processing
     When I run bin/hoc with "-h"
     Then Exit code is zero
     And Stdout contains "--format"
-
-  Scenario: Simple git repo
-    Given I run bash:
-    """
-    set -e
-    git init .
-    git config user.email test@teamed.io
-    git config user.name test
-    echo 'hello, world!' > test.txt
-    git add test.txt
-    git commit -am test
-    """
-    When I run bin/hoc with "-f int"
-    Then Exit code is zero
-    And Stdout contains "1"
-
-  Scenario: Real git repo
-    Given I run bash:
-    """
-    set -e
-    rm -rf *
-    git clone https://github.com/teamed/hoc.git .
-    """
-    When I run bin/hoc with "-f int"
-    Then Exit code is zero

data/features/gem_package.feature

@@ -3,20 +3,20 @@ Feature: Gem Package
   package the Gem into .gem file
 
   Scenario: Gem can be packaged
+    Given It is Unix
     Given I have a "execs.rb" file with content:
-    """
-    #!/usr/bin/env ruby
-    require 'rubygems'
-    spec = Gem::Specification::load('./spec.rb')
-    fail 'no executables' if spec.executables.empty?
-    """
+      """
+      #!/usr/bin/env ruby
+      require 'rubygems'
+      spec = Gem::Specification::load('./spec.rb')
+      fail 'no executables' if spec.executables.empty?
+      """
     When I run bash:
-    """
-    set -e
-    cd hoc
-    gem build hoc.gemspec
-    gem specification --ruby hoc-*.gem > ../spec.rb
-    cd ..
-    ruby execs.rb
-    """
+      """
+      cd hoc
+      gem build hoc.gemspec
+      gem specification --ruby hoc-*.gem > ../spec.rb
+      cd ..
+      ruby execs.rb
+      """
     Then Exit code is zero

data/features/git_basics.feature

@@ -0,0 +1,27 @@
+Feature: Git repo processing
+  As a source code writer I want to be able to
+  calculate my hits-of-code metric
+
+  Scenario: Simple git repo
+    Given It is Unix
+    Given I run bash:
+      """
+      git init .
+      git config user.email test@teamed.io
+      git config user.name test
+      echo 'hello, world!' > test.txt
+      git add test.txt
+      git commit -am test
+      """
+    When I run bin/hoc with "-f int"
+    Then Exit code is zero
+    And Stdout contains "1"
+
+  Scenario: Real git repo
+    Given I run bash:
+      """
+      git clone https://github.com/teamed/hoc.git hoc-repo
+      """
+    When I run bin/hoc with "-f int -d hoc-repo"
+    Then Exit code is zero
+

data/features/git_excludes.feature

@@ -3,18 +3,18 @@ Feature: Exclude dirs from Git counting
   exclude certain files from counting
 
   Scenario: Simple git repo
+    Given It is Unix
     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
-    """
+      """
+      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/step_definitions/steps.rb

@@ -38,10 +38,20 @@ After do
   FileUtils.rm_rf(@dir) if File.exist?(@dir)
 end
 
-Given(/^I run bash:$/) do |bash|
+Given(/^It is Unix$/) do
+  pending if Gem.win_platform?
+end
+
+Given(/^It is Windows$/) do
+  pending unless Gem.win_platform?
+end
+
+Given(/^I run bash:$/) do |script|
   FileUtils.copy_entry(@cwd, File.join(@dir, 'hoc'))
-  @stdout = `#{bash}`
+  cmd = script.split("\n").join(' && ')
+  @stdout = `#{cmd}`
   @exitstatus = $CHILD_STATUS.exitstatus
+  fail 'non-zero exit code' unless @exitstatus == 0
 end
 
 When(/^I run bin\/hoc with "([^"]*)"$/) do |arg|
@@ -52,7 +62,7 @@ end
 
 Then(/^Stdout contains "([^"]*)"$/) do |txt|
   unless @stdout.include?(txt)
-    fail "STDOUT doesn't contain '#{txt}':\n#{@stdout}"
+    fail "STDOUT doesn't contain '#{txt}':\n\n--------\n#{@stdout}\n--------\n"
   end
 end
 

data/features/svn_basics.feature

@@ -0,0 +1,22 @@
+Feature: SVN Repo Processing
+  As a source code writer I want to be able to
+  calculate my hits-of-code metric
+
+  Scenario: Simple SVN repo
+    Given It is Unix
+    Given I run bash:
+      """
+        svnadmin create base
+        svn co file://$(pwd)/base repo
+        cd repo
+        echo 'Hello, world!' > test.txt
+        svn add test.txt
+        svn ci -m 'first commit'
+        echo 'Bye!' > test.txt
+        svn ci -m 'second commit'
+        svn rm test.txt
+        svn ci -m 'third commit'
+        svn up
+      """
+    When I run bin/hoc with "-f int -d repo"
+    Then Exit code is zero

data/features/uses_config.feature

@@ -4,11 +4,11 @@ Feature: Using .hoc config file
   it via .hoc configuration file
 
   Scenario: Simple hoc counting
+    Given It is Unix
     Given I run bash:
-    """
-    set -e
-    echo '--help' > .hoc
-    """
+      """
+      echo '--help' > .hoc
+      """
     When I run bin/hoc with "-f int"
     Then Exit code is zero
     And Stdout contains "[options]"

data/hoc.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w(README.md LICENSE.txt)
   s.add_runtime_dependency 'slop', '3.6.0'
-  s.add_runtime_dependency 'rake', '10.3.2'
+  s.add_runtime_dependency 'rake', '10.4.2'
   s.add_development_dependency 'coveralls', '0.7'
   s.add_development_dependency 'rdoc', '3.11'
   s.add_development_dependency 'cucumber', '1.3.11'

data/lib/hoc/git.rb

@@ -37,8 +37,7 @@ module HOC
       fail "git version #{version} is too old, upgrade it to 2.0+" unless
         Gem::Version.new(version) >= Gem::Version.new('2.0')
       cmd = [
-        'git',
-        "'--git-dir=#{@dir}/.git'",
+        "cd #{@dir} && git",
         'log', '--pretty=tformat:', '--numstat',
         '--ignore-space-change', '--ignore-all-space',
         '--ignore-submodules', '--no-color',

data/lib/hoc/svn.rb

@@ -32,12 +32,12 @@ module HOC
     end
 
     def hits
-      version = `svn --version --quiet`
+      version = `svn --non-interactive --version --quiet`
       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?
-      log = `cd '#{@dir}'; svn log --diff | diffstat`
+      log = `cd '#{@dir}' && svn log --diff | diffstat`
       [
         Hits.new(
           Time.now,

data/lib/hoc/version.rb

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

data/lib/hoc.rb

@@ -32,10 +32,9 @@ module HOC
   # Code base abstraction
   class Base
     # Ctor.
-    # +dir+:: Directory to read from
     # +opts+:: Options
-    def initialize(dir, opts)
-      @dir = dir
+    def initialize(opts)
+      @dir = opts[:dir]
       fail "only \"int\" format is supported now" unless
         opts[:format].nil? || opts[:format] == 'int'
       @exclude = opts[:exclude].nil? ? [] : opts[:exclude]

data/test/test_git.rb

@@ -31,6 +31,7 @@ require 'tmpdir'
 # License:: MIT
 class TestGit < Minitest::Test
   def test_parsing
+    skip if Gem.win_platform?
     Dir.mktmpdir 'test' do |dir|
       fail unless system("
         set -e
@@ -53,6 +54,7 @@ class TestGit < Minitest::Test
   end
 
   def test_parsing_with_empty_git
+    skip if Gem.win_platform?
     Dir.mktmpdir 'test' do |dir|
       fail unless system("
         set -e
@@ -66,6 +68,7 @@ class TestGit < Minitest::Test
   end
 
   def test_ignores_binary_files
+    skip if Gem.win_platform?
     Dir.mktmpdir 'test' do |dir|
       fail unless system("
         set -e

data/test/test_hoc.rb

@@ -32,6 +32,7 @@ require 'slop'
 # License:: MIT
 class TestHOC < Minitest::Test
   def test_basic_git
+    skip if Gem.win_platform?
     Dir.mktmpdir 'test' do |dir|
       fail unless system("
         set -e
@@ -43,11 +44,12 @@ class TestHOC < Minitest::Test
         git add test.txt
         git commit -am test
       ")
-      assert HOC::Base.new(dir, exclude: ['a/**']).report > 0
+      assert HOC::Base.new(dir: '.', exclude: ['a/**']).report > 0
     end
   end
 
   def test_basic_svn
+    skip if Gem.win_platform?
     Dir.mktmpdir 'test' do |dir|
       fail unless system("
         set -e
@@ -64,14 +66,14 @@ class TestHOC < Minitest::Test
         svn ci -m 'third commit'
         svn up
       ")
-      assert HOC::Base.new(File.join(dir, 'repo'), {}).report > 0
+      assert HOC::Base.new(dir: 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, {}).report
+        HOC::Base.new(dir: dir).report
       end
     end
   end
@@ -79,7 +81,7 @@ class TestHOC < Minitest::Test
   def test_fails_if_not_int
     Dir.mktmpdir 'test' do |dir|
       assert_raises RuntimeError do
-        HOC::Base.new(dir, format: 'text').report
+        HOC::Base.new(dir: dir, format: 'text').report
       end
     end
   end

data/test/test_svn.rb

@@ -31,6 +31,7 @@ require 'tmpdir'
 # License:: MIT
 class TestSvn < Minitest::Test
   def test_parsing
+    skip if Gem.win_platform?
     Dir.mktmpdir 'test' do |dir|
       fail unless system("
         set -e

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: hoc
 version: !ruby/object:Gem::Version
-  version: '0.6'
-  prerelease: 
+  version: '0.7'
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -164,22 +145,26 @@ extra_rdoc_files:
 - README.md
 - LICENSE.txt
 files:
-- .gitignore
-- .rubocop.yml
-- .rultor.yml
-- .simplecov
-- .travis.yml
+- ".gitattributes"
+- ".gitignore"
+- ".rubocop.yml"
+- ".rultor.yml"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/hoc
 - cucumber.yml
 - features/cli.feature
 - features/gem_package.feature
+- features/git_basics.feature
 - features/git_excludes.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- features/svn_basics.feature
 - features/uses_config.feature
 - hoc.gemspec
 - lib/hoc.rb
@@ -194,35 +179,36 @@ files:
 homepage: http://github.com/teamed/hoc
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 2
 summary: Hits Of Code
 test_files:
 - features/cli.feature
 - features/gem_package.feature
+- features/git_basics.feature
 - features/git_excludes.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- features/svn_basics.feature
 - features/uses_config.feature
 - test/test__helper.rb
 - test/test_git.rb