pair_see 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81bb49796a8d7b405eaf42d4a686c6d4976ea0df
-  data.tar.gz: 0e3288c9919ba8915a9eaf3aac59423f8fda8536
+  metadata.gz: 395e98d640b7d14ff1c16a02ed3c21ff21823317
+  data.tar.gz: 33ca0a5a3b708ab237cf3c7bf90f16a86457e89d
 SHA512:
-  metadata.gz: 02ecfdf9001d28bef43a1a3d5a331a3b2a43f2e7024098136e62b9ff12b382326f3c6f6f10677f3b8d6e5650659cf0dec89ae69a7f3104dbacb4bf6e6e8b9ea7
-  data.tar.gz: d319af81af500915037e9bcd7e4aa280b110d560d773e4cd56771e61cade16db31e1fd2bb104866cf4f811d5caa2089d6aa80ae787a61cb12985f108eecff652
+  metadata.gz: 5d047500df1fac79f523fca933d433879dfa174d2de09fbf137ddcc5ce8073310a51e874f42c88026a29ac5f81d3898327d63071e72ceb8166e86cf764ed1759
+  data.tar.gz: 1b818b5f0a1aff57f1c9de4f2cfb7be3eada651693c400b5fc66319ebb7ab37358ddb5e8f3fd974674c823e930cc0f1c5d7c2329a721c325a3ca090cb4cac9b4

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - "2.4.1"
+  - '2.4.1'
 addons:
   code_climate:
     repo_token: cdb26718880608c44fda7463511e0151140ade238d92cb1044892472da13ca48
@@ -10,3 +10,5 @@ notifications:
 before_install:
   - git config --global user.email 'pairsee-test@example.com'
   - git config --global user.name 'pairsee-test'
+after_success:
+  - bundle exec codeclimate-test-reporter

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-
+0.1.5
+=====
+* adding support for multiple git repositories specified by full path 
+* adding support for multiple commit aliases per person (i.e. name typos)
+* adding support for multiple card/project identifiers
 
 0.1.4
 =====

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pair_see (0.1.4)
+    pair_see (0.1.5)
       git (~> 1.3)
       trollop (~> 2.1)
       yamler (~> 0.1)

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/TODO.md

@@ -1,5 +1,6 @@
-- multiple names as same person
+- Fix bug in --extras where multi-name users are shown in extras
 - multiple codebases?
+- fix bug in "last commit" in -d, dates are not accurate
 - sort --latest by commit date
 - multiple card starters
 
@@ -11,3 +12,11 @@
 - add COLOR to graph / outputs - use vlad's color library?
 - sort -s by # cards worked
 
+- standardize quotes
+
+Fix this bug:
+DMM-103 - - - commits: 7 - - - duration: 0 days - - - last commit: 2017-03-07 - - - commits per day: Infinity
+DMM-17 - - - commits: 71 - - - duration: -1 days - - - last commit: 2017-04-06 - - - commits per day: -71.0
+DMM-39 - - - commits: 6 - - - duration: -6 days - - - last commit: 2017-04-12 - - - commits per day: -1.0
+DMM-81 - - - commits: 3 - - - duration: -6 days - - - last commit: 2017-03-08 - - - commits per day: -0.5
+DMM-136 - - - commits: 33 - - - duration: -33 days - - - last commit: 2017-05-30 - - - commits per day: -1.0

data/bin/pairsee

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/pair_see/seer'
+require_relative '../lib/pair_see/person'
 require 'trollop'
+require 'pry'
 
 opts = Trollop.options do
-  opt :root, 'Folder in which .git folder is', default: '.'
   opt :config, 'location of config file, example: ../../config/config.yml', default: "config/config.yml"
   opt :after, 'Date since which you want to get commits, in yyyy-mm-dd format', default: '0-1-1'
   opt :extras, 'See all commits without the name of any dev in them', default: false
@@ -18,14 +19,14 @@ def run_command(opts)
   begin
     config = YAML.load_file(opts[:config])
   rescue
-    puts "Config file not found at: " + opts[:config] + " See config/config.yml.sample for an example. ....exiting"
+    puts "Config file not found at: " + opts[:config] + " See config/config.yml.sample for an example. \n...exiting"
     exit
   end
   options = {
-      names: config['names'].split(' '),
+      names: config['names'].map {|i| PairSee::Person.new(i.split(' '))}, # todo rename "names" to "people"
       card_prefix: config['card_prefix'],
       after_date: opts[:after],
-      repo_location: opts[:root]
+      repo_locations: config['roots']
   }
 
   seer = PairSee::Seer.new(options)

data/build_and_install.sh

@@ -1,3 +1,3 @@
 rake build
-gem install pkg/pair_see-0.1.2.gem
+gem install pkg/pair_see-0.1.4.gem
 pairsee

data/config/config.yml.sample

@@ -1,2 +1,8 @@
-names: compwron Person1 Person2 Person3
-card_prefix: FOO-
+names:
+    - compwron cmpwrn compwrnn
+    - Person1
+    - Person2
+    - Person3
+card_prefix:
+    - FOO-
+    - BAR-

data/lib/pair_see/card.rb

@@ -1,6 +1,6 @@
 module PairSee
   class Card
-    attr_reader :card_name, :number_of_commits
+    attr_reader :card_name, :number_of_commits, :last_date
 
     def initialize(card_name, number_of_commits, first_date, last_date)
       @card_name = card_name
@@ -16,5 +16,10 @@ module PairSee
       card_name == other.card_name
       number_of_commits == other.number_of_commits
     end
+
+    def pretty
+      commits_per_day = ((number_of_commits * 1.0) / duration).round(2)
+      "#{card_name} - - - commits: #{number_of_commits} - - - duration: #{duration} days - - - last commit: #{last_date} - - - commits per day: #{commits_per_day}"
+    end
   end
 end

data/lib/pair_see/cards_per_person.rb

@@ -2,10 +2,10 @@ module PairSee
   class CardsPerPerson
     attr_reader :devs
 
-    def initialize(log_lines, options)
+    def initialize(log_lines, card_prefix, people)
       @log_lines = log_lines
-      @options = options
-      @devs = _active(options[:names])
+      @card_prefix = card_prefix
+      @devs = _active(people)
     end
 
     def cards_per_person
@@ -17,27 +17,25 @@ module PairSee
         {dev_name => cards_worked.uniq}
       end.inject({}) do |result, element|
         result.merge(element)
+      end.sort do |a, b|
+        a[1].size <=> b[1].size
       end.map do |dev, cards|
         "#{dev}: [#{cards.size} cards] #{cards.sort.join(', ')}"
       end
     end
 
-    def _cards_dev_worked_on(log_lines, dev)
+    def _cards_dev_worked_on(log_lines, person)
       log_lines.select do |log_line|
-        log_line.authored_by?(dev)
+        log_line.authored_by?(person)
       end.map do |log_line|
-        log_line.card_number(@options[:card_prefix])
+        log_line.card_number(@card_prefix)
       end.compact
     end
 
-    def _active(devs)
-      devs.select do |dev|
-        _is_active?(dev)
+    def _active(people)
+      people.select do |person|
+        @log_lines.active? person
       end
     end
-
-    def _is_active?(dev)
-      @log_lines.active? dev
-    end
   end
 end

data/lib/pair_see/log_line.rb

@@ -8,9 +8,18 @@ module PairSee
     end
 
     def authored_by?(*people)
-      people.empty? ? false : people.all? do |person|
-        /(^|\s+|\W)#{person}(\s+|$|\W)/i =~ line
-      end
+      return false if people.empty?
+      people.map {|person|
+        contains_any_of?(person.names)
+      }.all?
+    end
+
+    def contains_any_of?(names)
+      names.any? {|name| line_contains_name(name)}
+    end
+
+    def line_contains_name(name)
+      /(^|\s+|\W)#{name}(\s+|$|\W)/i =~ line
     end
 
     def contains_card?(card_prefix)
@@ -23,15 +32,25 @@ module PairSee
       !git_matcher.nil?
     end
 
-    def card_name(card_prefix)
-      regex = /(#{card_prefix}\d+)/
-      matcher = line.match(regex)
-      matcher.nil? ? nil : (line.match regex)[1]
+    def card_name(card_prefixes)
+      card_prefixes.each {|cp|
+        regex = /(#{cp}\d+)/
+        matcher = line.match(regex)
+        if (!matcher.nil?)
+          return (line.match regex)[1]
+        end
+      }
+      return nil
     end
 
-    def card_number(card_prefix)
-      card_num = card_name(card_prefix)
-      card_num ? card_num.gsub(card_prefix, '') : nil
+    def card_number(card_prefixes)
+      card_prefixes.each {|cp|
+        card_num = card_name([cp])
+        if (card_num)
+          return card_num.gsub(cp, '')
+        end
+      }
+      return nil
     end
 
     def merge_commit?
@@ -45,8 +64,11 @@ module PairSee
       Date.parse(part_to_parse)
     end
 
-    def not_by_pair?(devs)
-      devs.any? { |dev| authored_by?(dev) || merge_commit? }
+    def by_any?(devs)
+      if devs.size == 0
+        return false
+      end
+      devs.any? {|dev| authored_by?(dev)}
     end
 
     def to_s

data/lib/pair_see/log_lines.rb

@@ -17,23 +17,23 @@ module PairSee
       lines.last
     end
 
-    def active?(dev)
+    def active?(person)
       any? do |log_line|
-        log_line.authored_by?(dev)
+        log_line.authored_by?(person)
       end
     end
 
     def commits_for_pair(person1, person2)
-      select { |log_line| log_line.authored_by?(person1, person2) }
+      select {|log_line| log_line.authored_by?(person1, person2)}
     end
 
     def commits_not_by_known_pair(devs)
-      reject { |log_line| log_line.not_by_pair? devs }
+      reject {|log_line| log_line.by_any? devs}
     end
 
-    def solo_commits(devs, dev)
+    def solo_commits(people, person)
       select do |log_line|
-        log_line.authored_by?(dev) && (devs - [dev]).none? { |d| log_line.authored_by?(d) }
+        log_line.authored_by?(person) && (people - [person]).none? {|single_person| log_line.authored_by?(single_person)}
       end
     end
 

data/lib/pair_see/person.rb

@@ -0,0 +1,16 @@
+module PairSee
+  class Person
+
+    attr_reader :display_name
+    attr_reader :names
+
+    def initialize(names)
+      @names = names
+      @display_name = names.first
+    end
+
+    def to_s
+      display_name
+    end
+  end
+end

data/lib/pair_see/seer.rb

@@ -8,60 +8,57 @@ module PairSee
     require_relative 'cards_per_person'
     require_relative 'active_devs'
 
-    attr_reader :log_lines, :devs, :dev_pairs, :card_prefix
+    attr_reader :log_lines, :devs, :dev_pairs, :card_prefixes
     @@maximum_commits_to_parse = 9999
 
     def initialize(options)
-      @log_lines = _lines_from(options[:repo_location], options[:after_date])
-      @sub_seer = CardsPerPerson.new(@log_lines, options)
+      @log_lines = _lines_from(options[:repo_locations], options[:after_date])
+      @sub_seer = CardsPerPerson.new(@log_lines, options[:card_prefix], options[:names])
       @active_devs = ActiveDevs.new(@log_lines, options).devs
       @devs = @sub_seer.devs
-      @card_prefix = options[:card_prefix]
+      @card_prefixes = options[:card_prefix]
       @dev_pairs = devs.combination(2)
     end
 
-# seer.commits_not_by_known_pair
-# seer.all_most_recent_commits
-# seer.recommended_pairings
-# seer.pretty_card_data
-# seer.cards_per_person
-# seer.all_commits
-
-
     def cards_per_person
       @sub_seer.cards_per_person
     end
 
-    def _lines_from(git_home, date_string)
-      g = Git.open(git_home)
-      lines = g.log(@@maximum_commits_to_parse).since(date_string).map do |l|
-        LogLine.new("#{l.date} #{l.message}")
-      end
-      LogLines.new(lines)
+    def _lines_from(roots, date_string)
+      lines = []
+      roots.each {|root|
+        g = Git.open(root)
+        lines << g.log(@@maximum_commits_to_parse).since(date_string).map do |l|
+          LogLine.new("#{l.date} #{l.message}")
+        end
+      }
+      LogLines.new(lines.flatten)
     end
 
     def pretty_card_data
-      card_data(card_prefix).map do |card|
-        "#{card.card_name} - - - commits: #{card.number_of_commits} - - - duration: #{card.duration} days " unless card.nil?
+      card_data(card_prefixes).map do |card|
+        card.pretty unless card.nil?
       end
     end
 
-    def card_data(card_prefix)
-      card_numbers(card_prefix).map do |card_name|
-        commits = commits_on_card(card_name)
-        Card.new(card_name, commits.count, commits.first.date, commits.last.date)
-      end.sort_by(&:duration).reverse
+    def card_data(card_prefixes)
+      card_prefixes.map do |card_prefix|
+        card_numbers(card_prefix).map do |card_name|
+          commits = commits_on_card(card_name)
+          Card.new(card_name, commits.count, commits.first.date, commits.last.date)
+        end
+      end.flatten.sort_by(&:duration).reverse
     end
 
     def commits_on_card(card_name)
-      log_lines.select { |line| line.contains_card_name?(card_name) }
+      log_lines.select {|line| line.contains_card_name?(card_name)}
     end
 
     def card_numbers(card_prefix)
       log_lines.select do |line|
         line.contains_card?(card_prefix)
       end.map do |line|
-        line.card_name(card_prefix)
+        line.card_name([card_prefix])
       end.uniq.compact
     end
 
@@ -111,13 +108,13 @@ module PairSee
 
     def recommended_pairings
       should_pair = unpaired_in_range
-      should_pair.empty? ? least_recent_pair : should_pair
+      should_pair.empty? ? [least_recent_pair] : should_pair
     end
 
     def least_recent_pair
-      devs.select do |dev|
-        log_lines.last.line.match(dev)
-      end.join(', ')
+      devs.select do |person|
+        person.names.any? {|name| log_lines.last.line.match(name)}
+      end.map(&:display_name).join(', ')
     end
 
     def unpaired_in_range

data/lib/pair_see/version.rb

@@ -1,3 +1,3 @@
 module PairSee
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/pair_see.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   gem.bindir = 'bin'
-  gem.executables = ["pairsee"]
+  gem.executables = ['pairsee']
   gem.require_paths = ['lib']
 
   gem.add_dependency 'yamler', '~> 0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pair_see
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - compwron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yamler
@@ -197,6 +197,7 @@ files:
 - lib/pair_see/date_combo.rb
 - lib/pair_see/log_line.rb
 - lib/pair_see/log_lines.rb
+- lib/pair_see/person.rb
 - lib/pair_see/seer.rb
 - lib/pair_see/version.rb
 - pair_see.gemspec