fgi 0.2.6.2 → 0.2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6b83bfa515632d441dfe973d5cef26db17cc47a
-  data.tar.gz: 620554f320cb674a2d478139de5df1643c6d7307
+  metadata.gz: 4cccd7a5b745ba11b6a6b1587d74a6766e0d017c
+  data.tar.gz: 580b1cc6fcbbefb0d551904de1027e849f8328dd
 SHA512:
-  metadata.gz: a69539d110e1dafdf47748e4cd63d36923d71e6239b4613d63531da24c629795b5e40f69ce4e3a1b723388410aafa489ae7a4ecf1d6356ab4b99feec3dfc4a9a
-  data.tar.gz: ff2efbf77202b2cd67bb2c0fe3542c8d50dabce4fd95ddf5c013489d63e6773cb23a0fe61927ef7418cb55221a5fc324ab01a6d86128631677d6522e48e03d42
+  metadata.gz: 077e1f8ace7e2f006e6429603836af1934219c9dc5811f63676794340700ed819d4ac03e65cdbfdbd4bdf8480219b21e8c30a40d17082e7c77d2ef2f1b126236
+  data.tar.gz: edc81dfbb587b2990e22e341f34adeaa97589d931779fef12371107c7c1ef7c7a15e167c5dcfe6eb1bf38a184fbc15430f5f1e9926266956b7efd8403e3ff2fe

data/README.md

@@ -2,18 +2,19 @@
 
 ## Welcome to Fast Gitlab Issues!
 
-Fast Gitlab Issues, aka Fgi, is a command line issue creation tool for Gitlab.
+Fast Gitlab Issues, aka Fgi, is a command line issue creation tool for Gitlab v8.8+.
 
 To install, add the following to your project's Gemfile:
 
 ```ruby
-gem 'fgi', git: 'git@source.modulotech.fr:modulotech/fgi.git'
+gem 'fgi', git: 'https://github.com/moduloTech/fast-gitlab-issues.git'
 ```
 
 And run `bundle install`.
 
 After it finishes, run `$ fgi --config` if the gem is new to the project, or run `$ fgi --token <token>` if you are new to the project and fgi was previously installed.
 
+You can create your token from Gitlab -> Settings -> Access Tokens
 From then on, create your issues from the console:
 
 ```sh
@@ -31,4 +32,4 @@ $ fgi --token \<token\> \# saves the private gitlab token to a file and adds it
 
 The config will ask you for your gitlab access token (you can get it from AF2) and the project URL from gitlab.
 
-Any bugs/requests please open an issue, feel free to use fgi to do so!
+Any bugs/requests please open an issue, feel free to use fgi to do so!

data/exe/fgi

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'open3'
-require "fgi"
+require 'uri'
+require 'net/http'
+require_relative '../lib/fgi'
 
 # extract core logic from here into the gem bin
 module Fgi
@@ -17,23 +19,25 @@ module Fgi
       when content.match(/--config/)
         Fgi::Configurator.run
       when content.match(/--token/)
-        Fgi::Configurator.save_gitlab_token(content.strip.split(' ').last)
+        Fgi::Configurator.validate_and_save_gitlab_token(content.strip.split(' ').last)
       else
-        title = content
-        description = []
-        success = system("vim temp.txt")
-        if success
-          File.open("temp.txt", "r") do |f|
-            f.each_line do |line|
-              description << line
-            end
-          end
-          # convert the description of the issue into a string we can use in a curl request
-          description = description.join
-        end
-        Fgi::Executor.new.process_data(title, description)
+        create_issue(content)
       end
     end
+
+    # Get the issue's description and initiate its creation
+    # @param title [String] the issue's title
+    def create_issue(title)
+      puts "\nWrite your issue description right bellow (save and quit with CTRL+D) :"
+      puts "---------------------------------------------------------------------\n\n"
+      begin
+        description = STDIN.read
+      rescue Interrupt => int
+        puts %q[Why did you killed me ? :'(]
+        exit!
+      end
+      Fgi::Executor.new.process_data(title, description)
+    end
   end
 end
 

data/fgi.gemspec

@@ -4,23 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fgi/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "fgi"
+  spec.name          = 'fgi'
   spec.version       = Fgi::VERSION
-  spec.authors       = ["Julien PHILIBIN", "Pedro Coutinho"]
-  spec.email         = ["philib_j@modulotech.fr"]
+  spec.authors       = ['Julien Philibin', 'Pedro Coutinho', 'Matthieu Gourvénec']
+  spec.email         = ['philib_j@modulotech.fr']
 
-  spec.summary       = %q{CLI for gitlab.}
-  spec.description   = %q{Fast Gitlab Issues.}
-  spec.homepage      = "https://www.modulotech.fr"
+  spec.summary       = 'CLI for gitlab.'
+  spec.description   = 'Fast Gitlab Issues.'
+  spec.homepage      = 'https://www.modulotech.fr'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/fgi.rb

@@ -6,13 +6,13 @@ require 'json'
 module Fgi
   class << self
   end
-  autoload :Config, 'fgi/config'
-  autoload :Version, 'fgi/version'
-  autoload :Executor, 'fgi/executor'
-  autoload :HTMLRequest, 'fgi/html_request'
-  autoload :Helper, 'fgi/helper'
-  autoload :Configurator, 'fgi/configurator'
-  autoload :GenerateFile, 'fgi/generate_file'
+  require_relative 'fgi/config'
+  require_relative 'fgi/version'
+  require_relative 'fgi/executor'
+  require_relative 'fgi/html_request'
+  require_relative 'fgi/helper'
+  require_relative 'fgi/configurator'
+  require_relative 'fgi/generate_file'
 
   CONFIG_FILE = '.fast_gitlab_issues.yml'
 end

data/lib/fgi/configurator.rb

@@ -1,83 +1,161 @@
 module Fgi
   class Configurator
     class << self
+
       def run
         @config = Fgi::Config.current
-        not_git_directory = !File.exist?(File.expand_path('.gitignore'))
-        puts "This doesn't seem to be the root of a git repository, browse to the root of your project and try again." if not_git_directory
-        return if not_git_directory
-        puts ''
+        is_git_dir?
         puts '####################################################################'
         puts '            Welcome to Fast Gitlab Issues configuration             '
-        puts '####################################################################'
-        puts ''
-        puts "Please enter your Gitlab access token:"
+        puts "####################################################################\n\n"
+        puts "#### Enter 'quit' or 'exit' at any time to go back to buisness! ####\n\n"
+
+        puts 'Please enter your Gitlab Url:'
+        validate_and_save_gitlab_uri
+
+        puts "\nPlease enter your Gitlab access token :"
+        puts "(You can generate new token from Gitlab -> Settings -> Access Tokens)"
+        puts '---------------------------------------'
         validate_and_save_gitlab_token
-        puts "Please paste the project url:"
-        get_id_from_gitlab
-        File.open('.fast_gitlab_issues.yml', 'w') {|f| f.write @config.to_yaml }
-        puts "You are now set to work on #{@config[:project_namespaced]}."
-        puts "Your configuration has been saved to .fast_gitlab_issues.yml, enjoy!"
-        puts ''
-        puts '####################################################################'
+
+        puts "\nPlease enter the name of the current project :"
+        puts '----------------------------------------------'
+        search_and_save_project
+
+        File.open('.fast_gitlab_issues.yml', 'w') { |f| f.write @config.to_yaml }
+        puts "\nYou are now set to work on #{@config[:project_namespaced]}."
+        puts 'Your configuration has been saved to .fast_gitlab_issues.yml, enjoy !'
+        puts "\n####################################################################"
       end
 
-      def get_id_from_gitlab
-        puts 'example: http://YOUR_GITLAB_URL/modulotech/fast-gitlab-issues'
-        @uri = URI.parse(STDIN.gets.chomp)
-        @config[:url] = "#{@uri.scheme}://#{@uri.host}"
-        uri = URI.parse("#{@config[:url]}/api/v4/projects?search=#{@uri.path.split('/').last}")
-        Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-          req = Net::HTTP::Get.new uri
-          req['Authorization'] = "Bearer #{@token}"
-          @response = JSON.parse(http.request(req).body)
-        end
-        if !@response[0].nil?
-          puts "Found #{@response.count} match(es):"
-          @response.each_with_index do |response, i|
-            puts "#{i+1} - #{response['name_with_namespace']}"
+      def validate_and_save_gitlab_token(inline_token = nil)
+        begin
+          @token = if inline_token.nil?
+                     STDIN.gets.chomp
+                   else
+                     set_config
+                     inline_token
+                   end
+          if %w(quit exit).include?(@token)
+            puts 'See you back soon !'
+            exit!
           end
-          puts "Please insert the number of the current project:"
-          @option = STDIN.gets.chomp.to_i
-          validate_option
-        else
-          puts "We couldn't find a project called #{@uri.path.split('/').last}, can you please double check that url?"
-          get_id_from_gitlab
+        rescue Interrupt => int
+          puts %q[Why did you killed me ? :'(]
+          exit!
         end
-      end
+        @projects_uri = "#{@config[:url]}/api/v4/projects"
+
+        req = Net::HTTP::Get.new(@projects_uri)
+        req['PRIVATE-TOKEN'] = @token
+        res = Net::HTTP.start(@uri.hostname, @uri.port) { |http| http.request(req) }
 
-      def validate_option
-        if (1..@response.length+1).include?(@option)
-          @config[:project_gitlab_id] = @response[@option - 1]["id"]
-          @config[:project_namespaced] = @response[@option - 1]["path_with_namespace"]
+        if res.code == '200'
+          save_gitlab_token
         else
-          puts "Sorry, the option is out of range, try again:"
-          @option = STDIN.gets.chomp.to_i
-          validate_option
+          puts "\nOops, seems to be an invalid token. Try again or quit (quit/exit) :"
+          puts '--------------------------------------------------------------'
+          validate_and_save_gitlab_token
         end
       end
 
-      def validate_and_save_gitlab_token
-        @token = STDIN.gets.chomp
-        if @token.length > 30
-          save_gitlab_token(@token)
-        else
-          puts "That doesn't seem to be a valid token, can you please check again?"
-          validate_and_save_gitlab_token
+      private
+
+      def validate_and_save_gitlab_uri
+        puts 'example: http://gitlab.example.com/'
+        puts '-----------------------------------'
+        begin
+          input = STDIN.gets.chomp
+          if %w(quit exit).include?(input)
+            puts 'See you back soon !'
+            exit!
+          end
+          input = "http://#{input}" if !input.start_with?('http://', 'https://')
+          @uri = URI.parse("#{input}/")
+          @config[:url] = "#{@uri.scheme}://#{@uri.host}"
+          req = Net::HTTP.new(@uri.host, @uri.port)
+          res = req.request_head(@uri.path)
+        rescue Interrupt => int
+          puts %q[Why did you killed me ? :'(]
+          exit!
+        rescue Exception => e
+          puts "\nOops, seems to be a bad url. Try again or quit (quit/exit) :"
+          validate_and_save_gitlab_uri
         end
       end
 
-      def save_gitlab_token(token)
-        @token = token
-        File.open('.gitlab_access_token', 'w') {|f| f.write @token }
+      def save_gitlab_token
+        File.open('.gitlab_access_token', 'w') { |f| f.write @token }
         if File.open('.gitignore').grep(/.gitlab_access_token/).empty?
           open('.gitignore', 'a') do |f|
             f.puts ''
-            f.puts "# Gfi secret token for gitlab"
-            f.puts ".gitlab_access_token"
+            f.puts '# Gfi secret token for gitlab'
+            f.puts '.gitlab_access_token'
           end
         end
-        puts "Gitlab secret token successfully saved to file and added to .gitignore."
+        puts "\nGitlab secret token successfully saved to file and added to .gitignore."
+      end
+
+      def search_and_save_project
+        begin
+          project_name = STDIN.gets.chomp
+          if %w(quit exit).include?(project_name)
+            puts 'See you back soon !'
+            exit!
+          end
+        rescue Interrupt => int
+          puts %q[Why did you killed me ? :'(]
+          exit!
+        end
+
+        req = Net::HTTP::Get.new("#{@projects_uri}?search=#{project_name}")
+        req['PRIVATE-TOKEN'] = @token
+        res = Net::HTTP.start(@uri.hostname, @uri.port) { |http| http.request(req) }
+
+        results = JSON.parse(res.body)
+        if res.code == '200' && !results.empty?
+          puts "\nFound #{results.count} match(es):"
+          results.each_with_index do |result, i|
+            puts "#{i+1} - #{result['name_with_namespace']}"
+          end
+          validate_option(results)
+        else
+          puts "\nOops, we couldn't find a project called #{project_name}. Try again or quit (quit/exit) :"
+          puts '-------------------------------------------------------------------'+('-'*project_name.length) # Yes, i'm a perfectionist <3
+          search_and_save_project
+        end
+      end
+
+      def validate_option(results)
+        puts "\nPlease insert the number of the current project :"
+        puts '-------------------------------------------------'
+        begin
+          option = STDIN.gets.chomp.to_i
+        rescue Interrupt => int
+          puts %q[Why did you killed me ? :'(]
+          exit!
+        end
+        if (1..results.length+1).include?(option)
+          @config[:project_gitlab_id] = results[option - 1]['id']
+          @config[:project_namespaced] = results[option - 1]['path_with_namespace']
+        else
+          puts "\nSorry, the option is out of range. Try again :"
+          validate_option(results)
+        end
+      end
+
+      def set_config
+        config_file = File.expand_path(CONFIG_FILE)
+        @config = YAML.load_file(config_file)
+        @uri = URI.parse(@config[:url])
+      end
+
+      def is_git_dir?
+        is_git_directory = Dir.exists?('.git')
+        if !is_git_directory
+          puts %q(This doesn't seem to be the root of a git repository, browse to the root of your project and try again.)
+          return
+        end
       end
     end
   end

data/lib/fgi/html_request.rb

@@ -1,30 +1,36 @@
 module Fgi
   class HTMLRequest
+
     def initialize(title, description)
       @title = title
       @description = description
     end
+
     def push
       uri = URI.parse(generate_link)
+      req = Net::HTTP::Post.new uri
+      req['PRIVATE-TOKEN'] = Fgi::Config[:token]
+
       Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-        req = Net::HTTP::Post.new uri
-        req['Authorization'] = "Bearer #{Fgi::Config[:token]}"
         @response = JSON.parse(http.request(req).body)
       end
-      if !@response["iid"].nil?
-        puts "Your issue has been sucessfully created."
-        puts "To view it, please follow the link bellow:"
-        puts ""
-        puts "     #{Fgi::Config[:url]}/#{Fgi::Config[:project_namespaced]}/issues/#{@response["iid"].to_s}"
-        puts ""
-        puts "Thank you for using Fast Gitlab Issues!"
+
+      if !@response['iid'].nil?
+        puts 'Your issue has been sucessfully created.'
+        puts 'To view it, please follow the link bellow:'
+        puts ''
+        puts "#{Fgi::Config[:url]}/#{Fgi::Config[:project_namespaced]}/issues/#{@response['iid'].to_s}"
+        puts ''
+        puts 'Thank you for using Fast Gitlab Issues!'
       else
-        puts "I'm not really sure what happened, but I believe something went wrong."
-        puts "CALL HELP!!!"
+        puts %q(I'm not really sure what happened, but I believe something went wrong.)
+        puts 'CALL HELP!!!'
       end
     end
+
     def generate_link
-      Fgi::Config[:url] + "/api/v4/projects/" + Fgi::Config[:project_gitlab_id].to_s + "/issues?title=" + URI.encode(@title) + '&description=' + URI.encode(@description)
+      Fgi::Config[:url] + '/api/v4/projects/' + Fgi::Config[:project_gitlab_id].to_s + '/issues?title=' + URI.encode(@title) + '&description=' + URI.encode(@description)
     end
+
   end
 end

data/lib/fgi/version.rb

@@ -1,3 +1,3 @@
 module Fgi
-  VERSION = "0.2.6.2"
+  VERSION = "0.2.6.3"
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fgi
 version: !ruby/object:Gem::Version
-  version: 0.2.6.2
+  version: 0.2.6.3
 platform: ruby
 authors:
-- Julien PHILIBIN
+- Julien Philibin
 - Pedro Coutinho
+- Matthieu Gourvénec
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler