hoc 0.2 → 0.3

data/.rultor.yml

@@ -4,6 +4,7 @@ assets:
 
 install: |
   sudo gem install pdd
+  sudo apt-get install -y subversion diffstat
 
 release:
   script: |

data/.travis.yml

@@ -4,8 +4,10 @@ branches:
   only:
     - master
 install:
-  - sudo apt-get update
-  - travis_retry sudo apt-get install -y --fix-missing libmagic1 libmagic-dev
+  - 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 bundle install
 script:
   - rake

data/README.md

@@ -10,11 +10,11 @@
 Install it first:
 
 ```bash
-gem install hoc
+$ gem install hoc
 ```
 
 Run it locally and read its output:
 
 ```bash
-hoc --help
+$ hoc --help
 ```

data/bin/hoc

@@ -30,7 +30,8 @@ require 'hoc/version'
 
 opts = Slop.parse(ARGV, strict: true, help: true) do
   banner "Usage (#{HOC::VERSION}): hoc [options]"
-  on 'f', 'format', 'Output format (text|xml|json|int)', default: 'int'
+  on 'f', 'format', 'Output format (text|xml|json|int)',
+     default: 'int', argument: :required
 end
 
 if opts.help?

data/lib/hoc.rb

@@ -22,6 +22,7 @@
 # SOFTWARE.
 
 require 'hoc/git'
+require 'hoc/svn'
 
 # HOC main module.
 # Author:: Yegor Bugayenko (yegor@teamed.io)
@@ -36,15 +37,20 @@ module HOC
     def initialize(dir, format)
       @dir = dir
       @format = format
+      fail "only int format is supported (#{@format})" unless @format == 'int'
     end
 
     # Generate report.
     def report
+      repo = nil
       if File.exist?(File.join(@dir, '.git'))
-        Git.new(@dir).hits.map { |h| h.total }.inject(:+)
+        repo = Git.new(@dir)
+      elsif File.exist?(File.join(@dir, '.svn'))
+        repo = Svn.new(@dir)
       else
         fail 'only Git repositories supported now'
       end
+      repo.hits.map { |h| h.total }.inject(:+)
     end
   end
 end

data/lib/hoc/svn.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+#
+# Copyright (c) 2014 Teamed.io
+# Copyright (c) 2014 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'date'
+require 'hoc/hits'
+
+module HOC
+  # Subversion source code base.
+  class Svn
+    def initialize(dir)
+      @dir = dir
+    end
+
+    def hits
+      version = `svn --version --quiet`
+      fail "svn version #{version} is too old" 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`
+      [
+        Hits.new(
+          Time.now,
+          log.split(/\n/).last.split(/[^\d]/)
+            .map { |s| s.to_i }.select { |x| x > 0 }
+            .drop(1).inject(:+)
+        )
+      ]
+    end
+  end
+end

data/lib/hoc/version.rb

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

data/test/test_git.rb

@@ -34,7 +34,6 @@ class TestGit < Minitest::Test
     Dir.mktmpdir 'test' do |dir|
       system("
         set -e
-        set -x
         cd '#{dir}'
         git init .
         git config user.email test@teamed.io

data/test/test_hoc.rb

@@ -31,11 +31,10 @@ require 'slop'
 # Copyright:: Copyright (c) 2014 Yegor Bugayenko
 # License:: MIT
 class TestHOC < Minitest::Test
-  def test_basic
+  def test_basic_git
     Dir.mktmpdir 'test' do |dir|
       system("
         set -e
-        set -x
         cd '#{dir}'
         git init .
         git config user.email test@teamed.io
@@ -44,14 +43,35 @@ class TestHOC < Minitest::Test
         git add test.txt
         git commit -am test
       ")
-      assert HOC::Base.new(dir, 'total').report > 0
+      assert HOC::Base.new(dir, 'int').report > 0
+    end
+  end
+
+  def test_basic_svn
+    Dir.mktmpdir 'test' do |dir|
+      system("
+        set -e
+        cd '#{dir}'
+        svnadmin create base
+        svn co file://#{dir}/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
+      ")
+      assert HOC::Base.new(File.join(dir, 'repo'), 'int').report > 0
     end
   end
 
   def test_fails_if_not_repo
     Dir.mktmpdir 'test' do |dir|
       assert_raises RuntimeError do
-        HOC::Base.new(dir, 'total').report
+        HOC::Base.new(dir, 'int').report
       end
     end
   end

data/test/test_svn.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+#
+# Copyright (c) 2014 Teamed.io
+# Copyright (c) 2014 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'hoc/svn'
+require 'tmpdir'
+
+# Svn test.
+# Author:: Yegor Bugayenko (yegor@teamed.io)
+# Copyright:: Copyright (c) 2014 Yegor Bugayenko
+# License:: MIT
+class TestSvn < Minitest::Test
+  def test_parsing
+    Dir.mktmpdir 'test' do |dir|
+      system("
+        set -e
+        cd '#{dir}'
+        svnadmin create base
+        svn co file://#{dir}/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
+      ")
+      hits = HOC::Svn.new(File.join(dir, 'repo')).hits
+      assert_equal 1, hits.size
+      assert_equal 4, hits[0].total
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoc
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -184,10 +184,12 @@ files:
 - lib/hoc.rb
 - lib/hoc/git.rb
 - lib/hoc/hits.rb
+- lib/hoc/svn.rb
 - lib/hoc/version.rb
 - test/test_git.rb
 - test/test_helper.rb
 - test/test_hoc.rb
+- test/test_svn.rb
 homepage: http://github.com/teamed/hoc
 licenses:
 - MIT
@@ -222,3 +224,4 @@ test_files:
 - test/test_git.rb
 - test/test_helper.rb
 - test/test_hoc.rb
+- test/test_svn.rb