ghedsh 1.1.38 → 1.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe3fa8042c7233e78cc4fc2424d4ca7892675ea
-  data.tar.gz: c24e5dfc9d262fd21c4ba622816ba77fbe9400b3
+  metadata.gz: c81ab0cbd1e2dd44e2aa3679176b5ae079e9bddc
+  data.tar.gz: ba021c28e9f2a32a5aea738e36c84bd525005391
 SHA512:
-  metadata.gz: c91ca1b3582071de94eb21dce1da08ce91efb1d30c5fa33498df366d5bd884e3b60405aa6870b5df5984219fb3dfd6606efddd91d49d5bfe924dc343be61c70f
-  data.tar.gz: 0b87d7f4bb5574e12f22619989ce1c3bb51b08b9bb800cfc7a7368e851d88d89a992e96d9faf835959f00cdb035222e69a219ae00efd4706694de9c4c51eb7b6
+  metadata.gz: 2f2859e405ac8e55bba00e33c01882c9e882fd77aad735aa08a1b25dce34584dc7e4a21d7eca578c0853c0aa99fd8cb727d72ee8084c4c05f2bf54123d417bf5
+  data.tar.gz: a843631878ec2a7eb2d572403186df56f30b63f5c0bc473b34fe78f160228d753885b7c09eb0069f2c283e4e97892da0b0d0dc1467cc71dcdd622be02a06efd8

data/lib/actions/orgs.rb

@@ -6,7 +6,7 @@ require 'require_all'
 require_rel '.'
 require 'readline'
 
-GITHUB_LIST=['githubid','idgithub','github_id','id_github','githubuser','github_user']
+GITHUB_LIST=['githubid','github','idgithub','github_id','id_github','githubuser','github_user']
 MAIL_LIST=['email','mail','e-mail']
 
 class Organizations
@@ -487,6 +487,8 @@ class Organizations
     list=self.load_people()
     csvoptions={:quote_char => "|",:headers=>true,:skip_blanks=>true}
     members=self.get_organization_members(client,config)  #members of the organization
+    change=false
+    indexname=""
 
     inpeople=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
     if inpeople==nil
@@ -515,29 +517,38 @@ class Organizations
         fields.each do |j|
           if i[j]!=nil
             if GITHUB_LIST.include?(j.gsub("\"", "").downcase.strip)
-              aux["github"]=i[j].gsub("\"", "").strip
+              data=i[j]
+              data=data.gsub("\"", "")
+              aux["github"]=data
               j="github"
             else
               if MAIL_LIST.include?(j.gsub("\"", "").downcase.strip)
                 aux["email"]=i[j].gsub("\"", "").strip
+                indexname=j
                 j="email"
+                change=true
               else
-                aux[j.gsub("\"", "").downcase.strip]=i[j].gsub("\"", "").strip
+                data=i[j].gsub("\"", "")
+                aux[j.gsub("\"", "").downcase.strip]=data.strip
               end
             end
           else
-            aux[j.gsub("\"", "").downcase.strip]=i[j]
+            data=i[j].gsub("\"", "")
+            aux[j.gsub("\"", "").downcase.strip]=data.strip
           end
         end
         users.push(aux)
       end
       ## Aqui empiezan las diferenciaa
       if relation==true
-
+        if change==true
+          fields[fields.index(indexname)]="email"
+        end
+        fields=users[0].keys
         # if users.keys.include?("github") and users.keys.include?("email") and users.keys.size==2
         if fields.include?("github") and fields.include?("email") and fields.size==2
           users.each do |i|
-            if members.include?(i["github"])
+            if members.include?(i["github"].delete("\""))
               here=list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"].detect{|aux2| aux2["github"]==i["github"]} #miro si ya esta registrado
               if here==nil
                 list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"]<<i
@@ -876,7 +887,7 @@ class Organizations
       Sys.new.save_people("#{ENV['HOME']}/.ghedsh",list)
       puts "Extended information has not been added yet"
     else
-      if user.downcase.start_with?("/") and user.downcase.end_with?("/")
+      if user.downcase.start_with?("/") and user.downcase.count("/")==2
         sp=user.split('/')
         exp=Regexp.new(sp[1],sp[2])
         inuser=Sys.new.search_rexp_peoplehash(list["orgs"].detect{|aux| aux["name"]==config["Org"]}["users"],exp)

data/lib/actions/repo.rb

@@ -453,19 +453,21 @@ class Repositories
     case
     when scope==USER_REPO
       if config["Repo"].split("/").size == 1
-        mem=client.collaborators(config["User"]+"/"+config["Repo"],"master")
+        mem=client.collaborators(config["User"]+"/"+config["Repo"])
       else
-        mem=client.collaborators(config["Repo"],"master")
+        mem=client.collaborators(config["Repo"])
       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[:login]}"
-      collalist.push(i[:login])
+    if mem!=nil
+      mem.each do |i|
+        puts " #{i[:login]}"
+        collalist.push(i[:login])
+      end
+      print "\n"
     end
-    print "\n"
     return collalist
   end
 
@@ -599,6 +601,8 @@ class Repositories
         repo=client.repositories()
       when scope==ORGS
         repo=client.organization_repositories(config["Org"])
+      when scope==ASSIG
+        repo=client.organization_repositories(config["Org"])
       when scope==TEAM
         repo=client.team_repositories(config["TeamID"])
     end
@@ -673,6 +677,12 @@ class Repositories
             @clonedrepos.push("#{config["Org"]}/#{i}")
             system(command)
           end
+        when scope==ASSIG
+          list.each do |i|
+            command = "git clone #{web2}#{config["Org"]}/#{i}.git"
+            @clonedrepos.push("#{config["Org"]}/#{i}")
+            system(command)
+          end
         end
         self.clonedpush()
       else
@@ -698,7 +708,7 @@ class Repositories
     if files!=[]
       print "\n"
       puts files
-      puts "Are gone to be removed (Y/N)"
+      puts "Are gone to be removed (y/N)"
       op=gets.chomp
       if op.downcase=="y" || op.downcase=="yes"
         files.each do |i|

data/lib/interface.rb

@@ -735,6 +735,10 @@ class Interface
         if opcd.size==1 && (@deep==USER_REPO || @deep==TEAM_REPO || @deep==ORGS_REPO)
           r.clone_repo(@client,@config,nil,@deep)
         end
+        if opcd.size==1 && deep==ASSIG
+          r.clone_repo(@client,@config,"/#{@config["Assig"]}/",@deep)
+          puts "/#{@config["Assig"]}/"
+        end
       end
       if op.match(/^!/)
         op=op.split("!")

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.38'
+  VERSION='1.1.39'
 end

metadata

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