gitwakatime 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d47de3815abb7edcfb65449699ce7ed4ea939de
-  data.tar.gz: f540146be05016d14cb0272603257403cb4a31f5
+  metadata.gz: 168b591ace36a3aee27b46f91c877e1c7ed46dd9
+  data.tar.gz: ea9639102940b3d512fefb4d94ea89deab3d8d1e
 SHA512:
-  metadata.gz: 6e9bebde6645f4b5052ef01af5d6bd7a7e6217814caa6c1766ea25aa0875fd7b1a4f6678f1083a82a97ccb2d53babeecbbef5c7b31d7a470e0b0dbbf2913e636
-  data.tar.gz: b6065a0f59b9f06ee0b657c48c4b109c699e7afac461ff443324f7e54e095f2cf57129af079dffae46b6eef877dff21165fb02230c5336f5643f01dbe6f113f6
+  metadata.gz: a5d4ff163d2161129b89b98c57c5d8a3fe0067248c3ae2c54f6080cc13e3a781d5a96044336ec1d23cac22135099b0c1a5fe93a8ac597550c861dc149ce3925c
+  data.tar.gz: cde46c05f64e924f5a9d8128337d77542e79f2c265fe8a6d0fac046c6d7e220858af69b183cc23454a99bacb7ac693e9d423d1d8a574c32afa18936093d76dc3

data/lib/gitwakatime/cli.rb

@@ -51,21 +51,21 @@ module  GitWakaTime
         path: File.expand_path(options.file), date: date
       ).timer
 
-      print_output(@timer)
+      print_output(@timer, format: options.output)
     end
 
     no_commands do
-      def print_output(timer)
-        if output == 'text'
+      def print_output(timer, format: 'text')
+        if format == 'text'
           timer.each do |c_date, commits|
             print_commit(c_date, commits)
           end
-        elsif output == 'json'
+        elsif format == 'json'
           @timer.to_json
         end
       end
 
-      def print_commit
+      def print_commit(c_date, commits)
         sum_c_time = commits.map(&:time_in_seconds).compact.reduce(&:+).to_i
         Log.new format(
           '%-40s %-40s'.blue,

data/lib/gitwakatime/commited_file.rb

@@ -25,18 +25,16 @@ module  GitWakaTime
     # out of commits to check
     def find_dependent_commit(name, i = 1)
       commits = load_dependent_commits(name)
-      loop do
+      begin
         commit = commits[i]
-        break if commit.nil?
 
-        next unless allowed_commit(commit)
+        if commit && allowed_commit(commit)
+          set dependent_sha: commit.sha, dependent_date: commit.date
+          check_and_correct_split_tree(commit)
+        end
 
-        set dependent_sha: commit.sha, dependent_date: commit.date
-
-        check_and_correct_split_tree(commit)
         i += 1
-        break unless dependent_sha.blank?
-      end
+      end until !dependent_sha.nil? || commit.nil?
     end
 
     def check_and_correct_split_tree(commit)

data/lib/gitwakatime/durations.rb

@@ -44,16 +44,17 @@ module GitWakaTime
 
     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)) + 3.day
-        ).to_date
-        !(
-          @args[:start].to_date..@args[:end].to_date
-        ).include?(max_local_timetamp)
-      else
-        false
-      end
+      # 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
+      false
     end
 
     def cached_heartbeats

data/lib/gitwakatime/query.rb

@@ -8,7 +8,7 @@ module GitWakaTime
     def initialize(commits, files, project, _path = nil)
       @commits   = commits
       @files = files
-      @api_limit = 35
+      @api_limit = 1
       @project   = project
       @requests   = build_requests
     end
@@ -19,8 +19,9 @@ module GitWakaTime
       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
+      first_commit_at = timestamps.first
+      @start_at = if first_commit_at && first_commit_at >= Time.new(2013, 5, 1)
+                    first_commit_at
                   else
                     Time.new(2013, 5, 1)
                   end

data/lib/gitwakatime/version.rb

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

data/spec/cli_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe GitWakaTime::Cli do
+  before do
+    stub_request(:get, /wakatime\.com/)
+    .with(query: hash_including(:start, :end))
+    .to_return(body: File.read('./spec/fixtures/heartbeats.json'), status: 200)
+  end
+  it 'should be able to be called' do
+    ARGV.replace %w[tally --start_on 2012-01-01 --file] << @wdir.to_s
+    expect(capture(:stdout) { GitWakaTime::Cli.start }).to eq ''
+    # puts GitWakaTime::Cli.start('tally', "--file #{@wdir.to_s}")
+  end
+end

data/spec/spec_helper.rb

@@ -41,6 +41,19 @@ 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__))
   @wdir_dot = File.expand_path(File.join(@test_dir, 'dummy'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitwakatime
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -239,6 +239,7 @@ files:
 - lib/gitwakatime/query.rb
 - lib/gitwakatime/timer.rb
 - lib/gitwakatime/version.rb
+- spec/cli_spec.rb
 - spec/commit_spec.rb
 - spec/commited_file_spec.rb
 - spec/dummy/dot_git/FETCH_HEAD
@@ -315,12 +316,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Tool that will compile git data with wakatime data to establish time per
   commit
 test_files:
+- spec/cli_spec.rb
 - spec/commit_spec.rb
 - spec/commited_file_spec.rb
 - spec/dummy/dot_git/FETCH_HEAD