gitwakatime 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf4972a50946fcb26cfdf6170e2a52930ac0b17
-  data.tar.gz: 382999961244a24765284c514aa00584574674ab
+  metadata.gz: 46d9e8b02b43ba532f6631155c4beadff25d65e1
+  data.tar.gz: 7ea139ea0454e766c82186a526bc17cad859a542
 SHA512:
-  metadata.gz: cbbce74e5296c17b1f363b7471d29bc18cc479d36183ff773aabb41961b3a4d138b2e86123e7006dd150d3bb7c64f48829333dbb84cea8f31181840534d5ca14
-  data.tar.gz: e6f8104a2ee6ea1b4d02707dbd4e8331140656a8f5d994300093efcb83c91bbbe1be5b37971b31a4fb5daaddebc97e852eef01de6d00707459a6628a7f3659ed
+  metadata.gz: baed9a3f9d7cd015d0148356e657cac46b792ae0b8276c4ad61848ec26cfc700bbfbf0b6b36abff102bf825cedf9723292143aa689033bdcd312ca1fa0bce1e9
+  data.tar.gz: a51aca840239070583c1f81f3326931f72cd023e893850b7e755c8da30308bfb5325f844e387891fca7ca98dffdb8dc0e5a70a0877848120de0291c180e99d5c

data/.travis.yml

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

data/README.md

@@ -4,10 +4,8 @@
 [![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)
 
-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?"
-
-
+GitWakaTime is a mash up between data obtained through "wakatime" 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"
 
 ## Installation
 
@@ -15,15 +13,21 @@ Install the gem:
 
     $ gem install gitwakatime
 
-## Usage
+    Run the setup command: (you will need your wakatime api key). Creates a .gitwakatime.yml file on the user's home directory ~/.gitwakatime.yml which will contain your api keys
 
-    Creates a .gitwakatime.yml file on the user's home directory ~/.gitwakatime.yml which will contain your api keys
     $ gitwakatime init
 
+
+## Usage
     Process the current directory
 
     $ gitwakatime tally
 
+    Hard reset of the local cache database
+
+    $ gitwakatime reset
+
+
 ## Output
     Total Recorded time 21 hrs 59 mins 59 secs
     Total Commited Time 18 hrs 50 mins 53 secs

data/gitwakatime.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   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'

data/lib/gitwakatime.rb

@@ -1,5 +1,16 @@
+require 'sequel'
+if ENV['thor_env'] != 'test'
+  DB = Sequel.connect("sqlite://#{File.join(Dir.home, '.wakatime.sqlite')}")
+else
+  # Use a in memory db to have a nice clean testing bed.
+  DB = Sequel.sqlite
+end
+
+DB.use_timestamp_timezones = false
+
 require 'gitwakatime/version'
-require 'gitwakatime/actions'
+require 'gitwakatime/durations'
+require 'gitwakatime/action'
 require 'gitwakatime/commit'
 require 'gitwakatime/mapper'
 require 'gitwakatime/query'
@@ -7,21 +18,63 @@ require 'gitwakatime/timer'
 require 'gitwakatime/log'
 require 'gitwakatime/commited_file'
 require 'gitwakatime/cli'
+
 # Silence is golden
 module GitWakaTime
   class Configuration
-    attr_accessor :api_key, :log_level, :root, :project
+    attr_accessor :api_key, :log_level, :root, :project, :git
 
     def initialize
       self.api_key = nil
       self.log_level = :info
     end
 
+    def user_name
+      GitWakaTime.config.git.config('user.name')
+    end
+
     def load_config_yaml
       yaml = YAML.load_file(File.join(Dir.home, '.wakatime.yml'))
       self.api_key = yaml[:api_key]
       self.log_level = yaml[:log_level]
     end
+
+    def setup_local_db
+      DB.create_table? :commits do
+        primary_key :id
+        String :sha
+        String :parent_sha
+        String :project
+        integer :time_in_seconds, default: 0
+        datetime :date
+        text :message
+        String :author
+      end
+
+      DB.create_table? :commited_files do
+        primary_key :id
+        integer :commit_id
+        String :dependent_sha
+        DateTime :dependent_date
+        integer :time_in_seconds, default: 0
+        String :sha
+        String :name
+        String :project
+        index :dependent_sha
+        index :sha
+      end
+
+      DB.create_table? :actions do
+        primary_key :id
+        String :uuid
+        DateTime :time
+        integer :duration, default: 0
+        String :file
+        String :branch
+        String :project
+        index :uuid, unique: true
+      end
+    end
   end
 
   def self.config

data/lib/gitwakatime/action.rb

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

data/lib/gitwakatime/cli.rb

@@ -18,35 +18,51 @@ module  GitWakaTime
     method_option :file, aliases: '-f', default: '.'
 
     def init
-      api_key = ask('What is your wakatime api key? ( Get it here https://wakatime.com/settings):')
-      say('Adding .wakatime.yml to home directory')
-      create_file File.join(Dir.home, '.wakatime.yml') do
-        YAML.dump(api_key: api_key, last_commit: nil, log_level: :info)
-      end
+      unless File.exist?(File.join(Dir.home, '.wakatime.yml'))
+        api_key = ask('What is your wakatime api key? ( Get it here https://wakatime.com/settings):')
+        say('Adding .wakatime.yml to home directory')
+
+        create_file File.join(Dir.home, '.wakatime.yml') do
+          YAML.dump(api_key: api_key, last_commit: nil, log_level: :info)
+        end
+    end
+      reset
+    end
+
+    desc 'reset', 'Reset local sqlite db'
+    def reset
+      DB.disconnect
+
+      db_path = File.expand_path(File.join(Dir.home, '.wakatime.sqlite'))
+      FileUtils.rm_r(db_path) if File.exist?(db_path)
+      DB.connect("sqlite://#{db_path}")
+      GitWakaTime.config.setup_local_db
     end
 
     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
+      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 = 1.month.ago.beginning_of_month unless options.start_on
       GitWakaTime.config.load_config_yaml
-      @git_map = Mapper.new(path, start_at: date)
-      @actions = Query.new(@git_map.commits, File.basename(path)).get
+      GitWakaTime.config.git = Git.open(path)
+      @git_map = Mapper.new(start_at: date)
+      @actions = Query.new(Commit.all, File.basename(path)).get
 
-      @timer   = Timer.new(@git_map.commits, @actions, File.basename(path)).process
+      @timer   = Timer.new(Commit.all, @actions, File.basename(path)).process
 
       @timer.each do |date, commits|
         Log.new format('%-40s %-40s'.blue,
                        date,
-                       "Total #{ChronicDuration.output commits.map(&:time_in_seconds).reduce(&:+)}"
+                       "Total #{ChronicDuration.output commits.map(&:time_in_seconds).compact.reduce(&:+).to_i}"
                        )
         commits.each do |commit|
           # Log.new commit.message
           Log.new commit.to_s
-          commit.files.each { |file| Log.new file.to_s }
+          commit.commited_files.each { |file| Log.new file.to_s }
         end
       end
     end

data/lib/gitwakatime/commit.rb

@@ -1,28 +1,15 @@
 module GitWakaTime
-  class Commit
-    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 = get_files  if load_files
-    end
-
-    def inspect
-      [sha[0..8], time_in_seconds]
+  class Commit < Sequel::Model
+    one_to_many :commited_files
+    def after_create
+      get_files
     end
 
     def to_s
       format('        %-8s %8s %-30s %-80s'.green,
              sha[0..8],
              date,
-             ChronicDuration.output(time_in_seconds),
+             ChronicDuration.output(time_in_seconds.to_i),
              message
              )
     end
@@ -31,13 +18,23 @@ module GitWakaTime
       @files.sort { |f| f.commit.date }.first
     end
 
+    def time_in_seconds
+      commited_files.collect {|f| f.time_in_seconds}.inject(:+)
+    end
+
     private
 
     def get_files
+      @raw_commit = GitWakaTime.config.git.gcommit(sha)
       # 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, commit: @raw_commit, name: file, dependent: false)
+      if @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
+        end
       end
     end
   end

data/lib/gitwakatime/commited_file.rb

@@ -1,22 +1,18 @@
 module  GitWakaTime
-  class CommitedFile
-    attr_reader :name, :dependent_commit, :git
-    attr_accessor :time_in_seconds
-    def initialize(args)
-      @git = args[:git]
-      @name = args[:name]
-      @commit = args[:commit]
-      @time_in_seconds = 0
-
-      @dependent_commit = find_dependent_commit(name)
+  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.
+
+    def before_create
+      find_dependent_commit(name)
     end
 
     def to_s
-      format('                 %-20s %-40s %-100s '.blue,
-             (dependent_commit.sha[0..8] if @dependent_commit),
-             ChronicDuration.output(@time_in_seconds.to_f),
+      format('                        %-20s %-40s %-100s '.blue,
+             (dependent_sha[0..8] if dependent_sha),
+             ChronicDuration.output(time_in_seconds.to_f),
              name
-
              )
     end
 
@@ -24,26 +20,43 @@ module  GitWakaTime
 
     def find_dependent_commit(name)
       i = 1
-      dependent = nil
-      commit = 1
 
+      # Call git log for path, loop through till we find a valid commit or run
+      # out of commits to check
+      commits = load_dependent_commits(name)
       begin
-        commit = load_dependent_commit(name, i: i)
-        dependent = Commit.new(@git, commit, false) if allowed_commit(commit)
+        commit = commits[i]
+
+        if commit && allowed_commit(commit)
+
+          self.dependent_date = commit.date
+          self.dependent_sha = commit.sha
+
+          # 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
+
         i += 1
-      end until !dependent.nil? || commit.nil?
-      dependent
+      end until !dependent_sha.nil? || commit.nil?
     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')
+      return false if commit.sha == sha
+      return false if commit.author.name != GitWakaTime.config.user_name
+      return false if commit.parents.size > 1
       true
     end
 
-    def load_dependent_commit(name, i: 1)
-      @git.log.object(@commit.sha).path(name)[i]
+    def load_dependent_commits(name)
+      GitWakaTime.config.git.log.object(sha).path(name)
     rescue Git::GitExecuteError
       puts error
       nil

data/lib/gitwakatime/durations.rb

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

data/lib/gitwakatime/log.rb

@@ -7,6 +7,7 @@ module GitWakaTime
     end
 
     def print_message
+      return if ENV['waka_log'] == 'false'
       if @color.nil?
         puts @msg
       else

data/lib/gitwakatime/mapper.rb

@@ -2,23 +2,29 @@ module GitWakaTime
   # Th
   class Mapper
     attr_accessor :commits, :git
-    def initialize(path, commits: 500, start_at: Date.today)
+    def initialize(commits: 500, start_at: Date.today)
       Log.new 'Mapping commits for dependent commits'
       time = Benchmark.realtime do
-        @git = if File.directory?(File.join(path, '.git'))
-                 Git.open(path)
-        else
-          Git.bare(path)
-        end
+        g = GitWakaTime.config.git
+        project = File.basename(g.dir.path)
+        logs =  g.log(commits).since(start_at).until(Date.today)
 
-        logs =  @git.log(commits).since(start_at).until(Date.today)
+        @commits = logs.map do |git_c|
 
-        @commits = logs.map do |git_commit|
-          next if git_commit.author.name != @git.config('user.name')
-          Commit.new(@git, git_commit)
+          next if git_c.author.name != GitWakaTime.config.user_name
+          Commit.find_or_create(
+             sha: git_c.sha,
+             project: project
+             ) do |c|
+            c.update(
+             author: git_c.author.name,
+             message: git_c.message,
+             date: git_c.date
+            )
+          end
         end.compact
       end
-      Log.new "Map Completed took #{time}s"
+      Log.new "Map Completed took #{time}s with #{Commit.count}"
     end
   end
 end

data/lib/gitwakatime/query.rb

@@ -9,39 +9,44 @@ module GitWakaTime
       @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
+        Durations.new(params).load_actions
       end
 
-      Actions.new(actions: @actions.uniq(&:id)).actions_to_durations
+      Durations.new(actions: actions).actions_to_durations
+    end
+
+    def actions
+      Action.where('time >= ? and time <= ? ', @start_at, @end_at).where(project: @project)
     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
+      d_commits = CommitedFile.select(:dependent_date).all.map { |f| f.values[:dependent_date] }.compact
+      timestamps = (commits + d_commits.flatten).uniq.sort
+      @start_at = timestamps.first
+      @end_at = timestamps.last
+      # Always have a date range great than 1 as the num request will be 0/1 otherwise
+      num_requests = ((timestamps.last.to_date + 1) - timestamps.first.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
+          start: (timestamps.first.to_date + (i * @api_limit)).to_time.beginning_of_day,
+          end:  (timestamps.first.to_date + ((i + 1) * @api_limit)).to_time.end_of_day,
+          project: @project,
+          show: 'file,branch,project,time,id'
         }
         i += 1
         params
 
       end
-
       request_params
     end
   end

data/lib/gitwakatime/timer.rb

@@ -18,22 +18,25 @@ module GitWakaTime
 
     def total_commited
       total_commited = ChronicDuration.output(@commits_with_duration
-                                               .map(&:time_in_seconds)
+                                               .map(&:time_in_seconds).compact
                                                .reduce(:+).to_f)
-      Log.new "Total Commited Time #{total_commited} ".red
+      Log.new "Total Committed 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|
+        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)
-            commit.files[i].time_in_seconds += time
-            commit.time_in_seconds += time
+            file.time_in_seconds = time
+            commit.time_in_seconds = time
+
+            file.save
           end
+          commit.save
         else
-          # commit.time_in_seconds = sum_actions(actions_before(commit.date))
+          commit.time_in_seconds = sum_actions(actions_before(@actions_with_durations, commit.date))
         end
       end.compact
       total
@@ -45,38 +48,38 @@ module GitWakaTime
     private
 
     def relevant_actions(commit, file)
-      # The timestamps should be before the expected commit
-      actions = actions_before(commit.date)
-
       # The file should be the same file as we expect
       # TODO: Might need to pass root_path down
-      actions = actions.select do |action|
-        action['file'].include?(file.name)  # This is okay as other projects have already been purged
+      actions = @actions_with_durations.select do |action|
+        action[: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)
+
       # If this file had an earlier commit ensure the actions timestamp
       # is after that commit
-      if file.dependent_commit
-        actions = actions_after(actions, file.dependent_commit.date)
+      if file.dependent_date
+        actions = actions_after(actions, file.dependent_date)
       end
       actions
     end
 
-    def actions_before(date)
-      @actions_with_durations.select do |action|
-        Time.at(action['time']) <= date
+    def actions_before(actions, date)
+      actions.select do |action|
+        Time.at(action[:time]) <= date
       end
     end
 
     def actions_after(actions, date)
       actions.select do |action|
-        Time.at(action['time']) >= date
+        Time.at(action[:time]) >= date
       end
     end
 
     def sum_actions(actions)
-      actions.map { |action| action['duration'] }
-      .reduce(:+).to_f
+      actions.map { |action| action[:duration] }
+      .reduce(:+).to_i
     end
   end
 end

data/lib/gitwakatime/version.rb

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

data/spec/commited_file_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+# * commit a4c26aeb79acb1f012201fe96e4d68e8d17c75d9 (HEAD, origin/master, origin/HEAD, master)
+# | Author: rpo <rother@gmail.com>
+# | Date:   Sat Jan 31 15:49:07 2015 -0500
+# |
+# |      I was edited online using git hub's editor
+# |
+# * commit 570f1df0505ed828656eeaf9411ddd6a6068b095
+# | Author: Russell Osborne <rother@gmail.com>
+# | Date:   Fri Jan 30 00:19:00 2015 -0500
+# |
+# |     And one more
+# |
+# * commit dcd748bd06b8a0f239d779bee4f1eaf1f4aa500d
+# | Author: Russell Osborne <rother@gmail.com>
+# | Date:   Fri Jan 30 00:01:54 2015 -0500
+# |
+# |     a final commit on master
+# |
+# *   commit 57b0d5cdb6da2b2b9ac7e9847716b0c54466d1c6
+# |\  Merge: e493d6f d642b3c
+# | | Author: Russell Osborne <rother@gmail.com>
+# | | Date:   Thu Jan 29 22:27:26 2015 -0500
+# | |
+# | |     Merge branch 'dev'
+# | |
+# | * commit d642b3c04c3025655a9c33e32b9d530696dcf7cc
+# | | Author: Russell Osborne <rother@gmail.com>
+# | | Date:   Thu Jan 29 22:26:05 2015 -0500
+# | |
+# | |     another commit on dev.
+# | |
+# * | commit e493d6f2ab2a702fa7f9c168b852a3b44c524f08
+# |/  Author: Russell Osborne <rother@gmail.com>
+# |   Date:   Thu Jan 29 22:26:20 2015 -0500 or 1422570380
+# |
+# |       conflicting commit on master.
+# |
+# * commit 4c1ea35f9a811a0ef79da15ec85f25fce4c446ba
+# | Author: Russell Osborne <rother@gmail.com>
+# | Date:   Thu Jan 29 22:25:08 2015 -0500 or 1422570308
+# |
+# |     commit on dev branch
+# |
+# * commit 2254dd56976b5f32a2289438842e42a35a18ff86
+# | Author: Russell Osborne <rother@gmail.com>
+# | Date:   Thu Jan 29 21:49:31 2015 -0500
+# |
+# |     testing
+# |
+# * commit 052ff8c0e8c7cd39880d1536f4e27cc554e698f6
+#   Author: Russell Osborne <rother@gmail.com>
+#   Date:   Thu Jan 29 21:49:12 2015 -0500
+
+#       created readme
+describe 'description' do
+  let (:git) { Git.open(@wdir) }
+
+  before do
+    GitWakaTime::Commit.dataset.destroy
+    GitWakaTime::Commit.dataset.destroy
+  end
+
+  it 'can be created  ' 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)
+    )
+
+    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'
+      )
+
+    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_date.utc.to_s).to eql(Time.at(1_422_570_380).utc.to_s)
+  end
+
+end

