fgi 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d59a2d5cf5f06e8ac7234bd5e997f2979dee1c23
-  data.tar.gz: 87c72213d77138f9f9e2f962763d08c2c75cf310
+  metadata.gz: 91922d15f334ba84772f933b85794b8684e0e26a
+  data.tar.gz: ad27509e51ffc44569ca6baa93023770b9988621
 SHA512:
-  metadata.gz: 80a6daec4ed632e0ab6a8c73cfeabad5592c3fa7c67cbde92e42557d76c49a32a96632bce0b79ea362483d8f11a7d034fecd64321b7eef41b3485ac8e783888b
-  data.tar.gz: f443b71afe99c46d12b2bd9f305d7aed2c1f806142f3013473df725fe4540f580344354d328dcfcf0063dcfac2d366d126c5b0bdacd8aeb97c5c0a7090a3448d
+  metadata.gz: af1d05fc79eb0889510fd949c6206ef0d48de344fb904b0e13e37fa5f372dfeb3a018326fb4987ffaa32c76998907630064f17bce1de8c96149250c3e7f488e9
+  data.tar.gz: 6d3fd9699f8b44ddbbff1e450f82f6ca5bd13a067b5e0082fa312b6e8a4b042f1229b656199172d8d87d8df0577ab621159ef98b719c5f4daa5c98e3e084e7fa

data/bin/fgi

@@ -19,7 +19,7 @@ options_parser = OptionParser.new do |fgi|
   # NEW
   fgi.separator "\nfgi new [ISSUE_NAME] [OPTIONS]     : create the issue with the given name.\n\n"
   fgi.on('-e', '--estimate [ESTIMATION]', 'How many time do you think you will spend on this issue ? (example: 1d13h37m05s)') do |estimate|
-    options[:estimate] = estimate
+    options[:duration] = estimate
   end
   fgi.on('-l', '--later', 'Tell FGI that you only want to create an issue but not to create and switch branch.') do
     options[:later] = true
@@ -35,6 +35,9 @@ options_parser = OptionParser.new do |fgi|
   fgi.on('-m', '--fix-message [MESSAGE]', %q(Add a custom message with the basic 'Fix #ID')) do |message|
     options[:fix_message] = message
   end
+  fgi.on('-s', '--spent [SPENT_TIME]', 'How many time have you spent on this issue ? (example: 1d13h37m05s)') do |spent|
+    options[:duration] = spent
+  end
   # CURRENT
   fgi.separator "\nfgi current [OPTIONS]              : display the current branch and issue."
   fgi.separator "\n    -e, --estimate [ESTIMATION]      Add/rewrite the estimation time on the current issue. See 'fgi new' options."
@@ -77,8 +80,9 @@ when 'fix'
 when 'current'
   current_branch = Fgi::GitService.current_branch
   puts "Current branch : #{current_branch}"
-  if (defined? Fgi::ISSUES) && !options[:estimate].nil?
-    Fgi::GitService.set_issue_estimation(issue_id: Fgi::ISSUES[current_branch][:id], estimation: options[:estimate], git_service: Fgi::CONFIG[:git_service_class].new)
+  if (defined? Fgi::ISSUES) && !options[:duration].nil?
+    res = Fgi::GitService.set_issue_time_trackers(issue_id: Fgi::ISSUES[current_branch][:id], duration: options[:duration], git_service: Fgi::CONFIG[:git_service_class].new, tracker: :estimate)
+    post_estimation_display(res['human_time_estimate'], options[:duration])
     exit!
   elsif Fgi::ISSUES
     puts "Current issue  : #{Fgi::ISSUES[current_branch][:title]}" || 'This branch do not match any FGI issue.'

data/lib/fgi.rb

@@ -14,7 +14,7 @@ module Fgi
   require_relative 'fgi/configuration'
   require_relative 'fgi/git_service'
 
-  VERSION = '1.1.5'.freeze
+  VERSION = '1.1.6'.freeze
 
   # Add FGI user's current issues to the gitignore
   if `cat .gitignore | grep '.current_issues.fgi.yml'`.empty?

data/lib/fgi/git_service.rb

@@ -34,11 +34,15 @@ module Fgi
           branch_name = "#{options[:prefix]}/#{branch_name}" unless options[:prefix].nil?
           save_issue(branch: branch_name, id: response['iid'], title: response['title'].tr("'", ' ').tr('_', ' '))
           create_branch(name: branch_name, from_current: options[:from_current]) unless options[:later]
-          set_issue_estimation(
-            issue_id:    response['iid'],
-            estimation:  options[:estimate],
-            git_service: git_service
-          )
+          unless options[:duration].nil?
+            res = set_issue_time_trackers(
+                    issue_id:    response['iid'],
+                    duration:    options[:duration],
+                    git_service: git_service,
+                    tracker:     :estimate
+                  )
+            post_estimation_display(res['human_time_estimate'], options[:duration])
+          end
         end
       end
 
@@ -52,6 +56,7 @@ module Fgi
           puts "We could not find any issues to fix on your current branch (#{current_branch})."
           exit!
         end
+        set_spent_time(options: options, issue_id: ISSUES[current_branch][:id])
         git_remote = ask_for_remote
         `git add .`
         puts "Are you sure to want to close the issue #{ISSUES[current_branch][:title]} ?"
@@ -62,7 +67,7 @@ module Fgi
             commit_message += " - #{options[:fix_message]}" unless options[:fix_message].nil?
             `git commit -a --allow-empty -m '#{commit_message}'`
             `git push #{git_remote} HEAD`
-            `git branch -u #{git_remote}/#{name}` # Define the upstream branch
+            `git branch -u #{git_remote}/#{ISSUES[current_branch]}` # Define the upstream branch
             `git checkout #{CONFIG[:default_branch]}` # Be sure to be on the default branch.
             remove_issue(current_branch)
             puts "Congrat's ! You're now back to work on the default branch (#{CONFIG[:default_branch]})"
@@ -73,29 +78,34 @@ module Fgi
         end
       end
 
-      def current_branch
-        `git branch | grep '*'`.gsub('* ', '').chomp
-      end
-
       # TODO, Make sure it works for all git services
       # The method to set the estimation time to resolve the issue
       # @param issue_id [Integer] the issue id to set its estimation time
       # @param estimation [String] the estimation time given by the user
       # @param git_service [Class] the git service class to use for this project
-      def set_issue_estimation(issue_id:, estimation:, git_service:)
-        return if estimation.nil?
+      # @param tracker [Symbol] the tracker to set. Can be :estimate or :spent
+      def set_issue_time_trackers(issue_id:, duration:, git_service:, tracker:)
+        return if duration.nil? || !%i[estimate spent].include?(tracker)
         # Since GitLab version isn't up to date, we should be able
-        #   to add estimations in issues comments (/estimate)
-        url_with_querystring = "#{git_service.routes[:issues]}/#{issue_id}/time_estimate?duration=#{estimation}"
+        #   to add estimations and spent time in issues comments (/estimate, /spent)
+        api = if tracker == :spent
+                'add_spent_time'
+              else
+                'time_estimate'
+              end
+        url_with_querystring = "#{git_service.routes[:issues]}/#{issue_id}/#{api}?duration=#{duration}"
         headers = { git_service.token_header => TOKEN, 'Content-Type' => 'application/json' }
         response = post(url: url_with_querystring, headers: headers)
         # GitLab sucks sometimes... This API is an example
         begin
-          response_body = JSON.parse(response[:body])
+          JSON.parse(response[:body])
         rescue Exception
-          response_body = response[:body]
+          response[:body]
         end
-        post_estimation_display(response_body['human_time_estimate'], estimation)
+      end
+
+      def current_branch
+        `git branch | grep '*'`.gsub('* ', '').chomp
       end
 
       private
@@ -127,6 +137,17 @@ module Fgi
         end
       end
 
+      def set_spent_time(options:, issue_id:)
+        return if options[:duration].nil?
+        res = set_issue_time_trackers(
+          issue_id:    issue_id,
+          duration:    options[:duration],
+          git_service: CONFIG[:git_service_class].new,
+          tracker:     :spent
+        )
+        post_spent_display(res['human_time_estimate'], options[:duration])
+      end
+
       # Save the current user's FGI created issue in the gitignored file 'current_issue.fgi.yml'
       # @param id [Integer] the current issue id
       # @param title [String] the current issue name
@@ -238,6 +259,15 @@ module Fgi
         end
       end
 
+      def post_spent_display(response_spent, spent_time)
+        if response_spent.nil?
+          puts "\nWe weren't able to save your spent time."
+          puts "You'll have to do it manually on #{CONFIG[:git_service].capitalize}."
+        else
+          puts "\nYou have spent #{spent_time} on this issue."
+        end
+      end
+
       # The method used to commit the user's local changes
       def commit_changes
         puts 'Enter your commit message :'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fgi
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Julien Philibin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler