v2gpti 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d42ceb59abdcceff2e129b8c7144be02fa73995
-  data.tar.gz: ad715bb77d922aa00d920367fbbd53b75d457b90
+  metadata.gz: 5b95b1ea97c9e06cb79191c5c2720a7f76715b92
+  data.tar.gz: 603e825bd082e623a914335cb75a0638a8a4f12a
 SHA512:
-  metadata.gz: c595151e4329039ed4235470dea778b0e0c13e5af5a3c7f59f4a2d1fa20df121acf781bf0ca37d58e2b32dfa87ca66be8aef7c7a5b4b1c2ca8df662a58cd0d5c
-  data.tar.gz: 7bd8509a922209ff1edeb5473bd48f69642e1f12429d2b2ebeaa562f82f88249e15f4b900ea6a66480ebb4ee22f93954f76393b099d5a9c94a7f4c4bc4b60eda
+  metadata.gz: 79b30970ff47789df877ec08951b8b22086add8c92b5b1178d7b654cefafa845529933abe105fb1611fece8fd53243bc5228e68e09ad7eaa8f1ae64c0bdd6cc2
+  data.tar.gz: 6df693f8679f497a47abf2835a1162e3a1b44febc5343b7471191a094ce5254907c78f4ad37c59ea931db030fb599fa2f012c1871b6c61133c28e1e556ea1e6e

data/lib/git-pivotal-tracker-integration/command/base.rb

@@ -91,10 +91,12 @@ class GitPivotalTrackerIntegration::Command::Base
     params[:estimated_seconds] = estimated_seconds current_story
     params[:pid] = configuration.toggl_project_id
     params[:uid] = @toggl.me["id"]
+    params[:tags] = [current_story.story_type]
+    params[:active] = false
     params[:description] = "#{current_story.id}" + " commit:" + "#{(GitPivotalTrackerIntegration::Util::Shell.exec "git rev-parse HEAD").chomp[0..6]}"
     params[:created_with] = "v2gpti"
-    params[:start] = current_story.created_at.iso8601
     params[:duration] = seconds_spent(time_spent)
+    params[:start] = (Time.now - params[:duration]).iso8601
     task = @toggl.get_project_task_with_name(configuration.toggl_project_id, "#{current_story.id}")
      if !task.nil?
        params[:tid] = task['id']
@@ -117,7 +119,7 @@ class GitPivotalTrackerIntegration::Command::Base
       when 1
         estimate = 1.25 * 60 * 60
       when 2
-        estiamte = 3 * 60 * 60
+        estimate = 3 * 60 * 60
       when 3
         estimate = 8 * 60 * 60
       else

data/lib/git-pivotal-tracker-integration/command/finish.rb

@@ -30,6 +30,12 @@ class GitPivotalTrackerIntegration::Command::Finish < GitPivotalTrackerIntegrati
   def run(argument)
     $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{(GitPivotalTrackerIntegration::Util::Shell.exec 'pwd').chop} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
     no_complete = argument =~ /--no-complete/
+
+    # ask("pause")
+    GitPivotalTrackerIntegration::Util::Git.trivial_merge?
+    $LOG.debug("configuration:#{@configuration}")
+    $LOG.debug("project:#{@project}")
+    $LOG.debug("story:#{@configuration.story(@project)}")
     time_spent = ""
     while 1
       time_spent = ask("How much time did you spend on this task? (example: 15m, 2.5h)")
@@ -38,11 +44,6 @@ class GitPivotalTrackerIntegration::Command::Finish < GitPivotalTrackerIntegrati
       end
     end
     finish_toggle(@configuration, time_spent)
-    # ask("pause")
-    GitPivotalTrackerIntegration::Util::Git.trivial_merge?
-    $LOG.debug("configuration:#{@configuration}")
-    $LOG.debug("project:#{@project}")
-    $LOG.debug("story:#{@configuration.story(@project)}")
     GitPivotalTrackerIntegration::Util::Git.merge(@configuration.story(@project), no_complete)
     GitPivotalTrackerIntegration::Util::Git.push GitPivotalTrackerIntegration::Util::Git.branch_name
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2gpti
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ben Hale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline