ghedsh 1.1.21 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91993b0a9f8bd97edbb09612f1c1ce4924436b22
-  data.tar.gz: 3f8ae8fadc7bc61d17fc0c2f454272620c05e297
+  metadata.gz: 3e6a1aa39eb28e77a453ffd27bd0a5eb3ba41003
+  data.tar.gz: 0b4b7a21e90573c14f588c4ca82849ed3b0b3d78
 SHA512:
-  metadata.gz: 7694cc5fe678e4c7ea228b6adcfcad7f10d62437f6d4de9711e8fdd3d2b7bbcaebf149bf64cb4cebfe30e8c422eda0d119f1774b2baf527bdae315f9fac98904
-  data.tar.gz: 4401a6bcb3041ef9c4454cd4e85bb6bbe965b4c378ab8c266e26a0e29726889241bf86100ead09fc28719aa2d99f1527e577f792a2f7b0ff6efc7bf51f59947c
+  metadata.gz: 573c4ae20362c0ca25a5a7a5b55823e85a63e0c2ec5b8a226deca62da789a5c0378dadb47bd99dd39415223462d3fb8cdce5d8f3e3ed3c1d812871eb53dea84a
+  data.tar.gz: 7f4e4b70fc9afcdeba7efbaf7091bb59eaa93931c9f2a8659d4d1f5c177f04182c28d8ec38a581cf09e3b554fefebd6ef00084d9b6dcba7c030161485fcfc159

data/lib/actions/orgs.rb

@@ -28,11 +28,10 @@ class Organizations
         assig["assigs"].each do |i|
           puts "\n"
           puts i["name_assig"]
-          puts "Repository: #{i["repo"]}"
-          print "Groups: "
+          puts "\tRepository: #{i["repo"]}"
+          puts "\tGroups: "
           i["groups"].each do |y|
-            print y
-            print " "
+            puts "\t\t#{y}"
           end
           print "\n"
         end
@@ -82,7 +81,7 @@ class Organizations
           end
           if reponame!=""
             if client.repository?("#{reponame}")==false
-              puts "The repository #{reponame} doesn't exist\n"
+              puts "\e[31m The repository #{reponame} doesn't exist\n \e[0m"
               puts "\nName of the repository (To skip and add the repository later, only press enter): "
               if reponame==""
                 ex2=true
@@ -96,13 +95,13 @@ class Organizations
       if op=="2"
         ex2=false
         until ex2==true
-          ex2=Repositories.new().create_repository(client,config,reponame,false,ORGS)
-          if ex2==false
-            puts "Name of the repository (To skip and add the repository later, press enter): "
-            reponame=gets.chomp
-            if reponame==""
-              ex2=true
-            end
+          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
@@ -119,7 +118,10 @@ class Organizations
 
     puts "\n"
     puts "Groups currently available:\n\n"
-    puts groupslist
+    groupslist.each do |aux|
+      puts "\t#{aux}"
+    end
+    #puts groupslist
     puts "\nAdd groups to your assignment (Press enter to skip): "
     op=gets.chomp
     if op==""
@@ -134,11 +136,11 @@ class Organizations
            name="Group-#{time.ctime}"
            name=name.split(" ").join("-")
         end
-        puts "Teams currently available:\n\n"
+        puts "\nTeams currently available:\n\n"
         teamlist.each do |aux|
-          print "#{aux[0]} "
+          puts "\t#{aux[0]}"
         end
-        puts "\n\nPut a list of Teams: "
+        puts "\nPut a list of Teams: "
 
         list=gets.chomp
         list=list.split(" ")
@@ -185,7 +187,7 @@ class Organizations
     assig=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
     if assig!=nil
       if assig["assigs"].empty?
-        puts "No assignments are available yet"
+        puts "\e[31m No assignments are available yet\e[0m"
       else
         assig["assigs"].each do |i|
           assiglist.push(i["name_assig"])
@@ -207,15 +209,19 @@ class Organizations
 
   def show_assig_info(config,assig)
     assig=self.get_single_assig(config,assig)
+    team=Teams.new()
     puts "\n"
     puts assig["name_assig"]
-    puts "Repository: #{assig["repo"]}"
-    print "Groups: "
+    puts "\tRepository: #{assig["repo"]}"
+    puts "\tGroups: "
     assig["groups"].each do |y|
-      print y
-      print " "
+      puts "\t\t#{y}"
+      t=team.get_single_group(config,y)
+      t.each do |z|
+        puts "\t\t\t#{z}"
+      end
     end
-    puts "\n\n"
+    puts "\n"
   end
 
   def make_assig(client,config,assig)
@@ -223,13 +229,15 @@ class Organizations
     web2="git@github.com:"
     repo=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/#{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)
@@ -237,15 +245,15 @@ class Organizations
           config["TeamID"]=teamlist["#{y}"]
           config["Team"]=y
           repo.create_repository(client,config,"#{y}-#{assig["name_assig"]}",true,TEAM)
-          system("git -C #{ENV['HOME']}/.ghedsh/#{assig["repo"]} remote rm origin")
-          system("git -C #{ENV['HOME']}/.ghedsh/#{assig["repo"]} remote add origin #{web2}#{config["Org"]}/#{y}-#{assig["name_assig"]}.git")
+          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/#{assig["repo"]} push origin --all")
+          system("git -C #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]} push origin --all")
         end
       end
-      system("rm -rf #{ENV['HOME']}/.ghedsh/#{assig["repo"]}")
+      #system("rm -rf #{ENV['HOME']}/.ghedsh/temp/#{assig["repo"]}")
     else
-      puts "No repository is given for this assignment"
+      puts "\e[31m No repository is given for this assignment\e[0m"
     end
 
 
@@ -253,8 +261,6 @@ class Organizations
 
   def add_team_to_assig(client,config,assig,data)
     assig=self.get_single_assig(config,assig)
-
-
   end
 
   def add_group_to_assig(client,config,assig)

data/lib/actions/repo.rb

@@ -184,7 +184,7 @@ class Repositories
     end
 
     if rlist.empty?
-      puts "No repository matches with that expression"
+      puts "\e[31m No repository matches with that expression\e[0m"
     else
       print "\n"
       puts "Repositories found: #{rlist.size}"
@@ -243,7 +243,7 @@ class Repositories
 
     if scope==ORGS
       if client.repository?("#{config["Org"]}/#{repo}")==false
-        puts "It doesn't exist a repository with that name in #{config["Org"]}"
+        puts "\e[31m It doesn't exist a repository with that name in #{config["Org"]}\e[0m"
       else
         ex=false
         until ex==true
@@ -259,7 +259,7 @@ class Repositories
     end
     if scope==USER || scope==TEAM
       if client.repository?("#{config["User"]}/#{repo}")==false
-        puts "It doesn't exist a repository with that name in #{config["User"]}"
+        puts "\e[31m It doesn't exist a repository with that name in #{config["User"]}\e[0m"
       else
         ex=false
         until ex==true
@@ -291,7 +291,7 @@ class Repositories
         puts "created repository in #{config["Org"]}"
         return true
       else
-        puts "Already exists a repository with that name in #{config["Org"]}"
+        puts "\e[31m Already exists a repository with that name in #{config["Org"]}\e[0m"
         return false
       end
     when scope==USER
@@ -300,7 +300,7 @@ class Repositories
         puts "created repository #{config["User"]}"
         return true
       else
-        puts "Already exists a repository with that name in #{config["User"]}"
+        puts "\e[31m Already exists a repository with that name in #{config["User"]}\e[0m"
         return false
       end
     when scope==TEAM
@@ -313,7 +313,7 @@ class Repositories
         puts "created repository in #{config["Org"]} for team #{config["Team"]}"
         return true
       else
-        puts "Already exists a repository with that name in #{config["Org"]}"
+        puts "\e[31m Already exists a repository with that name in #{config["Org"]}\e[0m"
         return false
       end
     end

data/lib/actions/system.rb

@@ -207,6 +207,18 @@ class Sys
       return config
   end
 
+  def create_temp(path)
+    if (File.exist?(path))==false
+      FileUtils.mkdir_p(path)
+    end
+  end
+
+  def remove_temp(path)
+    if (File.exist?(path))==true
+      system("rm -rf #{path}")
+    end
+  end
+
   def save_groups(path,data)
     File.write("#{path}/groups.json",data.to_json)
   end

data/lib/interface.rb

@@ -364,9 +364,10 @@ class Interface
             @sysbh.add_history_str(2,list)
             @orgs_repos=list
           else
-            list=repo.show_repos(@client,@config,ORGS)
+            #list=repo.show_repos(@client,@config,ORGS)
+            list=repo.get_repos(@client,@config,ORGS)
             @sysbh.add_history_str(2,list)
-            @repos_list=list
+            @orgs_repos=list
             puts list
           end
         else
@@ -464,6 +465,7 @@ class Interface
       case
         when op == "exit" then ex=0
           s.save_cache(config_path,@config)
+          s.remove_temp("#{ENV['HOME']}/.ghedsh/temp")
         when op == "help" then self.help()
         when op == "orgs" then self.orgs()
         when op == "cd .." then self.cdback(false)
@@ -605,6 +607,9 @@ class Interface
       if opcd[0]=="rm_repository" and opcd.size==2
         if @deep==ORGS || @deep==USER || @deep==TEAM
           r.delete_repository(@client,@config,opcd[1],@deep)
+          if @deep==ORGS
+            @orgs_repos.delete(opcd[1])
+          end
         end
       end
       if opcd[0]=="new_team" and opcd.size>2
@@ -620,6 +625,7 @@ class Interface
         when @deep==ORGS
           #r.create_repository_by_teamlist(@client,@config,opcd[1],opcd[2,opcd.size],self.get_teamlist(opcd[2,opcd.size]))
           o.create_assig(@client,@config,opcd[1])
+          @sysbh.add_history(opcd[1])
         end
       end
       if opcd[0]=="new_group" and opcd.size>2

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.21'
+  VERSION='1.1.22'
 end

metadata

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