ghedsh 1.1.29 → 1.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cab8913900ed4610a1f804f2c229020ac93e2fc
-  data.tar.gz: d1278ce2803f79eda19a96cbfa7641844838b2e8
+  metadata.gz: e9ad6c1b3785d23f444874aaf51c1d9eed534ba7
+  data.tar.gz: f7cf2faca38d73638cd5d3db97bba0620f7b78d2
 SHA512:
-  metadata.gz: 120f161ceb9f25cf456afee6136f350a3c739c5a74c437ece463964b92488050cc401ba413e4a25412a61bb84fc5145b6a3252ce14fd938556ff704c4cfe233f
-  data.tar.gz: f10b759370d2d7ef93374438e2c6273578901ad32850e2155748d66c0165a151e876db8c896e3009c8b2ca9fe3550d1c0f22b58a1f4b0f1f1968710afad046db
+  metadata.gz: 9fdefa767839703b084dfea4ea0a49ac08ba2dd97f411531aaf64f1c3eefcdaa7672fbb253ec089f4169773a4368a81efe70947fecc97619bacf710a73b43c78
+  data.tar.gz: 7d027abcb718f4aece629a5f53dbb6a02383a429614e0c26412398cae66a307fc2e0ae07f4c30c0517f4a7906f4af18bd7bdaa18518d8f26b66f696300aaad2b

data/lib/actions/help.rb

@@ -38,6 +38,7 @@ class HelpM
     print "\tteams\t\t\tTeams of a organization\n"
     print "\tnew_people_info\t\tGet extended information from a .csv file founded in the excecute path\n"
     print "\t\t\t\t->\tnew_people_info [name of the file]\n\n"
+    print "\trm people info\t\tDelete the extended information\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"

data/lib/actions/orgs.rb

@@ -289,6 +289,7 @@ class Organizations
   def add_people_info(client,config,file)
     list=self.load_people()
     csvoptions={:quote_char => "|",:headers=>true}
+    members=self.get_organization_members(client,config)  #members of the organization
 
     inpeople=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
     if inpeople==nil
@@ -310,6 +311,7 @@ class Organizations
       users=[]
       puts "\nFields found: "
       puts fields
+      puts
       mem.each do |i|
         aux=Hash.new
         fields.each do |j|
@@ -327,34 +329,39 @@ class Organizations
       end
 
       users.each do |i|
-        here=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["github"]==i["github"]}
-        if here==nil
-          list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"]<<i
-        else
-          puts "\nAlready exits \e[31m#{i["github"]}\e[0m in database"
-          if here.eql?(i)
-            puts "The information given is the same as in the database, changes are being discard."
+        if members.include?(i["github"])
+          here=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["github"]==i["github"]}
+          if here==nil
+            list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"]<<i
+            puts "#{i["github"]} information correctly added"
           else
-            puts "The information is different thant the original. Do you want to change it?"
-            puts "\n Github:\t#{here["github"]} -> #{i["github"]}"
-
-            fields.each do |j|
-              puts " #{j} :\t\t#{here[j.gsub("\"", "").downcase]} -> #{i[j.gsub("\"", "").downcase]}"
-            end
+            puts "\nAlready exits \e[31m#{i["github"]}\e[0m in database"
+            if here.eql?(i)
+              puts "The information given is the same as in the database, changes are being discard."
+            else
+              puts "The information is different thant the original. Do you want to change it?"
+              puts "\n Github:\t#{here["github"]} -> #{i["github"]}"
 
-            puts "\nPress any key and enter to proceed, or only enter to skip: "
-            op=gets.chomp
-            if op!=""
-              index1=list["orgs"].index{|aux| aux["name"]==config["Org"]}
-              index2=list["orgs"][index1]["users"].index{|aux2| aux2["github"]==i["github"]}
+              fields.each do |j|
+                puts " #{j} :\t\t#{here[j.gsub("\"", "").downcase]} -> #{i[j.gsub("\"", "").downcase]}"
+              end
 
-              list["orgs"][index1]["users"].pop(index2)
-              list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"]<<i
-              puts "The information about \e[31m#{i["github"]}\e[0m has been changed"
-            else
-              puts "The new information about \e[31m#{i["github"]}\e[0m has been discarded"
+              puts "\nPress any key and enter to proceed, or only enter to skip: "
+              op=gets.chomp
+              if op!=""
+                index1=list["orgs"].index{|aux| aux["name"]==config["Org"]}
+                index2=list["orgs"][index1]["users"].index{|aux2| aux2["github"]==i["github"]}
+
+                list["orgs"][index1]["users"].pop(index2)
+                list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"]<<i
+                puts "The information about \e[31m#{i["github"]}\e[0m has been changed"
+              else
+                puts "The new information about \e[31m#{i["github"]}\e[0m has been discarded"
+              end
             end
           end
+        else
+          puts "#{i["github"]} is not registered in this organiation"
         end
       end
       Sys.new.save_people("#{ENV['HOME']}/.ghedsh",list)
@@ -363,8 +370,25 @@ class Organizations
     end
   end
 
+  def rm_people_info(client,config)
+    list=self.load_people()
+    inpeople=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
+    if inpeople==nil
+      puts "Extended information has not been added yet"
+    else
+      if inpeople["users"].empty?
+        puts "Extended information has not been added yet"
+      else
+        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"]=[]
+        Sys.new.save_people("#{ENV['HOME']}/.ghedsh",list)
+        puts "The aditional information of #{config["Org"]} has been removed"
+      end
+    end
+  end
+
   def show_people_info(client,config,user)
     list=self.load_people()
+
     inpeople=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
     peopleinfolist=[]
 
@@ -373,28 +397,36 @@ class Organizations
       Sys.new.save_people("#{ENV['HOME']}/.ghedsh",list)
       puts "Extended information has not been added yet"
     else
-      if user==nil
-        fields=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"][0].keys
-        list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].each do |i|
-          puts "\n\e[31m#{i["github"]}\e[0m"
-          fields.each do |j|
-            puts "#{j.capitalize}:\t #{i[j]}"
+      if inpeople["users"]!=[]
+        if user==nil
+          fields=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"][0].keys
+          list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].each do |i|
+            puts "\n\e[31m#{i["github"]}\e[0m"
+            fields.each do |j|
+              puts "#{j.capitalize}:\t #{i[j]}"
+            end
+            peopleinfolist<<i["github"]
           end
-          peopleinfolist<<i["github"]
-        end
-        return peopleinfolist
-      else
-        inuser=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["github"]==user}
-        if inuser==nil
-          puts "Not extended information has been added of that user."
+          return peopleinfolist
         else
-          fields=inuser.keys
-          puts "\n\e[31m#{inuser["github"]}\e[0m"
-          fields.each do |j|
-            puts "#{j.capitalize}:\t #{inuser[j]}"
+          if user.include?("@")
+            inuser=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["mail"]==user}
+          else
+            inuser=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["github"]==user}
+          end
+          if inuser==nil
+            puts "Not extended information has been added of that user."
+          else
+            fields=inuser.keys
+            puts "\n\e[31m#{inuser["github"]}\e[0m"
+            fields.each do |j|
+              puts "#{j.capitalize}:\t #{inuser[j]}"
+            end
+            puts
           end
-          puts
         end
+      else
+        puts "Extended information has not been added yet"
       end
     end
   end
@@ -423,6 +455,17 @@ class Organizations
     return orgslist
   end
 
+  def get_organization_members(client,config)
+    mem=client.organization_members(config["Org"])
+    list=[]
+    if mem!=nil
+      mem.each do |i|
+        list<<i[:login]
+      end
+    end
+    return list
+  end
+
   def show_orgs(client,config)
     orgslist=[]
     print "\n"

data/lib/interface.rb

@@ -512,6 +512,10 @@ class Interface
           if @deep==USER_REPO || @deep==TEAM_REPO || @deep==ORGS_REPO then r.info_repository(@client,@config,@deep) end
         when op== "add_repo"
           if @deep=ASSIG then o.add_repo_to_assig(@client,@config,@assig_path) end
+        when op.include?("rm")
+          if @deep==ORGS and opcd[1]=="people" and opcd[2]=="info"
+            o.rm_people_info(@client,@config)
+          end
         when op== "add_group"
             if @deep=ASSIG then o.add_group_to_assig(@client,@config,@assig_path) end
         when op == "version"
@@ -668,7 +672,8 @@ class Interface
       if opcd[0]=="new_people_info" and opcd.size==2 and @deep==ORGS then o.add_people_info(@client,@config,opcd[1]) end
       if opcd[0]=="people" and opcd[1]=="info"
         if opcd.size==2
-          @sysbh.add_history_str(2,o.show_people_info(@client,@config,nil))
+          info_strm=o.show_people_info(@client,@config,nil)
+          if info_strm!=nil then @sysbh.add_history_str(2,info_strm) end
         else
           o.show_people_info(@client,@config,opcd[2])
         end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.29'
+  VERSION='1.1.30'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghedsh
 version: !ruby/object:Gem::Version
-  version: 1.1.29
+  version: 1.1.30
 platform: ruby
 authors:
 - Javier Clemente
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit