ghedsh 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b45f745ce7322d75cd57b4cea2c8603d4f9d01d9
-  data.tar.gz: 466f5140ece8a4dc12f15f8baaedd9610278b1cb
+  metadata.gz: 10c27568227695c5e7166c854a1e58e3ac74908c
+  data.tar.gz: 472ff14bd2ddc02686f346ca74b1f2935d360b35
 SHA512:
-  metadata.gz: 583065f321a6aaddb70cddd84835fe4598c74d18407d9923369664c41ccf815059f9364b3bd2d34872fa0182313b011d14eb93a0409d5d04bf4b2ed919c11b85
-  data.tar.gz: 828fda9f6005bcf315f8987fbf220cbe5e8b119de0d7fc6e399eeab72682c04a75b6f6ca89dd355a679f143a487bf8dde079b7468c93fcb008e1a8d74bd58d46
+  metadata.gz: 228dc8b4b3dbaff83deb9f4dde4e555063ee14ef598004387a9d8d681fcc637fe381c655639ea69fe92f92b5dd97f68d2bb27fc401d9eef245a73cd062f901aa
+  data.tar.gz: eb5604973f82e1ad6eab5f91adf885ae1bbe61b35bbf9949144b7b0ddeadbc9d0c287d0bfc08fe9d825739e9952d59112db8abbc3989bf0fe9d9fb8d180ff814

data/lib/actions/repo.rb

@@ -24,11 +24,20 @@ class Repositories
     end
   end
 
-  def show_repos(client,config,scope)
+  def show_repos(client,config,scope,exp)
     print "\n"
     reposlist=[]
     options=Hash.new
     o=Organizations.new
+    regex=false
+
+    if exp!=nil
+      if exp.match(/^\//)
+        regex=true
+        sp=exp.split('/')
+        exp=sp[1]
+      end
+    end
 
     case
       when scope==1
@@ -43,11 +52,24 @@ class Repositories
         repo=client.team_repositories(config["TeamID"])
     end
     repo.each do |i|
-      puts i.name
-      reposlist.push(i.name)
+      if regex==false
+        puts i.name
+        reposlist.push(i.name)
+      else
+
+        if i.name.match(/#{exp}/)
+          puts i.name
+          reposlist.push(i.name)
+        end
+      end
     end
-    print "\n"
-    puts "Repositories found: #{reposlist.size}"
+    if reposlist.empty?
+      puts "No repository matches with that expression"
+    else
+      print "\n"
+      puts "Repositories found: #{reposlist.size}"
+    end
+
     return reposlist
   end
 
@@ -63,26 +85,6 @@ class Repositories
   end
 
 
-  def show_repos_smart(client,config,exp,scope)
-    reposlist=[]
-    case
-      when scope==1
-        repo=client.repositories(config["User"])
-        #repo=client.all_repositories()
-      when scope==2
-        repo=client.organization_repositories(config["Org"])
-      when scope==3
-        repo=client.team_repositories(config["TeamID"])
-    end
-    repo.each do |i|
-      reposlist.push(i.name)
-    end
-
-    reposlist=Sys.new.search_rexp(reposlist,exp)
-    puts reposlist
-    return reposlist
-  end
-
   def show_forks(client,config,scope)
     print "\n"
     forklist=[]

data/lib/actions/system.rb

@@ -12,21 +12,20 @@ class Sys
   def load_config(configure_path,argv_token)
     if File.exist?(configure_path)
       if argv_token==nil
-        token=File.read("#{configure_path}/ghedsh-token")
+        token=self.get_login_token(configure_path)
       else
         token=argv_token
       end
       json = File.read("#{configure_path}/ghedsh-cache.json")
       config=JSON.parse(json)
 
-      if token!=""
+      if token!=nil
         @client=self.login(token)
         config["User"]=@client.login
         userslist=self.load_users(configure_path)
 
-        if userslist["#{config["User"]}"]==nil
-          userslist["#{config["User"]}"]=token
-          self.save_users(configure_path,userslist)
+         if userslist["users"].detect {|f| f["#{config["User"]}"] }==nil
+          self.add_users(configure_path,"#{config["User"]}"=>token)
         end
         if argv_token!=nil
           self.save_token(configure_path,argv_token)
@@ -44,12 +43,13 @@ class Sys
   def load_config_user(configure_path, user)
     if File.exist?(configure_path)
       list=self.load_users(configure_path)
-      if list["#{user}"]!=nil
+      userFound=list["users"].detect {|f| f["#{user}"]}
+      if userFound!=nil
         json = File.read("#{configure_path}/ghedsh-cache.json")
         config=JSON.parse(json)
-        @client=self.login(list["#{user}"])
+        @client=self.login(userFound["#{user}"])
         config["User"]=@client.login
-        self.save_token(configure_path,list["#{user}"])
+        self.save_token(configure_path,userFound["#{user}"])
         return config
       else
         puts "User not found"
@@ -67,8 +67,24 @@ class Sys
     return users
   end
 
+  def add_users(path,data)
+    json=File.read("#{path}/ghedsh-users.json")
+    users=JSON.parse(json)
+    users["users"].push(data)
+    File.write("#{path}/ghedsh-users.json",users.to_json)
+  end
+
   def save_token(path,token)
-    File.write("#{path}/ghedsh-token",token)
+    json=File.read("#{path}/ghedsh-users.json")
+    login=JSON.parse(json)
+    login["login"]=token
+    File.write("#{path}/ghedsh-users.json",login.to_json)
+  end
+
+  def get_login_token(path)
+    json=File.read("#{path}/ghedsh-users.json")
+    us=JSON.parse(json)
+    return us["login"]
   end
 
   def login(token)
@@ -90,9 +106,8 @@ class Sys
     if us!=nil
       puts "Login succesful as #{us.login}\n"
       config["User"]=us.login
-      userhash["#{config["User"]}"]=token
-      self.save_users(configure_path,userhash)
-      File.write("#{configure_path}/ghedsh-token",token) #config["Token"]=token
+      self.add_users(configure_path,"#{config["User"]}"=>token)
+      self.save_token(configure_path,token)
       @client=us
       return config
     end
@@ -111,9 +126,8 @@ class Sys
 
   def create_config(configure_path)
     con={:User=>nil,:Org=>nil,:Repo=>nil,:Team=>nil,:TeamID=>nil}
-    us={}
+    us={:login=>nil, :users=>[]}
     FileUtils.mkdir_p(configure_path)
-    File.new("#{configure_path}/ghedsh-token","w")
     File.write("#{configure_path}/ghedsh-cache.json",con.to_json)
     File.write("#{configure_path}/ghedsh-users.json",us.to_json)
     puts "Confiration files created in #{configure_path}"
@@ -138,7 +152,6 @@ class Sys
 
   def search_rexp(list,exp)
     list= list.select{|o| o.match(/#{exp}/)}
-    #puts list
     return list
   end
 
@@ -169,7 +182,7 @@ class Sys
     begin
       parser.parse!
     rescue
-      puts "Argument error. Use ghedsh -v or ghedsh --help for more information about the usage of this program"
+      puts "Argument error. Use ghedsh -h or ghedsh --help for more information about the usage of this program"
       exit
     end
     return options

data/lib/interface.rb

@@ -4,7 +4,6 @@ require 'json'
 require 'readline'
 require 'octokit'
 require 'optparse'
-
 require 'actions/help'
 require 'actions/orgs'
 require 'actions/repo'
@@ -13,6 +12,13 @@ require 'actions/teams'
 require 'actions/user'
 require 'version'
 
+USER=1
+ORGS=2
+USER_REPO=10
+ORGS_REPO=3
+TEAM=4
+TEAM_REPO=5
+
 class Interface
   attr_reader :option
   attr_accessor :config
@@ -26,12 +32,18 @@ class Interface
   def initialize
     sysbh=Sys.new()
     options=sysbh.parse
-
-    if options[:user]==nil && options[:token]==nil &&  options[:path]!=nil
-      self.run(options[:path],options[:token],options[:user])
-    else
-      self.run("#{ENV['HOME']}/.ghedsh",options[:token],options[:user])
+    begin
+      if options[:user]==nil && options[:token]==nil &&  options[:path]!=nil
+        self.run(options[:path],options[:token],options[:user])
+      else
+        self.run("#{ENV['HOME']}/.ghedsh",options[:token],options[:user])
+      end
+    rescue SystemExit, Interrupt
+      raise
+    rescue Exception => e
+      puts "exit"
     end
+
   end
 
   def add_history(value)
@@ -181,13 +193,13 @@ class Interface
     repo=Repositories.new()
     case
       when @deep == 1
-        list=repo.show_repos(@client,@config,1)
+        list=repo.show_repos(@client,@config,1,nil)
         self.add_history_str(2,list)
       when @deep ==2
-        list=repo.show_repos(@client,@config,2)
+        list=repo.show_repos(@client,@config,2,nil)
         self.add_history_str(2,list)
       when @deep==4
-        list=repo.show_repos(@client,@config,3)
+        list=repo.show_repos(@client,@config,3,nil)
         self.add_history_str(2,list)
     end
   end
@@ -240,6 +252,7 @@ class Interface
     s=Sys.new
     # orden de búsqueda: ~/.ghedsh.json ./ghedsh.json ENV["ghedsh"] --configpath path/to/file.json
 
+    #control de carga de parametros en el logueo de la aplicacion
     if user!=nil
       @config=s.load_config_user(config_path,user)
       @client=s.client
@@ -257,6 +270,7 @@ class Interface
     end
 
     while ex != 0
+
       op=Readline.readline(self.prompt,true)
       opcd=op.split
       case
@@ -289,11 +303,11 @@ class Interface
       if opcd[0]=="repos" and opcd.size>1
         case
           when @deep==1
-            r.show_repos_smart(@client,@config,opcd[1],1)
+            r.show_repos(@client,@config,1,opcd[1])
           when @deep==2
-            r.show_repos_smart(@client,@config,opcd[1],2)
+            r.show_repos(@client,@config,2,opcd[1])
           when @deep==3
-            r.show_repos_smart(@client,@config,opcd[1],3)
+            r.show_repos(@client,@config,3,opcd[1])
         end
       end
       if opcd[0]=="add_team_member"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.9'
+  VERSION='1.1.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghedsh
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Javier Clemente
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit