gitwakatime 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1c9bcc647f411393c85c1a67bf26d883b8d6d31
-  data.tar.gz: cb344b96d438e4a9b102bfb6828f9bb183977599
+  metadata.gz: 87b1a52859dcdf8ad54d5be75e5c981961e56fab
+  data.tar.gz: e8c3f862a72c6e6717eaaa553624e51cce2b9d4c
 SHA512:
-  metadata.gz: ea8350ae2cbbe3e36bc1759a0031c4ff3d25c9e234e459cb54c39f071a93d9485a6751219b2542fe1e64f16e43a6cc3e82bce8bb5e930e1634d1f7f66c294d17
-  data.tar.gz: 988380175f02e9d7c91a0b4b925a4f0be432f6fc3923c1d38c2c989248941380af90ef1b5e478aab8497b00a6f4f5b0e8abedbba0ea37f9bd58133c761733153
+  metadata.gz: 92157e1509a6f4f05b3ce58b86df8a13c0f4ffd9788204ad82b69b2cdb4850952723cc997ccb9c592702d9144c5872b5a32c02656a498bab6410d03df8b47d54
+  data.tar.gz: 44b4acdc179a5d4d976e56bd43758d52f09320fa6c12b62d6e6907f81c617051de062f36803c4dab86eb1726f2ed3637e784848cd51d55447693bc02d3b2fb4c

data/README.md

@@ -39,6 +39,11 @@ Hard reset of the local cache database, if you are getting odd numbers
 
     $ gitwakatime reset
 
+## 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. 
 
 ## Output
     Total Recorded time 1 day 9 hrs 13 mins 32 secs

data/lib/gitwakatime/cli.rb

@@ -50,9 +50,11 @@ module  GitWakaTime
       GitWakaTime.config.load_config_yaml
       GitWakaTime.config.git = Git.open(path)
       @git_map = Mapper.new(start_at: date)
-      @actions = Query.new(Commit.where('date > ?', date).all, File.basename(path)).get
+      @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
 
-      @timer   = Timer.new(Commit.where('date > ?', date).all, @actions, File.basename(path)).process
+      @timer   = Timer.new(@relevant_commits, @actions, File.basename(path)).process
 
       @timer.each do |date, commits|
         Log.new format('%-40s %-40s'.blue,

data/lib/gitwakatime/commit.rb

@@ -19,7 +19,7 @@ module GitWakaTime
     end
 
     def time_in_seconds
-      commited_files.collect {|f| f.time_in_seconds}.inject(:+)
+      commited_files.map(&:time_in_seconds).inject(:+)
     end
 
     private

data/lib/gitwakatime/durations.rb

@@ -13,7 +13,7 @@ module GitWakaTime
     end
 
     def load_actions
-      unless cached?(@args)
+      unless cached?
 
         Log.new "querying WakaTime actions for #{@project}"
         time = Benchmark.realtime do
@@ -27,34 +27,40 @@ module GitWakaTime
 
         Log.new "API took #{time}s"
         persist_actions_localy(@actions)
-    end 
+      end
       true
     end
 
     def persist_actions_localy(actions)
-      actions.each do |action|
-
-        Action.find_or_create(uuid: action['id']) do |c|
+      sterile_actions = actions.map do |action|
           action['uuid'] = action['id']
           action['time'] = Time.at(action['time'])
           action.delete('id')
-          c.update(action)
-        end
-
+          Action.find_or_create(uuid: action['uuid']) do |a|
+            a.update(action)
+          end
       end
+      
     end
 
-    def cached?(params)
+    def cached?
       # 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
+      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)
+      else
+        false
+      end
+    end
+
+    def cached_actions
+      Action.where('time >= ?',@args[:end]).where(project: @project)
     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?

data/lib/gitwakatime/mapper.rb

@@ -10,8 +10,8 @@ module GitWakaTime
         logs =  g.log(commits).since(start_at).until(Date.today)
 
         @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
@@ -19,7 +19,7 @@ module GitWakaTime
             c.update(
              author: git_c.author.name,
              message: git_c.message,
-             date: git_c.date
+             date: git_c.date.utc
             )
           end
         end.compact

data/lib/gitwakatime/query.rb

@@ -7,7 +7,7 @@ module GitWakaTime
   class Query
     def initialize(commits, project, _path = nil)
       @commits   = commits
-      @api_limit = 15
+      @api_limit = 35
       @project   = project
       @requests   = time_params
     end
@@ -29,17 +29,20 @@ module GitWakaTime
       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
-      @start_at = timestamps.first
+
+      # 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
+
       # 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
+      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: (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,
+          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'
         }

data/lib/gitwakatime/version.rb

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

data/spec/durations_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+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 'checks cached state' do
+    pending
+  end
+
+  it 'calculates durations of actions' do
+    pending
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitwakatime
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Russell Osborne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -271,6 +271,7 @@ files:
 - spec/dummy/dot_git/sourcetreeconfig
 - spec/dummy/hi
 - spec/dummy/readme
+- spec/durations_spec.rb
 - spec/fixtures/actions.json
 - spec/mapper_spec.rb
 - spec/query_spec.rb
@@ -352,9 +353,9 @@ test_files:
 - spec/dummy/dot_git/sourcetreeconfig
 - spec/dummy/hi
 - spec/dummy/readme
+- spec/durations_spec.rb
 - spec/fixtures/actions.json
 - spec/mapper_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
 - spec/timer_spec.rb
-has_rdoc: