ghedsh 1.1.19 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2ec1d8b2fd095c583e532595ee68fe18b6b53f
-  data.tar.gz: 9b6a3fbe5ec29a58cae30595eb2619391d21093d
+  metadata.gz: df4f9b762bbed5fa79231616af6df96b34954dba
+  data.tar.gz: 76d67595bfba20f88780bbbdbe83856f30ff8794
 SHA512:
-  metadata.gz: 11f9343de0221abdc6c56d3eaf200a67e2e1ed14de797d3eff0889e269741b5e4efa047266887522c0ff427c569bcd7e577ac91e7d320e5578b428142a6ad38f
-  data.tar.gz: 9698941036512841612c7d370e44e3bfcf3b157b756eb60b48f7e63879b3434b8f667575f3f2d9f4d6a62de1a16c948566de4afe5411b83e78f181f007c19489
+  metadata.gz: 83f259674514ecbfea88048e0c7d43b05596c33a47380d94939666d7dca96b583a80264f5487ea90c34daf57c128f7c1d34187cf15d28033ea2f3bd621666aac
+  data.tar.gz: ff59f9e13672b1a326f9e6003b5c92c3ea10d9612e85dc6ac560376a8ff6531a917a873b073be8898f990fee9b70a1a115c0b7f23e24b4fb9dec153b81f680e8

data/lib/actions/orgs.rb

@@ -45,17 +45,10 @@ class Organizations
 
   end
 
-  def create_assig(client,config,name)
-    list=self.load_assig()
-    assigs=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
-
-    if assigs==nil
-      list["orgs"].push({"name"=>config["Org"],"assigs"=>[]})
-      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
-    end
-
+  def assignment_repository(client,config,name)
     ex=false
     until ex==true
+      puts "\n"
       puts "Assignment: #{name}"
       puts "1) Add a repository already created "
       puts "2) Create a new empty repository"
@@ -66,35 +59,74 @@ class Organizations
         ex=true
       end
     end
-
     case
     when op=="1" || op=="2"
       puts "Name of the repository: "
       reponame=gets.chomp
-      if client.repository?("#{config["Org"]}/#{reponame}")==false
-        puts "The repository #{reponame} doesn't exist"
-        reponame=nil
+      if op==1
+        if client.repository?("#{config["Org"]}/#{reponame}")==false
+          puts "The repository #{reponame} doesn't exist"
+          reponame=""
+        end
       end
       if op=="2"
         Repositories.new().create_repository(client,config,reponame,ORGS)
       end
     when op=="3" then reponame=""
     end
+    return reponame
+  end
 
-    groupslist=Teams.new().get_groupslist(config)
+  def assignment_groups(client,config)
+    team=Teams.new()
+    groupslist=team.get_groupslist(config)
+    groupsadd=[]
+    puts "\n"
     puts "Add groups to your assignment (Press enter to skip): "
     op=gets.chomp
-    if op!=nil
+    if op==""
+      puts "Do you want to create a new group? (Press any key to preceed, or only enter to skip)"
+      an=gets.chomp
+
+      if an!=""
+        time=Time.new
+        puts "Put the name of the group (If you skip with enter, the group's name will be \"Group-#{time.ctime}\")"
+        name=gets.chomp
+        if name==""
+           name="Group-#{time.ctime}"
+           name=name.split(" ").join("-")
+        end
+        puts "Put a list of Teams"
+        list=gets.chomp
+        list=list.split(" ")
+        team.new_group(client,config,name,list)
+        groupsadd.push(name)
+      else
+        groupsadd=[]
+      end
 
+    else
       groupsadd=op.split(" ")
       groupsadd.each do |item|
         if groupslist.detect{|aux| aux==item}==nil
           groupsadd.delete(item)
         end
       end
-    else
-      groupsadd=[]
     end
+    return groupsadd
+  end
+
+  def create_assig(client,config,name)
+    list=self.load_assig()
+    assigs=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
+
+    if assigs==nil
+      list["orgs"].push({"name"=>config["Org"],"assigs"=>[]})
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+    end
+
+    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})
@@ -127,10 +159,22 @@ class Organizations
     list=self.load_assig()
     as=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
     as=as["assigs"].detect{|aux| aux["name_assig"]==wanted}
-    puts as
     return as
   end
 
+  def show_assig_info(config,assig)
+    assig=self.get_single_assig(config,assig)
+    puts "\n"
+    puts assig["name_assig"]
+    puts "Repository: #{assig["repo"]}"
+    print "Groups: "
+    assig["groups"].each do |y|
+      print y
+      print " "
+    end
+    puts "\n\n"
+  end
+
   def make_assig(client,config,assig)
     web="https://github.com/"
     web2="git@github.com:"
@@ -165,21 +209,33 @@ class Organizations
 
   end
 
-  def add_team_to_assig(client,config,data)
+  def add_team_to_assig(client,config,assig,data)
+    assig=self.get_single_assig(config,assig)
+
 
   end
 
-  def add_group_to_assig(client,config,data)
+  def add_group_to_assig(client,config,assig)
+    list=self.load_assig()
 
+    groups=self.assignment_groups(client,config)
+    if groups!=""
+      groups.each do |i|
+        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux2| aux2["name_assig"]==assig}["groups"].push(i)
+      end
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+    end
   end
 
-  def add_repo_to_assig(client,config,data)
-    options=Hash.new
-    options[:organization]=config["Org"]
-    options[:auto_init]=true
 
-    client.create_repository(data,options)
+  def add_repo_to_assig(client,config,assig)
+    list=self.load_assig()
 
+    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)
+    end
   end
   #------------End assig. stuff------------
 

data/lib/actions/repo.rb

@@ -33,7 +33,7 @@ class Repositories
     end
   end
 
-  def open_issue(client,config,scope)
+  def create_issue(client,config,scope)
     puts "Insert Issue tittle: "
     tittle=gets.chomp
     puts "Add a description: "
@@ -65,6 +65,19 @@ class Repositories
     end
   end
 
+  def open_issue(client,config,scope,id)
+    case
+    when scope==USER_REPO
+      if config["Repo"].split("/").size == 1
+        client.reopen_issue(config["User"]+"/"+config["Repo"],id)
+      else
+        client.reopen_issue(config["Repo"],id)
+      end
+    when scope==ORGS_REPO || scope==TEAM_REPO
+      client.reopen_issue(config["Org"]+"/"+config["Repo"],id)
+    end
+  end
+
   def show_issues(client,config,scope)
       print "\n"
       case

data/lib/actions/system.rb

@@ -10,7 +10,7 @@ class Sys
   attr_reader :client
   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_', 'new_group ', 'rm_group', 'rm_', 'do ', 'make'].sort
+    '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'].sort
 
   def initialize()
     @memory=[]

data/lib/interface.rb

@@ -183,7 +183,7 @@ class Interface
           @sysbh.add_history_str(1,@teamlist)
           @deep=2
         else
-          puts "\nNo organization is available with that name"
+          #puts "\nNo organization is available with that name"
           self.set(path)
         end
       when @deep == ORGS
@@ -193,7 +193,7 @@ class Interface
           @config["TeamID"]=@teamlist[path]
           @deep=TEAM
         else
-          puts "\nNo team is available with that name"
+          #puts "\nNo team is available with that name"
           if cdassig(path)==false
             self.set(path)
           end
@@ -223,11 +223,11 @@ class Interface
               self.set(path_split[2])
             end
           else
-            puts "\nNo team is available with that name"
+            #puts "\nNo team is available with that name"
             self.set(path_split[1])
           end
         else
-          puts "\nNo organization is available with that name"
+          #puts "\nNo organization is available with that name"
           self.set(path)
         end
       when @deep==ORGS
@@ -237,7 +237,7 @@ class Interface
           @deep=TEAM
           self.set(path_split[1])
         else
-          puts "\nNo team is available with that name"
+          #puts "\nNo team is available with that name"
         end
       end
     end
@@ -282,7 +282,12 @@ class Interface
         puts "Set in #{@config["Team"]} repository: #{path}\n\n"
       end
     end
-    if @deep==USER || @deep==ORGS || @deep==TEAM then puts "No repository is available with that name\n\n" end
+    #if @deep==USER || @deep==ORGS || @deep==TEAM then puts "No repository is available with that name\n\n" end
+    if @deep==USER || @deep==ORGS || @deep==TEAM
+      puts "\nNo organization is available with that name"
+      puts "\nNo team is available with that name"
+      puts "No repository is available with that name\n\n"
+    end
   end
 
   def cdrepo(path)
@@ -478,6 +483,12 @@ class Interface
           if @deep==ORGS
             t.list_groups(@client,@config)
           end
+        when op == "info"
+          if @deep=ASSIG then o.show_assig_info(@config,@assig_path) end
+        when op== "add_repo"
+          if @deep=ASSIG then o.add_repo_to_assig(@client,@config,@assig_path) end
+        when op== "add_group"
+            if @deep=ASSIG then o.add_group_to_assig(@client,@config,@assig_path) end
         when op == "version"
           puts "GitHub Education Shell v#{Ghedsh::VERSION}"
         when op == "assignments"
@@ -567,7 +578,7 @@ class Interface
       end
       if opcd[0]=="new_issue" and opcd.size==1
         if @deep==ORGS_REPO || @deep==USER_REPO || @deep==TEAM_REPO
-          r.open_issue(@client,@config,@deep)
+          r.create_issue(@client,@config,@deep)
         end
       end
       if opcd[0]=="close_issue" and opcd.size==2
@@ -575,6 +586,11 @@ class Interface
           r.close_issue(@client,@config,@deep,opcd[1])
         end
       end
+      if opcd[0]=="open_issue" and opcd.size==2
+        if @deep==ORGS_REPO || @deep==USER_REPO || @deep==TEAM_REPO
+          r.open_issue(@client,@config,@deep,opcd[1])
+        end
+      end
       if opcd[0]=="rm_team"
         t.delete_team(@client,@teamlist[opcd[1]])
         self.quit_history(@teamlist[opcd[1]])

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.19'
+  VERSION='1.1.20'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghedsh
 version: !ruby/object:Gem::Version
-  version: 1.1.19
+  version: 1.1.20
 platform: ruby
 authors:
 - Javier Clemente
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit