ghedsh 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d284d3044a823a0685dc8000446c04121025c9b5
-  data.tar.gz: c1d9b80bd3e9b7212b33901493221ac90ead897a
+  metadata.gz: 8f4dcc6a2dbae9b352b9894bf2a7ef7f84887249
+  data.tar.gz: a63dccdd412919b01e57fcd267cdf87a64bd439b
 SHA512:
-  metadata.gz: 800d79a32bdfd1aeeecd14a4d72ac930d7a9d624f626c59b51c6cb10638bbf7adeffa37e34caeea1a782787f9b2b2b501301a4d72c49df827bf63f6ce2c37a5a
-  data.tar.gz: efa095937b48289ee543e081f37a5f201a93042b5a98be524524bb22df986ad51d63582706bf2f40b38bcc54da3129d9d38cca79f3af743eb8ccfd2d96e9694d
+  metadata.gz: 5fafc80b7cd0c38c52d8726c99e09be30847c4f7b1f01dbfed79bd56ece3e75ca22777ad5b50ef867e4bf74cf22ef0026c787b615ab718cfe458e687d10174d6
+  data.tar.gz: ccdee0c1a494cfd079d4f6aed60c33971bf0dce7ceff53161531ab60e099c9cae8e4da1075cfe462f04fea20b02acf24192f0c973ca5d36300d639ac3b21ab57

data/lib/actions/repo.rb

@@ -54,7 +54,7 @@ class Repositories
 
       when scope==2
         repo=client.organization_repositories(config["Org"])
-      when scope==3
+      when scope==4
         repo=client.team_repositories(config["TeamID"])
     end
 
@@ -183,7 +183,7 @@ class Repositories
         repo=client.repositories
       when scope==2
         repo=client.organization_repositories(config["Org"])
-      when scope==3
+      when scope==4
         repo=client.team_repositories(config["TeamID"])
     end
     repo.each do |i|

data/lib/actions/system.rb

@@ -239,4 +239,51 @@ class Sys
     return options
   end
 
+  def showcachelist(list,exp)
+    print "\n"
+    rlist=[]
+    options=Hash.new
+    o=Organizations.new
+    regex=false
+
+    if exp!=nil
+      if exp.match(/^\//)
+        regex=true
+        sp=exp.split('/')
+        exp=Regexp.new(sp[1],sp[2])
+      end
+    end
+    counter=0
+    allpages=true
+
+    list.each do |i|
+      if regex==false
+        if counter==100 && allpages==true
+          op=Readline.readline("\nThere are more results. Show next repositories (press any key) or Show all repositories (press a): ",true)
+          if op=="a"
+            allpages=false
+          end
+          counter=0
+        end
+        puts i
+        rlist.push(i)
+        counter=counter+1
+      else
+
+      if i.match(exp)
+          puts i
+          rlist.push(i)
+          counter=counter+1
+        end
+      end
+    end
+
+    if rlist.empty?
+      puts "No repository matches with that expression"
+    else
+      print "\n"
+      puts "Repositories found: #{rlist.size}"
+    end
+  end
+
 end

data/lib/actions/teams.rb

@@ -69,6 +69,7 @@ class Teams
     end
     print "\n"
     return memberlist
+    print "\n"
   end
 
 end

data/lib/interface.rb

@@ -26,11 +26,10 @@ class Interface
   attr_accessor :deep
   attr_accessor :memory
   attr_reader :orgs_list,:repos_list, :teamlist, :orgs_repos, :teams_repos
-  LIST = ['repos', 'exit', 'orgs','help', 'people','teams', 'cd ', 'cd repo ','commits','forks', 'add_team_member ','new_team ','rm_team ','new_repository ','new_assignment ','clone '].sort
 
   def initialize
     @sysbh=Sys.new()
-    @repos_list=[]; @orgs_repos=[]
+    @repos_list=[]; @orgs_repos=[]; @teams_repos=[]
 
     options=@sysbh.parse
 
@@ -46,7 +45,7 @@ class Interface
         raise
       rescue Exception => e
         puts "exit"
-        puts e
+      #  puts e
       end
     end
   end
@@ -56,7 +55,7 @@ class Interface
       when @deep == USER then return @config["User"]+"> "
       when @deep == USER_REPO then return @config["User"]+">"+ "\e[31m#{@config["Repo"]}\e[0m"+"> "
       when @deep == ORGS then return @config["User"]+">"+ "\e[34m#{@config["Org"]}\e[0m"+"> "
-      when @deep == TEAM then return @config["User"]+">"+@config["Org"]+">"+@config["Team"]+"> "
+      when @deep == TEAM then return @config["User"]+">"+"\e[34m#{@config["Org"]}\e[0m"+">"+@config["Team"]+"> "
       when @deep == TEAM_REPO then return @config["User"]+">"+"\e[34m#{@config["Org"]}\e[0m"+">"+@config["Team"]+">"+"\e[31m#{@config["Repo"]}\e[0m"+"> "
       when @deep == ORGS_REPO then return @config["User"]+">"+"\e[34m#{@config["Org"]}\e[0m"+">"+"\e[31m#{@config["Repo"]}\e[0m"+"> "
     end
@@ -85,6 +84,7 @@ class Interface
         when @deep == ORGS
           @config["Org"]=nil
           @deep=1
+          @orgs_repos=[]
         when @deep == ORGS_REPO
           @config["Repo"]=nil
           @deep=2
@@ -94,6 +94,7 @@ class Interface
         when @deep == TEAM
           @config["Team"]=nil
           @config["TeamID"]=nil
+          @teams_repos=[]
           @deep=2
       end
     else
@@ -102,6 +103,7 @@ class Interface
       @config["Team"]=nil
       @config["TeamID"]=nil
       @deep=1
+      @orgs_repos=[]; @teams_repos=[]
     end
   end
 
@@ -115,7 +117,6 @@ class Interface
       if aux.one?{|aux| aux==path}
         @config["Org"]=path
         @teamlist=Teams.new.read_teamlist(@client,@config)
-        #self.add_history_str(1,@teamlist)
         @sysbh.add_history_str(1,@teamlist)
         @deep=2
       else
@@ -169,7 +170,7 @@ class Interface
       if @teams_repos.empty? == false
         repostlist=@teams_repos
       else
-        repostlist.get_repos_list(@client,@config,@deep)
+        reposlist=reposlist.get_repos_list(@client,@config,@deep)
       end
       if reposlist.one?{|aux| aux==path}
         @deep=TEAM_REPO
@@ -182,7 +183,6 @@ class Interface
   def orgs()
     case
     when @deep==USER
-      #self.add_history_str(2,Organizations.new.show_orgs(@client,@config))
       @sysbh.add_history_str(2,Organizations.new.show_orgs(@client,@config))
     end
   end
@@ -190,11 +190,9 @@ class Interface
   def people()
     case
     when @deep==ORGS
-      #self.add_history_str(2,Organizations.new.show_organization_members_bs(@client,@config))
       @sysbh.add_history_str(2,Organizations.new.show_organization_members_bs(@client,@config))
     when @deep==TEAM
-      #self.add_history_str(2,Teams.new.show_team_members_bs(@client,@config))
-      @sysbh.add_history_str(2,Organizations.new.show_organization_members_bs(@client,@config))
+      @sysbh.add_history_str(2,Teams.new.show_team_members_bs(@client,@config))
     end
   end
 
@@ -204,28 +202,26 @@ class Interface
       when @deep == USER
         if @repos_list.empty?
           list=repo.show_repos(@client,@config,USER,nil)
-          #self.add_history_str(2,list)
           @sysbh.add_history_str(2,list)
           @repos_list=list
         else
-          puts @repos_list
+          @sysbh.showcachelist(@repos_list,nil)
         end
       when @deep ==ORGS
         if @orgs_repos.empty?
           list=repo.show_repos(@client,@config,ORGS,nil)
-          #self.add_history_str(2,list)
           @sysbh.add_history_str(2,list)
           @orgs_repos=list
         else
-          puts @orgs_repos
+          @sysbh.showcachelist(@orgs_repos,nil)
         end
       when @deep==TEAM
         if @teams_repos.empty?
           list=repo.show_repos(@client,@config,TEAM,nil)
-          self.add_history_str(2,list)
+          @sysbh.add_history_str(2,list)
           @teams_repos=list
         else
-          puts @teams_repos
+          @sysbh.showcachelist(@teams_repos,nil)
         end
     end
   end
@@ -289,7 +285,6 @@ class Interface
 
     @deep=USER
     if @client!=nil
-      #self.add_history_str(2,Organizations.new.read_orgs(@client))
       @sysbh.add_history_str(2,Organizations.new.read_orgs(@client))
     end
 
@@ -330,8 +325,30 @@ class Interface
       if opcd[0]=="repos" and opcd.size==1
         self.repos()
       end
-      if opcd[0]=="repos" and opcd.size>1
-         r.show_repos(@client,@config,@deep,opcd[1])
+      if opcd[0]=="repos" and opcd.size>1         ##Busca con expresion regular, si no esta en la cache realiza la consulta
+        case
+        when @deep==USER
+          if @repos_list.empty?
+            r.show_repos(@client,@config,@deep,opcd[1])
+            @repos_list=r.get_repos_list(@client,@config,@deep)
+          else
+            @sysbh.showcachelist(@repos_list,opcd[1])
+          end
+        when @deep==ORGS
+          if @orgs_repos.empty?
+            r.show_repos(@client,@config,@deep,opcd[1])
+            @orgs_repos=r.get_repos_list(@client,@config,@deep)
+          else
+            @sysbh.showcachelist(@orgs_repos,opcd[1])
+          end
+        when @deep==TEAM
+          if @teams_repos.empty?
+            r.show_repos(@client,@config,@deep,opcd[1])
+            @teams_repos=r.get_repos_list(@client,@config,@deep)
+          else
+            @sysbh.showcachelist(@teams_repos,opcd[1])
+          end
+        end
       end
       if opcd[0]=="add_team_member"
         t.add_to_team(@client,@config,opcd[1])
@@ -339,18 +356,18 @@ class Interface
       if opcd[0]=="new_team" and opcd.size==2
       	t.create_team(@client,@config,opcd[1])
       	@teamlist=t.read_teamlist(@client,@config)
-      	self.add_history_str(1,@teamlist)
+      	@sysbh.add_history_str(1,@teamlist)
       end
       if opcd[0]=="rm_team"
         t.delete_team(@client,@teamlist[opcd[1]])
         self.quit_history(@teamlist[opcd[1]])
         @teamlist=t.read_teamlist(@client,@config)
-        self.add_history_str(1,@teamlist)
+        @sysbh.add_history_str(1,@teamlist)
       end
       if opcd[0]=="new_team" and opcd.size>2
       	t.create_team_with_members(@client,@config,opcd[1],opcd[2..opcd.size])
       	@teamlist=t.read_teamlist(@client,@config)
-      	self.add_history_str(1,@teamlist)
+      	@sysbh.add_history_str(1,@teamlist)
       end
       if opcd[0]=="new_repository" and opcd.size==2
         r.create_repository(@client,@config,opcd[1],@deep)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.11'
+  VERSION='1.1.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghedsh
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Javier Clemente