gitwakatime 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87b1a52859dcdf8ad54d5be75e5c981961e56fab
-  data.tar.gz: e8c3f862a72c6e6717eaaa553624e51cce2b9d4c
+  metadata.gz: 6d47de3815abb7edcfb65449699ce7ed4ea939de
+  data.tar.gz: f540146be05016d14cb0272603257403cb4a31f5
 SHA512:
-  metadata.gz: 92157e1509a6f4f05b3ce58b86df8a13c0f4ffd9788204ad82b69b2cdb4850952723cc997ccb9c592702d9144c5872b5a32c02656a498bab6410d03df8b47d54
-  data.tar.gz: 44b4acdc179a5d4d976e56bd43758d52f09320fa6c12b62d6e6907f81c617051de062f36803c4dab86eb1726f2ed3637e784848cd51d55447693bc02d3b2fb4c
+  metadata.gz: 6e9bebde6645f4b5052ef01af5d6bd7a7e6217814caa6c1766ea25aa0875fd7b1a4f6678f1083a82a97ccb2d53babeecbbef5c7b31d7a470e0b0dbbf2913e636
+  data.tar.gz: b6065a0f59b9f06ee0b657c48c4b109c699e7afac461ff443324f7e54e095f2cf57129af079dffae46b6eef877dff21165fb02230c5336f5643f01dbe6f113f6

data/README.md

@@ -27,7 +27,7 @@ Process the current directory for the past 7 days
 
     $ gitwakatime tally
 
-Process the current directory from a given point  (this will still load all actions data to prevent providing incorrect timing at the start point)
+Process the current directory from a given point  (this will still load all heartbeats data to prevent providing incorrect timing at the start point)
 
     $ gitwakatime tally -s 2014-02-01
 
@@ -62,10 +62,10 @@ There a currently a few limitations with this model
                             4949d899a            4 mins 47 secs                           spec/query_spec.rb
                             4949d899a            1 min 49 secs                            spec/spec_helper.rb
                             ea23d7dd7            3 mins 3 secs                            spec/timer_spec.rb
-            30415f0a3 2015-02-04 11:54:18 -0500 1 hr 30 mins 17 secs           Cache Actions locally, in sqlite.
+            30415f0a3 2015-02-04 11:54:18 -0500 1 hr 30 mins 17 secs           Cache Heartbeats locally, in sqlite.
                             093f9e4d5            4 mins 19 secs                           lib/gitwakatime.rb
-                                                 25 secs                                  lib/gitwakatime/action.rb
-                            caf409884            7 mins 45 secs                           lib/gitwakatime/actions.rb
+                                                 25 secs                                  lib/gitwakatime/heartbeat.rb
+                            caf409884            7 mins 45 secs                           lib/gitwakatime/heartbeats.rb
                             331723757            1 min 39 secs                            lib/gitwakatime/cli.rb
                                                  46 mins 2 secs                           lib/gitwakatime/durations.rb
                             b1cd1d09c            23 mins 50 secs                          lib/gitwakatime/query.rb

data/Rakefile

@@ -1,6 +1,13 @@
 require 'bundler/gem_tasks'
 begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts 'Run `bundle install` to install missing gems'
+  exit e.status_code
 end
+require 'rake'
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)

data/gitwakatime.gemspec

@@ -3,32 +3,41 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitwakatime/version'
 
-Gem::Specification.new do |spec|
-  spec.name          = 'gitwakatime'
-  spec.version       = GitWakaTime::VERSION
-  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'
+Gem::Specification.new do |s|
+  s.name          = 'gitwakatime'
+  s.version       = GitWakaTime::VERSION
+  s.authors       = ['Russell Osborne']
+  s.email         = ['russosborn@gmail.com']
+  s.summary       = 'A Tool that will compile git data with wakatime
+                        data to establish time per commit'
+  s.description   = 'A Tool that will compile git data with wakatime
+                        data to establish time per commit '
+  s.homepage      = ''
+  s.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']
+  s.files = `git ls-files`.split($RS)
+  s.test_files = s.files.grep(/^spec\//)
+  s.executables = s.files.grep(/^bin\//) { |f| File.basename(f) }
 
-  spec.add_runtime_dependency 'git', '>= 1.2.9.1'
-  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_runtime_dependency 'sequel'
-  spec.add_runtime_dependency 'sqlite3'
-  spec.add_development_dependency('bundler', ['>= 0'])
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency('webmock', ['>= 0'])
+  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.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 'sequel'
+  s.add_runtime_dependency 'sqlite3'
+  s.add_development_dependency('bundler', ['>= 0'])
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency('webmock', ['>= 0'])
+  s.add_development_dependency('pry', ['>= 0'])
 end

data/lib/gitwakatime.rb

@@ -6,21 +6,26 @@ else
   DB = Sequel.sqlite
 end
 
+Sequel::Model.plugin :json_serializer
 DB.use_timestamp_timezones = false
 
 require 'gitwakatime/version'
 require 'gitwakatime/durations'
-require 'gitwakatime/action'
+require 'gitwakatime/heartbeat'
 require 'gitwakatime/commit'
 require 'gitwakatime/mapper'
 require 'gitwakatime/query'
 require 'gitwakatime/timer'
 require 'gitwakatime/log'
 require 'gitwakatime/commited_file'
+require 'gitwakatime/controller'
 require 'gitwakatime/cli'
 
-# Silence is golden
+# It's a module :)
 module GitWakaTime
+  ##
+  # Stores primary config and project information
+  # Currently not thread safe.
   class Configuration
     attr_accessor :api_key, :log_level, :root, :project, :git
 
@@ -40,6 +45,12 @@ module GitWakaTime
     end
 
     def setup_local_db
+      create_commits_table
+      create_commited_files_table
+      create_heartbeats_table
+    end
+
+    def create_commits_table
       DB.create_table? :commits do
         primary_key :id
         String :sha
@@ -50,7 +61,9 @@ module GitWakaTime
         text :message
         String :author
       end
+    end
 
+    def create_commited_files_table
       DB.create_table? :commited_files do
         primary_key :id
         integer :commit_id
@@ -63,8 +76,10 @@ module GitWakaTime
         index :dependent_sha
         index :sha
       end
+    end
 
-      DB.create_table? :actions do
+    def create_heartbeats_table
+      DB.create_table? :heartbeats do
         primary_key :id
         String :uuid
         DateTime :time

data/lib/gitwakatime/cli.rb

@@ -8,9 +8,9 @@ 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 actions init and tally
+  # Provides two CLI heartbeats init and tally
   class Cli < Thor
     include Thor::Actions
     desc 'init', 'Setups up Project for using the wakatime API
@@ -25,7 +25,7 @@ module  GitWakaTime
         create_file File.join(Dir.home, '.wakatime.yml') do
           YAML.dump(api_key: api_key, last_commit: nil, log_level: :info)
         end
-    end
+      end
       reset
     end
 
@@ -41,26 +41,37 @@ 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
+    method_option :start_on, aliases: '-s', default: 7.days.ago.to_s
+    method_option :output, aliases: '-o', default: 'text', type: 'string'
+
     def tally
-      GitWakaTime.config.setup_local_db
-      path, GitWakaTime.config.root = File.expand_path(options.file)
-      date = Date.parse(options.start_on) if options.start_on
-      date = 7.days.ago unless options.start_on
-      GitWakaTime.config.load_config_yaml
-      GitWakaTime.config.git = Git.open(path)
-      @git_map = Mapper.new(start_at: date)
-      @project = File.basename(GitWakaTime.config.git.dir.path)
-      @relevant_commits = Commit.where('date > ? and project = ?', date, @project).all
-      @actions = Query.new(@relevant_commits, File.basename(path)).get
+      date = Date.parse(options.start_on)
 
-      @timer   = Timer.new(@relevant_commits, @actions, File.basename(path)).process
+      @timer = GitWakaTime::Controller.new(
+        path: File.expand_path(options.file), date: date
+      ).timer
+
+      print_output(@timer)
+    end
+
+    no_commands do
+      def print_output(timer)
+        if output == 'text'
+          timer.each do |c_date, commits|
+            print_commit(c_date, commits)
+          end
+        elsif output == 'json'
+          @timer.to_json
+        end
+      end
 
-      @timer.each do |date, commits|
-        Log.new format('%-40s %-40s'.blue,
-                       date,
-                       "Total #{ChronicDuration.output commits.map(&:time_in_seconds).compact.reduce(&:+).to_i}"
-                       )
+      def print_commit
+        sum_c_time = commits.map(&:time_in_seconds).compact.reduce(&:+).to_i
+        Log.new format(
+          '%-40s %-40s'.blue,
+          c_date,
+          "Total #{ChronicDuration.output sum_c_time }"
+        )
         commits.each do |commit|
           # Log.new commit.message
           Log.new commit.to_s

data/lib/gitwakatime/commit.rb

@@ -1,8 +1,11 @@
 module GitWakaTime
+  ##
+  # Cache git commit and correlate it's children
+  #
   class Commit < Sequel::Model
     one_to_many :commited_files
     def after_create
-      get_files
+      extract_changed_files
     end
 
     def to_s
@@ -24,16 +27,15 @@ module GitWakaTime
 
     private
 
-    def get_files
+    def extract_changed_files
       @raw_commit = GitWakaTime.config.git.gcommit(sha)
       # TODO: Assume gap time to lookup time prior to first commit.
-      if @raw_commit.parent
-        update(parent_sha: @raw_commit.parent.sha)
+      return unless @raw_commit.parent
+      update(parent_sha: @raw_commit.parent.sha)
 
-        @raw_commit.diff_parent.stats[:files].keys.map do |file|
-          CommitedFile.find_or_create(commit_id: id, name: file) do |c|
-            c.update(sha: sha, project: project)
-          end
+      @raw_commit.diff_parent.stats[:files].keys.map do |file|
+        CommitedFile.find_or_create(commit_id: id, name: file) do |c|
+          c.update(sha: sha, project: project)
         end
       end
     end

data/lib/gitwakatime/commited_file.rb

@@ -1,9 +1,12 @@
 module  GitWakaTime
+  ##
+  # Determines When a file was lasted commit and stores time and hash.
   class CommitedFile < Sequel::Model
     many_to_one :commit
-    # No two committed files should have the same name + dependent_date this
-    # means a split tree, and we should split time between the two, or more, commits.
 
+    # No two committed files should have the same name + dependent_date this
+    # means a split tree, and we should split time between the two, or
+    # more, commits.
     def before_create
       find_dependent_commit(name)
     end
@@ -18,34 +21,37 @@ module  GitWakaTime
 
     private
 
-    def find_dependent_commit(name)
-      i = 1
-
-      # Call git log for path, loop through till we find a valid commit or run
-      # out of commits to check
+    # Call git log for path, loop through till we find a valid commit or run
+    # out of commits to check
+    def find_dependent_commit(name, i = 1)
       commits = load_dependent_commits(name)
-      begin
+      loop do
         commit = commits[i]
+        break if commit.nil?
 
-        if commit && allowed_commit(commit)
-
-          self.dependent_date = commit.date
-          self.dependent_sha = commit.sha
+        next unless allowed_commit(commit)
 
-          # This is the magical fix for the split tree issue
-          # Current though is this will fail if more than 2 split tree files
-          split_tree_file = CommitedFile.where(name: name, dependent_sha: commit.sha).first
-          if split_tree_file && split_tree_file.commit
-            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)
-            end
-          end
-        end
+        set dependent_sha: commit.sha, dependent_date: commit.date
 
+        check_and_correct_split_tree(commit)
         i += 1
-      end until !dependent_sha.nil? || commit.nil?
+        break unless dependent_sha.blank?
+      end
+    end
+
+    def check_and_correct_split_tree(commit)
+      # This is the magical fix for the split tree issue
+      # Current though is this will fail if more than 2 split tree files
+      split_tree_file = CommitedFile.where(
+        name: name, dependent_sha: commit.sha
+      ).first
+      return unless split_tree_file && split_tree_file.commit
+
+      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)
+      end
     end
 
     def allowed_commit(commit)

data/lib/gitwakatime/controller.rb

@@ -0,0 +1,31 @@
+module GitWakaTime
+  # Extract Duration Data from Heartbeats for the WAKATIME API
+  class Controller
+    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)
+      @git_map = Mapper.new(start_at: date)
+      @project = File.basename(GitWakaTime.config.git.dir.path)
+      @relevant_commits = Commit.where(
+        'date > ? and project = ?', date, @project
+      )
+
+      @files = CommitedFile.where(
+        '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)
+      ).process
+    end
+  end
+end

data/lib/gitwakatime/durations.rb

@@ -1,90 +1,93 @@
 module GitWakaTime
-  # Extract Duration Data from Actions for the WAKATIME API
+  # Extract Duration Data from Heartbeats for the WAKATIME API
   class Durations
-    attr_accessor :actions
+    attr_accessor :heartbeats
     def initialize(args)
-      return @actions = args[:actions] if args[:actions]
+      return @heartbeats = args[:heartbeats] if args[:heartbeats]
       fail if args[:project].nil?
       @project = args[:project]
       @args = args
       @session     = Wakatime::Session.new(api_key: GitWakaTime.config.api_key)
       @client      = Wakatime::Client.new(@session)
-      @actions = []
+      @heartbeats = []
     end
 
-    def load_actions
+    def load_heartbeats
       unless cached?
 
-        Log.new "querying WakaTime actions for #{@project}"
+        Log.new "querying WakaTime heartbeats for #{@project}"
         time = Benchmark.realtime do
-          @actions = @client.actions(@args)
+          @heartbeats = @client.heartbeats(@args)
 
-          # remove returned actions that do not have the project we want
-          @actions =  @actions.keep_if do  |a|
+          # remove returned heartbeats that do not have the project we want
+          @heartbeats =  @heartbeats.keep_if do  |a|
             a['project'] == @project
           end
         end
 
         Log.new "API took #{time}s"
-        persist_actions_localy(@actions)
+        persist_heartbeats_localy(@heartbeats)
       end
       true
     end
 
-    def persist_actions_localy(actions)
-      sterile_actions = actions.map do |action|
-          action['uuid'] = action['id']
-          action['time'] = Time.at(action['time'])
-          action.delete('id')
-          Action.find_or_create(uuid: action['uuid']) do |a|
-            a.update(action)
-          end
+    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
-      
     end
 
     def cached?
       # Check to see if this date range might be stale?
-      if cached_actions.count > 0
-        max_local_timetamp = (Time.parse(cached_actions.max(:time)) + 3.day).to_date
-        !(@args[:start].to_date..@args[:end].to_date).include?(max_local_timetamp)
+      if cached_heartbeats.count > 0
+        max_local_timetamp = (
+          Time.parse(cached_heartbeats.max(:time)) + 3.day
+        ).to_date
+        !(
+          @args[:start].to_date..@args[:end].to_date
+        ).include?(max_local_timetamp)
       else
         false
       end
     end
 
-    def cached_actions
-      Action.where('time >= ?',@args[:end]).where(project: @project)
+    def cached_heartbeats
+      Heartbeat.where('time >= ?', @args[:end]).where(project: @project)
     end
 
-    def actions_to_durations(_project = nil, timeout = 15)
+    def heartbeats_to_durations(_project = nil, timeout = 15)
       durations = []
       current = nil
 
-      @actions.each do | action |
-        # the first action just sets state and does nothing
+      @heartbeats.each do | heartbeat |
+        # the first heartbeat just sets state and does nothing
         unless current.nil?
 
-          # get duration since last action
-          duration = action.time.round - current.time.round
+          # 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 action
+            # add duration to current heartbeat
             current.duration = duration
 
             # save to local db
             current.save
 
-            # log current action as a duration
+            # log current heartbeat as a duration
             durations << current
           end
         end
         # set state (re-start the clock)
-        current = action
+        current = heartbeat
 
       end
       durations

data/lib/gitwakatime/heartbeat.rb

@@ -0,0 +1,4 @@
+module GitWakaTime
+  class Heartbeat < Sequel::Model
+  end
+end

data/lib/gitwakatime/log.rb

@@ -1,4 +1,6 @@
 module GitWakaTime
+  ##
+  # Pretty output, and ability to silence in testing
   class Log
     def initialize(msg, color = nil)
       @color = color

data/lib/gitwakatime/query.rb

@@ -3,54 +3,76 @@ require 'colorize'
 require 'active_support/core_ext/time'
 
 module GitWakaTime
-  # Integrates the nested hash from mapper with actions api
+  # Integrates the nested hash from mapper with heartbeats api
   class Query
-    def initialize(commits, project, _path = nil)
+    def initialize(commits, files, project, _path = nil)
       @commits   = commits
+      @files = files
       @api_limit = 35
       @project   = project
-      @requests   = time_params
+      @requests   = build_requests
+    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
+      @start_at = if timestamps.first >= Time.new(2013, 5, 1)
+                    timestamps.first
+                  else
+                    Time.new(2013, 5, 1)
+                  end
+      @end_at = timestamps.last
     end
 
     def get
       @requests.each do |params|
-        Log.new "Requesting actions #{params[:start].to_date} to #{params[:end].to_date}".red
-        Durations.new(params).load_actions
+        Log.new "Gettting heartbeats
+         #{params[:start].to_date} to #{params[:end].to_date}".red
+        Durations.new(params).load_heartbeats
       end
 
-      Durations.new(actions: actions).actions_to_durations
+      Durations.new(
+        heartbeats: heartbeats.where('duration <= 0')
+      ).heartbeats_to_durations
+      heartbeats.all
     end
 
-    def actions
-      Action.where('time >= ? and time <= ? ', @start_at, @end_at).where(project: @project)
+    def heartbeats
+      Heartbeat.where(
+        'time >= ? and time <= ? ', @start_at, @end_at
+      ).where(project: @project)
     end
 
-    def time_params
-      commits = @commits.map(&:date)
-      d_commits = CommitedFile.select(:dependent_date).all.map { |f| f.values[:dependent_date] }.compact
-      timestamps = (commits + d_commits.flatten).uniq.sort
-
-      # Don't query before the Wakatime Epoch
-      @start_at = timestamps.first >= Time.new(2013, 5, 1) ? timestamps.first : Time.new(2013, 5, 1)
-      @end_at = timestamps.last
+    def build_requests
+      time_range
 
-      # Always have a date range great than 1 as the num request will be 0/1 otherwise
+      # 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 = {
-          start: (@start_at.to_date + (i * @api_limit)).to_time.beginning_of_day,
-          end:  (@start_at.to_date + ((i + 1) * @api_limit)).to_time.end_of_day,
-          project: @project,
-          show: 'file,branch,project,time,id'
-        }
+        params = construct_params(i)
         i += 1
         params
 
       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 + 1) * @api_limit)).to_time.end_of_day,
+        project: @project,
+        show: 'file,branch,project,time,id'
+      }
+    end
   end
 end

data/lib/gitwakatime/timer.rb

@@ -3,23 +3,23 @@ require 'colorize'
 require 'active_support/core_ext/time'
 
 module GitWakaTime
-  # Integrates the nested hash from mapper with actions api
+  # Integrates the nested hash from mapper with heartbeats api
   class Timer
-    def initialize(commits, actions_with_durations, project)
+    def initialize(commits, heartbeats_with_durations, project)
       @commits = commits
-      @actions_with_durations   = actions_with_durations
+      @heartbeats_with_durations   = heartbeats_with_durations
       @project   = project
     end
 
     def total
-      total_time = sum_actions @actions_with_durations
+      total_time = sum_heartbeats @heartbeats_with_durations
       Log.new "Total Recorded time #{ChronicDuration.output total_time}", :red
     end
 
     def total_commited
       total_commited = ChronicDuration.output(@commits_with_duration
-                                               .map(&:time_in_seconds).compact
-                                               .reduce(:+).to_f)
+                                              .map(&:time_in_seconds).compact
+                                              .reduce(:+).to_f)
       Log.new "Total Committed Time #{total_commited} ".red
     end
 
@@ -28,7 +28,7 @@ module GitWakaTime
 
         if commit.commited_files.count > 0 || commit.parent_sha
           commit.commited_files.each_with_index do |file, _i|
-            time = sum_actions relevant_actions(commit, file)
+            time = sum_heartbeats relevant_heartbeats(commit, file)
             file.time_in_seconds = time
             commit.time_in_seconds = time
 
@@ -36,49 +36,52 @@ module GitWakaTime
           end
           commit.save
         else
-          commit.time_in_seconds = sum_actions(actions_before(@actions_with_durations, commit.date))
+          commit.time_in_seconds = sum_heartbeats(
+            heartbeats_before(@heartbeats_with_durations, commit.date)
+          )
         end
       end.compact
       total
       total_commited
-      @commits_with_duration
-      @commits_with_duration_by_date = @commits_with_duration.group_by { |c| c.date.to_date }
+      @commits_with_duration.group_by { |c| c.date.to_date }
     end
 
     private
 
-    def relevant_actions(commit, file)
+    def relevant_heartbeats(commit, file)
       # The file should be the same file as we expect
       # TODO: Might need to pass root_path down
-      actions = @actions_with_durations.select do |action|
-        action[:file].include?(File.join(File.basename(GitWakaTime.config.git.dir.path), file.name))
+      heartbeats = @heartbeats_with_durations.select do |heartbeat|
+        heartbeat[:file].include?(
+          File.join(File.basename(GitWakaTime.config.git.dir.path), file.name)
+        )
       end
 
       # The timestamps should be before the expected commit
-      actions = actions_before(actions, commit.date)
+      heartbeats = heartbeats_before(heartbeats, commit.date)
 
-      # If this file had an earlier commit ensure the actions timestamp
+      # If this file had an earlier commit ensure the heartbeats timestamp
       # is after that commit
       if file.dependent_date
-        actions = actions_after(actions, file.dependent_date)
+        heartbeats = heartbeats_after(heartbeats, file.dependent_date)
       end
-      actions
+      heartbeats
     end
 
-    def actions_before(actions, date)
-      actions.select do |action|
-        Time.at(action[:time]) <= date
+    def heartbeats_before(heartbeats, date)
+      heartbeats.select do |heartbeat|
+        Time.at(heartbeat[:time]) <= date
       end
     end
 
-    def actions_after(actions, date)
-      actions.select do |action|
-        Time.at(action[:time]) >= date
+    def heartbeats_after(heartbeats, date)
+      heartbeats.select do |heartbeat|
+        Time.at(heartbeat[:time]) >= date
       end
     end
 
-    def sum_actions(actions)
-      actions.map { |action| action[:duration] }
+    def sum_heartbeats(heartbeats)
+      heartbeats.map { |heartbeat| heartbeat[:duration] }
       .reduce(:+).to_i
     end
   end

data/lib/gitwakatime/version.rb

@@ -1,4 +1,4 @@
 # Version Number Definition
 module GitWakaTime
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/spec/commited_file_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
-# * commit a4c26aeb79acb1f012201fe96e4d68e8d17c75d9 (HEAD, origin/master, origin/HEAD, master)
+# * commit a4c26aeb79acb1f012201fe96e4d68e8d17c75d9
+# | (HEAD, origin/master, origin/HEAD, master)
 # | Author: rpo <rother@gmail.com>
 # | Date:   Sat Jan 31 15:49:07 2015 -0500
 # |
@@ -54,7 +55,7 @@ require 'spec_helper'
 
 #       created readme
 describe 'description' do
-  let (:git) { Git.open(@wdir) }
+  let(:git) { Git.open(@wdir) }
 
   before do
     GitWakaTime::Commit.dataset.destroy
@@ -65,29 +66,48 @@ describe 'description' do
     GitWakaTime.config.git = git
 
     first_commit = GitWakaTime::Commit.find_or_create(
-    sha: 'e493d6f2ab2a702fa7f9c168b852a3b44c524f08',
-    author: 'Russell Osborne',
-    message: 'conflicting commit on blah.',
-    project: git.repo.to_s,
-    date: Time.at(1_422_570_380)
+      sha: 'e493d6f2ab2a702fa7f9c168b852a3b44c524f08',
+      author: 'Russell Osborne',
+      message: 'conflicting commit on blah.',
+      project: git.repo.to_s,
+      date: DateTime.parse('Thu Jan 29 22:26:20 2015 -0500').utc
     )
 
-    expect(first_commit.commited_files.first.dependent_sha).to eql('4c1ea35f9a811a0ef79da15ec85f25fce4c446ba')
-    expect(first_commit.commited_files.first.dependent_date.utc.to_s).to eql('2015-01-30 03:25:08 UTC')
+    expect(
+      first_commit.commited_files.first.dependent_sha
+    ).to eql(
+      '4c1ea35f9a811a0ef79da15ec85f25fce4c446ba'
+    )
+    expect(
+      first_commit.commited_files.first.dependent_date.utc.to_s
+    ).to eql(
+      '2015-01-30 03:25:08 UTC'
+    )
 
     second_commit = GitWakaTime::Commit.find_or_create(
-       sha: 'd642b3c04c3025655a9c33e32b9d530696dcf7cc',
-       author: 'Russell Osborne',
-       message: 'conflicting commit on master.',
-       project:  git.repo.to_s,
-       date: 'Thu Jan 29 22:26:05 2015 -0500'
-      )
+      sha: 'd642b3c04c3025655a9c33e32b9d530696dcf7cc',
+      author: 'Russell Osborne',
+      message: 'conflicting commit on master.',
+      project:  git.repo.to_s,
+      date: DateTime.parse('Thu Jan 29 22:26:05 2015 -0500').utc
+    )
+
+    # Verify that we have a split tree, both commit 1 and two should depend on
+    # 4c1ea
+    expect(
+      second_commit.commited_files.first.dependent_sha
+    ).to eql('4c1ea35f9a811a0ef79da15ec85f25fce4c446ba')
+
+    expect(
+      GitWakaTime::Commit.find(id: first_commit.id)
+      .commited_files.first.dependent_date.utc.to_s
+    ).to eql('2015-01-30 03:25:08 UTC')
 
-    expect(second_commit.commited_files.first.dependent_sha).to eql('4c1ea35f9a811a0ef79da15ec85f25fce4c446ba')
+    # Second commit should depend on first commit not actual depedent time as
+    # it would duplicate time
     expect(
-        GitWakaTime::Commit.find(id: first_commit.id).commited_files.first.dependent_date.utc.to_s
-      ).to eql('2015-01-30 03:25:08 UTC')
-    expect(second_commit.commited_files.first.dependent_date.utc.to_s).to eql(Time.at(1_422_570_380).utc.to_s)
+      second_commit.commited_files.first.dependent_date.utc.to_s
+    ).to eql(Time.parse('Thu Jan 29 22:26:20 2015 -0500').utc.to_s)
   end
 
 end

data/spec/durations_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'description' do
-  # let (:git) { Git.open(@wdir) }
+  # let(:git) { Git.open(@wdir) }
   before(:each) do
     # GitWakaTime.config.git = git
     # GitWakaTime::Mapper.new(start_at: Date.new(2015, 1, 28))
@@ -11,7 +11,7 @@ describe 'description' do
     pending
   end
 
-  it 'calculates durations of actions' do
+  it 'calculates durations of heartbeats' do
     pending
   end
 

data/spec/mapper_spec.rb

@@ -1,24 +1,34 @@
 require 'spec_helper'
 
 describe 'description' do
-  let (:git) { Git.open(@wdir) }
+  let(:git) { Git.open(@wdir) }
   before(:each) do
     GitWakaTime.config.git = git
-    GitWakaTime::Mapper.new(start_at: Date.new(2015, 1, 28))
+    GitWakaTime::Mapper.new(start_at: Date.new(2015, 1, 25))
   end
 
   it 'can be run on dummy' do
-    expect(GitWakaTime::Commit.all.size).to eq 8 # 9ths is lonely
+    expect(
+      GitWakaTime::Commit.all.size
+    ).to eq 7 # 9ths is lonely
   end
   it 'can be run on dummy' do
-    expect(GitWakaTime::Commit.order(:date).first.message).to eq 'created readme'
+    expect(
+      GitWakaTime::Commit.order(:date).first.message
+    ).to eq 'created readme'
   end
 
   it 'maps files dependent commits' do
-    expect(GitWakaTime::Commit.all.first.commited_files.first.dependent_sha).to eq 'dcd748bd06b8a0f239d779bee4f1eaf1f4aa500d'
+    expect(
+      GitWakaTime::Commit.all.first.commited_files.first.dependent_sha
+    ).to eq 'dcd748bd06b8a0f239d779bee4f1eaf1f4aa500d'
   end
 
   it 'maps files dependent commits' do
-    expect(GitWakaTime::Commit.all.select { |c| c.sha == 'dcd748bd06b8a0f239d779bee4f1eaf1f4aa500d' }.first.commited_files.first.dependent_sha).to eq '2254dd56976b5f32a2289438842e42a35a18ff86'
+    expect(
+      GitWakaTime::Commit.all.select do |c|
+        c.sha == 'dcd748bd06b8a0f239d779bee4f1eaf1f4aa500d'
+      end.first.commited_files.first.dependent_sha
+    ).to eq '2254dd56976b5f32a2289438842e42a35a18ff86'
   end
 end

data/spec/query_spec.rb

@@ -5,28 +5,31 @@ describe 'description' do
   before(:each) do
     GitWakaTime.config.git = Git.open(@wdir)
     GitWakaTime::Mapper.new(start_at: Date.new(2015, 1, 24))
+    @commits = GitWakaTime::Commit
+    @files   = GitWakaTime::CommitedFile
+    @query = GitWakaTime::Query.new(@commits, @files, File.basename(@wdir))
   end
 
   before do
-    stub_request(:get, 'https://wakatime.com/api/v1/actions')
+    stub_request(:get, 'https://wakatime.com/api/v1/heartbeats')
     .with(query: hash_including(:start, :end))
-    .to_return(body: File.read('./spec/fixtures/actions.json'), status: 200)
+    .to_return(body: File.read('./spec/fixtures/heartbeats.json'), status: 200)
   end
 
   it 'can be run on dummy' do
+    heartbeats = @query.get
 
-    actions = GitWakaTime::Query.new(GitWakaTime::Commit.all, File.basename(@wdir)).get
-
-    expect(actions).to be_a Array
-    expect(actions.size).to eq 6 # 9ths is lonely
-    expect(actions.last).to be_a GitWakaTime::Action
-    expect(actions.last.branch).to eq 'master'
+    expect(heartbeats).to be_a Array
+    expect(heartbeats.size).to eq 9 # 10ths is lonely
+    expect(heartbeats.last).to be_a GitWakaTime::Heartbeat
+    expect(heartbeats.last.branch).to eq 'master'
   end
   it 'produces valid search for api' do
-    actions = GitWakaTime::Query.new(GitWakaTime::Commit.all, File.basename(@wdir)).time_params
 
-    expect(actions).to be_a Array
-    expect(actions.first[:start].to_date).to eq Date.new(2015, 01, 30)
-    expect(actions.first[:end].to_date).to eq Date.new(2015, 02, 14)
+    heartbeats = @query.build_requests
+
+    expect(heartbeats).to be_a Array
+    expect(heartbeats.first[:start].to_date).to eq Date.new(2015, 01, 29)
+    expect(heartbeats.first[:end].to_date).to eq Date.new(2015, 03, 05)
   end
 end

data/spec/spec_helper.rb

@@ -18,15 +18,17 @@ RSpec.configure do |config|
     GitWakaTime.config.setup_local_db
     GitWakaTime::Commit.new.columns
     GitWakaTime::CommitedFile.new.columns
-    GitWakaTime::Action.new.columns
+    GitWakaTime::Heartbeat.new.columns
   end
 
   config.before(:each) do
     GitWakaTime::Commit.truncate
     GitWakaTime::CommitedFile.truncate
-    GitWakaTime::Action.truncate
+    GitWakaTime::Heartbeat.truncate
 
-    expect(GitWakaTime.config).to receive('user_name').and_return('Russell Osborne').at_least(:once)
+    expect(
+      GitWakaTime.config
+    ).to receive('user_name').and_return('Russell Osborne').at_least(:once)
   end
 
   config.after(:all) do
@@ -47,12 +49,18 @@ end
 
 def create_temp_repo(clone_path)
   filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s.rjust(3, '0')
-  @tmp_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', filename))
+  @tmp_path = File.expand_path(
+    File.join(File.dirname(__FILE__), '..', 'tmp', filename)
+  )
   FileUtils.mkdir_p(@tmp_path)
   FileUtils.cp_r(clone_path, @tmp_path)
   tmp_path = File.join(@tmp_path, 'dummy')
-  Dir.chdir(tmp_path) do
+  activate_repo_as_git(tmp_path)
+  tmp_path
+end
+
+def activate_repo_as_git(path)
+  Dir.chdir(path) do
     FileUtils.mv('dot_git', '.git')
   end
-  tmp_path
 end

data/spec/timer_spec.rb

@@ -1,23 +1,30 @@
 require 'spec_helper'
 
 describe 'description' do
-  let (:git) { Git.open(@wdir) }
+  let(:git) { Git.open(@wdir) }
 
   before do
-    stub_request(:get, 'https://wakatime.com/api/v1/actions')
+    stub_request(:get, 'https://wakatime.com/api/v1/heartbeats')
     .with(query: hash_including(:start, :end))
-    .to_return(body: File.read('./spec/fixtures/actions.json'), status: 200)
+    .to_return(body: File.read('./spec/fixtures/heartbeats.json'), status: 200)
   end
 
   it 'can be run on dummy' do
     GitWakaTime.config.git = git
     GitWakaTime::Mapper.new(start_at: Date.new(2015, 1, 24))
-    actions = GitWakaTime::Query.new(GitWakaTime::Commit.all, File.basename(@wdir)).get
-    timer = GitWakaTime::Timer.new(GitWakaTime::Commit.all, actions, File.basename(@wdir)).process
+    heartbeats = GitWakaTime::Query.new(
+      GitWakaTime::Commit, GitWakaTime::CommitedFile, File.basename(@wdir)
+    ).get
+    timer = GitWakaTime::Timer.new(
+      GitWakaTime::Commit.all, heartbeats, File.basename(@wdir)
+    ).process
 
-    # # UTC breaks actions of 1 day
+    # # UTC breaks heartbeats of 1 day
     # expect(timer.size).to eq 1
-    # With 8 relevant commits
-    expect(timer[timer.keys.first].size).to eq 8
+    # With 7 relevant commits
+    expect(timer[timer.keys.first].size).to eq 7
+    expect(
+      timer[Date.new(2015, 1, 30)].map(&:time_in_seconds).compact.reduce(&:+)
+    ).to eql(201)
   end
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: gitwakatime
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
-- Russell Osborne
+- Bozhidar Batsov
+- Jonas Arvidsson
+- Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -192,8 +194,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'A Tool that will compile git data with wakatime data to establish time
-  per commit '
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      Automatic Ruby code style checking tool.
+      Aims to enforce the community-driven Ruby Style Guide.
 email:
 - russosborn@gmail.com
 executables:
@@ -211,11 +228,12 @@ files:
 - bin/gitwakatime
 - gitwakatime.gemspec
 - lib/gitwakatime.rb
-- lib/gitwakatime/action.rb
 - lib/gitwakatime/cli.rb
 - lib/gitwakatime/commit.rb
 - lib/gitwakatime/commited_file.rb
+- lib/gitwakatime/controller.rb
 - lib/gitwakatime/durations.rb
+- lib/gitwakatime/heartbeat.rb
 - lib/gitwakatime/log.rb
 - lib/gitwakatime/mapper.rb
 - lib/gitwakatime/query.rb
@@ -272,7 +290,7 @@ files:
 - spec/dummy/hi
 - spec/dummy/readme
 - spec/durations_spec.rb
-- spec/fixtures/actions.json
+- spec/fixtures/heartbeats.json
 - spec/mapper_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
@@ -354,7 +372,7 @@ test_files:
 - spec/dummy/hi
 - spec/dummy/readme
 - spec/durations_spec.rb
-- spec/fixtures/actions.json
+- spec/fixtures/heartbeats.json
 - spec/mapper_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb

data/lib/gitwakatime/action.rb

@@ -1,4 +0,0 @@
-module GitWakaTime
-  class Action < Sequel::Model
-  end
-end