git_fame 1.7.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd0e84253d48334aadecae9770216086d4ac67e7
-  data.tar.gz: af9f1a996b0e68e4d537cfe456319d66f66c9c1a
+  metadata.gz: 0175e601e8681095c5da74adf6a8e6b276e82920
+  data.tar.gz: 4e666c4ca6c54971be8fba75804eb0cce51977d4
 SHA512:
-  metadata.gz: da9a68656473b6c1bfaefad0bab00634b2ff0f5fafd8b999ebc695ead627e4b3340ff80a6ce5409ac122a81a5e99eae73c6d7ce337f910cf94b6c62ef9cf151b
-  data.tar.gz: 87fbb2d5a0f67140eb55929ef1e5ec1aedc7169c711337425873ee652579f52f1bda3f805dce5d1d419cd36f0a320a8cffd89eaf58a47864e72b584170034801
+  metadata.gz: f6727e87b63440e77772bfbea2bd6c6984a7cc1284424bfa4786f7f2502f81afb4006f248a7585284cee25ccb654514027cc88e0659124539970503026d365c1
+  data.tar.gz: 73e5b637a4950d5b626b4c7a2c4ccac1d1532b6b8865caea2d411072353fbd182d00911975e35aac79534db10c26450ad91306a4830137b1238e5addbadaf766

data/.gitignore

@@ -15,4 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.byebug_history
+.byebug_history
+.tags
+.tags1

data/.rspec

@@ -1,5 +1,7 @@
 --color
--Ilib
--Ispec
+-I lib
+-I spec
 --require spec_helper
---exclude-pattern spec/fixtures/**/*_spec.rb
+--exclude-pattern spec/fixtures/**/*_spec.rb
+--tty
+--format documentation

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
 - 2.0.0
 - 1.9.3
 script:
- - 'rspec spec --format documentation'
+ - 'rspec spec'
 notifications:
   webhooks:
     urls:
@@ -14,3 +14,8 @@ notifications:
     on_success: change  # options: [always|never|change] default: always
     on_failure: change  # options: [always|never|change] default: always
     on_start: false     # default: false
+before_install:
+  - sudo add-apt-repository ppa:git-core/ppa -y
+  - sudo apt-get update -q
+  - sudo apt-get install git -y
+  - gem install bundler

data/README.md

@@ -8,29 +8,20 @@ Pretty-print collaborators sorted by contributions.
 ## Output
 
 ```
-Total number of files: 2,053
-Total number of lines: 63,132
-Total number of commits: 4,330
-
-+------------------------+--------+---------+-------+--------------------+
-| name                   | loc    | commits | files | distribution       |
-+------------------------+--------+---------+-------+--------------------+
-| Johan Sørensen         | 22,272 | 1,814   | 414   | 35.3 / 41.9 / 20.2 |
-| Marius Mathiesen       | 10,387 | 502     | 229   | 16.5 / 11.6 / 11.2 |
-| Jesper Josefsson       | 9,689  | 519     | 191   | 15.3 / 12.0 / 9.3  |
-| Ole Martin Kristiansen | 6,632  | 24      | 60    | 10.5 / 0.6 / 2.9   |
-| Linus Oleander         | 5,769  | 705     | 277   | 9.1 / 16.3 / 13.5  |
-| Fabio Akita            | 2,122  | 24      | 60    | 3.4 / 0.6 / 2.9    |
-| August Lilleaas        | 1,572  | 123     | 63    | 2.5 / 2.8 / 3.1    |
-| David A. Cuadrado      | 731    | 111     | 35    | 1.2 / 2.6 / 1.7    |
-| Jonas Ängeslevä        | 705    | 148     | 51    | 1.1 / 3.4 / 2.5    |
-| Diego Algorta          | 650    | 6       | 5     | 1.0 / 0.1 / 0.2    |
-| Arash Rouhani          | 629    | 95      | 31    | 1.0 / 2.2 / 1.5    |
-| Sofia Larsson          | 595    | 70      | 77    | 0.9 / 1.6 / 3.8    |
-| Tor Arne Vestbø        | 527    | 51      | 97    | 0.8 / 1.2 / 4.7    |
-| spontus                | 339    | 18      | 42    | 0.5 / 0.4 / 2.0    |
-| Pontus                 | 225    | 49      | 34    | 0.4 / 1.1 / 1.7    |
-+------------------------+--------+---------+-------+--------------------+
+Statistics based on master
+Active files: 21
+Active lines: 967
+Total commits: 109
+
+Note: Files matching MIME type image, binary has been ignored
+
++----------------+-----+---------+-------+---------------------+
+| name           | loc | commits | files | distribution (%)    |
++----------------+-----+---------+-------+---------------------+
+| Linus Oleander | 914 | 106     | 21    | 94.5 / 97.2 / 100.0 |
+| f1yegor        | 47  | 2       | 7     |  4.9 /  1.8 / 33.3  |
+| David Selassie | 6   | 1       | 2     |  0.6 /  0.9 /  9.5  |
++----------------+-----+---------+-------+---------------------+
 ```
 
 ## Installation
@@ -41,67 +32,70 @@ Total number of commits: 4,330
 
 ### Console
 
-Start by navigating to a git repository.
-
-Run `git fame` to generate output as above.
+From a git repository run `git fame`.
 
 #### Options
 
-- `git fame --bytype` Should a breakout of line counts by file type be output? Default is `false`.
-- `git fame --exclude=paths/to/files,paths/to/other/files` Comma separated, realtive paths to exclude from the counts. Note that you should not start the paths with a dot. Default is none.
-- `git fame --sort=loc` Order table by `loc`. Available options are: `loc`, `commits` and `files`. Default is `loc`.
-- `git fame --progressbar=1` Should a progressbar be visible during the calculation? Default is `1`.
-- `git fame --whitespace` Ignore whitespace changes when blaming files. Default is `false`.
+- `git fame --by-type` Group line counts by file extension (i.e. .rb, .erb, .yml). See the *by type* section below.
+- `git fame --exclude=path1/*,path2/*` Comma separated, [glob](https://en.wikipedia.org/wiki/Glob_(programming)) file path to exclude.
+- `git fame --include=path1/*,path2/*` Comma separated, [glob](https://en.wikipedia.org/wiki/Glob_(programming)) file path to include.
+- `git fame --sort=loc` Order table by `loc`. Available options are: `loc`, `files` and `commits`. Default is `loc`.
+- `git fame --hide-progressbar` Hide progressbar.
+- `git fame --whitespace` Ignore whitespace changes when blaming files. [More about git blame and whitespace](https://coderwall.com/p/x8xbnq/git-don-t-blame-people-for-changing-whitespaces-or-moving-code).
 - `git fame --repository=/path/to/repo` Git repository to be used. Default is the current folder.
-- `git fame --branch=master` Branch to run on. Default is `master`.
-- `git fame --format=output` Output format. Default is `pretty`. Additional: csv.
+- `git fame --branch=master` Branch to run on. Default is what `HEAD` points to.
+- `git fame --format=output` Output format. Default is `pretty`. Additional: `csv`.
+- `git fame --after=2010-01-01` Only use commmits after this date. Format: yyyy-mm-dd. Note that the given date is included.
+- `git fame --before=2016-02-01` Only use commits before this date. Format: yyyy-mm-dd. Note that the given date is included.
+- `git fame --verbose` Print shell commands used by `git-fame`.
+- `git fame --everything` Images and binaries are ignored by default. Include them as well.
+
+#### By type
+
+`--by-type` adds extra columns file types.
+
+```
++----------------+-----+---------+-------+---------------------+---------+-----+----+---------+-----+
+| name           | loc | commits | files | distribution (%)    | unknown | yml | md | gemspec | rb  |
++----------------+-----+---------+-------+---------------------+---------+-----+----+---------+-----+
+| Linus Oleander | 914 | 106     | 21    | 94.5 / 97.2 / 100.0 | 32      | 5   | 61 | 23      | 257 |
+| f1yegor        | 47  | 2       | 7     |  4.9 /  1.8 / 33.3  | 3       | 5   | 6  | 1       | 10  |
+| David Selassie | 6   | 1       | 2     |  0.6 /  0.9 /  9.5  | 2       | 0   | 3  | 0       | 0   |
++----------------+-----+---------+-------+---------------------+---------+-----+----+---------+-----+
+```
 
-### Class
+### Programmatically
 
-Want to work with the data before printing it?
+Want to work with the data before using it? Here's how.
 
 #### Constructor arguments
 
-- **repository** (String) Path to repository.
-- **sort** (String) What should #authors be sorted by? Available options are: `loc`, `commits` and `files`. Default is `loc`.
-- **progressbar** (Boolean) Should a progressbar be shown during the calculation? Default is `false`.
-- **whitespace** (Boolean) Ignore whitespace changes when blaming files. Default is `false`.
-- **bytype** (Boolean) Should a breakout of line counts by file type be output? Default is 'false'
-- **exclude** (String) Comma separated paths to exclude from the counts. Default is none.
-- **branch** (String) Branch to run on. Default is `master`.
-- **format** (String) Output format. Default is `pretty`.
+`options` is a hash with most of the arguments passed to the binary defined above.
+Take a look at the [bin/git-fame](bin/git-fame) file for more information.
 
 ``` ruby
-repository = GitFame::Base.new({
-  sort: "loc",
-  repository: "/tmp/repo",
-  progressbar: false,
-  whitespace: false
-  bytype: false,
-  exclude: "vendor, public/assets",
-  branch: "master",
-  format: "pretty"
-})
+repository = GitFame::Base.new(options)
 ```
 
-#### Print table to console
+#### Print table
+
+`repository.pretty_puts` outputs the statistics as an ascii table.
 
-`repository.pretty_puts`
 
 #### Print csv table to console
 
-`repository.csv_puts`
+`repository.csv_puts` outputs the statistics as csv.
 
-### Statistics
+#### Statistics
 
-#### GitFame
+##### GitFame
 
 - `repository.loc` (Fixnum) Total number of lines.
 - `repository.commits` (Fixnum) Total number of commits.
 - `repository.files` (Fixnum) Total number of files.
 - `repository.authors` (Array< Author >) All authors.
 
-#### Author
+##### Author
 
 `author = repository.authors.first`
 
@@ -116,9 +110,13 @@ repository = GitFame::Base.new({
   - `author.raw_files` (Fixnum) Number of files changed.
   - `author.file_type_counts` (Array) File types (k) and loc (v)
 
-#### A note about authors found
+## Testing
 
-The list of authors may include duplicate people. If a git user's configured name or email address change over time, the person will appear multiple times in this list (and your repo's git history). Git allows you to configure this using the .mailmap feature. See ````git shortlog --help```` for more information.
+1. Download fixtures (`spec/fixtures`) using `git submodule update --init`.
+2. Run rspec using `bundle exec rspec`.
+
+Note that `puts` has been disabled to avoid unnecessary output during testing.
+Visit `spec/spec_helper.rb` to enable it again.
 
 ## Contributing
 
@@ -128,18 +126,10 @@ The list of authors may include duplicate people. If a git user's configured nam
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## Testing
-
-1. Download fixtures (`spec/fixtures`) using `git submodule update --init`.
-2. Run rspec using `bundle exec rspec`.
-
-Note that `puts` has been disabled to avoid unnecessary output during testing.
-Visit `spec/spec_helper.rb` to enable it again.
-
 ## Requirements
 
 *GitFame* should work on all Unix based operating system with Git installed.
 
 ## License
 
-*GitFame* is released under the *MIT license*.
+*GitFame* is released under the *MIT license*.

data/Rakefile

@@ -1,2 +1,15 @@
 #!/usr/bin/env rake
+
 require "bundler/gem_tasks"
+require "method_profiler"
+require "git_fame"
+
+task :profile do
+  profiler = MethodProfiler.observe(GitFame::Base)
+
+  GitFame::Base.new({
+    repository: "spec/fixtures/gash"
+  })
+
+  puts profiler.report
+end

data/bin/git-fame

@@ -5,31 +5,46 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 require "git_fame"
 require "trollop"
 
-sort = ["name", "commits", "loc", "files"]
 opts = Trollop::options do
   version "git-fame #{GitFame::VERSION} (c) 2012-#{Date.today.year} Linus Oleander"
   opt :repository, "What git repository should be used?", default: "."
-  opt :sort, "What should the printed table be sorted by? #{sort.join(", ")}", default: "loc", type: String
-  opt :progressbar, "Show progressbar during calculation", default: 1, type: Integer
+  opt :sort, "What should the printed table be sorted by? #{GitFame::SORT.join(", ")}", default: "loc", type: String
+  opt :"hide-progressbar", "Hide progressbar", default: false
   opt :whitespace, "Ignore whitespace changes", default: false
-  opt :bytype, "Group line counts by file extension (i.e. .rb, .erb, .yml)", default: false
-  opt :include, "Paths to include in git ls-files", default: "", type: String
-  opt :exclude, "Paths to exclude (comma separated)", default: "", type: String
+  opt :"by-type", "Group line counts by file extension (i.e. .rb, .erb, .yml)", default: false
+  opt :include, "Comma separated, glob file path to include. I.e path/*.rb", default: "", type: String
+  opt :exclude, "Comma separated, glob file path to exclude. I.e any/**/path/*", default: "", type: String
   opt :extension, "Comma-separated list of extensions to consider, leave blank for all", default: "", type: String
   opt :branch, "Branch to run on", default: "master", type: String
   opt :format, "Format (pretty/csv)", default: "pretty", type: String
+  opt :after, "Only use commmits after this date. Format: yyyy-mm-dd. Note that the given date is included", type: String
+  opt :before, "Only use commits before this date. Format: yyyy-mm-dd. Note that the given date is included", type: String
+  opt :verbose, "Print shell commands used by git-fame", default: false
+  opt :everything, "Images and binaries are ignored by default. Include them as well", default: false
 end
 
-Trollop::die :sort, "must be one of the following; #{sort.join(", ")}" unless sort.include?(opts[:sort])
-fame = GitFame::Base.new({
-  repository: opts[:repository],
-  progressbar: opts[:progressbar] == 1,
-  sort: opts[:sort],
-  whitespace: opts[:whitespace],
-  bytype: opts[:bytype],
-  include: opts[:include],
-  exclude: opts[:exclude],
-  extensions: opts[:extension],
-  branch: opts[:branch]
-})
-opts[:format] == "csv" ? fame.csv_puts : fame.pretty_puts
+unless GitFame::SORT.include?(opts[:sort])
+  Trollop::die :sort, "must be one of the following; #{GitFame::SORT.join(", ")}"
+end
+
+begin
+  fame = GitFame::Base.new({
+    repository: opts[:repository],
+    progressbar: ! opts[:"hide-progressbar"],
+    sort: opts[:sort],
+    whitespace: opts[:whitespace],
+    by_type: opts[:"by-type"],
+    include: opts[:include],
+    exclude: opts[:exclude],
+    extensions: opts[:extension],
+    branch: opts[:branch],
+    after: opts[:after],
+    before: opts[:before],
+    verbose: opts[:verbose],
+    everything: opts[:everything]
+  })
+
+  opts[:format] == "csv" ? fame.csv_puts : fame.pretty_puts
+rescue GitFame::Error => e
+  abort "Error: #{e.message}"
+end

data/git_fame.gemspec

@@ -24,16 +24,17 @@ Generates data like:
   gem.require_paths = ["lib"]
   gem.version       = GitFame::VERSION
 
-  gem.add_dependency("progressbar")
-  gem.add_dependency("trollop")
-  gem.add_dependency("hirb")
-  gem.add_dependency("mimer_plus")
-  gem.add_dependency("scrub_rb")
+  gem.add_dependency("ruby-progressbar", "~> 1.7.5")
+  gem.add_dependency("trollop", "~> 2.1.2")
+  gem.add_dependency("hirb", "~> 0.7.3")
+  gem.add_dependency("scrub_rb", "~> 1.0.1")
+  gem.add_dependency("memoist", "~> 0.14.0")
+  gem.add_dependency("method_profiler", "~> 2.0.1")
 
-  gem.add_development_dependency("rspec", "~> 3.0")
-  gem.add_development_dependency("rspec-collection_matchers")
-  gem.add_development_dependency("rake")
-  gem.add_development_dependency("coveralls")
+  gem.add_development_dependency("rspec", "~> 3.4.0")
+  gem.add_development_dependency("rspec-collection_matchers", "~> 1.1.2")
+  gem.add_development_dependency("rake", "~> 10.4.2")
+  gem.add_development_dependency("coveralls", "~> 0.8.1")
 
   gem.required_ruby_version = ">= 1.9.2"
-end
+end

data/lib/git_fame.rb

@@ -1,9 +1,4 @@
 $-v = false
+
 require "git_fame/version"
-require "progressbar"
-require "mimer_plus"
-require "hirb"
-require "git_fame/helper"
-require "git_fame/author"
-require "git_fame/silent_progressbar"
 require "git_fame/base"

data/lib/git_fame/author.rb

@@ -19,6 +19,14 @@ module GitFame
       end
     end
 
+    def merge(author)
+      tap do
+        FIELDS.each do |field|
+          inc(field, author.raw(field))
+        end
+      end
+    end
+
     #
     # @format loc / commits / files
     # @return String Distribution (in %) between users
@@ -36,6 +44,12 @@ module GitFame
       end
     end
 
+    def update(params)
+      params.keys.each do |key|
+        send("#{key}=", params[key])
+      end
+    end
+
     #
     # Intended to catch file type counts
     #

data/lib/git_fame/base.rb

@@ -1,30 +1,47 @@
 require "csv"
-require_relative "./errors"
-require_relative "./result"
-require_relative "./file"
+require "time"
 require "open3"
+require "hirb"
+require "memoist"
+require "timeout"
 
+# String#scrib is build in to Ruby 2.1+
 if RUBY_VERSION.to_f < 2.1
   require "scrub_rb"
 end
 
+require "git_fame/helper"
+require "git_fame/author"
+require "git_fame/silent_progressbar"
+require "git_fame/blame_parser"
+require "git_fame/result"
+require "git_fame/file"
+require "git_fame/errors"
+require "git_fame/commit_range"
+
 module GitFame
+  SORT = ["name", "commits", "loc", "files"]
+  CMD_TIMEOUT = 10
+
   class Base
     include GitFame::Helper
-    attr_accessor :file_extensions
+    extend Memoist
 
     #
     # @args[:repository] String Absolute path to git repository
     # @args[:sort] String What should #authors be sorted by?
-    # @args[:bytype] Boolean Should counts be grouped by file extension?
+    # @args[:by_type] Boolean Should counts be grouped by file extension?
     # @args[:exclude] String Comma-separated list of paths in the repo
     #   which should be excluded
     # @args[:branch] String Branch to run from
+    # @args[:after] date after
+    # @args[:before] date before
     #
     def initialize(args)
       @default_settings = {
         branch: "master",
-        sorting: "loc"
+        sorting: "loc",
+        ignore_types: ["image", "binary"]
       }
       @progressbar  = args.fetch(:progressbar, false)
       @file_authors = Hash.new { |h,k| h[k] = {} }
@@ -33,21 +50,30 @@ module GitFame
         map{ |path| path.strip.sub(/\A\//, "") }
       @extensions = args.fetch(:extensions, "").split(",")
       # Default sorting option is by loc
-      @include = args.fetch(:include, "")
+      @include = args.fetch(:include, "").split(",")
       @sort = args.fetch(:sort, @default_settings.fetch(:sorting))
       @repository = args.fetch(:repository)
-      @bytype = args.fetch(:bytype, false)
-      @branch = args.fetch(:branch, default_branch)
+      @by_type = args.fetch(:by_type, false)
+      @branch = args.fetch(:branch, nil)
+      @everything = args.fetch(:everything, false)
 
       # Figure out what branch the caller is using
       if present?(@branch = args[:branch])
         unless branch_exists?(@branch)
-          raise GitFame::BranchNotFound, "Branch '#{@branch}' does not exist"
+          raise Error, "Branch '#{@branch}' does not exist"
         end
       else
         @branch = default_branch
       end
 
+      @after = args.fetch(:after, nil)
+      @before = args.fetch(:before, nil)
+      [@after, @before].each do |date|
+        if date and not valid_date?(date)
+          raise Error, "#{date} is not a valid date"
+        end
+      end
+
       # Fields that should be visible in the final table
       # Used by #csv_puts, #to_csv and #pretty_puts
       # Format: [ [ :method_on_author, "custom column name" ] ]
@@ -58,10 +84,12 @@ module GitFame
         :files,
         [:distribution, "distribution (%)"]
       ]
-      @cache = {}
-      @file_extensions = []
       @wopt = args.fetch(:whitespace, false) ? "-w" : ""
       @authors = {}
+      @cache = {}
+      @verbose = args.fetch(:verbose, false)
+
+      populate
     end
 
     #
@@ -70,10 +98,13 @@ module GitFame
     def pretty_puts
       extend Hirb::Console
       Hirb.enable({ pager: false })
-      puts "\nTotal number of files: #{number_with_delimiter(files)}"
-      puts "Total number of lines: #{number_with_delimiter(loc)}"
-      puts "Total number of commits: #{number_with_delimiter(commits)}\n"
-
+      puts "\nStatistics based on #{commit_range.to_s(true)}"
+      puts "Active files: #{number_with_delimiter(files)}"
+      puts "Active lines: #{number_with_delimiter(loc)}"
+      puts "Total commits: #{number_with_delimiter(commits)}\n"
+      unless @everything
+        puts "\nNote: Files matching MIME type #{ignore_types.join(", ")} has been ignored\n\n"
+      end
       table(authors, fields: printable_fields)
     end
 
@@ -103,15 +134,14 @@ module GitFame
     # TODO: Rename this
     #
     def files
-      file_list.count
+      used_files.count
     end
 
     #
     # @return Array list of repo files processed
     #
-    def file_list
-      populate { current_files }
-    end
+    # TODO: Rename
+    def file_list; used_files; end
 
     #
     # @return Fixnum Total number of commits
@@ -131,91 +161,121 @@ module GitFame
     # @return Array<Author> A list of authors
     #
     def authors
-      cache(:authors) do
-        populate do
-          @authors.values.sort_by do |author|
-            @sort == "name" ? author.send(@sort) : -1 * author.raw(@sort)
-          end
-        end
+      unique_authors.sort_by do |author|
+        @sort == "name" ? author.send(@sort) : -1 * author.raw(@sort)
       end
     end
 
-    private
+    protected
 
-    # Populates @authors and @file_extensions with data
+    # Populates @authors and with data
     # Block is called on every call to populate, but
     # the data is only calculated once
-    def populate(&block)
-      cache(:populate) do
-        # Display progressbar with the number of files as countdown
-        progressbar = init_progressbar(current_files.count)
+    def populate
+      # Display progressbar with the number of files as countdown
+      progressbar = init_progressbar(current_files.count)
 
-        # Extract the blame history from all checked in files
-        current_files.each do |file|
-          progressbar.inc
+      # Extract the blame history from all checked in files
+      current_files.each do |file|
+        progressbar.increment
 
-          # Skip if mimetype can't be decided
-          next unless type = Mimer.identify(File.join(@repository, file.path))
-          # Binary types isn't very usefull to run git-blame on
-          next if type.binary?
+        # Skip this file if non wanted type
+        next unless check_file?(file)
 
-          @file_extensions << file.extname
+        # -w ignore whitespaces (defined in @wopt)
+        # -M detect moved or copied lines.
+        # -p procelain mode (parsed by BlameParser)
+        execute("git blame #{encoding_opt} -p -M #{default_params} #{commit_range.to_s} #{@wopt} -- '#{file}'") do |result|
+          BlameParser.new(result.to_s).parse.each do |row|
+            next if row[:boundary]
 
-          execute("git blame #{@wopt} --line-porcelain #{@branch} -- '#{file}'") do |result|
-            # Authors from git blame has to be parsed
-            result.to_s.scan(/^author (.+)$/).each do |raw_author, _|
-              # Create or find already existing user
-              author = fetch(raw_author)
+            email = get(row, :author, :mail)
+            name = get(row, :author, :name)
 
-              # Get author by name and increase the number of loc by 1
-              author.inc(:loc, 1)
+            # Create or find user
+            author = author_by_email(email, name)
 
-              # Store the files and authors together
-              @file_authors[raw_author][file] ||= 1
+            # Get author by name and increase the number of loc by 1
+            author.inc(:loc, get(row, :num_lines))
 
-              @bytype && author.file_type_counts[file.extname] += 1
-            end
+            # Store the files and authors together
+            associate_file_with_author(author, file)
           end
         end
+      end
 
-        # Get repository summery and update each author accordingly
-        execute("git shortlog #{@branch} -se") do |result|
-          result.to_s.split("\n").map do |line|
-            _, commits, raw_author = line.match(%r{^\s*(\d+)\s+(.+?)\s+<.+?>}).to_a
-            author = fetch(raw_author)
-            # There might be duplicate authors using git shortlog
-            # (same name, different emails). Update already existing authors
-            if author.raw(:commits).zero?
-              update(raw_author, {
-                raw_commits: commits.to_i,
-                raw_files: @file_authors[raw_author].keys.count,
-                files_list: @file_authors[raw_author].keys
-              })
-            else
-              # Calculate the number of files edited by users
-              files = (author.files_list + @file_authors[raw_author].keys).uniq
-              update(raw_author, {
-                raw_commits: commits.to_i + author.raw(:commits),
-                raw_files: files.count,
-                files_list: files
-              })
-            end
-          end
-        end
+      # Get repository summery and update each author accordingly
+      execute("git shortlog #{encoding_opt} #{default_params} -se #{commit_range.to_s}") do |result|
+        result.to_s.split("\n").map do |line|
+          _, commits, name, email = line.match(/(\d+)\s+(.+)\s+<(.+?)>/).to_a
+          author = author_by_email(email)
 
-        progressbar.finish
+          author.name = name
+
+          author.update({
+            raw_commits: commits.to_i,
+            raw_files: files_from_author(author).count,
+            files_list: files_from_author(author)
+          })
+        end
       end
 
-      block.call
+      progressbar.finish
+    end
+
+    # Ignore mime types found in {ignore_types}
+    def check_file?(file)
+      return true if @everything
+      type = mime_type_for_file(file)
+      ! ignore_types.any? { |ignored| type.include?(ignored) }
+    end
+
+    # Return mime type for file (form: x/y)
+    def mime_type_for_file(file)
+      execute("git show #{commit_range.range.last}:'#{file}' | file --mime-type -").to_s.
+        match(/.+: (.+?)$/).to_a[1]
+    end
+
+    def get(hash, *keys)
+      keys.inject(hash) { |h, key| h.fetch(key) }
+    end
+
+    def ignore_types
+      @default_settings.fetch(:ignore_types)
+    end
+
+    def unique_authors
+      # Merges duplicate users (users with the same name)
+      # Object#dup prevents the original to be changed
+      @authors.values.dup.each_with_object({}) do |author, result|
+        if ex_author = result[author.name]
+          result[author.name] = ex_author.dup.merge(author)
+        else
+          result[author.name] = author
+        end
+      end.values
     end
 
     # Uses the more printable names in @visible_fields
     def printable_fields
-      cache(:printable_fields) do
-        raw_fields.map do |field|
-          field.is_a?(Array) ? field.last : field
-        end
+      raw_fields.map do |field|
+        field.is_a?(Array) ? field.last : field
+      end
+    end
+
+    def associate_file_with_author(author, file)
+      if @by_type
+        author.file_type_counts[file.extname] += 1
       end
+      @file_authors[author][file] ||= 1
+    end
+
+    def used_files
+      @file_authors.values.map(&:keys).flatten.uniq
+    end
+
+    def file_extensions
+      used_files.map(&:extname)
     end
 
     # Check to see if a string is empty (nil or "")
@@ -223,40 +283,52 @@ module GitFame
       value.nil? or value.empty?
     end
 
+    def files_from_author(author)
+      @file_authors[author].keys
+    end
+
     def present?(value)
       not blank?(value)
     end
 
+    def valid_date?(date)
+      !! date.match(/\d{4}-\d{2}-\d{2}/)
+    end
+
     # Includes fields from file extensions
     def raw_fields
-      return @visible_fields unless @bytype
-      cache(:raw_fields) do
-        populate do
-          (@visible_fields + file_extensions).uniq
-        end
-      end
+      return @visible_fields unless @by_type
+      (@visible_fields + file_extensions).uniq
     end
 
     # Method fields used by #to_csv and #pretty_puts
     def fields
-      cache(:fields) do
-        raw_fields.map do |field|
-          field.is_a?(Array) ? field.first : field
-        end
+      raw_fields.map do |field|
+        field.is_a?(Array) ? field.first : field
       end
     end
 
     # Command to be executed at @repository
     # @silent = true wont raise an error on exit code =! 0
     def execute(command, silent = false, &block)
-      result = Open3.popen2e(command, chdir: @repository) do |_, out, thread|
-        Result.new(out.read, thread.value.success?)
-      end
+      result = run(command)
 
-      return block.call(result) if result.success? or silent
-      raise cmd_error_message(command, result.data)
+      if result.success? or silent
+        warn command if @verbose
+        return result unless block
+        return block.call(result)
+      end
+      raise Error, cmd_error_message(command, result.data)
     rescue Errno::ENOENT
-      raise cmd_error_message(command, $!.message)
+      raise Error, cmd_error_message(command, $!.message)
+    end
+
+    def run(command)
+      Timeout.timeout(CMD_TIMEOUT) do
+        Open3.popen2e(command, chdir: @repository) do |_, out, thread|
+          Result.new(out.read.scrub.strip, thread.value.success?)
+        end
+      end
     end
 
     def cmd_error_message(command, message)
@@ -279,47 +351,136 @@ module GitFame
         return @default_settings.fetch(:branch)
       end
 
-      execute("git rev-parse HEAD") do |result|
-        return result.data if result.success?
+      execute("git rev-parse HEAD | head -1") do |result|
+        return result.data.split(" ")[0] if result.success?
       end
+      raise Error, "No branch found. Define one using --branch=<branch>"
+    end
 
-      raise BranchNotFound.new("No branch found")
+    def author_by_email(email, name = nil)
+      @authors[email.strip] ||= Author.new({ parent: self, name: name })
     end
 
-    # Tries to create an author, unless it already exists in cache
-    # User is always updated with the passed @args
-    def update(author, args)
-      fetch(author).tap do |found|
-        args.keys.each do |key|
-          found.send("#{key}=", args[key])
+    # List all files in current git directory, excluding
+    # extensions in @extensions defined by the user
+    def current_files
+      if commit_range.is_range?
+        execute("git diff --name-status #{encoding_opt} #{default_params} #{commit_range.to_s} | grep -v '^D' | cut -f2-") do |result|
+          filter_files(result)
+        end
+      else
+        execute("git ls-tree -r #{commit_range.to_s} | grep blob | cut -f2-") do |result|
+          filter_files(result)
         end
       end
     end
 
-    # Fetches user from cache
-    def fetch(author)
-      @authors[author] ||= Author.new({ name: author, parent: self })
+    def default_params
+      "--date=local"
     end
 
-    # List all files in current git directory, excluding
-    # extensions in @extensions defined by the user
-    def current_files
-      cache(:current_files) do
-        execute("git ls-tree -r #{@branch} --name-only #{@include}") do |result|
-          files = remove_excluded_files(result.to_s.split("\n")).map do |path|
-            GitFame::FileUnit.new(path)
+    def encoding_opt
+      "--encoding=UTF-8"
+    end
+
+    def filter_files(result)
+      raw_files = result.to_s.split("\n")
+      files = remove_excluded_files(raw_files)
+      files = keep_included_files(files)
+      files = files.map { |file| GitFame::FileUnit.new(file) }
+      return files if @extensions.empty?
+      files.select { |file| @extensions.include?(file.extname) }
+    end
+
+    def commit_range
+      CommitRange.new(current_range, @branch)
+    end
+
+    def current_range
+      return @branch if blank?(@after) and blank?(@before)
+
+      if present?(@after) and present?(@before)
+        if end_date < start_date
+          raise Error, "after=#{@after} can't be greater then before=#{@before}"
+        end
+
+        if end_date > end_commit_date and start_date > end_commit_date
+          raise Error, "after=#{@after} and before=#{@before} is set too high, higest is #{end_commit_date}"
+        end
+
+        if end_date < start_commit_date and start_date < start_commit_date
+          raise Error, "after=#{@after} and before=#{@before} is set too low, lowest is #{start_commit_date}"
+        end
+      elsif present?(@after)
+        if start_date > end_commit_date
+          raise Error, "after=#{@after} is set too high, highest is #{end_commit_date}"
+        end
+      elsif present?(@before)
+        if end_date < start_commit_date
+          raise Error, "before=#{@before} is set too low, lowest is #{start_commit_date}"
+        end
+      end
+
+      if present?(@before)
+        if end_date > end_commit_date
+          commit2 = @branch
+        else
+          # Try finding a commit that day
+          commit2 = execute("git rev-list --before='#{@before} 23:59:59' --after='#{@before} 00:00:01' #{default_params} '#{@branch}' | head -1").to_s
+
+          # Otherwise, look for the closest commit
+          if blank?(commit2)
+            commit2 = execute("git rev-list --before='#{@before}' #{default_params} '#{@branch}' | head -1").to_s
           end
+        end
+      end
+
+      if present?(@after)
+        if start_date < start_commit_date
+          return present?(commit2) ? commit2 : @branch
+        end
 
-          return files if @extensions.empty?
-          files.select { |file| @extensions.include?(file.extname) }
+        commit1 = execute("git rev-list --before='#{end_of_yesterday(@after)}' #{default_params} '#{@branch}' | head -1").to_s
+
+        # No commit found this early
+        # If NO end date is choosen, just use current branch
+        # Otherwise use specified (@before) as end date
+        if blank?(commit1)
+          return @branch unless @before
+          return commit2
+        end
+      end
+
+      if @after and @before
+        # Nothing found in date span
+        if commit1 == commit2
+          raise Error, "There are no commits between #{@before} and #{@after}"
         end
+        return [commit1, commit2]
       end
+
+      return commit2 if @before
+      [commit1, @branch]
+    end
+
+    def end_of_yesterday(time)
+      (Time.parse(time) - 86400).strftime("%F 23:59:59")
+    end
+
+    def start_commit_date
+      Time.parse(execute("git log #{encoding_opt} --pretty=format:'%cd' #{default_params} #{@branch} | tail -1").to_s)
+    end
+
+    def end_commit_date
+      Time.parse(execute("git log #{encoding_opt} --pretty=format:'%cd' #{default_params} #{@branch} | head -1").to_s)
+    end
+
+    def end_date
+      Time.parse("#{@before} 23:59:59")
     end
 
-    # The block is only called once for every unique key
-    # Used to ensure methods are only called once
-    def cache(key, &block)
-      @cache[key] ||= block.call
+    def start_date
+      Time.parse("#{@after} 00:00:01")
     end
 
     # Removes files excluded by the user
@@ -327,12 +488,28 @@ module GitFame
     def remove_excluded_files(files)
       return files if @exclude.empty?
       files.reject do |file|
-        @exclude.any? { |exclude| file.match(exclude) }
+        @exclude.any? { |exclude| File.fnmatch(exclude, file) }
+      end
+    end
+
+    def keep_included_files(files)
+      return files if @include.empty?
+      files.select do |file|
+        @include.any? { |include| File.fnmatch(include, file) }
       end
     end
 
     def init_progressbar(files_count)
-      SilentProgressbar.new("GitBlame", files_count, @progressbar)
+      SilentProgressbar.new("Git Fame", files_count, (@progressbar and not @verbose))
     end
+
+    # TODO: Are all these needed?
+    memoize :populate, :run
+    memoize :current_range, :current_files
+    memoize :printable_fields, :files_from_author
+    memoize :raw_fields, :fields, :file_list
+    memoize :end_commit_date, :loc, :commits
+    memoize :start_commit_date, :files, :authors
+    memoize :file_extensions, :used_files
   end
-end
+end