ghedsh 1.1.15 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc397c9530e474d050f6d450dd4aa466232c58ba
-  data.tar.gz: e802e974b144bae6a1b4066c371abeb90fc1f3a7
+  metadata.gz: b7bed6aad874d5f0faf8a0b387eba24d5b4a9353
+  data.tar.gz: 519dafec3cc338ede392b2dd1bf38f6c1e864efc
 SHA512:
-  metadata.gz: 692e0d27cde267e4bd71a84e0a1fba548d509a55f0a5e7dc9112cfc52c16148fecc35d64a4aeb115102277dd3865f7745e4492caa5d18367fed19f74d244415b
-  data.tar.gz: f3101d13d3efbcf58914d864f2970b453c1ebceeec100000cdb705b421ed63afdd05934a57a6647f824a3b63c72d6502c5589c43609fecca7e6eaf06a479c44b
+  metadata.gz: 7ec45575411bc1e8062f486fa71664fa3f0932c5a203afc3970181ee7124959629a90fa3fa35f1a506b480ba260fe65ad4ff03639f0a6ba21a1deffe5275e81c
+  data.tar.gz: 1c53cedf872f4fcc6c544456ab357ea07d8faa4651a6299823a7c58e3b06e45d961288c7dea7958baccc74f9c1a25802bee824609758ca1428a0487944e1e5fe

data/.gitignore

@@ -4,6 +4,7 @@
 /lib/pruebas.rb
 /lib/db/assignments2.json
 .ghedsh
+script
 
 *.gem
 *.rbc

data/README.md

@@ -9,25 +9,21 @@ This program give you an interaction with Github like you was using your command
 
 Following the philosophy of Github Education, you can use this application to managing your own organization as a classroom where you can make assignments to your students using repository strategies.    
 
-##First step: Oauth requirements.
+##Installing GHEDSH
 
-Ir order to run this program, you need to make an **Access token** from Github with create and edit scope. When you run the program, it asks you the access token to identify yourself with no need to use your user and password.
-
-[Link to create a new personal access token](https://github.com/settings/tokens/new?description=ghedsh)
-
-You need to tick all options, unless admin:gpg_key scopes.  
+You can download the gem **ghdesh** from rubygem.
 
+``gem install ghdesh``
 
-##Running the program in your computer
+To run the app you need to call the binary file "ghedsh" in your command line after install it. Configuration files are being set in a hidden directory called *.ghedsh*, in your Home path.  
 
-To start using the program, put "rake bash" or "rake" in your command line in the main folder of this program. You can invoke the binary file using the command *ghedsh*.
+###First step: Oauth requirements.
 
-##Using the gem
-Instead of download the program from the repository, you can download the gem **ghdesh** from rubygem.
+Ir order to run this program, you need to make an **Access token** from Github with create and edit scope. When you run the program, it asks you the access token to identify yourself with no need to use your user and password.
 
-``gem install ghdesh``
+[Link to create a new personal access token](https://github.com/settings/tokens/new?description=ghedsh)
 
-To run the app you need to call the binary file "ghedsh" in your command line after install it.  
+You need to tick all options, unless admin:gpg_key scopes.  
 
 ###ghedsh executable options
 
@@ -152,7 +148,7 @@ issues
 Muestra los issues del repositorio en el que se encuentre el usuario.
 
 
-
-
 ##Aditional information
+[GHEDSH extended info](https://alu0100505023.gitbooks.io/ghedsh/content/en/)
+
 [Github Education](https://education.github.com/)

data/lib/actions/help.rb

@@ -64,6 +64,7 @@ class HelpM
 
   def common_opt()
     puts "\nList of commands\n"
+    print "\tdo\t\t\trun a script in ghedsh execute path\n"
     print "\texit\t\t\texit from this program\n"
     print "\thelp\t\t\tlist of commands available\n"
     print "\tcd\t\t\tgo to the path\n"

data/lib/actions/orgs.rb

@@ -12,28 +12,92 @@ class Organizations
 
   def load_assig()
     @assiglist=Hash.new()
-    @assiglist=Sys.new.load_assig_db()
+    @assiglist=Sys.new.load_assig_db("#{ENV['HOME']}/.ghedsh")
     return @assiglist
   end
 
-  def show_assignements() #client,orgs
-    @assiglist["Organization"].each do |org|
-      puts org["name"]
+  def show_assignments(client, config) #client,orgs
+    list=self.load_assig()
 
-      org["assignements"].each do |assig|
-        puts assig["name"]
+    assig=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
+    if assig!=nil
+      if assig["assigs"].empty?
+        puts "No assignments are available yet"
+      else
+        assig["assigs"].each do |i|
+          puts "\n"
+          puts i["name_assig"]
+          puts "Repository: #{i["repo"]}"
+          puts "Groups: "
+          puts "Teams: "
+          # i["teams"].each do |j|
+          #     puts "\t#{j}"
+          # end
+        end
       end
-
+    else
+      puts "No assignments are available yet"
+      list["orgs"].push({"name"=>config["Org"],"assigs"=>[]})
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
     end
+
   end
-  def get_assig()
-    return @assiglist
+
+  def create_assig(client,config,name)
+    list=self.load_assig()
+    assigs=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
+
+    if assigs==nil
+      list["orgs"].push({"name"=>config["Org"],"assigs"=>[]})
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+    end
+
+    begin
+      list["orgs"][list["orgs"].index{|aux| aux["name"]==config["Org"]}]["assigs"].push({"name_assig"=>name,"teams"=>[],"groups"=>[],"repo"=>nil})
+    rescue Exception => e
+      puts e
+    end
+    Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+
   end
 
-  def create_assig(client,config,data)
+
+  def get_assigs(client,config)
+    list=self.load_assig()
+    assiglist=[]
+    assig=list["orgs"].detect{|aux| aux["name"]==config["Org"]}
+    if assig!=nil
+      if assig["assigs"].empty?
+        puts "No assignments are available yet"
+      else
+        assig["assigs"].each do |i|
+          assiglist.push(i["name_assig"])
+        end
+      end
+    else
+      list["orgs"].push({"name"=>config["Org"],"assigs"=>[]})
+      Sys.new.save_assigs("#{ENV['HOME']}/.ghedsh",list)
+    end
+    return assiglist
   end
 
+
+
   def add_team_to_assig(client,config,data)
+
+  end
+
+  def add_group_to_assig(client,config,data)
+
+  end
+
+  def add_repo_to_assig(client,config,data)
+    options=Hash.new
+    options[:organization]=config["Org"]
+    options[:auto_init]=true
+
+    client.create_repository(data,options)
+
   end
   #------------End assig. stuff------------
 

data/lib/actions/repo.rb

@@ -49,9 +49,23 @@ class Repositories
         #print i[:sha],"\n",i[:commit][:author][:name],"\n",i[:commit][:author][:date],"\n",i[:commit][:message],"\n\n"
         puts "##{i[:number]} state: #{i[:state]} -> #{i[:title]} "
       end
+      return mem
       puts "\n"
   end
 
+  def get_issues(client,config,scope)
+    case
+    when scope==USER_REPO
+      if config["Repo"].split("/").size == 1
+        mem=client.list_issues(config["User"]+"/"+config["Repo"],{:state=>"all"})
+      else
+        mem=client.list_issues(config["Repo"],{:state=>"all"})
+      end
+    when scope==ORGS_REPO || scope==TEAM_REPO
+        mem=client.list_issues(config["Org"]+"/"+config["Repo"],{:state=>"all"})
+    end
+    return mem
+  end
   #Show repositories and return a list of them
   #exp = regular expression
   def show_repos(client,config,scope,exp)
@@ -380,7 +394,7 @@ class Repositories
       if show!=false
         self.show_files(list)
       else
-        return list  
+        return list
       end
     else
       puts "#{path} is not a directory. If you want to open a file try to use cat <path>"

data/lib/actions/system.rb

@@ -9,7 +9,8 @@ require 'version'
 class Sys
   attr_reader :client
   attr_reader :memory
-  LIST = ['repos', 'exit', 'orgs','help', 'people','teams', 'cd ', 'cd repo ','commits','forks', 'add_team_member ','new_team ','rm_team ','new_repository ','new_assignment ','clone ', 'issues', 'version'].sort
+  LIST = ['repos', 'exit', 'orgs','help', 'people','teams', 'cd ', 'cd repo ','commits','forks', 'add_team_member ','new_team ','rm_team ','new_repository ','new_assignment ','clone ', 'issues',
+    'version', 'cat ', 'groups', 'files', 'assignments'].sort
 
   def initialize()
     @memory=[]
@@ -165,13 +166,27 @@ class Sys
 
   def load_assig_db(path)
     if (File.exist?(path))==true
-      json = File.read("#{path}/db/assignments.json")
+      if File.exist?("#{path}/assignments.json")
+        json = File.read("#{path}/assignments.json")
+      else
+        #{"Organization":[{"name":null,"assignments":[{"name":null,"teams":{"teamid":null}}]}]}
+        con={:orgs=>[]}
+        File.write("#{path}/assignments.json",con.to_json)
+        json = File.read("#{path}/assignments.json")
+      end
+    end
+    config=JSON.parse(json)
+    return config
+  end
+
+  def load_script(path)
+    if (File.exist?(path))==true
+      script = File.read("#{path}")
+      return script.split("\n")
     else
-      #path="/db/assignments.json"
-      #json = File.read(path)
+      puts "No script is found with that name"
+      return []
     end
-      config=JSON.parse(json)
-      return config
   end
 
   def load_groups(path)
@@ -195,6 +210,10 @@ class Sys
     File.write("#{path}/groups.json",data.to_json)
   end
 
+  def save_assigs(path,data)
+    File.write("#{path}/assignments.json",data.to_json)
+  end
+
   #creates all ghedsh local stuff
   def create_config(configure_path)
     con={:User=>nil,:Org=>nil,:Repo=>nil,:Team=>nil,:TeamID=>nil}

data/lib/interface.rb

@@ -17,6 +17,7 @@ ORGS=2
 USER_REPO=10
 ORGS_REPO=3
 TEAM=4
+ASSIG=6
 TEAM_REPO=5
 
 class Interface
@@ -25,7 +26,7 @@ class Interface
   attr_accessor :client
   attr_accessor :deep
   attr_accessor :memory
-  attr_reader :orgs_list,:repos_list, :teamlist, :orgs_repos, :teams_repos, :repo_path
+  attr_reader :orgs_list,:repos_list, :teamlist, :orgs_repos, :teams_repos, :repo_path, :assig_path, :issues_list
 
   def initialize
     @sysbh=Sys.new()
@@ -46,7 +47,7 @@ class Interface
         raise
       rescue Exception => e
         puts "exit"
-        #puts e
+        puts e
       end
     end
   end
@@ -61,6 +62,7 @@ class Interface
           return @config["User"]+">"+ "\e[31m#{@config["Repo"]}\e[0m"+"> "
         end
       when @deep == ORGS then return @config["User"]+">"+ "\e[34m#{@config["Org"]}\e[0m"+"> "
+      when @deep == ASSIG then return @config["User"]+">"+ "\e[34m#{@config["Org"]}\e[0m"+">"+"\e[35m#{@assig_path}\e[0m"+"> "
       when @deep == TEAM then return @config["User"]+">"+"\e[34m#{@config["Org"]}\e[0m"+">"+"\e[32m#{@config["Team"]}\e[0m"+"> "
       when @deep == TEAM_REPO
         if @repo_path!=""
@@ -134,6 +136,9 @@ class Interface
           @config["TeamID"]=nil
           @teams_repos=[]
           @deep=2
+        when @deep == ASSIG
+          @deep=ORGS
+          @assig_path=""
         when @deep == TEAM_REPO
           if @repo_path==""
             @config["Repo"]=nil
@@ -155,7 +160,7 @@ class Interface
       @config["TeamID"]=nil
       @deep=1
       @orgs_repos=[]; @teams_repos=[]
-      @repo_path=""
+      @repo_path=""; @assig_path="";
     end
   end
 
@@ -189,7 +194,9 @@ class Interface
           @deep=TEAM
         else
           puts "\nNo team is available with that name"
-          self.set(path)
+          if cdassig(path)==false
+            self.set(path)
+          end
         end
       when @deep == TEAM
         self.set(path)
@@ -221,6 +228,7 @@ class Interface
           end
         else
           puts "\nNo organization is available with that name"
+          self.set(path)
         end
       when @deep==ORGS
         if aux[path_split[0]]!=nil
@@ -294,6 +302,20 @@ class Interface
     end
   end
 
+  def cdassig(path)
+    o=Organizations.new()
+    list=o.get_assigs(@client,@config)
+    if list.one?{|aux| aux==path}
+      @deep=ASSIG
+      @assig_path=path
+      puts "Set in #{@config["Org"]} assignment: #{path}\n\n"
+      return true
+    else
+      puts "No assignment is available with that name"
+      return false
+    end
+  end
+
   def orgs()
     case
     when @deep==USER
@@ -396,10 +418,11 @@ class Interface
   #Main program
   def run(config_path, argv_token,user)
     ex=1
+    opscript=[]
 
     @sysbh.write_initial_memory()
     HelpM.new.welcome()
-
+    o=Organizations.new
     t=Teams.new
     r=Repositories.new
     s=Sys.new
@@ -424,8 +447,15 @@ class Interface
 
     while ex != 0
 
-      op=Readline.readline(self.prompt,true)
-      opcd=op.split
+      if opscript.empty?
+        op=Readline.readline(self.prompt,true)
+        opcd=op.split
+      else
+        op=opscript[0]
+        opcd=op.split
+        opscript.delete(opscript[0])
+      end
+
       case
         when op == "exit" then ex=0
           s.save_cache(config_path,@config)
@@ -440,7 +470,7 @@ class Interface
         when op == "commits" then self.commits()
         when op == "issues"
           if @deep==ORGS_REPO || @deep==USER_REPO || @deep==TEAM_REPO
-            r.show_issues(@client,@config,@deep)
+            @issues_list=r.show_issues(@client,@config,@deep)
           end
         when op == "col" then self.collaborators()
         when op == "forks" then self.show_forks()
@@ -450,10 +480,32 @@ class Interface
           end
         when op == "version"
           puts "GitHub Education Shell v#{Ghedsh::VERSION}"
+        when op == "assignments"
+          if @deep==ORGS
+            o.show_assignments(@cliente,@config)
+          end
+      end
+
+      if opcd[0]=="issue" and opcd.size>1
+        issfound=0
+        @issues_list=r.get_issues(@client,@config,@deep)
+        if @issues_list!=nil
+          @issues_list.each do |i|
+            if i[:number]==opcd[1].to_i
+              puts "##{i[:number]} state: #{i[:state]} -> #{i[:title]} \n"
+              puts "#{i[:body]}"
+              issfound=1
+            end
+          end
+        end
+        if issfound==0
+          puts "Issue not found"
+        end
+        puts "\n"
       end
 
       if opcd[0]=="cd" and opcd[1]!=".."
-        if opcd[1]=="/"
+        if opcd[1]=="/" or opcd.size==1
           self.cdback(true)
         else
           if opcd[1]=="repo" and opcd.size>2
@@ -463,6 +515,9 @@ class Interface
           end
         end
       end
+      if opcd[0]=="do" and opcd.size>1
+        opscript=s.load_script(opcd[1])
+      end
       if opcd[0]=="set"
         self.set(opcd[1])
       end
@@ -520,10 +575,11 @@ class Interface
       if opcd[0]=="new_repository" and opcd.size==2
         r.create_repository(@client,@config,opcd[1],@deep)
       end
-      if opcd[0]=="new_assignment" and opcd.size>2
+      if opcd[0]=="new_assignment" and opcd.size>1 #2
         case
         when @deep==ORGS
-          r.create_repository_by_teamlist(@client,@config,opcd[1],opcd[2,opcd.size],self.get_teamlist(opcd[2,opcd.size]))
+          #r.create_repository_by_teamlist(@client,@config,opcd[1],opcd[2,opcd.size],self.get_teamlist(opcd[2,opcd.size]))
+          o.create_assig(@client,@config,opcd[1])
         end
       end
       if opcd[0]=="new_group" and opcd.size>2

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghedsh
-  VERSION='1.1.15'
+  VERSION='1.1.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghedsh
 version: !ruby/object:Gem::Version
-  version: 1.1.15
+  version: 1.1.16
 platform: ruby
 authors:
 - Javier Clemente
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-06-01 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/db/assignments.json
 - lib/interface.rb
 - lib/version.rb
 - spec/spec.rb

data/lib/db/assignments.json

@@ -1 +0,0 @@
-{"Organization":[{"name":null,"assignements":[{"name":null,"teams":{"teamid":null}}]}]}