ghedsh 1.1.34 → 1.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c000cf17c43c9b07bfd32dac120393c4d1aba0f4
-  data.tar.gz: 08e5da6725f2183f3e06c2034516e3be04fd798c
+  metadata.gz: 4ad491e04b2533a4043a8eae4c8391323dc04e92
+  data.tar.gz: 3e4bd3eabb39c8133dba7b0f6fc3b7397ccfbff2
 SHA512:
-  metadata.gz: a495ef83cc19ae0430e379521fc36f797cf490f81c3651907384f68b1cc2c4c469c603ebee66f1f9edd6eed304d8f6407b3d3baad7616922a64b125bc3289b38
-  data.tar.gz: 634663d451195320e5e25707f6d1f2be0380a54fa79102fef274ee0c32f4f3f41263db8f3d75b721c9a19d8ad15913d2d97c2dcf7fa0871e62f1d3b5157fb029
+  metadata.gz: 2cb4f0ae4f096d72fad72c7bf411ab9a00ea89a71f3e6bf1ca4fadd0344573e6345e205993100730e3aafe2d0295726674a681f7e7836e5e2d754a8df437d7b3
+  data.tar.gz: a0bb16a3fe99284259016b946ca14c56ddf36db529d73d61a5cf49883ca7bf522a5ab91dde6581a72e4614c43fd707af353868beb6f0c41e669d8629fe6db589

data/lib/actions/help.rb

@@ -16,6 +16,8 @@ class HelpM
     print "\tclone\t\t\tClone a repository or a list of repositories using a regular expresion\n"
     print "\tnew repository\t\tCreate a repository in your personal account\n"
     print "\t\t\t\t->\tnew repository [name of the repository]\n\n"
+    print "\trm repository\t\tDelete a repository in your personal account\n"
+    print "\t\t\t\t->\trm repository [name of the repository]\n\n"
     print "\tset\t\t\tMove you to a specific repository\n"
 
   end
@@ -27,6 +29,8 @@ class HelpM
     print "\trepos\t\t\tList the repositories of your organization\n"
     print "\tnew repository\t\tCreate a repository in a organization\n"
     print "\t\t\t\t->\tnew repository [name of the repository]\n\n"
+    print "\trm repository\t\tDelete a repository in a organization\n"
+    print "\t\t\t\t->\trm repository [name of the repository]\n\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"
@@ -39,6 +43,8 @@ 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 "\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"
     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 "\trm people info\t\tDelete the extended information\n"
@@ -131,7 +137,11 @@ class HelpM
     print "\n\tCOMMAND\t\t\tDESCRIPTION\n\n"
     print "\tinfo\t\t\t\Show information about the assignment\n"
     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 "\tadd group\t\tAdd a new group to the assignment\n"
+    print "\topen\t\t\topen the github assignment repositories disposition\n"
+    print "\tadd students\t\tAdd new students to the assignment\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

@@ -39,10 +39,19 @@ class Organizations
         assig["assigs"].each do |i|
           puts "\n"
           puts i["name_assig"]
-          puts "\tRepository: #{i["repo"]}"
-          puts "\tGroups: "
-          i["groups"].each do |y|
-            puts "\t\t#{y}"
+          i.each{|key, value| if key.include?("repo") then  puts "Repository #{key.delete("repo")}: #{value}" end}
+          if i["groups"]!=[] and i["groups"]!=nil
+            puts "\tGroups: "
+            i["groups"].each do |y|
+              puts "\t\t#{y}"
+            end
+          end
+          if i["people"]!=[] and i["people"]!=nil
+            puts "\tStudents: "
+            i["people"].each do |y|
+              puts "\t\t#{y}"
+            end
+            puts "\n"
           end
           print "\n"
         end
@@ -157,6 +166,7 @@ class Organizations
           puts "2)Take all the Teams available"
           puts "3)Take the teams from a file\n"
           puts "4)Add the teams to the group later"
+          print "option => "
           op2=gets.chomp
         end while (op2!="1" && op2!="2" && op2!="3" && op2!="4")
         refuse=false         #para no añadirlo cuando se niege en la repeticion de la busqueda de fichero
@@ -206,6 +216,60 @@ class Organizations
     return groupsadd
   end
 
+  def assignment_people(client,config)
+    refuse=false
+    members=self.get_organization_members(client,config)
+    sys=Sys.new()
+    begin
+      puts "\n1)Put a list of students"
+      puts "2)Take all the list"
+      puts "3)Take the students from a file\n"
+      puts "4)Add the students later"
+      print "option => "
+      op2=gets.chomp
+    end while (op2!="1" && op2!="2" && op2!="3" && op2!="4")
+    if op2=="1"
+      puts members
+      puts "\nPut a list of students (Separeted with space): "
+      list=gets.chomp
+      list=list.split(" ")
+    end
+    if op2=="2"
+      puts "All the students have been taken"
+      list=members
+    end
+    if op2=="3"
+      begin
+        ex=2
+        puts "Put the name of the file: "
+        file=gets.chomp
+        list=sys.loadfile(file)
+        if list==nil
+          puts "The file doesn't exist or It's empty. Do you like to try again? (y/n):"
+          op3=gets.chomp
+          if op3 == "n" or op3 == "N"
+            ex=1
+            refuse=true
+          end
+        else
+          ex=1
+        end
+      end while ex!=1
+    end
+    if op2!=4 and refuse==false
+      if op2!=2
+        list.each do |i|
+          if !members.include?(i)
+            list.delete(i)
+          end
+        end
+      end
+      return list
+    else
+      return []
+    end
+  end
+
   def create_assig(client,config,name)
     list=self.load_assig()
     assigs=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
@@ -217,16 +281,31 @@ class Organizations
 
     assig_exist=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux| aux["name_assig"]==name}
     if assig_exist==nil
-
-      reponame=self.assignment_repository(client,config,name)
-      groupsadd=self.assignment_groups(client,config)
-
       begin
-        list["orgs"][list["orgs"].index{|aux| aux["name"]==config["Org"]}]["assigs"].push({"name_assig"=>name,"teams"=>[],"groups"=>groupsadd,"repo"=>reponame})
-      rescue Exception => e
-        puts e
+        puts "\n1)Individual assignment"
+        puts "2)Group assignment"
+        puts "3)Discard assignment"
+        print "option => "
+        op=gets.chomp
+      end while op!="1" && op!="2" && op!="3"
+
+      if op!="3"
+        reponame=self.assignment_repository(client,config,name)
+        if op=="2"
+          groupsadd=self.assignment_groups(client,config)
+          peopleadd=[]
+        end
+        if op=="1"
+          peopleadd=self.assignment_people(client,config)
+          groupsadd=[]
+        end
+        begin
+          list["orgs"][list["orgs"].index{|aux| aux["name"]==config["Org"]}]["assigs"].push({"name_assig"=>name,"teams"=>[],"people"=>peopleadd,"groups"=>groupsadd,"repo"=>reponame})
+        rescue Exception => e
+          puts e
+        end
+        Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
       end
-      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
     else
       puts "Already exists an Assignment with that name"
     end
@@ -263,16 +342,27 @@ class Organizations
     team=Teams.new()
     puts "\n"
     puts assig["name_assig"]
-    puts "\tRepository: #{assig["repo"]}"
-    puts "\tGroups: "
-    assig["groups"].each do |y|
-      puts "\t\t#{y}"
-      t=team.get_single_group(config,y)
-      t.each do |z|
-        puts "\t\t\t#{z}"
+    assig.each{|key, value| if key.include?("repo") then  puts "Repository #{key.delete("repo")}: #{value}" end}
+
+    if assig["groups"]!=[]
+      puts "\tGroups: "
+      assig["groups"].each do |y|
+        puts "\t\t#{y}"
+        t=team.get_single_group(config,y)
+        if t!=nil
+          t.each do |z|
+            puts "\t\t\t#{z}"
+          end
+        end
       end
     end
-    puts "\n"
+    if assig["people"]!=[] and assig["people"]!=nil
+      puts "\tStudents: "
+      assig["people"].each do |y|
+        puts "\t\t#{y}"
+      end
+      puts "\n"
+    end
   end
 
   def make_assig(client,config,assig)
@@ -289,31 +379,59 @@ class Organizations
 
       #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"]}")
-
-      assig["groups"].each do |i|
-        teamsforgroup=team.get_single_group(config,i)
-        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")
+      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")
+            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)
         end
       end
-      #system("rm -rf #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]}")
     else
       puts "\e[31m No repository is given for this assignment\e[0m"
     end
-
-
   end
 
   def add_team_to_assig(client,config,assig,data)
     assig=self.get_single_assig(config,assig)
   end
 
+  def add_people_to_assig(client,config,assig)
+    list=self.load_assig()
+    people=self.assignment_people(client,config)
+    if list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["people"]==nil
+      list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["people"]=[]
+    end
+
+    if people!=""
+      people.each do |i|
+        if !list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["people"].include?(i)
+          list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["people"].push(i)
+        else
+          puts "#{i} is already in this assignment."
+        end
+      end
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+    end
+  end
+
   def add_group_to_assig(client,config,assig)
     list=self.load_assig()
 
@@ -326,8 +444,12 @@ class Organizations
     end
   end
 
+  def open_assig(config,assig)
+    Sys.new.open_url("https://github.com/search?q=org%3A#{config["Org"]}+#{assig}")
+  end
+
   #Takes people info froma a csv file and gets into ghedsh people information
-  def add_people_info(client,config,file)
+  def add_people_info(client,config,file,relation)
     list=self.load_people()
     csvoptions={:quote_char => "|",:headers=>true,:skip_blanks=>true}
     members=self.get_organization_members(client,config)  #members of the organization
@@ -347,6 +469,7 @@ class Organizations
       rescue
         print "Invalid csv format."
       end
+
       fields=mem.headers
       users=Hash.new;
       users=[]
@@ -359,9 +482,11 @@ class Organizations
           if i[j]!=nil
             if GITHUB_LIST.include?(j.gsub("\"", "").downcase.strip)
               aux["github"]=i[j].gsub("\"", "").strip
+              j="github"
             else
               if MAIL_LIST.include?(j.gsub("\"", "").downcase.strip)
                 aux["email"]=i[j].gsub("\"", "").strip
+                j="email"
               else
                 aux[j.gsub("\"", "").downcase.strip]=i[j].gsub("\"", "").strip
               end
@@ -370,45 +495,43 @@ class Organizations
             aux[j.gsub("\"", "").downcase.strip]=i[j]
           end
         end
-        users<< aux
+        users.push(aux)
       end
-
-      users.each do |i|
-        if members.include?(i["github"])
-          here=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["github"]==i["github"]}
-          if here==nil
-            list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"]<<i
-            puts "#{i["github"]} information correctly added"
-          else
-            puts "\nAlready exits \e[31m#{i["github"]}\e[0m in database"
-            if here.eql?(i)
-              puts "The information given is the same as in the database, changes are being discard."
-            else
-              puts "The information is different thant the original. Do you want to change it?"
-              puts "\n Github:\t#{here["github"]} -> #{i["github"]}"
-
-              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!=""
-                index1=list["orgs"].index{|aux| aux["name"]==config["Org"]}
-                index2=list["orgs"][index1]["users"].index{|aux2| aux2["github"]==i["github"]}
-
-                list["orgs"][index1]["users"].pop(index2)
+      ## Aqui empiezan las diferenciaa
+      if relation==true
+
+        # if users.keys.include?("github") and users.keys.include?("email") and users.keys.size==2
+        if fields.include?("github") and fields.include?("email") and fields.size==2
+          users.each do |i|
+            if members.include?(i["github"])
+              here=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["github"]==i["github"]} #miro si ya esta registrado
+              if here==nil
                 list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"]<<i
-                puts "The information about \e[31m#{i["github"]}\e[0m has been changed"
-              else
-                puts "The new information about \e[31m#{i["github"]}\e[0m has been discarded"
+                puts "#{i["github"]} information correctly added"
+              else                                                                        #si ya esta registrado...
+                puts "#{i["github"]} is already registered in this organization"
               end
+            else
+              puts "#{i["github"]} is not registered in this organization"
             end
           end
         else
-          puts "#{i["github"]} is not registered in this organization"
+          puts "No relationship found between github users and emails."
+          return nil
+        end
+      else                                                                           #insercion normal, relacion ya hecha
+        users.each do |i|
+          here=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["email"]==i["email"]}
+          if here!=nil
+            i.each do |j|
+              list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["email"]==i["email"]}["#{j[0]}"]=j[1]
+            end
+          else
+            puts "No relation found of #{i["email"]} in #{config["Org"]}"
+          end
         end
       end
+      #tocho
       Sys.new.save_people("#{ENV['HOME']}/.ghedsh",list)
     else
       print "\n#{file} file not found.\n\n"
@@ -476,16 +599,59 @@ class Organizations
     end
   end
 
-  def add_repo_to_assig(client,config,assig)
+  def add_repo_to_assig(client,config,assig,change)
     list=self.load_assig()
+    notexist=false
+
+    if change!=nil      #change an specific repository
+      reponumber=change
+      fields=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}.keys
+      if reponumber=="1"
+        if !fields.include?("repo")
+          notexist=true
+        end
+      else
+        if !fields.include?("repo"+change)
+          notexist=true
+        end
+      end
+    else                #adding new repository
+      fields=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}.keys
+      reponumber=1
+      ex=0
+      while ex==0
+        if reponumber==1
+          if fields.include?("repo")
+            reponumber=reponumber+1
+          else
+            ex=1
+          end
+        else
+          if fields.include?("repo#{reponumber}")
+            reponumber=reponumber+1
+          else
+            ex=1
+          end
+        end
+      end
+    end
 
-    reponame=self.assignment_repository(client,config,assig["name_assig"])
-    if reponame!=""
-      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)
+    if notexist==true
+      puts "Doesn't exist that repository"
+    else
+      reponame=self.assignment_repository(client,config,assig["name_assig"])
+    end
+
+    if reponame!="" and notexist==false
+      if reponumber==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
+        Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+      end
     end
   end
-  #------------End assig. stuff------------
 
   def show_organization_members_bs(client,config)
     orgslist=[]
@@ -569,10 +735,10 @@ class Organizations
           end
         else
           if inuser.keys.include?(field.downcase)
-            if !inuser[field.downcase].include?("https://") && !inuser[field.downcase].include?("http://")
-              url="http://"+inuser["#{field.downcase}"]
-            else
+            if inuser[field.downcase].include?("https://") or inuser[field.downcase].include?("http://")
               url=inuser["#{field.downcase}"]
+            else
+              url="http://"+inuser["#{field.downcase}"]
             end
             Sys.new.open_url(url)
           else

data/lib/actions/repo.rb

@@ -433,6 +433,9 @@ class Repositories
       return forklist
     end
   end
+  def add_collaborator(client,repo,name)
+    client.add_collaborator(repo,name)
+  end
 
   def show_collaborators(client,config,scope)
     print "\n"

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 ', 'new people info ', 'private ', 'people info ', 'new issue comment ', "rm people info"].sort
+    'add group','rm repository ', 'new people info ', 'private ', 'people info ', 'new issue comment ', "rm people info", "change repo",'add students','new relation'].sort
 
   def initialize()
     @memory=[]
@@ -141,6 +141,14 @@ class Sys
     return users
   end
 
+  # USER=1
+  # ORGS=2
+  # USER_REPO=10
+  # ORGS_REPO=3
+  # TEAM=4
+  # ASSIG=6
+  # TEAM_REPO=5
+
   def return_deep(path)
     json = File.read("#{path}/ghedsh-cache.json")
     cache=JSON.parse(json)
@@ -157,7 +165,11 @@ class Sys
           if cache["Repo"]!=nil
             deep=3
           else
-            deep=2
+            if cache["Assig"]!=nil
+              deep=6
+            else
+              deep=2
+            end
           end
         else
           if cache["Repo"]!=nil

data/lib/interface.rb

@@ -26,7 +26,7 @@ class Interface
   attr_accessor :client
   attr_accessor :deep
   attr_accessor :memory
-  attr_reader :orgs_list,:repos_list, :teamlist, :orgs_repos, :teams_repos, :repo_path, :assig_path, :issues_list
+  attr_reader :orgs_list,:repos_list, :teamlist, :orgs_repos, :teams_repos, :repo_path, :issues_list
 
   def initialize
     @sysbh=Sys.new()
@@ -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()
@@ -62,7 +62,7 @@ class Interface
           return @config["User"]+">"+ "\e[31m#{@config["Repo"]}\e[0m"+"> "
         end
       when @deep == ORGS then return @config["User"]+">"+ "\e[34m#{@config["Org"]}\e[0m"+"> "
-      when @deep == ASSIG then return @config["User"]+">"+ "\e[34m#{@config["Org"]}\e[0m"+">"+"\e[35m#{@assig_path}\e[0m"+"> "
+      when @deep == ASSIG then return @config["User"]+">"+ "\e[34m#{@config["Org"]}\e[0m"+">"+"\e[35m#{@config["Assig"]}\e[0m"+"> "
       when @deep == TEAM then return @config["User"]+">"+"\e[34m#{@config["Org"]}\e[0m"+">"+"\e[32m#{@config["Team"]}\e[0m"+"> "
       when @deep == TEAM_REPO
         if @repo_path!=""
@@ -140,7 +140,7 @@ class Interface
           @deep=2
         when @deep == ASSIG
           @deep=ORGS
-          @assig_path=""
+          @config["Assig"]=nil
         when @deep == TEAM_REPO
           if @repo_path==""
             @config["Repo"]=nil
@@ -160,9 +160,10 @@ class Interface
       @config["Repo"]=nil
       @config["Team"]=nil
       @config["TeamID"]=nil
+      @config["Assig"]=nil
       @deep=1
       @orgs_repos=[]; @teams_repos=[]
-      @repo_path=""; @assig_path="";
+      @repo_path="";
     end
   end
 
@@ -270,24 +271,26 @@ class Interface
           puts "Set in #{@config["User"]} repository: #{path}\n\n"
       end
     when @deep==ORGS
-      @config["Repo"]=path
+
       if @orgs_repos.empty? == false
         reposlist=@orgs_repos
       else
         reposlist=reposlist.get_repos_list(@client,@config,@deep)
       end
       if reposlist.one?{|aux| aux==path}
+        @config["Repo"]=path
         @deep=ORGS_REPO
         puts "Set in #{@config["Org"]} repository: #{path}\n\n"
       end
     when @deep==TEAM
-      @config["Repo"]=path
+
       if @teams_repos.empty? == false
         reposlist=@teams_repos
       else
         reposlist=reposlist.get_repos_list(@client,@config,@deep)
       end
       if reposlist.one?{|aux| aux==path}
+        @config["Repo"]=path
         @deep=TEAM_REPO
         puts "Set in #{@config["Team"]} repository: #{path}\n\n"
       end
@@ -322,8 +325,8 @@ class Interface
     list=o.get_assigs(@client,@config)
     if list.one?{|aux| aux==path}
       @deep=ASSIG
-      @assig_path=path
       puts "Set in #{@config["Org"]} assignment: #{path}\n\n"
+      @config["Assig"]=path
       return true
     else
       puts "No assignment is available with that name"
@@ -536,11 +539,15 @@ class Interface
             r.add_issue_cm(@client,@config,@deep,opcd[3],config_path)
           end
         when op.include?("new") && opcd[0]=="new" && opcd[1]=="people" && opcd[2]=="info"
-          if @deep==ORGS  && opcd.size==4 then o.add_people_info(@client,@config,opcd[3]) end
+          if @deep==ORGS  && opcd.size==4 then o.add_people_info(@client,@config,opcd[3],false) end
         when op.include?("new") && opcd[0]=="new" && opcd[1]=="repository"
           if opcd.size==3
             r.create_repository(@client,@config,opcd[2],false,@deep)
           end
+        when op.include?("new relation") && opcd[0]=="new" && opcd[1]="relation"
+          if opcd.size==3 and @deep==ORGS
+            o.add_people_info(@client,@config,opcd[2],true)
+          end
         when op.include?("new assignment") && opcd[0]=="new" && opcd[1]="assignment"
           if opcd.size==3 and @deep==ORGS
               r.create_repository_by_teamlist(@client,@config,opcd[2],opcd[3,opcd.size],self.get_teamlist(opcd[3,opcd.size]))
@@ -582,16 +589,26 @@ class Interface
           end
 
         when op == "info"
-          if @deep==ASSIG then o.show_assig_info(@config,@assig_path) end
+          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,@assig_path) end
+          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"
+          if @deep==ASSIG
+            if opcd.size>2
+              o.add_repo_to_assig(@client,@config,@config["Assig"],opcd[2])
+            else
+              o.add_repo_to_assig(@client,@config,@config["Assig"],1)
+            end
+          end
+        when op=="add students" && @deep==ASSIG
+           o.add_people_to_assig(@client,@config,@config["Assig"])
         when op.include?("rm")
           if @deep==ORGS and opcd[1]=="people" and opcd[2]=="info"
             o.rm_people_info(@client,@config)
           end
         when op== "add group"
-            if @deep=ASSIG then o.add_group_to_assig(@client,@config,@assig_path) end
+            if @deep=ASSIG then o.add_group_to_assig(@client,@config,@config["Assig"]) end
         when op == "version"
           puts "GitHub Education Shell v#{Ghedsh::VERSION}"
 
@@ -616,7 +633,7 @@ class Interface
           end
         when op =="make"
           if @deep==ASSIG
-            o.make_assig(@client,@config,@assig_path)
+            o.make_assig(@client,@config,@config["Assig"])
           end
         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
@@ -633,6 +650,7 @@ class Interface
             end
           end
           if @deep==TEAM then t.open_team_repos(@config) end
+          if @deep==ASSIG then o.open_assig(@config,@config["Assig"]) end
       end
 
       if opcd[0]=="issue" and opcd.size>1

data/lib/version.rb

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

metadata

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