data/spec/dummy/dot_git/sourcetreeconfig

@@ -1,7 +1,7 @@
 autorefresh=1
 savedIncoming=0
-lastUsedView=1
+lastUsedView=0
 savedOutgoing=0
-lastCheckedRemotes=2015-01-31 22:27:02 +0000
+lastCheckedRemotes=2015-02-03 06:54:37 +0000
 disablerecursiveoperations=0
 autorefreshremotes=1

data/spec/mapper_spec.rb

@@ -1,20 +1,24 @@
 require 'spec_helper'
-require 'gitwakatime'
-require 'gitwakatime/mapper'
 
 describe 'description' do
+  let (:git) { Git.open(@wdir) }
+  before(:each) do
+    GitWakaTime.config.git = git
+    GitWakaTime::Mapper.new(start_at: Date.new(2015, 1, 28))
+  end
+
   it 'can be run on dummy' do
-    expect(GitWakaTime::Mapper.new(@wdir).commits.size).to eq 8 # 9ths is lonely
+    expect(GitWakaTime::Commit.all.size).to eq 8 # 9ths is lonely
   end
   it 'can be run on dummy' do
-    expect(GitWakaTime::Mapper.new(@wdir).commits.last.raw_commit.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::Mapper.new(@wdir).commits.first.files.first.dependent_commit.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::Mapper.new(@wdir).commits.select { |c| c.sha == 'dcd748bd06b8a0f239d779bee4f1eaf1f4aa500d' }.first.files.first.dependent_commit.sha).to eq '2254dd56976b5f32a2289438842e42a35a18ff86'
+    expect(GitWakaTime::Commit.all.select { |c| c.sha == 'dcd748bd06b8a0f239d779bee4f1eaf1f4aa500d' }.first.commited_files.first.dependent_sha).to eq '2254dd56976b5f32a2289438842e42a35a18ff86'
   end
 end

data/spec/query_spec.rb

@@ -1,8 +1,11 @@
 require 'spec_helper'
-require 'gitwakatime'
 
 describe 'description' do
-  let (:map) { GitWakaTime::Mapper.new(@wdir) }
+
+  before(:each) do
+    GitWakaTime.config.git = Git.open(@wdir)
+    GitWakaTime::Mapper.new(start_at: Date.new(2015, 1, 24))
+  end
 
   before do
     stub_request(:get, 'https://wakatime.com/api/v1/actions')
@@ -12,11 +15,18 @@ describe 'description' do
 
   it 'can be run on dummy' do
 
-    timer = GitWakaTime::Query.new(map.commits, File.basename(@wdir)).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'
+  end
+  it 'produces valid search for api' do
+    actions = GitWakaTime::Query.new(GitWakaTime::Commit.all, File.basename(@wdir)).time_params
 
-    expect(timer.size).to eq 6 # 9ths is lonely
-    expect(timer).to be_a Array
-    expect(timer.last).to be_a Wakatime::Models::Action
-    expect(timer.last.branch).to eq 'master'
+    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)
   end
 end

data/spec/spec_helper.rb

@@ -4,12 +4,29 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+ENV['thor_env'] = 'test'
+ENV['waka_log'] = 'false'
+
+require 'gitwakatime'
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
   config.before(:all) do
     @wdir = set_file_paths
+    GitWakaTime.config.setup_local_db
+    GitWakaTime::Commit.new.columns
+    GitWakaTime::CommitedFile.new.columns
+    GitWakaTime::Action.new.columns
+  end
+
+  config.before(:each) do
+    GitWakaTime::Commit.truncate
+    GitWakaTime::CommitedFile.truncate
+    GitWakaTime::Action.truncate
+
+    expect(GitWakaTime.config).to receive('user_name').and_return('Russell Osborne').at_least(:once)
   end
 
   config.after(:all) do
@@ -37,6 +54,5 @@ def create_temp_repo(clone_path)
   Dir.chdir(tmp_path) do
     FileUtils.mv('dot_git', '.git')
   end
-  puts tmp_path
   tmp_path
 end

data/spec/timer_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
-require 'gitwakatime'
 
 describe 'description' do
-  let (:map) { GitWakaTime::Mapper.new(@wdir) }
+  let (:git) { Git.open(@wdir) }
 
   before do
     stub_request(:get, 'https://wakatime.com/api/v1/actions')
@@ -11,8 +10,14 @@ describe 'description' do
   end
 
   it 'can be run on dummy' do
-    actions = GitWakaTime::Query.new(map.commits, File.basename(@wdir)).get
-    timer = GitWakaTime::Timer.new(map.commits, actions, File.basename(@wdir)).process
-    expect(timer.size).to eq 2
+    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
+
+    # # UTC breaks actions of 1 day
+    # expect(timer.size).to eq 1
+    # With 8 relevant commits
+    expect(timer[timer.keys.first].size).to eq 8
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitwakatime
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Russell Osborne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -183,15 +211,18 @@ files:
 - bin/gitwakatime
 - gitwakatime.gemspec
 - lib/gitwakatime.rb
-- lib/gitwakatime/actions.rb
+- lib/gitwakatime/action.rb
 - lib/gitwakatime/cli.rb
 - lib/gitwakatime/commit.rb
 - lib/gitwakatime/commited_file.rb
+- lib/gitwakatime/durations.rb
 - lib/gitwakatime/log.rb
 - lib/gitwakatime/mapper.rb
 - lib/gitwakatime/query.rb
 - lib/gitwakatime/timer.rb
 - lib/gitwakatime/version.rb
+- spec/commit_spec.rb
+- spec/commited_file_spec.rb
 - spec/dummy/dot_git/FETCH_HEAD
 - spec/dummy/dot_git/HEAD
 - spec/dummy/dot_git/config
@@ -271,6 +302,8 @@ specification_version: 4
 summary: A Tool that will compile git data with wakatime data to establish time per
   commit
 test_files:
+- spec/commit_spec.rb
+- spec/commited_file_spec.rb
 - spec/dummy/dot_git/FETCH_HEAD
 - spec/dummy/dot_git/HEAD
 - spec/dummy/dot_git/config

data/lib/gitwakatime/actions.rb

@@ -1,59 +0,0 @@
-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
-      @session     = Wakatime::Session.new(api_key: GitWakaTime.config.api_key)
-      @client      = Wakatime::Client.new(@session)
-      load_actions
-    end
-
-    def load_actions
-      Log.new "querying WakaTime actions for #{@project}"
-      time = Benchmark.realtime do
-        @actions = @client.actions(@args)
-        # remove returned actions that do not have the project we want
-        @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)
-      durations = []
-      current = []
-      @actions.each do | action |
-        # the first action just sets state and does nothing
-        unless current.empty?
-
-          # get duration since last action
-          duration = action.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
-            current['duration'] = duration
-
-            # log current action as a duration
-            durations << current
-          end
-        end
-        # set state (re-start the clock)
-        current = action
-        current.delete('id')
-
-      end
-      durations
-    end
-  end
-end