gitwakatime 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 608325483e8f379265e87a1a1043e1243994c36a
-  data.tar.gz: 818c9c1e91c25af377fdc13fc9fd06dc26a2a1ac
+  metadata.gz: b91819c201663c8522a6791246e37ae43633f66d
+  data.tar.gz: f8d581584110d02b8b3178dc8bd6e2902fe38bf1
 SHA512:
-  metadata.gz: 52151087d7120140ca3a55e85f223fa098fb3f73a881623b8bbe3251c877d6548af46d7236944c68345e17eeff07b29a22a079f0767b1f4b9eeb26a5a3d772ca
-  data.tar.gz: 3607317bf5cbea8d9265e17f6eb88f1fa005a97d975c3219d2092653881827f5802df269737452c9cd3d1710a7fbd9eb3a66f367d7314e4241e311e0fcd90740
+  metadata.gz: d94736601a38c5b028805eb78b67d83d9eba9c334fd7825cef8bb5cb8261c36b49a50a6c39fda6b267d80b314030414c5c2e04993d79d6a7e88c74a73608d6ca
+  data.tar.gz: f803b86f5fd86704f90609d8ff214e0d8147e5aba7139fc74ff07c966e9f589600edef32d0592c1f0566c7d29c74be494d3af717b792e8f6394526014df4e041

data/.codeclimate.yml

@@ -0,0 +1,22 @@
+---
+engines:
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+  brakeman:
+    enabled: true
+  bundler-audit:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+ratings:
+  paths:
+  - "**.rb"
+exclude_paths:
+- spec/**/*
+- ".codeclimate.yml"
+- ".rubocop.yml"

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+bin/rspec

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
+sudo: false
 rvm:
   - 2.1.2
 script: bundle exec rake spec
 
 addons:
   code_climate:
-    repo_token: 214446b5fc4f8697cc9ccc3ab1f2612c2e083ea1e71266648319663719cf85b9
+    repo_token: 214446b5fc4f8697cc9ccc3ab1f2612c2e083ea1e71266648319663719cf85b9

data/README.md

@@ -3,11 +3,13 @@
 [![Build Status](https://travis-ci.org/rposborne/gitwakatime.svg?branch=master)](https://travis-ci.org/rposborne/gitwakatime)
 [![Gem Version](https://badge.fury.io/rb/gitwakatime.svg)](http://badge.fury.io/rb/gitwakatime)
 [![Code Climate](https://codeclimate.com/github/rposborne/gitwakatime/badges/gpa.svg)](https://codeclimate.com/github/rposborne/gitwakatime)
+[![Test Coverage](https://codeclimate.com/github/rposborne/gitwakatime/badges/coverage.svg)](https://codeclimate.com/github/rposborne/gitwakatime/coverage)
+[![Issue Count](https://codeclimate.com/github/rposborne/gitwakatime/badges/issue_count.svg)](https://codeclimate.com/github/rposborne/gitwakatime)
 
-GitWakaTime is a mash up between data obtained through "(Wakatime)[https://wakatime.com]" and the data we all create using git.
+GitWakaTime is a mash up between data obtained through "[Wakatime](https://wakatime.com)" and the data we all create using git.
 The principal is to capture a baseline of activity for a task and answer the age old question "How much time did I spend on this?" or "What is the minimum amount I can charge for my time".
 
-This implementation various form (Wakatime's)[https://wakatime.com/#features] commit feature as it compares time spent on each file, vs comparing the time between commits.  It tends to be significantly more accurate for those who do per line commits. 
+This implementation varies form [Wakatime's](https://wakatime.com/#features) commit feature as it compares time spent on each file, vs comparing the time between commits.  It tends to be significantly more accurate for those who do per line commits. Read more about it [here](http://burningpony.com/2015/02/that-feature-took-how-long/)
 
 ## Installation
 
@@ -15,7 +17,7 @@ Install the gem:
 
     $ gem install gitwakatime
 
-Run the setup command: (you will need your wakatime api key)[https://wakatime.com/settings]
+Run the setup command: [you will need your wakatime api key](https://wakatime.com/settings)
 
     $ gitwakatime init
 
@@ -42,8 +44,8 @@ Hard reset of the local cache database, if you are getting odd numbers
 ## Assumptions
 
 There a currently a few limitations with this model
-    
-* Merges are free, (no time is attributed a merge).  This is true for most merges but conflict resolution will be attributed to git parent commit of that file for that merge. 
+
+* Merges are free, (no time is attributed a merge).  This is true for most merges but conflict resolution will be attributed to git parent commit of that file for that merge.
 
 ## Output
     Total Recorded time 1 day 9 hrs 13 mins 32 secs

data/Rakefile

@@ -7,7 +7,13 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rake'
-require 'rspec/core'
-require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  task default: :spec
+rescue LoadError
+  # no rspec available
+end

data/bin/gitwakatime

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
+require 'gitwakatime'
 require 'thor'
 
-require_relative '../lib/gitwakatime'
-
 GitWakaTime::Cli.start

data/gitwakatime.gemspec

@@ -20,19 +20,13 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(/^bin\//) { |f| File.basename(f) }
 
   s.require_paths = ['lib']
-  s.authors = ['Bozhidar Batsov', 'Jonas Arvidsson', 'Yuji Nakayama']
-  s.description = <<-EOF
-    Automatic Ruby code style checking tool.
-    Aims to enforce the community-driven Ruby Style Guide.
-  EOF
-
+  s.authors = ['Russell Osborne']
   s.add_runtime_dependency 'git', '>= 1.2.9.1'
   s.add_runtime_dependency 'wakatime', '>= 0.0.2'
-  s.add_runtime_dependency 'logger', '>= 0'
   s.add_runtime_dependency 'thor', '>= 0'
   s.add_runtime_dependency 'chronic_duration', '>=0'
   s.add_runtime_dependency 'colorize'
-  s.add_runtime_dependency 'activesupport'
+  s.add_runtime_dependency('activesupport', ['>= 0'])
   s.add_runtime_dependency 'sequel'
   s.add_runtime_dependency 'sqlite3'
   s.add_development_dependency('bundler', ['>= 0'])

data/lib/gitwakatime.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+
 if ENV['thor_env'] != 'test'
   DB = Sequel.connect("sqlite://#{File.join(Dir.home, '.wakatime.sqlite')}")
 else
@@ -7,14 +8,17 @@ else
 end
 
 Sequel::Model.plugin :json_serializer
+Sequel.default_timezone = :utc
 DB.use_timestamp_timezones = false
 
 require 'gitwakatime/version'
-require 'gitwakatime/durations'
+require 'gitwakatime/durations_calculator'
 require 'gitwakatime/heartbeat'
 require 'gitwakatime/commit'
 require 'gitwakatime/mapper'
 require 'gitwakatime/query'
+require 'gitwakatime/request'
+require 'gitwakatime/request_builder'
 require 'gitwakatime/timer'
 require 'gitwakatime/log'
 require 'gitwakatime/commited_file'
@@ -72,6 +76,7 @@ module GitWakaTime
         integer :time_in_seconds, default: 0
         String :sha
         String :name
+        String :entity
         String :project
         index :dependent_sha
         index :sha
@@ -84,7 +89,8 @@ module GitWakaTime
         String :uuid
         DateTime :time
         integer :duration, default: 0
-        String :file
+        String :entity
+        String :type
         String :branch
         String :project
         index :uuid, unique: true
@@ -93,7 +99,7 @@ module GitWakaTime
   end
 
   def self.config
-    @configuration ||=  Configuration.new
+    @configuration ||= Configuration.new
   end
 
   def self.configure

data/lib/gitwakatime/cli.rb

@@ -4,11 +4,12 @@ require 'wakatime'
 require 'chronic_duration'
 require 'yaml'
 require 'thor'
+require 'active_support'
 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'
-require 'pry'
+
 module  GitWakaTime
   # Provides two CLI heartbeats init and tally
   class Cli < Thor
@@ -47,6 +48,7 @@ module  GitWakaTime
     def tally
       date = Date.parse(options.start_on)
 
+
       @timer = GitWakaTime::Controller.new(
         path: File.expand_path(options.file), date: date
       ).timer
@@ -54,6 +56,16 @@ module  GitWakaTime
       print_output(@timer, format: options.output)
     end
 
+    desc 'update', 'Cache the latest heartbeats locally'
+    method_option :start_on, aliases: '-s'
+    def update
+      GitWakaTime.config.setup_local_db
+      GitWakaTime.config.load_config_yaml
+      date = Date.parse(options.start_on || GitWakaTime::Heartbeat.max(:time))
+
+      GitWakaTime::Query.new(date, Date.today, @project).call
+    end
+
     no_commands do
       def print_output(timer, format: 'text')
         if format == 'text'
@@ -70,7 +82,7 @@ module  GitWakaTime
         Log.new format(
           '%-40s %-40s'.blue,
           c_date,
-          "Total #{ChronicDuration.output sum_c_time }"
+          "Total #{ChronicDuration.output sum_c_time}"
         )
         commits.each do |commit|
           # Log.new commit.message

data/lib/gitwakatime/commit.rb

@@ -5,7 +5,7 @@ module GitWakaTime
   class Commit < Sequel::Model
     one_to_many :commited_files
     def after_create
-      extract_changed_files
+      extract_changed_files if GitWakaTime.config.git
     end
 
     def to_s
@@ -14,7 +14,7 @@ module GitWakaTime
              date,
              ChronicDuration.output(time_in_seconds.to_i),
              message
-             )
+            )
     end
 
     def oldest_dependent
@@ -22,7 +22,11 @@ module GitWakaTime
     end
 
     def time_in_seconds
-      commited_files.map(&:time_in_seconds).inject(:+)
+      commited_files.map(&:time_in_seconds).compact.inject(:+)
+    end
+
+    def date
+      self[:date].localtime
     end
 
     private

data/lib/gitwakatime/commited_file.rb

@@ -8,7 +8,7 @@ module  GitWakaTime
     # means a split tree, and we should split time between the two, or
     # more, commits.
     def before_create
-      find_dependent_commit(name)
+      find_dependent_commit(name) if GitWakaTime.config.git
     end
 
     def to_s
@@ -16,7 +16,7 @@ module  GitWakaTime
              (dependent_sha[0..8] if dependent_sha),
              ChronicDuration.output(time_in_seconds.to_f),
              name
-             )
+            )
     end
 
     private
@@ -25,7 +25,7 @@ module  GitWakaTime
     # out of commits to check
     def find_dependent_commit(name, i = 1)
       commits = load_dependent_commits(name)
-      begin
+      loop do
         commit = commits[i]
 
         if commit && allowed_commit(commit)
@@ -34,7 +34,8 @@ module  GitWakaTime
         end
 
         i += 1
-      end until !dependent_sha.nil? || commit.nil?
+        break if !dependent_sha.nil? || commit.nil?
+      end
     end
 
     def check_and_correct_split_tree(commit)
@@ -48,7 +49,7 @@ module  GitWakaTime
       if self.commit.date < split_tree_file.commit.date
         self.dependent_date = split_tree_file.commit.date
       elsif self.commit.date > split_tree_file.commit.date
-        split_tree_file.update(dependent_date: commit.date)
+        split_tree_file.update(dependent_date: commit.date.utc)
       end
     end
 

data/lib/gitwakatime/controller.rb

@@ -1,30 +1,33 @@
 module GitWakaTime
   # Extract Duration Data from Heartbeats for the WAKATIME API
   class Controller
+    attr_accessor :time_range, :heartbeats, :relevant_commits, :project
+
     def initialize(path: '.', date: nil)
       @path = path
       GitWakaTime.config.setup_local_db
       GitWakaTime.config.root = path
       GitWakaTime.config.load_config_yaml
       GitWakaTime.config.git = Git.open(path)
+      GitWakaTime::Query.new(date, Date.today, @project).call
+
       @git_map = Mapper.new(start_at: date)
       @project = File.basename(GitWakaTime.config.git.dir.path)
       @relevant_commits = Commit.where(
-        'date > ? and project = ?', date, @project
+        'project = ?', @project
       )
 
+      # Scope by date if one has been passed
+      @relevant_commits = @relevant_commits.where('date > ? ', date) if date
+
       @files = CommitedFile.where(
-        'commit_id IN ?',  @relevant_commits.select_map(:id)
+        'commit_id IN ?', @relevant_commits.select_map(:id)
       ).where('project = ?', @project)
-
-      @heartbeats = Query.new(
-        @relevant_commits, @files, File.basename(path)
-      ).get
     end
 
     def timer
       Timer.new(
-        @relevant_commits.all, @heartbeats, File.basename(@path)
+        @relevant_commits.all, Heartbeat
       ).process
     end
   end

data/lib/gitwakatime/durations_calculator.rb

@@ -0,0 +1,42 @@
+module GitWakaTime
+  # Extract Duration Data from Heartbeats for the WAKATIME API
+  class DurationsCalculator
+    attr_accessor :heartbeats
+    def initialize(args)
+      return @heartbeats = args[:heartbeats] if args[:heartbeats]
+      @args = args
+      @heartbeats = []
+    end
+
+    def heartbeats_to_durations(timeout = 15)
+      durations = []
+      current = nil
+      @heartbeats.each do |heartbeat|
+        # the first heartbeat just sets state and does nothing
+        unless current.nil?
+
+          # get duration since last heartbeat
+          duration = heartbeat.time.round - current.time.round
+
+          duration = 0.0 if duration < 0
+
+          # duration not logged if greater than the timeout
+          if duration < timeout * 60
+
+            # add duration to current heartbeat
+            current.duration = duration
+
+            # save to local db
+            current.save
+
+            # log current heartbeat as a duration
+            durations << current
+          end
+        end
+        # set state (re-start the clock)
+        current = heartbeat
+      end
+      durations
+    end
+  end
+end

data/lib/gitwakatime/mapper.rb

@@ -12,19 +12,20 @@ module GitWakaTime
         @commits = logs.map do |git_c|
           next if git_c.author.name != GitWakaTime.config.user_name
           next if git_c.parents.size > 1
+
           Commit.find_or_create(
-             sha: git_c.sha,
-             project: project
-             ) do |c|
+            sha: git_c.sha,
+            project: project
+          ) do |c|
             c.update(
-             author: git_c.author.name,
-             message: git_c.message,
-             date: git_c.date.utc
+              author: git_c.author.name,
+              message: git_c.message,
+              date: git_c.date.utc
             )
           end
         end.compact
       end
-      Log.new "Map Completed took #{time}s with #{Commit.count}"
+      Log.new "Map Completed took #{time}s with #{@commits.size} commits"
     end
   end
 end

data/lib/gitwakatime/query.rb

@@ -1,79 +1,51 @@
 require 'benchmark'
 require 'colorize'
-require 'active_support/core_ext/time'
 
 module GitWakaTime
   # Integrates the nested hash from mapper with heartbeats api
   class Query
-    def initialize(commits, files, project, _path = nil)
-      @commits   = commits
-      @files = files
-      @api_limit = 1
-      @project   = project
-      @requests   = build_requests
+    def initialize(start_at, end_at, project)
+      @start_at = start_at
+      @end_at = end_at
+      @project = project
+      @requests = RequestBuilder.new(@start_at, @end_at).call
+      Log.new "Loading Committed time from #{@start_at} to #{@end_at}".red
     end
 
-    def time_range
-      commits    = @commits.select_map(:date).sort
-      d_commits  = @files.select_map(:dependent_date).compact.sort
-      timestamps = (commits + d_commits.flatten).uniq.sort
-
-      # Don't query before the Wakatime Epoch
-      first_commit_at = timestamps.first
-      @start_at = if first_commit_at && first_commit_at >= Time.new(2013, 5, 1)
-                    first_commit_at
-                  else
-                    Time.new(2013, 5, 1)
-                  end
-      @end_at = timestamps.last
-    end
-
-    def get
+    def call
       @requests.each do |params|
-        Log.new "Gettting heartbeats
-         #{params[:start].to_date} to #{params[:end].to_date}".red
-        Durations.new(params).load_heartbeats
+        next if cached?(params[:date])
+        persist_heartbeats_localy(Request.new(params).call)
       end
 
-      Durations.new(
-        heartbeats: heartbeats.where('duration <= 0')
-      ).heartbeats_to_durations
-      heartbeats.all
+      DurationsCalculator.new(heartbeats: local_heartbeats.where('duration <= 0') ).heartbeats_to_durations
+      local_heartbeats.where(project: @project).all
     end
 
-    def heartbeats
-      Heartbeat.where(
-        'time >= ? and time <= ? ', @start_at, @end_at
-      ).where(project: @project)
+    def cached?(date)
+      max_local_timestamp = Heartbeat.max(:time)
+      return false if max_local_timestamp.nil?
+      @max_local_timestamp ||= (Time.parse(max_local_timestamp + ' UTC'))
+      date.to_date < @max_local_timestamp.to_date
     end
 
-    def build_requests
-      time_range
-
-      # Always have a date range great than 1 as the num request
-      # will be 0/1 otherwise
-      num_requests = ((@end_at.to_date + 1) - @start_at.to_date) / @api_limit
-      i = 0
-
-      request_params = num_requests.to_f.ceil.times.map do
-
-        params = construct_params(i)
-        i += 1
-        params
+    private
 
+    def persist_heartbeats_localy(heartbeats)
+      heartbeats.map do |heartbeat|
+        heartbeat['uuid'] = heartbeat['id']
+        heartbeat['time'] = Time.at(heartbeat['time'])
+        heartbeat.delete('id')
+        Heartbeat.find_or_create(uuid: heartbeat['uuid']) do |a|
+          a.update(heartbeat)
+        end
       end
-      request_params
     end
 
-    def construct_params(i)
-      {
-        start: (
-          @start_at.to_date + (i * @api_limit)
-        ).to_time.beginning_of_day,
-        end:  (@start_at.to_date + (i * @api_limit)).to_time.end_of_day,
-        project: @project,
-        show: 'file,branch,project,time,id'
-      }
+    def local_heartbeats
+      Heartbeat.where(
+        'time >= ? and time <= ? ', @start_at, @end_at
+      )
     end
   end
 end