ghedsh 1.1.23 → 1.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f33992ab76ebb5292a28ce928bf4e16aaf6f789
-  data.tar.gz: bf405fdeb60b377c4f108aee301a838cf95b2099
+  metadata.gz: 36911cdf6e7bac29a670d1b7dd854f7a5dd10c08
+  data.tar.gz: 80dd7f25d2e9778a9109c3476f1265e10d710975
 SHA512:
-  metadata.gz: 7213d3a442b613f8a84dc5a71c7d684e9d232b2613f50177ecbdbba07fd7e285f9ca38cfab004b46761a018c02a2d4bfedbebb2573eecc353dc0b9a58bb398d1
-  data.tar.gz: 8183b0ebdab696d62b5799e3fd6bc87bf468159aea557e939aea8b4fde9c504ba2b3c4f2b718fa4c06251cd1f7214c78f1c9dd84dd8442531ae8246218825d18
+  metadata.gz: 0cbff224c6963b3c89e300807dab6bfb11fb541e94c1e50b396e00d9825762c566bfa1639925ce26d69c607494448bf30956e2ce9e3ec1a6808c28f7a17ee0a2
+  data.tar.gz: 3ceda151d06dccaf7cacc5adbf1cedb356d24686d203460da269704000335861020a133b8b9054f1250cbad4b0a9f4cf433a314b48c9d0edb9eff937fd604632

data/lib/actions/help.rb

@@ -9,6 +9,7 @@ class HelpM
   def user()
     self.common_opt
     puts " Users options:"
+    print "\n\tCOMMAND\t\t\tDESCRIPTION\n\n"
     print "\torgs\t\t\tShow your organizations\n"
     print "\trepos\t\t\tList your repositories\n"
     print "\tclone\t\t\tClone a repository or a list of repositories using a regular expresion\n"
@@ -20,29 +21,44 @@ class HelpM
   def org()
     self.common_opt
     puts " Organization options:"
+    print "\n\tCOMMAND\t\t\tDESCRIPTION\n\n"
     print "\trepos\t\t\tList the repositories of your organization\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\tMembers of a organization\n"
     print "\tteams\t\t\tTeams of a organization\n"
-    print "\tnew_assignment\t\tCreate a repository in your organization\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 "\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"
+    print "\t\t\t\t->\trm_group [name of the group]\n\n"
     print "\trm_team\t\t\tDelete a team in you organization. Expected the name of the team\n"
-    print "\tnew_team\t\t\tCreate a team in the organization. Expected the name of the team, and/or members given one by one\n\n"
+    print "\t\t\t\t->\trm_team [name of the team]\n\n"
+    print "\tnew_team\t\tCreate a team in the organization. Expected the name of the team, and/or members given one by one\n"
+    print "\t\t\t\t->\tnew_team [name of the team] [member1] [member2] [member3] ... \n\n"
+
   end
 
   def org_repo()
     self.common_opt
     puts " Repository options:"
+    print "\n\tCOMMAND\t\t\tDESCRIPTION\n\n"
     print "\tcommits\t\t\tShow the list of commits from the repository\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 "\t\t\t\t->\tissue [Id of the issue]\n\n"
     print "\tfiles\t\t\tShow the files of the repository path given\n"
     print "\tcat\t\t\tShow data from a file\n"
+    print "\t\t\t\t->\tcat [file]\n\n"
     print "\tcol\t\t\tShow the list of collaborators from the repository\n\n"
   end
 
   def orgs_teams()
     self.common_opt
     puts " Organization team options:"
+    print "\n\tCOMMAND\t\t\tDESCRIPTION\n\n"
     print "\tpeople\t\t\tMembers of the team\n"
     print "\tclone\t\t\tClone a repository or a list of repositories using a regular expresion\n"
     print "\tnew_repository\t\tCreate a repository to this team\n"
@@ -52,19 +68,27 @@ class HelpM
   def user_repo()
     self.common_opt
     puts " Repository options:"
+    print "\n\tCOMMAND\t\t\tDESCRIPTION\n\n"
     print "\tcommits\t\t\tShow the list of commits from the repository\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 "\t\t\t\t->\tissue [Id of the issue]\n\n"
     print "\tfiles\t\t\tShow the files of the repository path given\n"
     print "\tcat\t\t\tShow data from a file\n"
+    print "\t\t\t\t->\tcat [file]\n\n"
     print "\tcol\t\t\tShow the list of collaborators from the repository\n\n"
   end
   def team_repo()
     self.common_opt
     puts " Repository options:"
