fgi 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33608108acb7c3f2ecd4c83270135f5e06740287
-  data.tar.gz: fa341ad5f16c126722c08201f4bb959cd2436c8c
+  metadata.gz: d59a2d5cf5f06e8ac7234bd5e997f2979dee1c23
+  data.tar.gz: 87c72213d77138f9f9e2f962763d08c2c75cf310
 SHA512:
-  metadata.gz: 81a4ef11f6164af60057df09b2196de60e616350bc0d23e0792c254dd92c451169322f83aaa97c942254a012865e890c8aa792e869a687bce39a3e282be1605e
-  data.tar.gz: 12e636b5a22cb8db4b4c27ce199952a601e6d759bcdf6b4b3362495cba261b4f5ac59a87adb2d5e50deabdd6645ef4af97ec34a5440c0a1260053dc0a69ac733
+  metadata.gz: 80a6daec4ed632e0ab6a8c73cfeabad5592c3fa7c67cbde92e42557d76c49a32a96632bce0b79ea362483d8f11a7d034fecd64321b7eef41b3485ac8e783888b
+  data.tar.gz: f443b71afe99c46d12b2bd9f305d7aed2c1f806142f3013473df725fe4540f580344354d328dcfcf0063dcfac2d366d126c5b0bdacd8aeb97c5c0a7090a3448d

data/bin/fgi

@@ -11,43 +11,40 @@ argv = ARGV
 
 options = {}
 options_parser = OptionParser.new do |fgi|
-  fgi.banner = 'Usage: fgi COMMAND [OPTION]'
-  fgi.separator ''
-  fgi.separator 'Commands'
-  fgi.separator '    config              : run the FGI configurator.'
-  fgi.separator '    token  [TOKEN]      : define the new user token.'
-  fgi.separator '    new    [ISSUE_NAME] : create the issue with the given name.'
-  fgi.separator '    fix                 : fix the current issue.'
-  fgi.separator '    ... more comming soon ...'
-  fgi.separator ''
-  fgi.separator 'Options'
-
-  fgi.on('-h', '--help', 'Display the FGI manual')
-
-  fgi.on('-v', '--version', 'Display the FGI version') do
-    puts "FGI #{Fgi::VERSION}"
-    exit!
-  end
-
+  fgi.banner = 'Usage: fgi COMMAND [OPTIONS]'
+  # CONFIG
+  fgi.separator "\nfgi config                         : run the FGI configurator."
+  # TOKEN
+  fgi.separator "\nfgi token [TOKEN]                  : define the new user token."
+  # 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
   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
   end
-
   fgi.on('-p', '--prefix [PREFIX]', 'Tell FGI that you want to add a prefix to the branch name.') do |prefix|
     options[:prefix] = prefix
   end
-
   fgi.on('--from-current', 'Tell FGI to create the new issue from a specific branch.') do
     options[:from_current] = true
   end
-
+  # FIX
+  fgi.separator "\nfgi fix [OPTIONS]                  : fix the current issue.\n\n"
   fgi.on('-m', '--fix-message [MESSAGE]', %q(Add a custom message with the basic 'Fix #ID')) do |message|
     options[:fix_message] = message
   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."
+  # COMMON OPTIONS
+  fgi.separator "\nCommon options :\n\n"
+  fgi.on('-h', '--help', 'Display the FGI manual')
+  fgi.on('-v', '--version', 'Display the FGI version') do
+    puts "FGI #{Fgi::VERSION}"
+    exit!
+  end
 end
 options_parser.parse!
 
@@ -77,6 +74,17 @@ when 'token'
   Fgi::Tokens.add_token(argv[1])
 when 'fix'
   Fgi::GitService.fix_issue(options)
+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)
+    exit!
+  elsif Fgi::ISSUES
+    puts "Current issue  : #{Fgi::ISSUES[current_branch][:title]}" || 'This branch do not match any FGI issue.'
+  else
+    puts 'This is not an FGI branch. There is no FGI issue for this one.'
+  end
 else
   puts options_parser
 end

data/lib/fgi.rb

@@ -14,7 +14,7 @@ module Fgi
   require_relative 'fgi/configuration'
   require_relative 'fgi/git_service'
 
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.1.5'.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

@@ -32,7 +32,7 @@ module Fgi
         elsif !response['iid'].nil?
           branch_name = snakify(title)
           branch_name = "#{options[:prefix]}/#{branch_name}" unless options[:prefix].nil?
-          save_issue(branch: branch_name, id: response['iid'], title: response['title'].tr("'", ' '))
+          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'],
@@ -48,7 +48,6 @@ module Fgi
       #   => Return to the default project branch
       # @param options [Hash] the options given by the user in the command line
       def fix_issue(options)
-        current_branch = `git branch | grep '*'`.gsub('* ', '').chomp
         if ISSUES[current_branch].nil?
           puts "We could not find any issues to fix on your current branch (#{current_branch})."
           exit!
@@ -74,6 +73,31 @@ 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?
+        # 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}"
+        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])
+        rescue Exception
+          response_body = response[:body]
+        end
+        post_estimation_display(response_body['human_time_estimate'], estimation)
+      end
+
       private
 
       def ask_for_remote
@@ -128,26 +152,6 @@ module Fgi
         File.open('.current_issues.fgi.yml', 'w') { |f| f.write(issues.to_yaml) }
       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?
-        # 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}"
-        response = post(url: url_with_querystring, headers: headers)
-        # GitLab sucks sometimes... This API is an example
-        begin
-          response_body = JSON.parse(response[:body])
-        rescue Exception
-          response_body = response[:body]
-        end
-        post_estimation_display(response_body['human_time_estimate'], estimation)
-      end
-
       # TODO, Make sure it works for all git services
       # The method used to create issues
       # @param title [String] the issue title
@@ -170,7 +174,7 @@ module Fgi
       # @param name [String] the branch name
       def create_branch(name:, from_current:)
         from = if from_current
-                 `git branch | grep '*'`.gsub('* ', '').chomp
+                 current_branch
                else
                  CONFIG[:default_branch]
                end
@@ -179,8 +183,7 @@ module Fgi
         `git checkout #{from}` # Be sure to be on the default or specified branch.
         `git pull #{git_remote} HEAD` # Be sure to get the remote changes locally.
         `git checkout -b #{name}` # Create the new branch.
-        to = `git branch | grep '*'`.gsub('* ', '').chomp
-        puts "\nYou are now working on branch #{to} created from #{from} !"
+        puts "\nYou are now working on branch #{current_branch} created from #{from} !"
       end
 
       # The method used to get the issue description

metadata

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