gitwakatime 0.2.2 → 0.4.0

data/spec/fixtures/wakatime.yml

@@ -0,0 +1,3 @@
+:api_key: 1234-1234-1234-1234
+:last_commit:
+:log_level: :info

data/spec/mapper_spec.rb

@@ -26,9 +26,9 @@ describe 'description' do
 
   it 'maps files dependent commits' do
     expect(
-      GitWakaTime::Commit.all.select do |c|
+      GitWakaTime::Commit.all.find do |c|
         c.sha == 'dcd748bd06b8a0f239d779bee4f1eaf1f4aa500d'
-      end.first.commited_files.first.dependent_sha
+      end.commited_files.first.dependent_sha
     ).to eq '2254dd56976b5f32a2289438842e42a35a18ff86'
   end
 end

data/spec/query_spec.rb

@@ -1,35 +1,51 @@
 require 'spec_helper'
 
-describe 'description' do
+describe GitWakaTime::Query 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
 
+  let(:start_at) { Date.new(2015, 1, 24) }
+  let(:end_at) { Date.new(2015, 2, 24) }
+  subject(:subject) { described_class.new(start_at, end_at, File.basename(@wdir)) }
+
   before do
-    stub_request(:get, 'https://wakatime.com/api/v1/heartbeats')
-    .with(query: hash_including(:start, :end))
+    stub_request(:get, /.*wakatime.com\/api\/v1\/users\/current\/heartbeats/)
+    .with(query: hash_including(:date))
     .to_return(body: File.read('./spec/fixtures/heartbeats.json'), status: 200)
   end
 
-  it 'can be run on dummy' do
-    heartbeats = @query.get
+  it 'will return an array of heartbeats' do
+    heartbeats = subject.call
 
     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
 
-    heartbeats = @query.build_requests
+  describe 'caching' do
+    it 'when heartbeats after query date return true ' do
+      expect(GitWakaTime::Heartbeat).to receive(:max).with(:time)
+      .and_return(Time.now.to_s)
+      expect(subject.cached?(1.month.ago)).to eq(true)
+    end
+
+    it 'when heartbeats after query date are the same ' do
+      expect(GitWakaTime::Heartbeat).to receive(:max).with(:time)
+      .and_return(Time.now.to_s)
+
+      expect(subject.cached?(Date.today)).to eq(false)
+    end
+
+    it 'when no heartbeats present' do
+      expect(GitWakaTime::Heartbeat).to receive(:max).with(:time)
+      .and_return(nil)
+
+      expect(subject.cached?(Date.today)).to eq(false)
+    end
 
-    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/request_builder_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe GitWakaTime::RequestBuilder do
+  subject(:subject) { described_class.new(3.days.ago, Time.now).call }
+
+  it 'returns a array of hashes' do
+    expect(subject).to be_a(Array)
+    expect(subject.first).to be_a(Hash)
+  end
+
+  it 'has a hash per day' do
+    expect(subject.size).to eq(4)
+  end
+
+  it 'has a first hash will be for 3 days ago' do
+    expect(subject.first).to eq(
+      date: 3.days.ago.to_date,
+      show: 'file,branch,project,time,id'
+    )
+  end
+end

data/spec/spec_helper.rb

@@ -6,7 +6,11 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 ENV['thor_env'] = 'test'
 ENV['waka_log'] = 'false'
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
 
+require 'webmock/rspec'
+WebMock.disable_net_connect!(allow: 'codeclimate.com')
 require 'gitwakatime'
 
 RSpec.configure do |config|
@@ -21,38 +25,20 @@ RSpec.configure do |config|
     GitWakaTime::Heartbeat.new.columns
   end
 
-  config.before(:each) do
-    GitWakaTime::Commit.truncate
-    GitWakaTime::CommitedFile.truncate
-    GitWakaTime::Heartbeat.truncate
+  config.around(:each) do |example|
+    DB.transaction(rollback: :always, auto_savepoint: true) { example.run }
+  end
 
-    expect(
+  config.before(:each) do
+    allow(
       GitWakaTime.config
-    ).to receive('user_name').and_return('Russell Osborne').at_least(:once)
+    ).to receive('user_name').and_return('Russell Osborne')
   end
 
   config.after(:all) do
     FileUtils.rm_r(File.dirname(@wdir))
   end
 end
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-require 'webmock/rspec'
-
-WebMock.disable_net_connect!(allow: 'codeclimate.com')
-
-def capture(stream)
-  begin
-    stream = stream.to_s
-    eval "$#{stream} = StringIO.new"
-    yield
-    result = eval("$#{stream}").string
-  ensure
-    eval("$#{stream} = #{stream.upcase}")
-  end
-
-  result
-end
 
 def set_file_paths
   @test_dir = File.join(File.dirname(__FILE__))

data/spec/timer_spec.rb

@@ -2,29 +2,45 @@ require 'spec_helper'
 
 describe 'description' do
   let(:git) { Git.open(@wdir) }
+  let(:heartbeat) { double(:heartbeat, sum: 1) }
+  let(:heartbeats) { double(:heartbeats, grep: [heartbeat, heartbeat]) }
 
   before do
-    stub_request(:get, 'https://wakatime.com/api/v1/heartbeats')
-    .with(query: hash_including(:start, :end))
-    .to_return(body: File.read('./spec/fixtures/heartbeats.json'), status: 200)
+    stub_request(:get, /.*wakatime.com\/api\/v1\/heartbeats/)
+      .with(query: hash_including(:date))
+      .to_return(body: File.read('./spec/fixtures/heartbeats.json'), status: 200)
+
+    # Prevent any callbacks to git.
+    # TODO: Refactor callbacks.
+    GitWakaTime.config.git = nil
   end
 
-  it 'can be run on dummy' do
-    GitWakaTime.config.git = git
-    GitWakaTime::Mapper.new(start_at: Date.new(2015, 1, 24))
-    heartbeats = GitWakaTime::Query.new(
-      GitWakaTime::Commit, GitWakaTime::CommitedFile, File.basename(@wdir)
-    ).get
+  it 'can be run on dummy with no heartbeats' do
     timer = GitWakaTime::Timer.new(
-      GitWakaTime::Commit.all, heartbeats, File.basename(@wdir)
+      GitWakaTime::Commit.all, GitWakaTime::Heartbeat
     ).process
 
     # # UTC breaks heartbeats of 1 day
     # expect(timer.size).to eq 1
     # 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)
+    expect(timer).to eq Hash.new
+  end
+
+  it 'can be run on dummy with no heartbeats' do
+    c1 = GitWakaTime::Commit.create(sha: 'e493d6f2ab2a702fa7f9c168b852a3b44c524f08', parent_sha: '4c1ea35f9a811a0ef79da15ec85f25fce4c446ba', project: 'dummy', time_in_seconds: 0, date: Time.parse('2015-01-30 03:26:12 UTC'), message: 'conflicting commit on master.', author: 'Russell Osborne')
+    c2 = GitWakaTime::Commit.create(sha: 'd642b3c04c3025655a9c33e32b9d530696dcf7cc', parent_sha: '4c1ea35f9a811a0ef79da15ec85f25fce4c446ba', project: 'dummy', time_in_seconds: 0, date: Time.parse('2015-01-30 03:26:05 UTC'), message: 'another commit on dev.', author: 'Russell Osborne')
+    GitWakaTime::CommitedFile.create(commit_id: c1.id, dependent_sha: '4c1ea35f9a811a0ef79da15ec85f25fce4c446ba', dependent_date: Time.parse('2015-01-30 01:00:00 UTC'), time_in_seconds: 0, sha: 'd642b3c04c3025655a9c33e32b9d530696dcf7cc', name: '/dummy/spec/commit_spec.rb', entity: nil, project: 'dummy')
+    GitWakaTime::CommitedFile.create(commit_id: c2.id, dependent_sha: '4c1ea35f9a811a0ef79da15ec85f25fce4c446ba', dependent_date: Time.parse('2015-01-30 02:00:00 UTC'), time_in_seconds: 0, sha: 'd642b3c04c3025655a9c33e32b9d530696dcf7cc', name: '/dummy/lib/dummy/timer.rb', entity: nil, project: 'dummy')
+    GitWakaTime::Heartbeat.create(time: Time.parse('2015-01-30 02:33:00 UTC'), duration: 500, entity: '/dummy/spec/commit_spec.rb', type: 'file', branch: 'master', project: 'dummy')
+    GitWakaTime::Heartbeat.create(time: Time.parse('2015-01-30 02:31:54 UTC'), duration: 333, entity: '/dummy/lib/dummy/timer.rb', type: 'file', branch: 'master', project: 'dummy')
+
+    timer = GitWakaTime::Timer.new(
+      GitWakaTime::Commit.all, GitWakaTime::Heartbeat
+    ).process
+
+    # One hash key per day
+    expect(timer.size).to eq 1
+    expect(timer[Date.new(2015, 1, 30)]).to be_a(Array)
+    expect(timer[Date.new(2015, 1, 30)].map(&:time_in_seconds).compact.reduce(&:+)).to eq(500 + 333)
   end
 end

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitwakatime
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
-- Bozhidar Batsov
-- Jonas Arvidsson
-- Yuji Nakayama
+- Russell Osborne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -40,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: logger
-  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -208,9 +192,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      Automatic Ruby code style checking tool.
-      Aims to enforce the community-driven Ruby Style Guide.
+description: "A Tool that will compile git data with wakatime\n                        data
+  to establish time per commit "
 email:
 - russosborn@gmail.com
 executables:
@@ -218,6 +201,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -232,11 +216,13 @@ files:
 - lib/gitwakatime/commit.rb
 - lib/gitwakatime/commited_file.rb
 - lib/gitwakatime/controller.rb
-- lib/gitwakatime/durations.rb
+- lib/gitwakatime/durations_calculator.rb
 - lib/gitwakatime/heartbeat.rb
 - lib/gitwakatime/log.rb
 - lib/gitwakatime/mapper.rb
 - lib/gitwakatime/query.rb
+- lib/gitwakatime/request.rb
+- lib/gitwakatime/request_builder.rb
 - lib/gitwakatime/timer.rb
 - lib/gitwakatime/version.rb
 - spec/cli_spec.rb
@@ -292,8 +278,10 @@ files:
 - spec/dummy/readme
 - spec/durations_spec.rb
 - spec/fixtures/heartbeats.json
+- spec/fixtures/wakatime.yml
 - spec/mapper_spec.rb
 - spec/query_spec.rb
+- spec/request_builder_spec.rb
 - spec/spec_helper.rb
 - spec/timer_spec.rb
 homepage: ''
@@ -316,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Tool that will compile git data with wakatime data to establish time per
@@ -375,7 +363,9 @@ test_files:
 - spec/dummy/readme
 - spec/durations_spec.rb
 - spec/fixtures/heartbeats.json
+- spec/fixtures/wakatime.yml
 - spec/mapper_spec.rb
 - spec/query_spec.rb
+- spec/request_builder_spec.rb
 - spec/spec_helper.rb
 - spec/timer_spec.rb

data/lib/gitwakatime/durations.rb

@@ -1,96 +0,0 @@
-module GitWakaTime
-  # Extract Duration Data from Heartbeats for the WAKATIME API
-  class Durations
-    attr_accessor :heartbeats
-    def initialize(args)
-      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)
-      @heartbeats = []
-    end
-
-    def load_heartbeats
-      unless cached?
-
-        Log.new "querying WakaTime heartbeats for #{@project}"
-        time = Benchmark.realtime do
-          @heartbeats = @client.heartbeats(@args)
-
-          # 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_heartbeats_localy(@heartbeats)
-      end
-      true
-    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_heartbeats.count > 0
-        max_local_timetamp = (
-          Time.parse(cached_heartbeats.max(:time)) + 15.day
-        ).to_date
-        !(
-          @args[:start].to_date..@args[:end].to_date
-        ).include?(max_local_timetamp)
-      else
-        false
-      end
-    end
-
-    def cached_heartbeats
-      Heartbeat.where('time >= ?', @args[:end]).where(project: @project)
-    end
-
-    def heartbeats_to_durations(_project = nil, 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