+    print "\n\tCOMMAND\t\t\tDESCRIPTION\n\n"
     print "\tcommits\t\t\tShow the list of commits from the repository\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 "\t\t\t\t->\tissue [Id of the issue]\n\n"
     print "\tfiles\t\t\tShow the files of the repository path given\n"
     print "\tcat\t\t\tShow data from a file\n"
+    print "\t\t\t\t->\tcat [file]\n\n"
     print "\tcol\t\t\tShow the list of collaborators from the repository\n\n"
   end
 
@@ -73,10 +97,19 @@ class HelpM
     puts " List of commands "
     puts "------------------"
     puts "\n Main options:"
+    print "\n\tCOMMAND\t\t\tDESCRIPTION\n\n"
     print "\tdo\t\t\tRun a script in ghedsh execute path\n"
+    print "\t\t\t\t->\tdo [filename]\n\n"
     print "\texit\t\t\tExit from this program\n"
     print "\thelp\t\t\tList of commands available\n"
-    print "\tcd\t\t\tGo to the path\n"
+    print "\tcd\t\t\tGo to the path. Could be an assignment, an organization, a team or a repository\n"
+    print "\t\t\t\t->\tcd [path]\n\n"
+    print "\t\t\t\tFor going to the user root path use cd without argument:\n"
+    print "\t\t\t\t->\tcd\n\n"
+    print "\t\t\t\tYou can go back to the previous level with the argument ".."\n"
+    print "\t\t\t\t->\tcd [..]\n\n"
+    print "\t\t\t\tDefault search look for repositories at the end of the queue. If you want to look for an specific repository use: \n"
+    print "\t\t\t\t->\tcd repo [name] \n\n"
     print "\t!\t\t\tExecute a bash command\n\n"
   end
 

data/lib/actions/orgs.rb

@@ -125,7 +125,7 @@ class Organizations
     puts "\nAdd groups to your assignment (Press enter to skip): "
     op=gets.chomp
     if op==""
-      puts "Do you want to create a new group? (Press any key to preceed, or only enter to skip)"
+      puts "Do you want to create a new group? (Press any key to proceed, or only enter to skip)"
       an=gets.chomp
 
       if an!=""

data/lib/actions/repo.rb

@@ -18,18 +18,26 @@ class Repositories
 
   def show_commits(client,config,scope)
     print "\n"
-    case
-    when scope==USER_REPO
-        if config["Repo"].split("/").size == 1
-          mem=client.commits(config["User"]+"/"+config["Repo"],"master")
-        else
-          mem=client.commits(config["Repo"],"master")
-        end
-      when scope==ORGS_REPO
-        mem=client.commits(config["Org"]+"/"+config["Repo"],"master")
+    empty=0
+    begin
+      case
+      when scope==USER_REPO
+          if config["Repo"].split("/").size == 1
+            mem=client.commits(config["User"]+"/"+config["Repo"],"master")
+          else
+            mem=client.commits(config["Repo"],"master")
+          end
+      when scope==ORGS_REPO || scope==TEAM_REPO
+          mem=client.commits(config["Org"]+"/"+config["Repo"],"master")
+      end
+    rescue
+      puts "The Repository is empty"
+      empty=1
     end
-    mem.each do |i|
-      print i[:sha],"\n",i[:commit][:author][:name],"\n",i[:commit][:author][:date],"\n",i[:commit][:message],"\n\n"
+    if empty==0
+      mem.each do |i|
+        print i[:sha],"\n",i[:commit][:author][:name],"\n",i[:commit][:author][:date],"\n",i[:commit][:message],"\n\n"
+      end
     end
   end
 
@@ -78,42 +86,88 @@ class Repositories
     end
   end
 
+  def get_issues(client,config,scope)
+    case
+    when scope==USER_REPO
+      if config["Repo"].split("/").size == 1
+        mem=client.list_issues(config["User"]+"/"+config["Repo"],{:state=>"all"})
+      else
+        mem=client.list_issues(config["Repo"],{:state=>"all"})
+      end
+    when scope==ORGS_REPO || scope==TEAM_REPO
+        mem=client.list_issues(config["Org"]+"/"+config["Repo"],{:state=>"all"})
+    end
+    return mem
+  end
+
+  #show all issues from a repository
   def show_issues(client,config,scope)
       print "\n"
-      case
-      when scope==USER_REPO
-        if config["Repo"].split("/").size == 1
-          mem=client.list_issues(config["User"]+"/"+config["Repo"],{:state=>"all"})
-        else
-          mem=client.list_issues(config["Repo"],{:state=>"all"})
-        end
-      when scope==ORGS_REPO || scope==TEAM_REPO
-          mem=client.list_issues(config["Org"]+"/"+config["Repo"],{:state=>"all"})
-      end
+      mem=self.get_issues(client,config,scope)
       mem.each do |i|
         #print i[:sha],"\n",i[:commit][:author][:name],"\n",i[:commit][:author][:date],"\n",i[:commit][:message],"\n\n"
         puts "##{i[:number]} state: #{i[:state]} -> #{i[:title]} "
       end
+      print "\n"
       return mem
-      puts "\n"
   end
 
-  def get_issues(client,config,scope)
+  #show an specific issue from a repository
+  def show_issue(client,config,scope,id)
+    issfound=0
+    issues_list=self.get_issues(client,config,scope)
+    if issues_list!=nil
+      issues_list.each do |i|
+        if i[:number]==id.to_i
+          puts
+          puts "  --------------------------------------"
+          puts "  Author: #{i[:user][:login]}"
+          puts "  ##{i[:number]} state: #{i[:state]}"
+          puts "  Tittle: #{i[:title]}"
+          puts "  --------------------------------------"
+          puts "\n#{i[:body]}"
+          issfound=1
+          print "\nShow comments (Press any key to proceed, or only enter to skip) -> "
+          show=gets.chomp
+          puts
+          if show!=""
+            self.show_issues_cm(client,config,scope,i[:number])
+          end
+        end
+      end
+    end
+    if issfound==0
+      puts "Issue not found"
+    end
+    puts "\n"
+  end
+
+  #show issues comment
+  def show_issues_cm(client,config,scope,id)
     case
     when scope==USER_REPO
       if config["Repo"].split("/").size == 1
-        mem=client.list_issues(config["User"]+"/"+config["Repo"],{:state=>"all"})
+        mem=client.issue_comments(config["User"]+"/"+config["Repo"],id)
       else
-        mem=client.list_issues(config["Repo"],{:state=>"all"})
+        mem=client.issue_comments(config["Repo"],id)
       end
     when scope==ORGS_REPO || scope==TEAM_REPO
-        mem=client.list_issues(config["Org"]+"/"+config["Repo"],{:state=>"all"})
+        mem=client.issue_comments(config["Org"]+"/"+config["Repo"],id)
+    end
+    if mem!=nil
+      puts
+      puts " < COMMENTS (#{mem.size}) >"
+      mem.each do |i|
+        puts
+        puts " --------------------------------------"
+        puts " Author: #{i[:user][:login]} "
+        puts " Date: #{i[:created_at]}"
+        puts " --------------------------------------"
+        puts "\n#{i[:body]}"
+      end
+    else
+      puts "No comments have been added yet"
     end
-    return mem
-  end
-
-  #show issues comment
-  def get_issues_cm
   end
 
   #add issue comment
@@ -217,27 +271,44 @@ class Repositories
     print "\n"
     forklist=[]
     case
-      when scope==USER
+    when scope==USER_REPO
+      if config["Repo"].split("/").size == 1
+        mem=client.forks(config["User"]+"/"+config["Repo"],"master")
+      else
+        mem=client.forks(config["Repo"],"master")
+      end
+    when scope==ORGS_REPO || scope==TEAM_REPO
         mem=client.forks(config["Org"]+"/"+config["Repo"])
     end
-    mem.each do |i|
-      puts i[:owner][:login]
-      forklist.push(i[:owner][:login])
+    if mem.size==0
+      puts "No forks found for this repository"
+    else
+      mem.each do |i|
+        puts i[:login]
+        forklist.push(i[:login])
+      end
+      print "\n"
+      return forklist
     end
-    print "\n"
-    return forklist
   end
 
   def show_collaborators(client,config,scope)
     print "\n"
     collalist=[]
     case
-    when scope==USER
+    when scope==USER_REPO
+      if config["Repo"].split("/").size == 1
+        mem=client.collaborators(config["User"]+"/"+config["Repo"],"master")
+      else
+        mem=client.collaborators(config["Repo"],"master")
+      end
+    when scope==ORGS_REPO || scope==TEAM_REPO
       mem=client.collaborators(config["Org"]+"/"+config["Repo"])
     end
+    print " Collaborators\n\n"
     mem.each do |i|
-      puts i[:author][:login]
-      collalist.push(i[:author][:login])
+      puts " #{i[:login]}"
+      collalist.push(i[:login])
     end
     print "\n"
     return collalist
@@ -328,17 +399,57 @@ class Repositories
     end
   end
 
+  def edit_repository(client, config, repo, scope, privacy)
+    options=Hash.new
+    options[:private]=privacy
+
+    case
+    when scope==ORGS
+      options[:organization]=config["Org"]
+      if client.repository?("#{config["Org"]}/#{repo}")==true
+        client.edit_repository(repo,options)
+        puts "Edited repository in #{config["Org"]}"
+        return true
+      else
+        puts "\e[31m Doesn't exists a repository with that name in #{config["Org"]}\e[0m"
+        return false
+      end
+    when scope==USER
+      if client.repository?("#{config["User"]}/#{repo}")==true
+        client.edit_repository(repo)
+        puts "Edited repository #{config["User"]}"
+        return true
+      else
+        puts "\e[31m Doesn't exists a repository with that name in #{config["User"]}\e[0m"
+        return false
+      end
+    when scope==TEAM
+      puts "Edited repository in #{config["Org"]} team"
+      options[:team_id]=config["TeamID"]
+      options[:organization]=config["Org"]
+
+      if client.repository?("#{config["Org"]}/#{repo}")==true
+        client.edit_repository(repo,options)
+        puts "Edited repository in #{config["Org"]} for team #{config["Team"]}"
+        return true
+      else
+        puts "\e[31m Doesn't exists a repository with that name in #{config["Org"]}\e[0m"
+        return false
+      end
+    end
+  end
+
+  def change_privacy(client,config,repo,list,list_id,privacy)
+    list.each do |i|
+    end
+  end
+
   def create_repository_by_teamlist(client,config,repo,list,list_id)
     options=Hash.new
     options[:organization]=config["Org"]
-    #puts list_id
     y=0
     list.each do |i|
       options[:team_id]=list_id[y]
-      # puts i, list_id[y]
-      # puts repo
-      # puts options
-      # puts "\n"
       client.create_repository(i+"/"+repo,false,options)
       y=y+1
     end

data/lib/actions/teams.rb

@@ -187,7 +187,9 @@ class Teams
         end
       end
     end
+  end
 
+  def change_group_repos_privacity()
   end
 
   def add_to_group(config,name)

data/lib/interface.rb

@@ -187,7 +187,11 @@ class Interface
           self.set(path)
         end
       when @deep == ORGS
+         if @teamlist==[]
+           @teamlist=Teams.new.read_teamlist(@client,@config)
+         end
         aux=@teamlist
+        # puts "lul #{@teamlist}"
         if aux[path]!=nil
           @config["Team"]=path
           @config["TeamID"]=@teamlist[path]
@@ -231,6 +235,10 @@ class Interface
           self.set(path)
         end
       when @deep==ORGS
+        if @teamlist==[]
+          @teamlist=Teams.new.read_teamlist(@client,@config)
+        end
+        aux=@teamlist
         if aux[path_split[0]]!=nil
           @config["Team"]=path_split[0]
           @config["TeamID"]=@teamlist[path_split[0]]
@@ -408,16 +416,16 @@ class Interface
   end
 
   def show_forks()
-    case
-    when @deep==ORGS_REPO
-      Repositories.new.show_forks(@client,@config,1)
+    c=Repositories.new
+    if @deep==ORGS_REPO || @deep==USER_REPO || @deep==TEAM_REPO
+      c.show_forks(@client,@config,@deep)
     end
   end
 
   def collaborators()
-    case
-    when @deep==ORGS_REPO
-      Repositories.show_collaborators(@client,@config,1)
+    c=Repositories.new
+    if @deep==ORGS_REPO || @deep==USER_REPO || @deep==TEAM_REPO
+      c.show_collaborators(@client,@config,@deep)
     end
   end
 
@@ -446,6 +454,7 @@ class Interface
       @config=s.load_config(config_path,argv_token)  #retorna la configuracion ya guardada anteriormente
       @client=s.client
       @deep=s.return_deep(config_path)
+      #if @deep==ORGS then @teamlist=t.get_teamlist end  #solucion a la carga de las ids de los equipos de trabajo
     end
 
     #@deep=USER
@@ -506,21 +515,9 @@ class Interface
       end
 
       if opcd[0]=="issue" and opcd.size>1
-        issfound=0
-        @issues_list=r.get_issues(@client,@config,@deep)
-        if @issues_list!=nil
-          @issues_list.each do |i|
-            if i[:number]==opcd[1].to_i
-              puts "##{i[:number]} state: #{i[:state]} -> #{i[:title]} \n"
-              puts "#{i[:body]}"
-              issfound=1
-            end
-          end
-        end
-        if issfound==0
-          puts "Issue not found"
+        if @deep==ORGS_REPO || @deep==USER_REPO || @deep==TEAM_REPO
+          r.show_issue(@client,@config,@deep,opcd[1])
         end
-        puts "\n"
       end
 
       if opcd[0]=="cd" and opcd[1]!=".."

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.23'
+  VERSION='1.1.24'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghedsh
 version: !ruby/object:Gem::Version
-  version: 1.1.23
+  version: 1.1.24
 platform: ruby
 authors:
 - Javier Clemente
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit