ghedsh 1.1.28 → 1.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17a76ca53bff0b058e4e19d2be8c227326ef34b1
-  data.tar.gz: 4fb73850d929ea7bd6edd6d9aa27f54c9dcb3802
+  metadata.gz: 6cab8913900ed4610a1f804f2c229020ac93e2fc
+  data.tar.gz: d1278ce2803f79eda19a96cbfa7641844838b2e8
 SHA512:
-  metadata.gz: 28a8b03e9a751adb7a91d8847da018f0dcb7be9544c650d92f27ce4297a132a1a892c9cbd3e83c5e4491f5747636aa21125d0fa6a22275d3971ddee5e188c764
-  data.tar.gz: d4b2242379e55bb41d5d32552678aba271d41f7b53ae72483d88aad9edd29432bf7e929329846dbf29640646b31838cb564ceb6a6c578c6043dcda375783a423
+  metadata.gz: 120f161ceb9f25cf456afee6136f350a3c739c5a74c437ece463964b92488050cc401ba413e4a25412a61bb84fc5145b6a3252ce14fd938556ff704c4cfe233f
+  data.tar.gz: f10b759370d2d7ef93374438e2c6273578901ad32850e2155748d66c0165a151e876db8c896e3009c8b2ca9fe3550d1c0f22b58a1f4b0f1f1968710afad046db

data/README.md

@@ -168,15 +168,15 @@ add_people_info	<file>
 ```
 Añade informacion extendida de los miembros de una organizacion mediante un archivo .csv.
 
-Formato y campos de la informacion añadida:
+Formato y campos de la informacion añadida: La primera linea del archivo .csv debera indicar el nombre de los campos que seran recogidos por el sistema.
 
-> github, id, nombre, apellido, emails, organizaciones, urls
+> "github", "id", "nombre", "apellido", "emails", "organizaciones", "urls"
 
-Ejemplo del contenido del archivo .csv. Cada linea representara los datos de un alumno, poniendo comillas se podra añadir varios valores en los campos de email, organizaciones y las urls.
+Ejemplo del contenido del archivo .csv. A partir de la primera linea de campos, cada nueva linea representara los datos de un alumno. Poniendo dobles comillas se podra añadir varios valores en un mismo campo.
 
-> studentbeta,alu1342,Pedro,Garcia Perez,"alu1342@ull.edu.es, pedrogarciaperez@gmail.com","classroom-testing, SYTW1617","http://campusvirtual.ull.es/aluXXX, http://pegarpe.github.io"
+> "studentbeta","alu1342","Pedro,Garcia Perez,""alu1342@ull.edu.es, pedrogarciaperez@gmail.com"",""classroom-testing, SYTW1617"",""http://campusvirtual.ull.es/aluXXX, http://pegarpe.github.io""
 
-> studentalpha1,alu321,Paco,Gutierrez,"alu321@ull.edu.es, pacogutierrez@gmail.com","classroom-testing, SYTW1617","http://campusvirtual.ull.es/aluXXX, http://st.github.io"
+> "studentalpha1","alu321","Paco","Gutierrez","alu321@ull.edu.es","classroom-testing",","http://st.github.com"
 
 
 ```sh

data/lib/actions/help.rb

@@ -25,6 +25,8 @@ class HelpM
     print "\n\tCOMMAND\t\t\tDESCRIPTION\n\n"
     print "\trepos\t\t\tList the repositories of your organization\n"
     print "\topen\t\t\tOpen the organization's url of github in your web browser.\n"
+    print "\t\t\t\tIf you have added the aditional .csv information with, you can open an specific github profile.\n"
+    print "\t\t\t\t->\topen [user]\n\n"
     print "\tclone\t\t\tClone a repository or a list of repositories using a regular expresion\n"
     print "\tset\t\t\tMove you to a specific repository\n"
     print "\tpeople\t\t\tShow the members of an organization\n"
@@ -34,11 +36,13 @@ class HelpM
     print "\t\t\t\tTo find a specific member extended info, you can give the github id as parameter.\n"
     print "\t\t\t\t->\tpeople info [github id]\n\n"
     print "\tteams\t\t\tTeams of a organization\n"
-    print "\tadd_people_info\t\tGet extended information from a .csv file founded in the excecute path\n"
-    print "\t\t\t\t->\tadd_people_info [name of the file]\n\n"
+    print "\tnew_people_info\t\tGet extended information from a .csv file founded in the excecute path\n"
+    print "\t\t\t\t->\tnew_people_info [name of the file]\n\n"
     print "\tassignments\t\tShow the list of assignments created\n"
     print "\tnew_assignment\t\tCreate an Assignment in your organization\n"
     print "\tgroups\t\t\tShow the list of groups with each team and user that it has\n"
+    print "\tgroup\t\t\tShow the information of an specific group\n"
+    print "\t\t\t\t->\tgroup [name of the group]\n\n"
     print "\tnew_group\t\tCreate a new group. Expected the name and teams given one by one\n"
     print "\t\t\t\t->\tnew_group [name of the group] [team1] [team2] [team3] ... \n\n"
     print "\trm_group\t\tDelete a created group\n"
@@ -61,8 +65,8 @@ class HelpM
     print "\tissues\t\t\tShow the list of issues from the repository\n"
     print "\tissue\t\t\tShow the issue and its comments\n"
     print "\t\t\t\t->\tissue [Id of the issue]\n\n"
-    print "\tadd_issue_comment\tAdd a comment in a specific issue\n"
-    print "\t\t\t\t->\tadd_issue_comment [Id of the issue]\n\n"
+    print "\tnew_issue_comment\tAdd a comment in a specific issue\n"
+    print "\t\t\t\t->\tnew_issue_comment [Id of the issue]\n\n"
     print "\topen_issue\t\tOpen a closed issue\n"
     print "\t\t\t\t->\topen_issue [Id of the issue]\n\n"
     print "\tclose_issue\t\tClose an opened issue\n"
@@ -97,8 +101,8 @@ class HelpM
     print "\tissues\t\t\tShow the list of issues from the repository\n"
     print "\tissue\t\t\tShow the issue and its comments\n"
     print "\t\t\t\t->\tissue [Id of the issue]\n\n"
-    print "\tadd_issue_comment\tAdd a comment in a specific issue\n"
-    print "\t\t\t\->\tadd_issue_comment [Id of the issue]\n\n"
+    print "\tnew_issue_comment\tAdd a comment in a specific issue\n"
+    print "\t\t\t\->\tnew_issue_comment [Id of the issue]\n\n"
     print "\topen_issue\t\tOpen a closed issue\n"
     print "\t\t\t\t->\topen_issue [Id of the issue]\n\n"
     print "\tclose_issue\t\tClose an opened issue\n"
@@ -121,8 +125,8 @@ class HelpM
     print "\tnew_issue\t\tCreates a new issue\n"
     print "\tissues\t\t\tShow the list of issues from the repository\n"
     print "\tissue\t\t\tShow the issue and its comments\n"
-    print "\tadd_issue_comment\tAdd a comment in a specific issue\n"
-    print "\t\t\t\t->\tadd_issue_comment [Id of the issue]\n\n"
+    print "\tnew_issue_comment\tAdd a comment in a specific issue\n"
+    print "\t\t\t\t->\tnew_issue_comment [Id of the issue]\n\n"
     print "\t\t\t\t->\tissue [Id of the issue]\n\n"
     print "\topen_issue\t\tOpen a closed issue\n"
     print "\t\t\t\t->\topen_issue [Id of the issue]\n\n"

data/lib/actions/orgs.rb

@@ -6,6 +6,8 @@ require 'require_all'
 require_rel '.'
 require 'readline'
 
+GITHUB_LIST=['githubid','idgithub','github_id','id_github','githubuser','github_user']
+
 class Organizations
 
   attr_accessor :orgslist
@@ -286,6 +288,8 @@ class Organizations
   #Takes people info froma a csv file and gets into ghedsh people information
   def add_people_info(client,config,file)
     list=self.load_people()
+    csvoptions={:quote_char => "|",:headers=>true}
+
     inpeople=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
     if inpeople==nil
       list["orgs"].push({"name"=>config["Org"],"users"=>[]})
@@ -297,21 +301,28 @@ class Organizations
     end
     if File.exist?(file)
       begin
-        mem = CSV.read(file,:quote_char => "|")
+        mem = CSV.read(file,csvoptions)
       rescue
         print "Invalid csv format."
       end
+      fields=mem.headers
       users=Hash.new;
       users=[]
+      puts "\nFields found: "
+      puts fields
       mem.each do |i|
         aux=Hash.new
-        aux["github"]=i[0]
-        aux["id"]=i[1]
-        aux["name"]=i[2]
-        aux["surname"]=i[3]
-        aux["emails"]=i[4]
-        aux["orgs"]=i[5]
-        aux["urls"]=i[6]
+        fields.each do |j|
+          if i[j]!=nil
+            if GITHUB_LIST.include?(j.gsub("\"", "").downcase)
+              aux["github"]=i[j].gsub("\"", "").strip
+            else
+              aux[j.gsub("\"", "").downcase]=i[j].gsub("\"", "").strip
+            end
+          else
+            aux[j.gsub("\"", "").downcase]=i[j]
+          end
+        end
         users<< aux
       end
 
@@ -326,12 +337,11 @@ class Organizations
           else
             puts "The information is different thant the original. Do you want to change it?"
             puts "\n Github:\t#{here["github"]} -> #{i["github"]}"
-            puts " ID:\t\t#{here["id"]} -> #{i["id"]}"
-            puts " Name:\t\t#{here["name"]} -> #{i["name"]}"
-            puts " Surname:\t#{here["surname"]} -> #{i["surname"]}"
-            puts " Emails:\t#{here["emails"]} -> #{i["emails"]}"
-            puts " Organizations:\t#{here["orgs"]} -> #{i["orgs"]}"
-            puts " Urls:\t\t#{here["urls"]} -> #{i["urls"]}"
+
+            fields.each do |j|
+              puts " #{j} :\t\t#{here[j.gsub("\"", "").downcase]} -> #{i[j.gsub("\"", "").downcase]}"
+            end
+
             puts "\nPress any key and enter to proceed, or only enter to skip: "
             op=gets.chomp
             if op!=""
@@ -356,36 +366,33 @@ class Organizations
   def show_people_info(client,config,user)
     list=self.load_people()
     inpeople=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
+    peopleinfolist=[]
+
     if inpeople==nil
       list["orgs"].push({"name"=>config["Org"],"users"=>[]})
       Sys.new.save_people("#{ENV['HOME']}/.ghedsh",list)
       puts "Extended information has not been added yet"
     else
       if user==nil
+        fields=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"][0].keys
         list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].each do |i|
-          puts "\n#{i["github"]}"
-          puts "\n Github:\t #{i["github"]}"
-          puts " ID:\t\t #{i["id"]}"
-          puts " Name:\t\t #{i["name"]}"
-          puts " Surname:\t #{i["surname"]}"
-          puts " Emails:\t #{i["emails"]}"
-          puts " Organizations:\t #{i["orgs"]}"
-          puts " Urls:\t\t #{i["urls"]}"
-          puts
+          puts "\n\e[31m#{i["github"]}\e[0m"
+          fields.each do |j|
+            puts "#{j.capitalize}:\t #{i[j]}"
+          end
+          peopleinfolist<<i["github"]
         end
+        return peopleinfolist
       else
         inuser=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["github"]==user}
         if inuser==nil
           puts "Not extended information has been added of that user."
         else
-          puts "\n#{inuser["github"]}"
-          puts "\n Github:\t #{inuser["github"]}"
-          puts " ID:\t\t #{inuser["id"]}"
-          puts " Name:\t\t #{inuser["name"]}"
-          puts " Surname:\t #{inuser["surname"]}"
-          puts " Emails:\t #{inuser["emails"]}"
-          puts " Organizations:\t #{inuser["orgs"]}"
-          puts " Urls:\t\t #{inuser["urls"]}"
+          fields=inuser.keys
+          puts "\n\e[31m#{inuser["github"]}\e[0m"
+          fields.each do |j|
+            puts "#{j.capitalize}:\t #{inuser[j]}"
+          end
           puts
         end
       end
@@ -449,4 +456,35 @@ class Organizations
     end
   end
 
+  def open_user_url(client,config,user)
+    list=self.load_people()
+    inpeople=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
+    found=0
+    if inpeople==nil
+      list["orgs"].push({"name"=>config["Org"],"users"=>[]})
+      Sys.new.save_people("#{ENV['HOME']}/.ghedsh",list)
+      puts "Extended information has not been added yet"
+    else
+      inuser=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["github"]==user}
+      if inuser==nil
+        puts "Not extended information has been added of that user."
+      else
+        inuser.each_value do |j|
+          if j.include?("github.com")
+            case
+            when RUBY_PLATFORM.downcase.include?("darwin")
+              system("open #{j}")
+            when RUBY_PLATFORM.downcase.include?("linux")
+              system("xdg-open #{j}")
+            end
+            found=1
+          end
+        end
+        if found==0
+          puts "No github web profile in the aditional information"
+        end
+      end
+    end
+  end
+
 end

data/lib/actions/repo.rb

@@ -92,10 +92,10 @@ class Repositories
   end
 
   def create_issue(client,config,scope,path)
-    tittle=""
-    while tittle==""
-      puts "\nInsert Issue tittle: "
-      tittle=gets.chomp
+    title=""
+    while title==""
+      puts "\nInsert Issue title: "
+      title=gets.chomp
     end
     puts "Write the description in you editor, press enter when you finish "
 
@@ -105,7 +105,7 @@ class Repositories
       editor=ENV["EDITOR"]
     end
 
-    system("#{editor} #{path}/temp.txt &")
+    system("#{editor} #{path}/temp.txt")
     gets
     begin
       desc=File.read("#{path}/temp.txt")
@@ -113,7 +113,7 @@ class Repositories
       puts "Empty description"
     end
     puts "This issue is gonna be created"
-    puts "\ntitle: #{tittle}"
+    puts "\ntitle: #{title}"
     puts "\n--------------------------------------"
     puts desc
     puts "--------------------------------------"
@@ -123,12 +123,12 @@ class Repositories
       case
       when scope==USER_REPO
         if config["Repo"].split("/").size == 1
-          client.create_issue(config["User"]+"/"+config["Repo"],tittle,desc)
+          client.create_issue(config["User"]+"/"+config["Repo"],title,desc)
         else
-          client.create_issue(config["Repo"],tittle,desc)
+          client.create_issue(config["Repo"],title,desc)
         end
       when scope==ORGS_REPO || scope==TEAM_REPO
-        client.create_issue(config["Org"]+"/"+config["Repo"],tittle,desc)
+        client.create_issue(config["Org"]+"/"+config["Repo"],title,desc)
       end
       puts "Issue correctly created"
     else
@@ -208,7 +208,7 @@ class Repositories
           puts "  --------------------------------------"
           puts "  Author: #{i[:user][:login]}"
           puts "  ##{i[:number]} state: #{i[:state]}"
-          puts "  Tittle: #{i[:title]}"
+          puts "  title: #{i[:title]}"
           puts "  --------------------------------------"
           puts "\n#{i[:body]}"
           issfound=1
@@ -257,48 +257,70 @@ class Repositories
 
   #add issue comment
   def add_issue_cm(client,config,scope,id,path)
-    puts "Write the description in you editor, press enter when you finish "
+    if self.issue_exist?(client,config,scope,id)
+      puts "Write the description in you editor, press enter when you finish "
 
-    if ENV["EDITOR"]==nil
-      editor="vi"
-    else
-      editor=ENV["EDITOR"]
-    end
-    system("#{editor} #{path}/temp.txt")
-    gets
-    begin
-      desc=File.read("#{path}/temp.txt")
-    rescue
-      puts "Empty description"
-    end
+      if ENV["EDITOR"]==nil
+        editor="vi"
+      else
+        editor=ENV["EDITOR"]
+      end
+      system("#{editor} #{path}/temp.txt")
+      gets
+      begin
+        desc=File.read("#{path}/temp.txt")
+      rescue
+        puts "Empty description"
+      end
 
-    puts "This comment is gonna be created"
-    puts "\n--------------------------------------"
-    puts desc
-    puts "--------------------------------------"
-    puts "\nTo proceed press enter, or to discard press any key and enter"
-    an=gets.chomp
+      puts "This comment is gonna be created"
+      puts "\n--------------------------------------"
+      puts desc
+      puts "--------------------------------------"
+      puts "\nTo proceed press enter, or to discard press any key and enter"
+      an=gets.chomp
 
-    if an==""
-      begin
-        case
-        when scope==USER_REPO
-          if config["Repo"].split("/").size == 1
-            client.add_comment(config["User"]+"/"+config["Repo"],id,desc)
-          else
-            client.add_comment(config["Repo"],id,desc)
+      if an==""
+        begin
+          case
+          when scope==USER_REPO
+            if config["Repo"].split("/").size == 1
+              client.add_comment(config["User"]+"/"+config["Repo"],id,desc)
+            else
+              client.add_comment(config["Repo"],id,desc)
+            end
+          when scope==ORGS_REPO || scope==TEAM_REPO
+            client.add_comment(config["Org"]+"/"+config["Repo"],id,desc)
           end
-        when scope==ORGS_REPO || scope==TEAM_REPO
-          client.add_comment(config["Org"]+"/"+config["Repo"],id,desc)
+          puts "Comment created"
+        rescue
+          puts "Issue not found"
         end
-        puts "Comment created"
-      rescue
-        puts "Issue not found"
+      else
+        puts "comment not created"
       end
+      Sys.new().remove_temp("#{path}/temp.txt")
     else
-      puts "comment not created"
+      puts "Issue not found"
     end
-    Sys.new().remove_temp("#{path}/temp.txt")
+  end
+
+  def issue_exist?(client,config,scope,id)
+    begin
+      case
+      when scope==USER_REPO
+        if config["Repo"].split("/").size == 1
+          client.issue(config["User"]+"/"+config["Repo"],id)
+        else
+          client.issue(config["Repo"],id)
+        end
+      when scope==ORGS_REPO || scope==TEAM_REPO
+        client.issue(config["Org"]+"/"+config["Repo"],id)
+      end
+    rescue
+      return false
+    end
+      return true
   end
 
   #Show repositories and return a list of them

data/lib/actions/system.rb

@@ -11,7 +11,7 @@ class Sys
   attr_reader :memory
   LIST = ['repos', 'exit', 'orgs','help', 'people','teams', 'cd ', 'cd repo ','commits','forks', 'add_team_member ','new_team ','rm_team ','new_repository ','new_assignment ','clone ', 'issues',
     'version', 'cat ', 'groups', 'files', 'assignments','new_issue ', 'open_issue', 'new_','open_', 'close_issue', 'new_group ', 'rm_group', 'rm_', 'do ', 'info','make','add_repo',
-    'add_group','rm_repository ', 'add_people_info ', 'private ', 'people info ', 'add_issue_comment '].sort
+    'add_group','rm_repository ', 'new_people_info ', 'private ', 'people info ', 'new_issue_comment '].sort
 
   def initialize()
     @memory=[]

data/lib/interface.rb

@@ -35,7 +35,7 @@ class Interface
 
     options=@sysbh.parse
 
-    trap("SIGINT") { throw :ctrl_c }
+    trap("SIGINT") { throw :ctrl_c}
     catch :ctrl_c do
       begin
         if options[:user]==nil && options[:token]==nil &&  options[:path]!=nil
@@ -466,8 +466,12 @@ class Interface
     while ex != 0
 
       if opscript.empty?
-        op=Readline.readline(self.prompt,true)
-        opcd=op.split
+        begin
+          op=Readline.readline(self.prompt,true).strip
+          opcd=op.split
+        rescue
+          op="exit";opcd="exit"
+        end
       else
         op=opscript[0]
         opcd=op.split
@@ -496,6 +500,12 @@ class Interface
         when op == "groups"
           if @deep==ORGS
             t.list_groups(@client,@config)
+            @sysbh.add_history_str(2,t.get_groupslist(@config))
+          end
+        when op.include?("group") && opcd[0]=="group"
+          if opcd.size==2
+            puts "Teams in group #{opcd[1]} :"
+            puts t.get_single_group(@config,opcd[1])
           end
         when op == "info"
           if @deep==ASSIG then o.show_assig_info(@config,@assig_path) end
@@ -514,10 +524,16 @@ class Interface
           if @deep==ASSIG
             o.make_assig(@client,@config,@assig_path)
           end
-        when op =="open"
+        when op.include?("open") && opcd[0]=="open"
           if @deep==USER_REPO || @deep==TEAM_REPO || @deep==ORGS_REPO then r.open_repository(@client,@config,@deep) end
           if @deep==USER then u.open_user(@client) end
-          if @deep==ORGS then o.open_org(@client,@config) end
+          if @deep==ORGS
+            if opcd.size==1
+              o.open_org(@client,@config)
+            else
+              o.open_user_url(@client,@config,opcd[1])
+            end
+          end
           if @deep==TEAM then t.open_team_repos(@config) end
       end
 
@@ -589,7 +605,7 @@ class Interface
           r.create_issue(@client,@config,@deep,config_path)
         end
       end
-      if opcd[0]=="add_issue_comment" and opcd.size==2
+      if opcd[0]=="new_issue_comment" and opcd.size==2
         if @deep==ORGS_REPO || @deep==USER_REPO || @deep==TEAM_REPO
           r.add_issue_cm(@client,@config,@deep,opcd[1],config_path)
         end
@@ -649,12 +665,12 @@ class Interface
           t.new_group(@client,@config,opcd[1],opcd[2..opcd.size-1])
         end
       end
-      if opcd[0]=="add_people_info" and opcd.size==2 and @deep==ORGS then o.add_people_info(@client,@config,opcd[1]) end
+      if opcd[0]=="new_people_info" and opcd.size==2 and @deep==ORGS then o.add_people_info(@client,@config,opcd[1]) end
       if opcd[0]=="people" and opcd[1]=="info"
         if opcd.size==2
-          Organizations.new.show_people_info(@client,@config,nil)
+          @sysbh.add_history_str(2,o.show_people_info(@client,@config,nil))
         else
-          Organizations.new.show_people_info(@client,@config,opcd[2])
+          o.show_people_info(@client,@config,opcd[2])
         end
       end
       if opcd[0]=="clone"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.28'
+  VERSION='1.1.29'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghedsh
 version: !ruby/object:Gem::Version
-  version: 1.1.28
+  version: 1.1.29
 platform: ruby
 authors:
 - Javier Clemente
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit