ghedsh 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a9fcfc67d78fecd9450d02367d39e3b08d7656
-  data.tar.gz: 4b408394b04c0f5db5f0df2d43c80859f3566388
+  metadata.gz: c8b0a139348f10866fd417e1e2f24711bdddb996
+  data.tar.gz: 6cc32b2b29fcd318259fd5531782a228fd461e9d
 SHA512:
-  metadata.gz: 3329ad4d8014c0b5cf39a74872916e33c1e23dc7991da09d7b16eeb0ca015dce5e1a31ea241e937e94a62b69ac2a30c2850636aa7b3fddce76070f6105ef61da
-  data.tar.gz: ba0a4777f210f8e3fba11bd7440577c694d359824e4f86b16805d29d2d63d59c4a2c95d2ff9a072b04f24d5e5bae4469977e5e1916fb11947273fc465a45c095
+  metadata.gz: 59cc7bb5ee72870148df73d215baa69cf9710b0c71fca8d7ebbb7dc126fbaa2ab1f25b2d7e0f58bbb47a3d1a6160a6b821af9a842e7e7e177f6f34439fc0c4e8
+  data.tar.gz: 6d3269bc28cd6a270be3c5d4ccd1cbca7fd45d85d4508fdf6586879724be1ed8613f0f2cf6019fac6a45766080251d7ef0a18b51f4b2a6550d1e16197fc4953b

data/.gitignore

@@ -3,6 +3,7 @@
 /lib/configure/configure2.json
 /lib/pruebas.rb
 /lib/db/assignments2.json
+.ghedsh
 
 *.gem
 *.rbc

data/lib/actions/system.rb

@@ -1,30 +1,36 @@
 require 'readline'
+require 'fileutils'
 require 'octokit'
 require 'json'
 require 'actions/system'
 require 'version'
 
 class Sys
+  attr_accessor :client
 
   def load_config(configure_path)
-    if (File.exist?(configure_path))==true
-      json = File.read(configure_path)
+    if File.exist?(configure_path)
+      token=File.read("#{configure_path}/ghedsh-token")
+      json = File.read("#{configure_path}/ghedsh-cache.json")
       config=JSON.parse(json)
 
-      if config["User"] == nil
-        return self.set_loguin_data_sh(config)
-      else
+      if token!=""
+        @client=self.login(token)
+        config["User"]=@client.login
         return config
+      else
+        return self.set_loguin_data_sh(config,configure_path)
       end
     else
-      configure_path="#{ENV['GEM_HOME']}/gems/ghedsh-#{Ghedsh::VERSION}/lib/configure/configure.json"
-      if (File.exist?(configure_path))==false
-        self.create_config(configure_path)
-      end
+      self.create_config(configure_path)
       load_config(configure_path)
     end
   end
 
+  def save_token(path,token)
+    File.write(path,token)
+  end
+
   def login(token)
     user=Octokit::Client.new(:access_token =>token)
     if user==false
@@ -34,56 +40,48 @@ class Sys
     end
   end
 
-  def set_loguin_data_sh(config)
+  def set_loguin_data_sh(config,configure_path)
     puts "Insert you Access Token: "
     token = gets.chomp
     us=self.login(token)
     if us!=nil
       puts "Login succesful as #{us.login}"
       config["User"]=us.login
-      config["Token"]=token
+      File.write("#{configure_path}/ghedsh-token",token) #config["Token"]=token
+      @client=us
       return config
     end
   end
 
-  def load_assig_db
-    path='./lib/db/assignments.json'
+  def load_assig_db(path)
     if (File.exist?(path))==true
-      json = File.read(path)
+      json = File.read("#{path}/db/assignments.json")
     else
-      path="#{ENV['GEM_HOME']}/gems/ghedsh-#{Ghedsh::VERSION}/lib/db/assignments.json"
-      json = File.read(path)
+      #path="/db/assignments.json"
+      #json = File.read(path)
     end
       config=JSON.parse(json)
       return config
   end
 
-  def create_config(path)
-      con={:User=>nil,:Token=>nil,:Org=>nil,:Repo=>nil,:Team=>nil,:TeamID=>nil}
-      File.write(path,con.to_json)
+  def create_config(configure_path)
+    con={:User=>nil,:Org=>nil,:Repo=>nil,:Team=>nil,:TeamID=>nil}
+    FileUtils.mkdir_p(configure_path)
+    File.new("#{configure_path}/ghedsh-token","w")
+    File.write("#{configure_path}/ghedsh-cache.json",con.to_json)
   end
 
-  def save_config(data)
-    if (File.exist?('./lib/configure/configure.json'))==true
-      File.write('./lib/configure/configure.json', data.to_json)
-    else
-      File.write("#{ENV['GEM_HOME']}/gems/ghedsh-#{Ghedsh::VERSION}/lib/configure/configure.json", data.to_json)
-    end
-  end
 
-  def save_db(data)
-    if (File.exist?('./lib/db/assignments.json'))==true
-      File.write('./lib/db/assignments.json', data.to_json)
-    else
-      File.write("#{ENV['GEM_HOME']}/gems/ghedsh-#{Ghedsh::VERSION}/lib/db/assignments.json", data.to_json)
-    end
+  def save_cache(path,data)
+    File.write('./.ghedsh/ghedsh-cache.json',data.to_json)
   end
 
-  def get_config
-    #todo
+  def save_db(path,data)
+    File.write("#{path}/db/assignments.json", data.to_json)
   end
 
 
+
   def search_rexp(list,exp)
     list= list.select{|o| o.match(/#{exp}/)}
     #puts list

data/lib/interface.rb

@@ -231,96 +231,101 @@ class Interface
     HelpM.new.welcome()
     t=Teams.new
     r=Repositories.new
-
+    s=Sys.new
     # orden de búsqueda: ~/.ghedsh.json ./ghedsh.json ENV["ghedsh"] --configpath path/to/file.json
-    config_path = './lib/configure/configure.json'
-    if self.load_config(config_path) == true
-      self.load_config(config_path)
-      @client=Sys.new.login(@config["Token"])
-      self.add_history_str(2,Organizations.new.read_orgs(@client))
-
-      while ex != 0
-        op=Readline.readline(self.prompt,true)
-        opcd=op.split
-        case
-          when op == "exit" then ex=0
-          when op == "help" then self.help()
+    #config_path = './lib/configure/configure.json'
+    config_path = './.ghedsh'
+    # if self.load_config(config_path) == true
+    #self.load_config(config_path)
+    @config=s.load_config(config_path)
+    @client=s.client
+    @deep=1
+    #@client=Sys.new.login(@config["Token"])
+    self.add_history_str(2,Organizations.new.read_orgs(@client))
+
+    while ex != 0
+      op=Readline.readline(self.prompt,true)
+      opcd=op.split
+      case
+        when op == "exit" then ex=0
+        when op == "help" then self.help()
           #when op == "repos" then self.repos()
           #when op == "ls -l" then self.lsl()
-          when op == "orgs" then self.orgs()
-          when op == "cd .." then self.cdback()
-          when op == "members" then self.members()
-          when op == "teams" #then self.teams()
-      	    if @deep==2
-      	      Teams.new.show_teams_bs(@client,@config)
-      	    end
-          when op == "commits" then self.commits()
-          when op == "col" then self.collaborators()
-          when op == "forks" then self.show_forks()
-        end
-        if opcd[0]=="cd" and opcd[1]!=".."
-          self.cd(opcd[1])
+        when op == "orgs" then self.orgs()
+        when op == "cd .." then self.cdback()
+        when op == "members" then self.members()
+        when op == "teams" #then self.teams()
+      	  if @deep==2
+      	    Teams.new.show_teams_bs(@client,@config)
+      	  end
+        when op == "commits" then self.commits()
+        when op == "col" then self.collaborators()
+        when op == "forks" then self.show_forks()
+      end
+      if opcd[0]=="cd" and opcd[1]!=".."
+        self.cd(opcd[1])
         #else
         #  self.cdback()
-        end
-        if opcd[0]=="set"
-          self.set(opcd[1])
-        end
-        if opcd[0]=="repos" and opcd.size==1
-          self.repos()
-        end
-        if opcd[0]=="repos" and opcd.size>1
-          case
-            when @deep==1
-              r.show_repos_smart(@client,@config,opcd[1],1)
-            when @deep==2
-              r.show_repos_smart(@client,@config,opcd[1],2)
-            when @deep==3
-              r.show_repos_smart(@client,@config,opcd[1],3)
-          end
-        end
-        if opcd[0]=="add_team_member"
-          t.add_to_team(@client,@config,opcd[1])
-        end
-        if opcd[0]=="create_team" and opcd.size==2
-      	  t.create_team(@client,@config,opcd[1])
-      	  @teamlist=t.read_teamlist(@client,@config)
-      	  self.add_history_str(1,@teamlist)
-        end
-        if opcd[0]=="delete_team"
-          t.delete_team(@client,@teamlist[opcd[1]])
-          self.quit_history(@teamlist[opcd[1]])
-          @teamlist=t.read_teamlist(@client,@config)
-          self.add_history_str(1,@teamlist)
-        end
-        if opcd[0]=="create_team" and opcd.size>2
-      	  t.create_team_with_members(@client,@config,opcd[1],opcd[2..opcd.size])
-      	  @teamlist=t.read_teamlist(@client,@config)
-      	  self.add_history_str(1,@teamlist)
-        end
-        if opcd[0]=="create_repository" and opcd.size==2
-          r.create_repository(@client,@config,opcd[1],@deep)
-        end
-        if opcd[0]=="create_repository" and opcd.size>2
-          case
+      end
+      if opcd[0]=="set"
+        self.set(opcd[1])
+      end
+      if opcd[0]=="repos" and opcd.size==1
+        self.repos()
+      end
+      if opcd[0]=="repos" and opcd.size>1
+        case
+          when @deep==1
+            r.show_repos_smart(@client,@config,opcd[1],1)
           when @deep==2
-            r.create_repository_by_teamlist(@client,@config,opcd[1],opcd[2,opcd.size],self.get_teamlist(opcd[2,opcd.size]))
-          end
+            r.show_repos_smart(@client,@config,opcd[1],2)
+          when @deep==3
+            r.show_repos_smart(@client,@config,opcd[1],3)
         end
-
-        if opcd[0]=="clone_repo" and opcd.size==2
-          r.clone_repo(@client,@config,opcd[1],@deep)
+      end
+      if opcd[0]=="add_team_member"
+        t.add_to_team(@client,@config,opcd[1])
+      end
+      if opcd[0]=="create_team" and opcd.size==2
+      	t.create_team(@client,@config,opcd[1])
+      	@teamlist=t.read_teamlist(@client,@config)
+      	self.add_history_str(1,@teamlist)
+      end
+      if opcd[0]=="delete_team"
+        t.delete_team(@client,@teamlist[opcd[1]])
+        self.quit_history(@teamlist[opcd[1]])
+        @teamlist=t.read_teamlist(@client,@config)
+        self.add_history_str(1,@teamlist)
+      end
+      if opcd[0]=="create_team" and opcd.size>2
+      	t.create_team_with_members(@client,@config,opcd[1],opcd[2..opcd.size])
+      	@teamlist=t.read_teamlist(@client,@config)
+      	self.add_history_str(1,@teamlist)
+      end
+      if opcd[0]=="create_repository" and opcd.size==2
+        r.create_repository(@client,@config,opcd[1],@deep)
+      end
+      if opcd[0]=="create_repository" and opcd.size>2
+        case
+        when @deep==2
+          r.create_repository_by_teamlist(@client,@config,opcd[1],opcd[2,opcd.size],self.get_teamlist(opcd[2,opcd.size]))
         end
+      end
 
-        if opcd[0]=="clone_repo" and opcd.size>2
+      if opcd[0]=="clone_repo" and opcd.size==2
+        r.clone_repo(@client,@config,opcd[1],@deep)
+      end
+
+      if opcd[0]=="clone_repo" and opcd.size>2
           #r.clone_repo(@client,@config,opcd[1])
-        end
       end
-    else
-      Sys.new.set_loguin_data_sh()
     end
+    # else
+      # Sys.new.set_loguin_data_sh()
+    # end
 
-    Sys.new.save_config(@config)
+    #Sys.new.save_config(@config)
+    s.save_cache(config_path,@config)
   end
 
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.2'
+  VERSION='1.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghedsh
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Javier Clemente
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -87,7 +87,6 @@ files:
 - lib/actions/system.rb
 - lib/actions/teams.rb
 - lib/actions/user.rb
-- lib/configure/configure_template.json
 - lib/db/assignments.json
 - lib/interface.rb
 - lib/version.rb

data/lib/configure/configure_template.json

@@ -1 +0,0 @@
-{"User":null,"Token":null,"Org":null,"Repo":null,"Team":null,"TeamID":null}