git_loc_tracker 0.0.2 → 0.0.3

data/lib/git_loc_tracker.rb

@@ -7,18 +7,10 @@ module GitLocTracker
 
   class Statistics
 
-    attr_accessor :git_lines, :git_command, :line_parser
+    attr_accessor :git_command_options, :git_lines, :git_command, :line_parser
 
     def initialize options
-      @git_command = GitLocTracker::CommandConstructor.new(options).git_command
-    end
-
-    def git_lines
-      @git_lines ||= GitLocTracker::CommandExecutor.new(@git_command).git_lines
-    end
-
-    def line_parser line
-      GitLocTracker::LineParser.new(line)
+      @git_command_options = options
     end
 
     def new_line_count
@@ -47,6 +39,20 @@ module GitLocTracker
       puts "********************************"
     end
 
+    private
+
+    def git_command
+      @git_command ||= GitLocTracker::CommandConstructor.new(git_command_options).git_command
+    end
+
+    def git_lines
+      @git_lines ||= GitLocTracker::CommandExecutor.new(git_command).git_lines
+    end
+
+    def line_parser line
+      GitLocTracker::LineParser.new(line)
+    end
+
   end
 
 end

data/lib/git_loc_tracker/command_constructor.rb

@@ -34,7 +34,7 @@ module GitLocTracker
     end
 
     def existing_search_scope
-      scope_parts = options[:search_scope].split(" ")
+      scope_parts = options[:search_scope] ? options[:search_scope].split(" ") : []
       existing_scope_dirs = scope_parts.select { |dir| File.exist?("#{options[:path]}/#{dir}") }
       existing_scope_dirs.empty? ? options[:path] : existing_scope_dirs.join(" ")
     end

data/lib/git_loc_tracker/line_parser.rb

@@ -6,14 +6,6 @@ module GitLocTracker
       @line = line
     end
 
-    def line_size_without_deleted_code
-      line.strip.gsub(GitLocTracker::CommandConstructor::DELETED_CODE_REGEXP, "").size
-    end
-
-    def line_size_without_new_code
-      line.strip.gsub(GitLocTracker::CommandConstructor::NEW_CODE_REGEXP, "").size
-    end
-
     def is_new?
       line_size_without_new_code == 0
     end
@@ -25,5 +17,16 @@ module GitLocTracker
     def is_modified?
       !is_new? && !is_deleted?
     end
+
+    private
+
+    def line_size_without_deleted_code
+      line.strip.gsub(GitLocTracker::CommandConstructor::DELETED_CODE_REGEXP, "").size
+    end
+
+    def line_size_without_new_code
+      line.strip.gsub(GitLocTracker::CommandConstructor::NEW_CODE_REGEXP, "").size
+    end
+
   end
 end

data/lib/git_loc_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitLocTracker
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/git_loc_tracker/lib/git_loc_tracker/command_constructor_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe GitLocTracker::CommandConstructor do
+  it "should receive options" do
+    options = {option_1: "a", option_2: "b"}
+    command_constructor = GitLocTracker::CommandConstructor.new options
+    command_constructor.options.should == options
+  end
+
+  it "should construct git command containing --since option" do
+    command_constructor = GitLocTracker::CommandConstructor.new({from: "1 day ago"})
+    command_constructor.git_command.should include("--since='1 day ago'")
+  end
+
+  it "should construct git command containing --until option" do
+    command_constructor = GitLocTracker::CommandConstructor.new({till: "1 day from now"})
+    command_constructor.git_command.should include("--until='1 day from now'")
+  end
+
+  it "should construct git command containing --author option" do
+    command_constructor = GitLocTracker::CommandConstructor.new({author: "Janis"})
+    command_constructor.git_command.should include("--author='Janis'")
+  end
+
+  it "should construct git command containing path" do
+    command_constructor = GitLocTracker::CommandConstructor.new({path: "/home/user/app_root"})
+    command_constructor.git_command.should include("cd /home/user/app_root")
+  end
+
+  it "should construct git command containing search scope" do
+    command_constructor = GitLocTracker::CommandConstructor.new({search_scope: "lib bin"})
+    command_constructor.git_command.should include("lib bin")
+  end
+
+  it "should not construct git command containing non-existing search scope directories" do
+    command_constructor = GitLocTracker::CommandConstructor.new({search_scope: "non_existing_1 non_existing_1"})
+    command_constructor.git_command.should_not include("non_existing")
+  end
+
+  it "should constrict git command containing modified line matching regexp" do
+    command_constructor = GitLocTracker::CommandConstructor.new({})
+    command_constructor.git_command.should include(GitLocTracker::CommandConstructor::NEW_CODE_REGEXP.source)
+    command_constructor.git_command.should include(GitLocTracker::CommandConstructor::DELETED_CODE_REGEXP.source)
+  end
+
+
+end

data/spec/git_loc_tracker/lib/git_loc_tracker/command_executor_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe GitLocTracker::CommandExecutor do
+  let(:spec_root) { File.expand_path(File.join(File.dirname(__FILE__), '..', '../../')) }
+
+  it "should initialize object with command attribute" do
+    GitLocTracker::CommandExecutor.new("git command").command.should == "git command"
+  end
+
+  it "should execute git command and return line array" do
+    executor = GitLocTracker::CommandExecutor.new("cd #{spec_root}/test_repo/ && git st")
+    executor.git_lines.should_not be_empty
+  end
+
+  it "should raise GitCommandError if invalid git command is provided" do
+    executor = GitLocTracker::CommandExecutor.new("cd #{spec_root}/test_repo/ && git non_existing_command")
+    lambda { executor.git_lines }.should raise_error(GitLocTracker::CommandExecutor::GitCommandError)
+  end
+
+end

data/spec/git_loc_tracker/lib/git_loc_tracker/line_parser_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe GitLocTracker::LineParser do
+  it "should initialize object with command attribute" do
+    GitLocTracker::LineParser.new("line string").line.should == "line string"
+  end
+
+  it "should detect new line" do
+    source_line = "{+Some new line+}"
+    GitLocTracker::LineParser.new(source_line).is_new?.should be_true
+  end
+
+  it "should detect deleted line" do
+    source_line = "[-Some deleted line-]"
+    GitLocTracker::LineParser.new(source_line).is_deleted?.should be_true
+  end
+
+  it "should detect modified line" do
+    source_line = "[-old deleted part-]{+replaced with new part+}"
+    GitLocTracker::LineParser.new(source_line).is_modified?.should be_true
+  end
+
+  it "should detect modified line which also contains unmodified parts" do
+    source_line = "Some unmodified part [-old deleted part-]{+replaced with new part+}"
+    GitLocTracker::LineParser.new(source_line).is_modified?.should be_true
+  end
+
+  it "should not count modified line as deleted or new line" do
+    source_line = "[-old deleted part-]{+replaced with new part+}"
+    GitLocTracker::LineParser.new(source_line).is_new?.should be_false
+    GitLocTracker::LineParser.new(source_line).is_deleted?.should be_false
+  end
+
+end

data/spec/git_loc_tracker/lib/git_loc_tracker_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+#spec/test_repo is a git repo containing file test_file which was initialized and commited 3 times:
+#1) with 10 new lines
+#2) with 5 modified lines
+#3) with 5 deleted lines
+
+describe GitLocTracker::Statistics do
+
+  TOTAL_LINES_AFFECTED_IN_TEST_REPO = 20
+  NEW_LINES_IN_TEST_REPO = 10
+  MODIFIED_LINES_IN_TEST_REPO = 5
+  DELETED_LINES_IN_TEST_REPO = 5
+
+  let(:default_git_options) do
+    {path: "#{File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))}/test_repo/",
+     from: "2012-10-31",
+     till: "2012-11-01",
+     author: "Janis",
+     search_scope: "test_file"}
+  end
+
+  it "should receive git options in initializer" do
+    options = {option_1: 1, option_2: 2}
+    GitLocTracker::Statistics.new(options).git_command_options.should == options
+  end
+
+  it "should return correct git command" do
+    git_command = "cd /home/janis/code/git_loc_tracker/spec/test_repo/ && git log -p --word-diff  --since='2012-10-31' --until='2012-11-01' --author='Janis'  test_file | egrep '\\[\\-.*\\-\\]|\\{\\+.*\\+\\}'"
+    GitLocTracker::Statistics.new(default_git_options).send(:git_command).should == git_command
+  end
+
+  it "should return correct amount of changed line count in test_file" do
+    GitLocTracker::Statistics.new(default_git_options).send(:git_lines).count == TOTAL_LINES_AFFECTED_IN_TEST_REPO
+  end
+
+  it "should return correct amount of new lines in test_file" do
+    GitLocTracker::Statistics.new(default_git_options).new_line_count.should == NEW_LINES_IN_TEST_REPO
+  end
+
+  it "should return correct amount of deleted lines in test_file" do
+    GitLocTracker::Statistics.new(default_git_options).deleted_line_count.should == DELETED_LINES_IN_TEST_REPO
+  end
+
+  it "should return correct amount of modified lines in test_file" do
+    GitLocTracker::Statistics.new(default_git_options).modified_line_count.should == MODIFIED_LINES_IN_TEST_REPO
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,17 +1,11 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
+require 'rubygems'
+require 'bundler/setup'
+require 'git_loc_tracker'
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
   config.order = 'random'
 end

data/spec/test_repo/test_file

@@ -0,0 +1,5 @@
+modified new line 1
+modified new line 2
+modified new line 3
+modified new line 4
+modified new line 5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_loc_tracker
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000Z
+date: 2012-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
-  requirement: &73615600 !ruby/object:Gem::Requirement
+  requirement: &85093350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 2.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *73615600
+  version_requirements: *85093350
 description: Counts new, deleted and modified lines in git repository with ability
   to pass various options
 email:
@@ -40,6 +40,11 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.md
+- spec/git_loc_tracker/lib/git_loc_tracker/command_executor_spec.rb
+- spec/git_loc_tracker/lib/git_loc_tracker/line_parser_spec.rb
+- spec/git_loc_tracker/lib/git_loc_tracker/command_constructor_spec.rb
+- spec/git_loc_tracker/lib/git_loc_tracker_spec.rb
+- spec/test_repo/test_file
 - spec/spec_helper.rb
 homepage: https://github.com/ithouse/git_loc_tracker
 licenses: []
@@ -67,4 +72,9 @@ specification_version: 3
 summary: Counts new, deleted and modified lines in git repository with ability to
   pass various options
 test_files:
+- spec/git_loc_tracker/lib/git_loc_tracker/command_executor_spec.rb
+- spec/git_loc_tracker/lib/git_loc_tracker/line_parser_spec.rb
+- spec/git_loc_tracker/lib/git_loc_tracker/command_constructor_spec.rb
+- spec/git_loc_tracker/lib/git_loc_tracker_spec.rb
+- spec/test_repo/test_file
 - spec/spec_helper.rb