fgi 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1891f28f5ddf8fb90c595b3ae58293bcd00651bb
-  data.tar.gz: 8d17307b6f8edadf84b85cbb5b408816423b2a58
+  metadata.gz: 33608108acb7c3f2ecd4c83270135f5e06740287
+  data.tar.gz: fa341ad5f16c126722c08201f4bb959cd2436c8c
 SHA512:
-  metadata.gz: 690c3ec932312ea33b690f4bd44aa62a2fd0aaca29def6ca4465a912c70d2dff8d09cc231acf6feade769d743382c7eb63b0c8cdfa8e214494c155aeb1c92cee
-  data.tar.gz: d6e096772f58333bd418c88dd8b316a2d34738951dfbddbd538e613e881ed464eef85958f2a23326daa8939756ca5753d5d5933dfea41b4f6b0b0585bd76b94f
+  metadata.gz: 81a4ef11f6164af60057df09b2196de60e616350bc0d23e0792c254dd92c451169322f83aaa97c942254a012865e890c8aa792e869a687bce39a3e282be1605e
+  data.tar.gz: 12e636b5a22cb8db4b4c27ce199952a601e6d759bcdf6b4b3362495cba261b4f5ac59a87adb2d5e50deabdd6645ef4af97ec34a5440c0a1260053dc0a69ac733

data/bin/fgi

@@ -41,6 +41,10 @@ options_parser = OptionParser.new do |fgi|
     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
+
   fgi.on('-m', '--fix-message [MESSAGE]', %q(Add a custom message with the basic 'Fix #ID')) do |message|
     options[:fix_message] = message
   end

data/lib/fgi.rb

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

@@ -33,7 +33,7 @@ module Fgi
           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("'", ' '))
-          create_branch(branch_name) unless options[:later]
+          create_branch(name: branch_name, from_current: options[:from_current]) unless options[:later]
           set_issue_estimation(
             issue_id:    response['iid'],
             estimation:  options[:estimate],
@@ -63,6 +63,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 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]})"
@@ -167,14 +168,17 @@ module Fgi
 
       # The method used to create branches
       # @param name [String] the branch name
-      def create_branch(name)
+      def create_branch(name:, from_current:)
+        from = if from_current
+                 `git branch | grep '*'`.gsub('* ', '').chomp
+               else
+                 CONFIG[:default_branch]
+               end
         check_status
         git_remote = ask_for_remote
-        `git checkout #{CONFIG[:default_branch]}` # Be sure to be on the default branch.
-        from = `git branch | grep '*'`.gsub('* ', '').chomp
+        `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.
-        `git branch -u #{git_remote}/#{name}` # Define the upstream branch
         to = `git branch | grep '*'`.gsub('* ', '').chomp
         puts "\nYou are now working on branch #{to} created from #{from} !"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fgi
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Julien Philibin