ghedsh 1.1.32 → 1.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e307fb5619bc43c42789ff8071892ba33939698
-  data.tar.gz: 24cdf3be7b778f776e16dd4042300a8d75e4012a
+  metadata.gz: 9dca8d52441f8e5577b607f806391d21014b8520
+  data.tar.gz: 812a9a01446c4180aecd626a6c4162432fb873d7
 SHA512:
-  metadata.gz: 1260c790dd6a4a2adc85d43340ae6cb7054b5debc55a21900c246dd1826c74fd8b3eb778c6159b3cf79632e4e563d59f00a7f44dc546524e1294bbb7fa41f88a
-  data.tar.gz: c741b85b73dc122ea8b27138064025094ab1ea35824cd651ccbcaf5324b81e133aae1e7cb125e6c24448bea7b3686deb7fefa1842226774b3aa862f703d6f065
+  metadata.gz: 0f970a8ecb8535662f24dac78a2f1039038f208f51f069c6f9fea090fd922598198fb2d7050cbf5dec5845a7e230f2afc53659524107b670a129ca6048a07581
+  data.tar.gz: dc6172feedf7d0336cdeac6eec0c33c2a5ab0c2f9d5fc47820f8dc08269206acef96c64a93d79661c23e80497fd2ef2d80ae6692ca9cae756ba52659d00c875f

data/lib/actions/orgs.rb

@@ -123,6 +123,7 @@ class Organizations
 
   def assignment_groups(client,config)
     team=Teams.new()
+    sys=Sys.new()
     groupslist=team.get_groupslist(config)
     groupsadd=[]
     teamlist=team.read_teamlist(client,config)
@@ -132,7 +133,7 @@ class Organizations
     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==""
@@ -151,11 +152,44 @@ class Organizations
         teamlist.each do |aux|
           puts "\t#{aux[0]}"
         end
-        puts "\nPut a list of Teams: "
-
-        list=gets.chomp
-        list=list.split(" ")
-        team.new_group(client,config,name,list)
+        begin
+          puts "\n1)Put a list of Teams"
+          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"
+          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
+        if op2=="1"
+          puts "\nPut a list of Teams (Separeted with space): "
+          list=gets.chomp
+          list=list.split(" ")
+        end
+        if op2=="2"
+          puts "All the teams have been taken"
+          list=teamlist.keys
+        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 op!="4" and refuse==false
+          team.new_group(client,config,name,list)
+        end
         groupsadd.push(name)
       else
         groupsadd=[]
@@ -181,15 +215,21 @@ class Organizations
       Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
     end
 
-    reponame=self.assignment_repository(client,config,name)
-    groupsadd=self.assignment_groups(client,config)
+    assig_exist=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["assigs"].detect{|aux| aux["name_assig"]==name}
+    if assig_exist==nil
 
-    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
+      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
+      end
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+    else
+      puts "Already exists an Assignment with that name"
     end
-    Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
   end
 
   def get_assigs(client,config)
@@ -516,8 +556,8 @@ class Organizations
         if field==nil
           inuser.each_value do |j|
             if j.include?("github.com")
-              if j.include?("https://")==false || j.include?("http://")==false
-                Sys.new.open_url("http://"+j)
+              if !j.include?("https://") && !j.include?("http://")
+                Sys.new.open_url("https://"+j)
               else
                 Sys.new.open_url(j)
               end
@@ -529,7 +569,7 @@ class Organizations
           end
         else
           if inuser.keys.include?(field.downcase)
-            if inuser[field.downcase].include?("https://")==false || inuser[field.downcase].include?("http://")==false
+            if !inuser[field.downcase].include?("https://") && !inuser[field.downcase].include?("http://")
               url="http://"+inuser["#{field.downcase}"]
             else
               url=inuser["#{field.downcase}"]

data/lib/actions/system.rb

@@ -49,6 +49,28 @@ class Sys
     Readline.completion_proc = comp
   end
 
+  def load_memory(path,config)
+    if File.exist?("#{path}/ghedsh-#{config["User"]}-history")
+      source=File.read("#{path}/ghedsh-#{config["User"]}-history")
+      s=source.split("\n")
+      s.each do |i|
+        Readline::HISTORY.push(i)
+      end
+    else
+      File.write("#{path}/ghedsh-#{config["User"]}-history","")
+    end
+  end
+
+  def save_memory(path,config)
+    mem= Readline::HISTORY.to_a
+    me=""
+    mem.each do |i|
+      me=me+i.to_s+"\n"
+    end
+    File.write("#{path}/ghedsh-#{config["User"]}-history",me)
+  end
+
+
   def write_initial_memory
     history=LIST+memory
     comp = proc { |s| LIST.grep( /^#{Regexp.escape(s)}/ ) }
@@ -399,6 +421,17 @@ class Sys
     end
   end
 
+  def loadfile(path)
+    if File.exist?(path)
+      mem=File.read(path)
+      mem=mem.split("\n")
+      return mem
+    else
+      puts "File not found"
+      return nil
+    end
+  end
+
   def open_url(url)
     case
     when RUBY_PLATFORM.downcase.include?("darwin")

data/lib/actions/teams.rb

@@ -5,10 +5,11 @@ require 'require_all'
 require_rel '.'
 
 class Teams
-  attr_accessor :teamlist
+  attr_accessor :teamlist; :groupsteams
 
   def initialize
     @teamlist=Hash.new
+    @groupsteams=Hash.new
   end
 
   def add_to_team(client,config,path)
@@ -28,6 +29,10 @@ class Teams
     return @teamlist
   end
 
+  def clean_groupsteams()   #metodo para limpiar la cache en cd ..
+    @groupsteams=Hash.new
+  end
+
   def create_team(client,config,name)
     begin
       client.create_team(config["Org"],{:name=>name,:permission=>'push'})
@@ -110,8 +115,16 @@ class Teams
           puts i["name_group"]
           i["teams"].each do |j|
               puts "\t#{j}"
-              self.get_team_members(client,config,j).each do |k|
-                puts "\t\t#{k}"
+              if @groupsteams["#{j}"]==nil
+                @groupsteams["#{j}"]=Array.new
+                self.get_team_members(client,config,j).each do |k|
+                  puts "\t\t#{k}"
+                  @groupsteams["#{j}"].push(k)
+                end
+              else
+                @groupsteams["#{j}"].each do |k|
+                    puts "\t\t#{k}"
+                end
               end
           end
         end

data/lib/interface.rb

@@ -435,7 +435,6 @@ class Interface
   def run(config_path, argv_token,user)
     ex=1
     opscript=[]
-
     @sysbh.write_initial_memory()
     HelpM.new.welcome()
     o=Organizations.new
@@ -459,7 +458,7 @@ class Interface
       @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
-
+    @sysbh.load_memory(config_path,@config)
     #@deep=USER
     if @client!=nil
       @sysbh.add_history_str(2,Organizations.new.read_orgs(@client))
@@ -482,13 +481,16 @@ class Interface
 
       case
         when op == "exit" then ex=0
+          @sysbh.save_memory(config_path,@config)
           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)
+        when op == "cd .."
+          if @deep==ORGS then t.clean_groupsteams() end ##cleans groups cache
+          self.cdback(false)
         when op == "people" then self.people()
-        when op == "teams" #then self.teams()
+        when op == "teams"
       	  if @deep==ORGS
       	    t.show_teams_bs(@client,@config)
       	  end
@@ -525,7 +527,7 @@ class Interface
             @teamlist=t.read_teamlist(@client,@config)
             @sysbh.add_history_str(1,@teamlist)
           end
-        when op.include?("new") && op.include?("comment")==false && opcd[0]=="new" && opcd[1]=="issue"
+        when op.include?("new") && !op.include?("comment") && opcd[0]=="new" && opcd[1]=="issue"
           if opcd.size==2 and (@deep==ORGS_REPO || @deep==USER_REPO || @deep==TEAM_REPO)
             r.create_issue(@client,@config,@deep,config_path)
           end
@@ -648,7 +650,7 @@ class Interface
         end
       end
       if opcd[0]=="do" and opcd.size>1
-        opscript=s.load_script(opcd[1])
+        # opscript=s.load_script(opcd[1])
       end
       if opcd[0]=="set"
         self.set(opcd[1])

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.32'
+  VERSION='1.1.33'
 end

metadata

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