gitwakatime 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e6080229ad2143f0874a4912e4ceb6df885306
-  data.tar.gz: 6f6aa24acd61e4f0b87217d674f8dc60a5652113
+  metadata.gz: 22675c8683f7ed9526d4715687b666c6b588387c
+  data.tar.gz: a72221a76657b3daea13882df4b5f18eb30021a2
 SHA512:
-  metadata.gz: d50a015052568968ff6dba0efba08e131f9d5e781555e16c136b20bc6775a21deb6115c7be66b7b0bd157c38cc9bfc19ce8e30cf009ae5565b8d28e90c2f059d
-  data.tar.gz: cef4abacec5ab099db09005c92a237d853cd5951261e65a9d8ae102d8be6dde1f7ef806327a091058d7698d7773eba19fa9a5e82f8fa249d9581bc0bd4daded6
+  metadata.gz: d53f9a01279650d49f4da02104108b0a0dd94ceffc5aa552dbc1a8ae5c70f55e64cb302b1b790e423e38e5bcf7807ceeb13d6fcff61ffc4efcfd380f7ad59c61
+  data.tar.gz: 814d9fcbb9f90a1b7138295bb3ea74e203c6367245e04067c598e91f356c58f7a9385bf148a262a7a67949f86060b4befeacd8741caec39225d36b8dc87d0492

data/README.md

@@ -1,24 +1,22 @@
 # GitWakaTime
 
-TODO: Write a gem description
+GitWakaTime is a mashup between data obtained through "wakatime" and the data we all create using git. 
+The prinicpal is to capture a baseline of activity for a task and answer the age old question "How much time did I spend on this?"
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem 'gitwakatime'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+Install the gem:
 
     $ gem install gitwakatime
 
 ## Usage
 
-TODO: Write usage instructions here
+    Creates a .gitwakatime.yml file on the user's home directory ~/.gitwakatime.yml which will contain your api keys
+    $ gitwakatime init 
+
+    Process the current directory
+
+    $ gitwakatime tally 
 
 ## Contributing
 

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/gitwakatime.gemspec

@@ -4,27 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitwakatime/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "gitwakatime"
+  spec.name          = 'gitwakatime'
   spec.version       = GitWakaTime::VERSION
-  spec.authors       = ["Russell Osborne"]
-  spec.email         = ["russosborn@gmail.com"]
-  spec.summary       = %q{A Tool that will compile git data with wakatime data to establish time per commit}
-  spec.description   = %q{A Tool that will compile git data with wakatime data to establish time per commit }
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['Russell Osborne']
+  spec.email         = ['russosborn@gmail.com']
+  spec.summary       = 'A Tool that will compile git data with wakatime data to establish time per commit'
+  spec.description   = 'A Tool that will compile git data with wakatime data to establish time per commit '
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "git", ">= 0"
-  spec.add_runtime_dependency "wakatime", ">= 0"
-  spec.add_runtime_dependency "logger", ">= 0"
-  spec.add_runtime_dependency "thor", ">= 0"
-  spec.add_runtime_dependency "chronic_duration", ">=0"
-  spec.add_runtime_dependency "colorize"
-  spec.add_development_dependency("bundler", [">= 0"])
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_runtime_dependency 'git', '>= 0'
+  spec.add_runtime_dependency 'wakatime', '>= 0.0.2'
+  spec.add_runtime_dependency 'logger', '>= 0'
+  spec.add_runtime_dependency 'thor', '>= 0'
+  spec.add_runtime_dependency 'chronic_duration', '>=0'
+  spec.add_runtime_dependency 'colorize'
+  spec.add_runtime_dependency 'activesupport'
+  spec.add_development_dependency('bundler', ['>= 0'])
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency('webmock', ['>= 0'])
 end

data/lib/gitwakatime/actions.rb

@@ -1,7 +1,9 @@
 module GitWakaTime
   # Extract Duration Data from Actions for the WAKATIME API
   class Actions
+    attr_accessor :actions
     def initialize(args)
+      return @actions = args[:actions] if args[:actions]
       fail if args[:project].nil?
       @project = args[:project]
       @args = args
@@ -15,12 +17,16 @@ module GitWakaTime
       time = Benchmark.realtime do
         @actions = @client.actions(@args)
         # remove returned actions that do not have the project we want
-        @actions.keep_if { |a| a['project'] == @project }
+        @actions =  @actions.keep_if do  |a|
+          a['project'] == @project
+        end
+
       end
       Log.new "API took #{time}s"
+      @actions
     end
 
-    def actions_to_durations(project = nil, timeout = 15)
+    def actions_to_durations(_project = nil, timeout = 15)
       durations = []
       current = []
       @actions.each do | action |

data/lib/gitwakatime/cli.rb

@@ -4,6 +4,11 @@ require 'wakatime'
 require 'chronic_duration'
 require 'yaml'
 require 'thor'
+require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/date_and_time/calculations'
+require 'active_support/core_ext/integer/time'
+require 'active_support/core_ext/time'
+
 module  GitWakaTime
   # Provides two CLI actions init and tally
   class Cli < Thor
@@ -22,16 +27,27 @@ module  GitWakaTime
 
     desc 'tally', 'Produce time spend for each commit and file in each commit'
     method_option :file, aliases: '-f', default: '.'
+    method_option :start_on, aliases: '-s', default: nil
     def tally
-      path , GitWakaTime.config.root = File.expand_path(options.file)
+      path, GitWakaTime.config.root = File.expand_path(options.file)
+      date = Date.parse(options.start_on) if options.start_on
+      date = 1.month.ago.beginning_of_month unless options.start_on
       GitWakaTime.config.load_config_yaml
-      @mapper   = Mapper.new(path)
+      @git_map = Mapper.new(path, start_at: date)
+      @actions = Query.new(@git_map.commits, File.basename(path)).get
+
+      @timer   = Timer.new(@git_map.commits, @actions, File.basename(path)).process
 
-      @timer = Timer.new(@mapper.commits, File.basename(path))
-      @commits_with_duration = @timer.process
-      @commits_with_duration.each do |commit|
-        Log.new commit.to_s
-        commit.files.each { |file| Log.new file.to_s }
+      @timer.each do |date, commits|
+        Log.new format('%-40s %-40s'.blue,
+                       date,
+                       "Total #{ChronicDuration.output commits.map(&:time_in_seconds).reduce(&:+)}"
+                       )
+        commits.each do |commit|
+          # Log.new commit.message
+          Log.new commit.to_s
+          commit.files.each { |file| Log.new file.to_s }
+        end
       end
     end
   end

data/lib/gitwakatime/commit.rb

@@ -1,20 +1,25 @@
 module GitWakaTime
   class Commit
-    attr_accessor :sha, :date, :message, :files, :time_in_seconds
+    attr_accessor :raw_commit, :sha, :date, :message, :files, :time_in_seconds, :git, :author
 
     def initialize(git, commit, load_files = true)
       @raw_commit      = commit
       @sha             = @raw_commit.sha
       @date            = @raw_commit.date
       @message         = @raw_commit.message
+      @author          = @raw_commit.author
       @time_in_seconds = 0
       @git             = git
       @load_files      = load_files
-      @files = load  if load_files
+      @files = get_files  if load_files
+    end
+
+    def inspect
+      [sha[0..8], time_in_seconds]
     end
 
     def to_s
-      format('%-8s %8s %-30s %-80s'.green,
+      format('        %-8s %8s %-30s %-80s'.green,
              sha[0..8],
              date,
              ChronicDuration.output(time_in_seconds),
@@ -22,12 +27,17 @@ module GitWakaTime
              )
     end
 
+    def oldest_dependent
+      @files.sort { |f| f.commit.date }.first
+    end
+
     private
 
-    def load
+    def get_files
+      # TODO: Assume gap time to lookup time prior to first commit.
       return [] unless @raw_commit.parent
       @raw_commit.diff_parent.stats[:files].keys.map do |file|
-        CommitedFile.new(git: @git , parent_commit: @raw_commit, name: file, dependent: false)
+        CommitedFile.new(git: @git, commit: @raw_commit, name: file, dependent: false)
       end
     end
   end

data/lib/gitwakatime/commited_file.rb

@@ -5,31 +5,47 @@ module  GitWakaTime
     def initialize(args)
       @git = args[:git]
       @name = args[:name]
-      @parent_commit = args[:parent_commit]
+      @commit = args[:commit]
       @time_in_seconds = 0
-      @find_dependent = args[:dependent] || true
 
-      write_dependent_commit(name) if @find_dependent
+      @dependent_commit = find_dependent_commit(name)
     end
 
     def to_s
-      format('    %-40s %-40s %-20s'.blue ,
-             ChronicDuration.output(time_in_seconds.to_f),
-             name,
-             (dependent_commit.sha[0..8] if @dependent_commit)
+      format('                 %-20s %-40s %-100s '.blue,
+             (dependent_commit.sha[0..8] if @dependent_commit),
+             ChronicDuration.output(@time_in_seconds.to_f),
+             name
+
              )
     end
 
     private
 
-    def write_dependent_commit(name)
-      commit = load_dependent_commit(name)
-      @dependent_commit = Commit.new(@git, commit , false) if commit
+    def find_dependent_commit(name)
+      i = 1
+      dependent = nil
+      commit = 1
+
+      begin
+        commit = load_dependent_commit(name, i: i)
+        dependent = Commit.new(@git, commit, false) if allowed_commit(commit)
+        i += 1
+      end until !dependent.nil? || commit.nil?
+      dependent
+    end
+
+    def allowed_commit(commit)
+      return false if commit.nil?
+      return false if commit.author.name != @git.config('user.name')
+      return false if commit.message.include?('Merge branch')
+      true
     end
 
-    def load_dependent_commit(name)
-      @git.log(100).until(@parent_commit.date.to_s).object(name)[1]
+    def load_dependent_commit(name, i: 1)
+      @git.log.object(@commit.sha).path(name)[i]
     rescue Git::GitExecuteError
+      puts error
       nil
     end
   end

data/lib/gitwakatime/mapper.rb

@@ -2,19 +2,16 @@ module GitWakaTime
   # Th
   class Mapper
     attr_accessor :commits, :git
-    def initialize(path, commits = 100)
+    def initialize(path, commits: 500, start_at: Date.today)
       Log.new 'Mapping commits for dependent commits'
       time = Benchmark.realtime do
         @git = Git.open(path)
-        # TODO: Expose since timestamp as a CLI option
-        # TODO: Expose number of commits as a CLI option
-        first_of_month = Date.new(Date.today.year, Date.today.month, 1)
 
-        logs =  @git.log(commits).since(first_of_month)
+        logs =  @git.log(commits).since(start_at).until(Date.today)
 
         @commits = logs.map do |git_commit|
           Commit.new(@git, git_commit)
-        end
+        end.compact
       end
       Log.new "Map Completed took #{time}s"
     end

data/lib/gitwakatime/query.rb

@@ -0,0 +1,48 @@
+require 'benchmark'
+require 'colorize'
+require 'active_support/core_ext/time'
+
+module GitWakaTime
+  # Integrates the nested hash from mapper with actions api
+  class Query
+    def initialize(commits, project, _path = nil)
+      @commits   = commits
+      @api_limit = 15
+      @project   = project
+      @actions   = []
+      @requests   = time_params
+    end
+
+    def get
+      @requests.each do |params|
+        Log.new "Requesting actions #{params[:start].to_date} to #{params[:end].to_date}".red
+        @actions = @actions.concat Actions.new(params).actions
+      end
+
+      Actions.new(actions: @actions.uniq(&:id)).actions_to_durations
+    end
+
+    def time_params
+      commits = @commits.map(&:date)
+      d_commits = @commits.map do |c|
+        c.files.map(&:dependent_commit).compact.map(&:date)
+      end
+      timestamps = (commits + d_commits.flatten).uniq
+      num_requests = (timestamps.first.to_date - timestamps.last.to_date) / @api_limit
+      i = 0
+      request_params = num_requests.to_f.ceil.times.map do
+
+        params = {
+          start: (timestamps.last.to_date + (i * @api_limit)).to_time.beginning_of_day,
+          end: (timestamps.last.to_date + ((i + 1) * @api_limit)).to_time.end_of_day,
+          project: @project
+        }
+        i += 1
+        params
+
+      end
+
+      request_params
+    end
+  end
+end

data/lib/gitwakatime/timer.rb

@@ -1,42 +1,31 @@
 require 'benchmark'
 require 'colorize'
-require 'pry'
+require 'active_support/core_ext/time'
+
 module GitWakaTime
   # Integrates the nested hash from mapper with actions api
   class Timer
-    def initialize(commits, project, path = nil)
-      @commits         = commits
-      params           = time_params
-      params[:project] = project
-      @actions         = Actions.new(params)
-      @actions_with_durations = @actions.actions_to_durations
-    end
-
-    def time_params
-      commits = @commits.map(&:date)
-      d_commits = @commits.map do |c|
-        c.files.map(&:dependent_commit).compact.map(&:date)
-      end
-      timestamps = (commits + d_commits.flatten).uniq
-      api_limit = Time.now - 60 * 60 * 24 * 60
-      min  = api_limit > timestamps.min ?  api_limit : timestamps.min
-      { start: min, end: timestamps.max }
+    def initialize(commits, actions_with_durations, project)
+      @commits = commits
+      @actions_with_durations   = actions_with_durations
+      @project   = project
     end
 
     def total
-      @total_time = sum_actions @actions_with_durations
-      Log.new "Total Recorded time #{ChronicDuration.output @total_time}", :red
+      total_time = sum_actions @actions_with_durations
+      Log.new "Total Recorded time #{ChronicDuration.output total_time}", :red
     end
 
     def total_commited
-      @total_commited = ChronicDuration.output(@commits_with_duration
-                                               .map { |c| c.time_in_seconds }
+      total_commited = ChronicDuration.output(@commits_with_duration
+                                               .map(&:time_in_seconds)
                                                .reduce(:+).to_f)
-      Log.new "Total Commited Time #{@total_commited} ".red
+      Log.new "Total Commited Time #{total_commited} ".red
     end
 
     def process
       @commits_with_duration = @commits.each do |commit|
+
         if !commit.files.empty?
           commit.files.each_with_index do |file, i|
             time = sum_actions relevant_actions(commit, file)
@@ -44,12 +33,13 @@ module GitWakaTime
             commit.time_in_seconds += time
           end
         else
-          commit.time_in_seconds = sum_actions(actions_before(commit.date))
+          # commit.time_in_seconds = sum_actions(actions_before(commit.date))
         end
-      end
+      end.compact
       total
       total_commited
       @commits_with_duration
+      @commits_with_duration_by_date = @commits_with_duration.group_by { |c| c.date.to_date }
     end
 
     private
@@ -66,11 +56,8 @@ module GitWakaTime
       # If this file had an earlier commit ensure the actions timestamp
       # is after that commit
       if file.dependent_commit
-        actions = actions.select do |action|
-          Time.at(action['time'])  >= file.dependent_commit.date
-        end
+        actions = actions_after(actions, file.dependent_commit.date)
       end
-
       actions
     end
 
@@ -80,6 +67,12 @@ module GitWakaTime
       end
     end
 
+    def actions_after(actions, date)
+      actions.select do |action|
+        Time.at(action['time']) >= date
+      end
+    end
+
     def sum_actions(actions)
       actions.map { |action| action['duration'] }
       .reduce(:+).to_f