ghedsh 1.1.35 → 1.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ad491e04b2533a4043a8eae4c8391323dc04e92
-  data.tar.gz: 3e4bd3eabb39c8133dba7b0f6fc3b7397ccfbff2
+  metadata.gz: 05400700524628b96f27e9cb871e74f39b4327a7
+  data.tar.gz: 5fdb40a95ceccdad4b6760d953894c15d4d13472
 SHA512:
-  metadata.gz: 2cb4f0ae4f096d72fad72c7bf411ab9a00ea89a71f3e6bf1ca4fadd0344573e6345e205993100730e3aafe2d0295726674a681f7e7836e5e2d754a8df437d7b3
-  data.tar.gz: a0bb16a3fe99284259016b946ca14c56ddf36db529d73d61a5cf49883ca7bf522a5ab91dde6581a72e4614c43fd707af353868beb6f0c41e669d8629fe6db589
+  metadata.gz: d03347f2dc1c882cf5e9c7a5613c5bed5c8ee816f37d01ae372c581caaeb52f0e5e2419e913d53f226977d050c2ee3b83b2b63982e2db013df36f0c468607489
+  data.tar.gz: 6b08af74955bfe2ea8567a1ef1f2ac052413c9ad3ca3394f28190340ccd48d9b7411174dfb8739cd576b0dfeac44556d3ebb74fe0ca71a9f8cfda4aa7a1c7b8f

data/lib/actions/help.rb

@@ -42,6 +42,8 @@ class HelpM
     print "\t\t\t\t->\tpeople info\n\n"
     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 "\t\t\t\tTo use a RegExp search in each field of the information, you can use the parameter /.\n"
+    print "\t\t\t\t->\tpeople info /[RegExp]/\n\n"
     print "\tteams\t\t\tTeams of a organization\n"
     print "\tnew relation\t\tSet a relation for the extendend information between Github ID and an email from a .csv file\n"
     print "\t\t\t\t->\tnew relation [name of the file]\n\n"
@@ -139,9 +141,21 @@ class HelpM
     print "\tadd repo\t\tAdd or create the repository of the assignment\n"
     print "\tchange repo\t\tChange a repository of the assignment\n"
     print "\t\t\t\t->\tchange repo [number of the repo]\n\n"
+    print "\trm repo\t\t\tDelete a repository from the assignment list.\n"
+    print "\t\t\t\t->\trm repo [id]\n\n"
+    print "\tchange sufix\t\tChange a sufix from a repository of the assignment\n"
+    print "\t\t\t\t->\tchange sufix [number of the repo]\n\n"
     print "\tadd group\t\tAdd a new group to the assignment\n"
+    print "\trm group\t\tDelete a group from the assignment list.\n"
+    print "\t\t\t\t->\trm group [name]\n\n"
+    print "\t\t\t\tTo delete all the groups list, use the parameter -all.\n"
+    print "\t\t\t\t->\trm group -all\n\n"
     print "\topen\t\t\topen the github assignment repositories disposition\n"
     print "\tadd students\t\tAdd new students to the assignment\n"
+    print "\trm student\t\tDelete a student from the assignment list.\n"
+    print "\t\t\t\t->\trm student [name]\n\n"
+    print "\t\t\t\tTo delete all the students list, use the parameter -all.\n"
+    print "\t\t\t\t->\trm student -all\n\n"
     print "\tmake\t\t\tCreate the repository assignment in Github for each team of every group\n\n"
   end
 

data/lib/actions/orgs.rb

@@ -61,7 +61,6 @@ class Organizations
       list["orgs"].push({"name"=>config["Org"],"assigs"=>[]})
       Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
     end
-
   end
 
   def assignment_repository(client,config,name)
@@ -70,17 +69,17 @@ class Organizations
       puts "\n"
       puts "Assignment: #{name}"
       puts "1) Add a repository already created "
-      puts "2) Create a new empty repository"
-      puts "3) Don't assign a repository yet"
+      # puts "2) Create a new empty repository"
+      puts "2) Don't assign a repository yet"
       print "option => "
       op=gets.chomp
       puts "\n"
-      if op=="3" or op=="1" or op=="2"
+      if op=="1" or op=="2"
         ex=true
       end
     end
     case
-    when op=="1" || op=="2"
+    when op=="1"
 
       if op=="1"
         ex2=false
@@ -112,20 +111,7 @@ class Organizations
           end
         end
       end
-      if op=="2"
-        ex2=false
-        until ex2==true
-          puts "Name of the repository (To skip and add the repository later, press enter): "
-          reponame=gets.chomp
-          if reponame==""
-            ex2=true
-          else
-            ex2=Repositories.new().create_repository(client,config,reponame,false,ORGS)
-            reponame="#{config["Org"]}/#{reponame}"
-          end
-        end
-      end
-    when op=="3" then reponame=""
+    when op=="2" then reponame=""
     end
     return reponame
   end
@@ -258,9 +244,11 @@ class Organizations
     end
     if op2!=4 and refuse==false
       if op2!=2
-        list.each do |i|
-          if !members.include?(i)
-            list.delete(i)
+        if list!=nil
+          list.each do |i|
+            if !members.include?(i)
+              list.delete(i)
+            end
           end
         end
       end
@@ -342,8 +330,11 @@ class Organizations
     team=Teams.new()
     puts "\n"
     puts assig["name_assig"]
+    assig=assig.sort.to_h
     assig.each{|key, value| if key.include?("repo") then  puts "Repository #{key.delete("repo")}: #{value}" end}
-
+    puts
+    assig.each{|key, value| if key.include?("sufix") then  puts "Sufix of Repository #{key.delete("sufix")} : #{value}" end}
+    print "\n"
     if assig["groups"]!=[]
       puts "\tGroups: "
       assig["groups"].each do |y|
@@ -368,40 +359,54 @@ class Organizations
   def make_assig(client,config,assig)
     web="https://github.com/"
     web2="git@github.com:"
-    repo=Repositories.new()
+    r=Repositories.new()
     team=Teams.new()
     sys=Sys.new()
     teamlist=team.read_teamlist(client,config)
     assig=self.get_single_assig(config,assig)
-
-    if assig["repo"]!=""
-      sys.create_temp("#{ENV['HOME']}/.ghedsh/temp")
-
-      #system("git clone #{web2}#{config["Org"]}/#{assig["repo"]}.git #{ENV['HOME']}/.ghedsh/#{assig["repo"]}")
-      system("git clone #{web2}#{assig["repo"]}.git #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]}")
-      if assig["groups"]!=[]
-        assig["groups"].each do |i|
-          teamsforgroup=team.get_single_group(config,i)
-          if teamsforgroup!=nil
-            teamsforgroup.each do |y|
-              config["TeamID"]=teamlist["#{y}"]
-              config["Team"]=y
-              repo.create_repository(client,config,"#{y}-#{assig["name_assig"]}",true,TEAM)
-              system("git -C #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]} remote rm origin")
-              system("git -C #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]} remote add origin #{web2}#{config["Org"]}/#{y}-#{assig["name_assig"]}.git")
-
-              system("git -C #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]} push origin --all")
+    repolist=[]
+    point=1
+    assig.each{|key, value| if key.include?("repo") then  repolist.push(value) end}
+
+    if repolist!=[]
+      repolist.each do |repo|
+        sys.create_temp("#{ENV['HOME']}/.ghedsh/temp")
+        puts repo
+        if repolist.size>1
+          sufix="sufix#{point}"
+          sufix="-#{assig["#{sufix}"]}"
+        else
+          sufix=""
+        end
+        point=point+1
+        system("git clone #{web2}#{repo}.git #{ENV['HOME']}/.ghedsh/temp/#{repo}")
+        if assig["groups"]!=[]
+          assig["groups"].each do |i|
+
+            teamsforgroup=team.get_single_group(config,i)
+            if teamsforgroup!=nil
+              teamsforgroup.each do |y|
+                config["TeamID"]=teamlist["#{y}"]
+                config["Team"]=y
+                puts y
+                puts sufix
+                r.create_repository(client,config,"#{assig["name_assig"]}#{sufix}-#{y}",true,TEAM)
+                system("git -C #{ENV['HOME']}/.ghedsh/temp/#{repo} remote rm origin")
+                system("git -C #{ENV['HOME']}/.ghedsh/temp/#{repo} remote add origin #{web2}#{config["Org"]}/#{assig["name_assig"]}#{sufix}-#{y}.git")
+
+                system("git -C #{ENV['HOME']}/.ghedsh/temp/#{repo} push origin --all")
+              end
             end
           end
         end
-      end
-      if assig["people"]!=[] and assig["people"]!=nil
-        assig["people"].each do |i|
-            repo.create_repository(client,config,"#{i}-#{assig["name_assig"]}",true,ORGS)
-            system("git -C #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]} remote rm origin")
-            system("git -C #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]} remote add origin #{web2}#{config["Org"]}/#{i}-#{assig["name_assig"]}.git")
-            system("git -C #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]} push origin --all")
-            repo.add_collaborator(client,"#{config["Org"]}/#{i}-#{assig["name_assig"]}",i)
+        if assig["people"]!=[] and assig["people"]!=nil
+          assig["people"].each do |i|
+              r.create_repository(client,config,"#{assig["name_assig"]}#{sufix}-#{i}",true,ORGS)
+              system("git -C #{ENV['HOME']}/.ghedsh/temp/#{repo} remote rm origin")
+              system("git -C #{ENV['HOME']}/.ghedsh/temp/#{repo} remote add origin #{web2}#{config["Org"]}/#{assig["name_assig"]}#{sufix}-#{i}.git")
+              system("git -C #{ENV['HOME']}/.ghedsh/temp/#{repo} push origin --all")
+              r.add_collaborator(client,"#{config["Org"]}/#{assig["name_assig"]}#{sufix}-#{i}",i)
+           end
         end
       end
     else
@@ -554,6 +559,37 @@ class Organizations
     end
   end
 
+  def search_rexp_people_info(client,config,exp)
+    list=self.load_people()
+    if list!=nil
+      if list["users"]!=[]
+        list=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
+        if exp.match(/^\//)
+          sp=exp.split('/')
+          exp=Regexp.new(sp[1],sp[2])
+        end
+        list=Sys.new.search_rexp_peoplehash(list["users"],exp)
+
+        if list!=[]
+          fields=list[0].keys
+          list.each do |i|
+            puts "\n\e[31m#{i["github"]}\e[0m"
+            fields.each do |j|
+              puts "#{j.capitalize}:\t #{i[j]}"
+            end
+            puts
+          end
+        end
+      else
+        puts "Extended information has not been added yet"
+      end
+    else
+      list["orgs"].push({"name"=>config["Org"],"users"=>[]})
+      Sys.new.save_people("#{ENV['HOME']}/.ghedsh",list)
+      puts "Extended information has not been added yet"
+    end
+  end
+
   def show_people_info(client,config,user)
     list=self.load_people()
 
@@ -611,7 +647,7 @@ class Organizations
           notexist=true
         end
       else
-        if !fields.include?("repo"+change)
+        if !fields.include?("repo"+change.to_s)
           notexist=true
         end
       end
@@ -640,17 +676,117 @@ class Organizations
       puts "Doesn't exist that repository"
     else
       reponame=self.assignment_repository(client,config,assig["name_assig"])
+      if reponumber.to_i>1
+        sufix="sufix#{reponumber}"
+        sufixname=self.assignment_repo_sufix(reponumber,1)
+      end
     end
 
     if reponame!="" and notexist==false
-      if reponumber==1
+      if reponumber.to_i==1
         list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["repo"]=reponame
         Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
       else
         list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["repo#{reponumber}"]=reponame
+        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["#{sufix}"]=sufixname
+        if sufix=="sufix2" and change==nil
+          sufixname=self.assignment_repo_sufix("1",2)
+          list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["sufix1"]=sufixname
+        end
+        Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+      end
+    end
+  end
+
+  def rm_assigment_repo(config,assig,reponumber)
+    list=self.load_assig()
+
+    if reponumber==1
+      if list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["repo"]!=nil
+        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}.delete("repo")
+        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}.delete("sufix1")
+        Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+      else
+        puts "Doesn't exist that repository"
+      end
+    else
+      if list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["repo#{reponumber}"]!=nil
+        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}.delete("repo#{reponumber}")
+        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}.delete("sufix#{reponumber}")
+        Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+      else
+        puts "Doesn't exist that repository"
+      end
+    end
+  end
+
+  def rm_assigment_student(config,assig,student,mode)
+    list=self.load_assig()
+    if mode==1
+      if list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["people"].include?(student)
+        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["people"].delete(student)
+        puts "Student #{student} correctly deleted from the assignment"
+        Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+      else
+        puts "Student not found"
+      end
+    else
+      list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["people"].clear()
+      puts "All the students has been deleted from the assignment"
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+    end
+  end
+
+  def rm_assigment_group(config,assig,group,mode)
+    list=self.load_assig()
+    if mode==1
+      if list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["groups"].include?(group)
+        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["groups"].delete(group)
+        puts "Group #{group} correctly deleted from the assignment"
         Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+      else
+        puts "Group not found"
+      end
+    else
+      list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["groups"].clear()
+      puts "All the groups has been deleted from the assignment"
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+    end
+  end
+
+  def assignment_repo_sufix(reponumber,order)
+    op=""
+    print "\n"
+    if order==1
+      while op=="" or op=="\n"
+        puts "Add the suffix of the repository \"#{reponumber}\", in order to differentiate it from the other repositories: "
+        op=gets.chomp
+      end
+    else
+      while op=="" or op=="\n"
+        puts "Add the suffix of the first repository, in order to differentiate it from the other repositories: "
+        op=gets.chomp
       end
     end
+    return op
+  end
+
+  def change_repo_sufix(config,assig,reponumber)
+    list=self.load_assig()
+    if list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["sufix#{reponumber}"]!=nil
+      if reponumber==1
+        sufixname=self.assignment_repo_sufix(reponumber,2)
+        sufix="sufix1"
+      else
+        sufixname=self.assignment_repo_sufix(reponumber,1)
+        sufix="sufix#{reponumber}"
+      end
+
+      list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["#{sufix}"]=sufixname
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+    else
+      puts "Doesn't exist a repository with that identifier"
+    end
   end
 
   def show_organization_members_bs(client,config)

data/lib/actions/system.rb

@@ -346,6 +346,23 @@ class Sys
     return list
   end
 
+  def search_rexp_peoplehash(list,exp)
+    found=[]
+    yes=false
+    list.each do |i|
+      i.each do |j|
+        if j[1].match(/#{exp}/)
+          yes=true
+        end
+      end
+      if yes==true
+        found.push(i)
+        yes=false
+      end
+    end
+    return found
+  end
+
   def parse()
     options = {:user => nil, :token => nil, :path => nil}
 

data/lib/interface.rb

@@ -35,21 +35,21 @@ class Interface
 
     options=@sysbh.parse
 
-    # trap("SIGINT") { throw :ctrl_c}
-    # catch :ctrl_c do
-    #   begin
+    trap("SIGINT") { throw :ctrl_c}
+    catch :ctrl_c do
+      begin
         if options[:user]==nil && options[:token]==nil &&  options[:path]!=nil
           self.run(options[:path],options[:token],options[:user])
         else
           self.run("#{ENV['HOME']}/.ghedsh",options[:token],options[:user])
         end
-    #   rescue SystemExit, Interrupt
-    #     raise
-    #   rescue Exception => e
-    #     puts "exit"
-    #     puts e
-    #   end
-    # end
+      rescue SystemExit, Interrupt
+        raise
+      rescue Exception => e
+        puts "exit"
+        puts e
+      end
+    end
   end
 
   def prompt()
@@ -137,7 +137,7 @@ class Interface
           @config["Team"]=nil
           @config["TeamID"]=nil
           @teams_repos=[]
-          @deep=2
+          @deep=ORGS
         when @deep == ASSIG
           @deep=ORGS
           @config["Assig"]=nil
@@ -492,6 +492,10 @@ class Interface
         when op == "cd .."
           if @deep==ORGS then t.clean_groupsteams() end ##cleans groups cache
           self.cdback(false)
+        when op.include?("cd assig") && opcd[0]=="cd" && opcd[1]=="assig" && opcd.size==3
+          if @deep==ORGS
+            self.cdassig(opcd[2])
+          end
         when op == "people" then self.people()
         when op == "teams"
       	  if @deep==ORGS
@@ -579,7 +583,21 @@ class Interface
           if opcd.size==3 and @deep==ORGS
             t.delete_group(@config,opcd[2])
           end
-
+          if opcd.size==3 and @deep==ASSIG
+            if opcd[2]!="-all"
+              o.rm_assigment_group(@config,@config["Assig"],opcd[2],1)
+            else
+              o.rm_assigment_group(@config,@config["Assig"],opcd[2],2)
+            end
+          end
+        when op.include?("rm student") && opcd[0]=="rm" && opcd[1]="student"
+          if opcd.size==3 and @deep==ASSIG
+            if opcd[2]!="-all"
+              o.rm_assigment_student(@config,@config["Assig"],opcd[2],1)
+            else
+              o.rm_assigment_student(@config,@config["Assig"],opcd[2],2)
+            end
+          end
         when op.include?("rm repository") && opcd[0]=="rm" && opcd[1]="repository"
           if @deep==ORGS || @deep==USER || @deep==TEAM
             r.delete_repository(@client,@config,opcd[2],@deep)
@@ -587,13 +605,16 @@ class Interface
               @orgs_repos.delete(opcd[2])
             end
           end
-
+        when op.include?("rm repo")&& opcd[0]=="rm" && opcd[1]="repo"
+          if @deep==ASSIG and opcd.size==3
+            o.rm_assigment_repo(@config,@config["Assig"],opcd[2])
+          end
         when op == "info"
           if @deep==ASSIG then o.show_assig_info(@config,@config["Assig"]) end
           if @deep==USER_REPO || @deep==TEAM_REPO || @deep==ORGS_REPO then r.info_repository(@client,@config,@deep) end
         when op== "add repo"
           if @deep==ASSIG then o.add_repo_to_assig(@client,@config,@config["Assig"],nil) end
-        when op.include?("change repo") && opcd[0]=="change" && opcd[1]="repo"
+        when op.include?("change repo") && opcd[0]=="change" && opcd[1]=="repo"
           if @deep==ASSIG
             if opcd.size>2
               o.add_repo_to_assig(@client,@config,@config["Assig"],opcd[2])
@@ -601,6 +622,10 @@ class Interface
               o.add_repo_to_assig(@client,@config,@config["Assig"],1)
             end
           end
+        when op.include?("change sufix") && opcd[0]=="change" && opcd[1]=="sufix"
+          if @deep==ASSIG
+            if opcd.size>2 then o.change_repo_sufix(@config,@config["Assig"],opcd[2]) end
+          end
         when op=="add students" && @deep==ASSIG
            o.add_people_to_assig(@client,@config,@config["Assig"])
         when op.include?("rm")
@@ -720,7 +745,11 @@ class Interface
           info_strm=o.show_people_info(@client,@config,nil)
           if info_strm!=nil then @sysbh.add_history_str(2,info_strm) end
         else
-          o.show_people_info(@client,@config,opcd[2])
+          if opcd[2].include?("/")
+            o.search_rexp_people_info(@client,@config,opcd[2])
+          else
+            o.show_people_info(@client,@config,opcd[2])
+          end
         end
       end
       if opcd[0]=="clone"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.35'
+  VERSION='1.1.36'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghedsh
 version: !ruby/object:Gem::Version
-  version: 1.1.35
+  version: 1.1.36
 platform: ruby
 authors:
 - Javier Clemente
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit