fgi 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a0ffde84c1a16a07e897b066e94506ec6b1ad3
-  data.tar.gz: 874c8018ce7869ed6b1b717536c9f6097dbdd0a7
+  metadata.gz: 2c10109eb480ab557f79d477ff770b7b4113d079
+  data.tar.gz: a718badc264ab8b9483e11ec76082db9a04aac99
 SHA512:
-  metadata.gz: 6bcf02b36010ba314721677d9c770f5861278e17a64e87ba5aa09f35619e0b9148f4a8f4a9b7e3d8da396d2197413389bf639175a8e69e4a97391280e1782aa4
-  data.tar.gz: 88a160d8142c980b9731a753c9f598eb41edc8bb9d210d04c333ecd6c234a58169188a5d55d51ac42997147a494aaf5283ef34620dab0f1c7b0037876a67a821
+  metadata.gz: 7eab634762636cc11025a56296c9b20e3e8d767935c245db69acefc7313b8ed02646d1660737343d50bc71d75ac128d2cb775127777c6166745281ba78633a44
+  data.tar.gz: ce9f2d259e89d34e3ee9fb822d0b0dfa6516f71cf91b74d3a5f51dbffed28aea0ddf7077125d4cf567f789506586a3a390365b01992fe6ff14f77489b85cd12e

data/bin/fgi

@@ -14,17 +14,21 @@ 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 '    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 '    ... more comming soon ...'
   fgi.separator ''
   fgi.separator 'Options'
 
-  fgi.on('-e', '--estimate ESTIMATION', 'How many time do you think you will spend on this issue ?') do |estimate|
+  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 anly want to create an issue but not to create and switch branch.') do
+    options[:later] = true
+  end
+
   fgi.on('-h', '--help', 'Display the FGI manual') do
     puts options_parser
   end
@@ -51,7 +55,7 @@ when 'new'
     exit!
   end
   title = get_full_issue_title(argv)
-  Fgi::GitService.create_issue(title)
+  Fgi::GitService.create_issue(title: title, options: options)
 when 'token'
   Fgi.configured?
   Fgi::Tokens.add_token(argv[1])

data/lib/fgi/configuration.rb

@@ -28,17 +28,22 @@ module Fgi
         #    :routes
         #    :project_id
         #    :project_slug
+        #    :default_branch
         config                     = {}
 
         config[:git_service_class] = define_git_service
         config[:url]               = save_git_url
 
         # Instanciation of the Git service class
+        # TODO - HARD REFECTO NEEDED HERE...
         git_service                = config[:git_service_class].new(config: config)
         config[:git_service]       = git_service.to_sym
         user_token                 = save_user_token(git_service)
         project_name_and_id        = define_project_name_and_id(git_service, user_token)
         config                     = config.merge(project_name_and_id)
+        git_service                = config[:git_service_class].new(config: config)
+        config[:default_branch]    = define_default_branch(git_service, user_token)
+
 
         # -------------------------- #
         #          CREATORS          #
@@ -110,7 +115,12 @@ module Fgi
           input = STDIN.gets.chomp
           exit! if input == 'quit'
           # force scheme if not specified
-          input = "http://#{input}" if !input.start_with?('http://', 'https://')
+          # TODO - Find a way to clear this... Find the correct scheme.
+          input = if input.start_with?('gitlab.com')
+                    "https://#{input}"
+                  elsif !input.start_with?('http://', 'https://')
+                    "http://#{input}"
+                  end
           # Call the entered url to know if it exist or not.
           # If not, would raise an exception
           get(url: input)
@@ -145,6 +155,7 @@ module Fgi
           exit! if input == 'quit'
 
           url = "#{git_service.routes[:search_projects]}#{input}"
+
           response = get(url: url, headers: { git_service.token_header => user_token })
 
           if response[:status] == '200' && !response[:body].empty?
@@ -153,7 +164,13 @@ module Fgi
               puts "#{index+1} - #{project['name_with_namespace']}"
             end
 
-            validate_project_choice(response[:body])
+            puts "\nPlease insert the number of the current project :"
+            puts '-------------------------------------------------'
+            input = validate_choice(response[:body])
+            {
+              project_slug: response[:body][input - 1]['path_with_namespace'],
+              project_id:   response[:body][input - 1]['id']
+            }
 
           else
             puts "\nOops, we couldn't find a project called #{input}. Try again or quit (quit) :"
@@ -165,21 +182,39 @@ module Fgi
         end
       end
 
+      def define_default_branch(git_service, user_token)
+        puts "\nPlease define the default project branch :"
+        puts '------------------------------------------'
+
+        url = "#{git_service.routes[:branches]}"
+        response = get(url: url, headers: { git_service.token_header => user_token })
+
+        if response[:status] == '200' && !response[:body].empty?
+          begin
+            response[:body].each_with_index do |branch, index|
+              puts "#{index+1} - #{branch['name']}"
+            end
+
+            puts "\nPlease insert the number of the default project branch :"
+            puts '--------------------------------------------------------'
+            input = validate_choice(response[:body])
+            response[:body][input - 1]['name']
+
+          rescue Interrupt => int
+            exit!
+          end
+        end
+      end
 
-      def validate_project_choice(response_body)
-        puts "\nPlease insert the number of the current project :"
-        puts '---------------------------------------------------'
+      def validate_choice(response_body)
         input = STDIN.gets.chomp
         exit! if input == 'quit'
         input = input.to_i
         if (1..response_body.count).include?(input)
-          {
-            project_slug: response_body[input - 1]['path_with_namespace'],
-            project_id:   response_body[input - 1]['id']
-          }
+          input
         else
           puts "\nSorry, the option is out of range. Try again :"
-          validate_project_choice(response_body)
+          validate_choice(response_body)
         end
       end
 

data/lib/fgi/git_service.rb

@@ -12,7 +12,7 @@ module Fgi
         services
       end
 
-      def create_issue(title)
+      def create_issue(title: title, options: {})
         git_service = CONFIG[:git_service_class].new
         title = get_issue_title if title.nil?
         description = get_issue_description
@@ -21,8 +21,63 @@ module Fgi
         url_with_querystring = "#{git_service.routes[:issues]}?title=#{URI.encode(title)}&description=#{URI.encode(description)}"
 
         response = post(url: url_with_querystring, headers: headers)
+        response_body = JSON.parse(response[:body])
 
-        post_issue_display(JSON.parse(response[:body]))
+        post_issue_display(response_body)
+
+        if CONFIG[:default_branch].nil?
+          puts "\n/!\\ FGI IS NOT UP-TO-DATE /!\\"
+          puts 'We are not able to create and switch you to the new branch.'
+          puts 'Delete .config.fgi.yml and reconfigure fgi by running `fgi config`'
+        else
+          create_new_branch(title) unless response_body['iid'].nil? || options[:later]
+        end
+
+        unless options[:estimate].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]}/#{response_body['iid']}/time_estimate?duration=#{options[:estimate]}"
+          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 => e
+            response_body = response[:body]
+          end
+
+          post_estimation_display(response_body, options[:estimate])
+        end
+      end
+
+      def create_new_branch(issue_title)
+        branch_name = snakecase(issue_title)
+        unless %x(git status -s).empty?
+          begin
+            puts "\nThere are unsaved changes on your current branch."
+            puts "Do you want to see them ? (y/n)"
+            puts '-------------------------------'
+            input = STDIN.gets.chomp
+            system('git diff') if %w[y yes].include?(input)
+
+            puts "\nDo you want to COMMIT theses changes ? (y/n)"
+            puts '--------------------------------------------'
+            input = STDIN.gets.chomp
+            if %w[y yes].include?(input)
+              commit_changes
+            else
+              stash_changes
+            end
+
+          rescue Interrupt => int
+            puts %q"Why did you killed me ? :'("
+            exit!
+          end
+        end
+        %x(git checkout #{CONFIG[:default_branch]}) # Be sure to be on the default branch.
+        from = %x(git branch | grep '*').gsub('* ', '').chomp
+        %x(git pull origin HEAD) # Be sure to get the remote changes locally.
+        %x(git checkout -b #{branch_name}) # Create the new branch.
+        to = %x(git branch | grep '*').gsub('* ', '').chomp
+        puts "\nYou are now working on branch #{to} created from #{from} !"
       end
 
       private
@@ -50,16 +105,48 @@ module Fgi
       end
 
       def post_issue_display(response)
-        if !response['iid'].nil?
+        unless response['iid'].nil?
           puts 'Your issue has been successfully created.'
           puts 'To view it, please follow the link bellow :'
           puts "\n#{CONFIG[:url]}/#{CONFIG[:project_slug]}/issues/#{response['iid']}"
-          puts "\nThank you for using Fast Gitlab Issues!"
         else
           puts %q(Your issue couldn't be created. Check your FGI configuration.)
         end
       end
 
+      def post_estimation_display(response, estimation)
+        if response['human_time_estimate'].nil?
+          puts "\nWe weren't able to save your estimation."
+          puts "You'll have to do it manually on #{CONFIG[:git_service].capitalize}."
+        else
+          puts "\nYou have #{estimation} to resolve this issue. Good luck ;)"
+        end
+      end
+
+      def commit_changes
+        puts 'Enter your commit message :'
+        commit_message = STDIN.gets.chomp
+        %x(git add .)
+        %x(git commit -am '#{commit_message}')
+        puts 'Your changes have been commited !'
+      end
+
+      def stash_changes
+        %x(git add .)
+        %x(git stash)
+        puts "\nYour changes have been stashed."
+        puts "We will let you manually `git stash pop` to get your work back if needed.\n"
+      end
+
+      def snakecase(string)
+        string.gsub(/::/, '/').
+               gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+               gsub(/([a-z\d])([A-Z])/,'\1_\2').
+               tr('-', '_').
+               tr(' ', '_').
+               downcase
+      end
+
     end
   end
 end

data/lib/fgi/git_services/gitlab.rb

@@ -9,7 +9,8 @@ module Fgi
         @routes = {
                      projects: "#{config[:url]}/api/#{@version}/projects",
                      search_projects: "#{config[:url]}/api/#{@version}/projects?search=",
-                     issues: "#{config[:url]}/api/#{@version}/projects/#{config[:project_id]}/issues"
+                     issues: "#{config[:url]}/api/#{@version}/projects/#{config[:project_id]}/issues",
+                     branches: "#{config[:url]}/api/#{@version}/projects/#{config[:project_id]}/repository/branches"
                    }
       end
 

data/lib/fgi/http_requests.rb

@@ -27,6 +27,7 @@ module Fgi
       # @param body [Hash] the body to set for the request
       # @return [String] the received response from the Git service API
       def http_request(verb:, url:, headers: nil, body: nil)
+        is_https = url.start_with?('https')
         uri = URI.parse(url)
         req = case verb
               when :get
@@ -40,7 +41,7 @@ module Fgi
         # Set body if given
         req.body = body.to_json unless body.nil?
 
-        res = Net::HTTP.start(uri.host, uri.port) do |http|
+        res = Net::HTTP.start(uri.host, uri.port, use_ssl: is_https) do |http|
           http.request(req)
         end
 

metadata

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