ghedsh 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5531c3b5660cdfd6546b38acd4b5790661059655
-  data.tar.gz: 8606e5bb3e19a2ee9b9d9a5d4a9125a8f6520bf1
+  metadata.gz: 3164a5b2130e36eeff5c5364fcec9223955c53f8
+  data.tar.gz: 01b013251710f96572b5a6c9d2f7bcffbfaa454d
 SHA512:
-  metadata.gz: 098338fb6c2cc94b0b2a71c03522859efe8726ab36b9377ede809a538d9b7280a24d8b7b2b2ca9e60e5ad767b1106e0aa2045499ecb798e6feecc09f653ffc49
-  data.tar.gz: d5fa13872ab7bb5780e28b56a6bdcd8aa741f52b00f74f6d6b0de3de8042b995be563a3a41e11d3bd580a227b08b48680fa41b7c774e38dfcea88ac4a486b357
+  metadata.gz: 65ad1922ca1004d8f0530f265c88be73fc675bcf3d0a0d852e970dc59b6550e6800d021bc32d854c1efb8033b9e28ec947f80460dca793eba18bdd0071407c25
+  data.tar.gz: f68d6cd15712ec424773649c4959866c242f078c9b6550d76ad7a0ee648ad7e404f23e4d6d0b992a753e980904bd203db1ce970e3fbe2246410be5bc9dc42fdc

data/lib/actions/help.rb

@@ -5,7 +5,7 @@ class HelpM
     self.common_opt
     print "orgs => show your organizations\n"
     print "repos => list your repositories\n\n"
-    print "clone_repo => clone a repository or a list of repositories using a regular expresion"
+    print "clone_repo => clone a repository or a list of repositories using a regular expresion\n"
     print "create_repository => create a repository in your personal account\n"
     print "set => move you to a specific repository\n"
 
@@ -14,7 +14,7 @@ class HelpM
   def org()
     self.common_opt
     print "repos => list the repositories of your organization\n"
-    print "clone_repo => clone a repository or a list of repositories using a regular expresion"
+    print "clone_repo => clone a repository or a list of repositories using a regular expresion\n"
     print "set => move you to a specific repository\n"
     print "members => members of a organization\n"
     print "teams => teams of a organization\n"
@@ -32,7 +32,7 @@ class HelpM
   def orgs_teams()
     self.common_opt
     print "members => members of the team\n"
-    print "clone_repo => clone a repository or a list of repositories using a regular expresion"
+    print "clone_repo => clone a repository or a list of repositories using a regular expresion\n"
     print "create_repository => create a repository to this team\n"
     print "add_to_team => add a member in the team\n\n"
   end
@@ -48,6 +48,7 @@ class HelpM
     print "exit => exit from this program\n"
     print "help => list of commands available\n"
     print "cd => go to the path\n"
+    print "! => execute a bash command\n"
   end
 
   def welcome
@@ -61,9 +62,11 @@ class HelpM
     puts "Run with default configuration. Configuration files are being set in #{ENV['HOME']}"
     puts "ghedsh --token TOKEN"
     puts "Provides a github access token by argument. Also works with ghedsh -t"
+    puts "ghedsh --user USERNAME"
+    puts "Change your user from your user's list. Also works with ghedsh -u"
     puts "ghedsh --version"
     puts "Show the current version of GHEDSH. Also works with ghedsh -v"
     puts "ghedsh --help"
-    puts "Show the executable options. Also works with ghedsh -h\n\n"
+    print "Show the executable options. Also works with ghedsh -h\n\n"
   end
 end

data/lib/actions/system.rb

@@ -21,6 +21,12 @@ class Sys
       if token!=""
         @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)
+        end
         if argv_token!=nil
           self.save_token(configure_path,argv_token)
         end
@@ -34,6 +40,32 @@ class Sys
     end
   end
 
+  def load_config_user(configure_path, user)
+    if File.exist?(configure_path)
+      list=self.load_users(configure_path)
+      if list["#{user}"]!=nil
+        json = File.read("#{configure_path}/ghedsh-cache.json")
+        config=JSON.parse(json)
+        @client=self.login(list["#{user}"])
+        config["User"]=@client.login
+        self.save_token(configure_path,list["#{user}"])
+        return config
+      else
+        puts "User not found"
+        return nil
+      end
+    else
+      puts "No user's history is available"
+      return nil
+    end
+  end
+
+  def load_users(path)
+    json=File.read("#{path}/ghedsh-users.json")
+    users=JSON.parse(json)
+    return users
+  end
+
   def save_token(path,token)
     File.write("#{path}/ghedsh-token",token)
   end
@@ -51,9 +83,13 @@ class Sys
     puts "Insert you Access Token: "
     token = gets.chomp
     us=self.login(token)
+    userhash=Hash.new
+
     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
       @client=us
       return config
@@ -73,22 +109,30 @@ class Sys
 
   def create_config(configure_path)
     con={:User=>nil,:Org=>nil,:Repo=>nil,:Team=>nil,:TeamID=>nil}
+    us={}
     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}"
   end
 
 
   def save_cache(path,data)
-    File.write('./.ghedsh/ghedsh-cache.json',data.to_json)
+    File.write("#{path}/ghedsh-cache.json",data.to_json)
   end
 
   def save_db(path,data)
     File.write("#{path}/db/assignments.json", data.to_json)
   end
 
+  def save_users(path,data)
+    File.write("#{path}/ghedsh-users.json",data.to_json)
+  end
 
+  def execute_bash(exp)
+    system(exp)
+  end
 
   def search_rexp(list,exp)
     list= list.select{|o| o.match(/#{exp}/)}

data/lib/interface.rb

@@ -25,20 +25,22 @@ class Interface
     @sysbh=Sys.new()
 
     if ARGV.empty?
-      #self.run('./.ghedsh',nil)
-      self.run("#{ENV['HOME']}/.ghedsh",nil)
+      #self.run('./.ghedsh',nil,nil)
+      self.run("#{ENV['HOME']}/.ghedsh",nil,nil)
     else
       case
         when ARGV[0]=="--configpath" || ARGV[0]=="-c"
           if File.exist?(ARGV[1])
-            self.run(ARGV[1],nil)
+            self.run(ARGV[1],nil,nil)
           else
             puts "the path doesn't exists"
           end
         when ARGV[0]=="--help" || ARGV[0]=="-h"
           HelpM.new.bin()
         when ARGV[0]=="--token" || ARGV[0]=="-t"
-          self.run('./.ghedsh',ARGV[1])
+          self.run("#{ENV['HOME']}/.ghedsh",ARGV[1],nil)
+        when ARGV[0]=="--user" || ARGV[0]=="-u"
+          self.run("#{ENV['HOME']}/.ghedsh",nil,ARGV[1])
         when ARGV[0]=="--version" || ARGV[0]=="-v"
           puts "GitHub Education Shell v#{Ghedsh::VERSION}"
       end
@@ -113,7 +115,6 @@ class Interface
 
   def cdback()
     case
-      #when @deep == 1 then @config["User"]=nil
       when @deep == 2
         @config["Org"]=nil
         @deep=1
@@ -143,7 +144,6 @@ class Interface
       @config["Team"]=path
       @config["TeamID"]=@teamlist[path]
       @deep=4
-      #self.get_data
     end
   end
 
@@ -226,7 +226,7 @@ class Interface
     end
   end
 
-  def run(config_path, argv_token)
+  def run(config_path, argv_token,user)
     ex=1
     @memory=[]
     history=LIST+memory
@@ -240,17 +240,28 @@ class Interface
     s=Sys.new
     # orden de búsqueda: ~/.ghedsh.json ./ghedsh.json ENV["ghedsh"] --configpath path/to/file.json
 
+    if user!=nil
+      @config=s.load_config_user(config_path,user)
+      @client=s.client
+      if @config==nil
+        ex=0
+      end
+    else
+      @config=s.load_config(config_path,argv_token)
+      @client=s.client
+    end
 
-    @config=s.load_config(config_path,argv_token)
-    @client=s.client
     @deep=1
-    self.add_history_str(2,Organizations.new.read_orgs(@client))
+    if @client!=nil
+      self.add_history_str(2,Organizations.new.read_orgs(@client))
+    end
 
     while ex != 0
       op=Readline.readline(self.prompt,true)
       opcd=op.split
       case
         when op == "exit" then ex=0
+          s.save_cache(config_path,@config)
         when op == "help" then self.help()
         when op == "orgs" then self.orgs()
         when op == "cd .." then self.cdback()
@@ -316,13 +327,14 @@ class Interface
       if opcd[0]=="clone_repo" and opcd.size==2
         r.clone_repo(@client,@config,opcd[1],@deep)
       end
-
+      if opcd[0]=="!"
+        s.execute_bash(opcd[1])
+      end
       if opcd[0]=="clone_repo" and opcd.size>2
           #r.clone_repo(@client,@config,opcd[1])
       end
     end
 
-    s.save_cache(config_path,@config)
   end
 
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.6'
+  VERSION='1.1.7'
 end

metadata

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