aka2 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b9680db7800abab6aae261dba6f793f6afe742
-  data.tar.gz: 5fb1c599c59e739026ad9a8cf03dc980988284a1
+  metadata.gz: 40626cc2cfc54d3962ec5658ecf5f38c4b305571
+  data.tar.gz: 1f50860a5d9a7083791f7b954837bfec1c091959
 SHA512:
-  metadata.gz: 6e1c26c386de17ef6d412f84bc896076cab09da5a4c00ff5c12915ca992196baba71fdb6b7d5663c283646280663094a6a11d68ca8f93488014748fca2300aee
-  data.tar.gz: 649c130efb72f720cca57869ef70d67bd7d1b6c240913cff74117661866bdf35745cd60acad5c67e58f90c58f55a8f15004ef343d1261c5df8a54a51c71c72cc
+  metadata.gz: 6aee9b32cb2e7b611e40ada21e45c9d2ba1e73f3557b46bc98888a5280478d58f077948224a81c83c91165a6e3d7f052715b0a47700c3655c351aaa18c6a0a08
+  data.tar.gz: e6fd42de9861d0f8b33db36a7ca8335fe32927e03444a7daea2624c1052c39bf6f515d1d943570eb1e643458bb85c976ee0cb1e1362cad162bfb2caab6fd0730

data/changelog.md

@@ -1,9 +1,9 @@
-## v0.1.8
-
-* Merge from ytbryan - Edit 'Error','Exist' output
-
-## v0.1.7
+## v0.1.9
+* Added -g option to add grouping to alias
+* Added -g option to find grouping based on group name
+* Usual clean up
 
+## v0.1.7 + v0.1.8
 * Add numbering option for list
 * Add validation for list method
 * Beautify aka output

data/lib/aka.rb

@@ -27,7 +27,7 @@ module Aka
     # aka where
     desc "where", "locate your dotfile"
     def where
-      puts readYML("#{Dir.home}/.aka/.config")["dotfile"]
+      puts readYML("#{Dir.pwd}/.aka/.config")["dotfile"]
     end
 
     #
@@ -39,7 +39,7 @@ module Aka
     method_options :to => :string
     method_options :login => :string
     def upload
-      if options.from and options.to and options.login
+      if options.from && options.to && options.login
         password = get_password()
 
         if File.exists?(options.from)
@@ -79,7 +79,7 @@ module Aka
     method_options :to => :string
     method_options :login => :string
     def upload
-      if options.from and options.to and options.login
+      if options.from && options.to && options.login
         password = get_password()
 
         if File.exists?(options.from)
@@ -110,23 +110,26 @@ module Aka
       end
     end
 
-    #
+    #################
     # GENERATE
-    #
+    #################
     desc "generate", "generate an alias (short alias: g)"
-    method_options :last => :boolean
+    method_option :last, :type => :boolean, :aliases => '-l', :desc => ''
+    method_option :group, :type => :string, :aliases => '-g', :desc => '', :default => 'default'
     def generate args
       result = false
       if options.last?
+        #we need to add group here.
         result = add(add_last_command(parseARGS(args))) if args
       else
-        result = add(parseARGS(args)) if args
-        if options.proj? and result == true
+        #we should probably phase out add()
+        result = add_with_group(parseARGS(args), options.group) if args
+        if options.proj? && result == true
           FileUtils.touch("#{Dir.pwd}/.aka")
           add_to_proj(args)
         end
       end
-      reload_dot_file if result == true and !options.noreload
+      reload_dot_file if result == true && !options.noreload
     end
 
     #
@@ -137,8 +140,8 @@ module Aka
     def destroy(*args)
       args.each_with_index do |value, index|
         result = remove(value)
-        unalias_the(value) if !options.nounalias and result == true
-        reload_dot_file if result == true and !options.noreload
+        unalias_the(value) if !options.nounalias && result == true
+        reload_dot_file if result == true && !options.noreload
       end
     end
 
@@ -172,9 +175,14 @@ module Aka
     #
     desc "find", "find an alias (short alias: f)"
     method_options :force => :boolean
+    method_option :group, :type => :string, :aliases => '-g', :desc => ''
     def find *args
-      args.each_with_index do |value, index|
-        search_alias_return_alias_tokens(value)
+      if options.group
+        search_alias_with_group_name(options.group)
+      else
+        args.each_with_index do |value, index|
+          search_alias_return_alias_tokens(value)
+        end
       end
     end
 
@@ -444,9 +452,28 @@ module Aka
       return [username, domain, port]
     end
 
+    def add_with_group input, name_of_group
+      if input && search_alias_return_alias_tokens(input).first == false && not_empty_alias(input) == false
+        array = input.split("=")
+        group_name = "# => #{name_of_group}"
+        full_command = "alias #{array.first}='#{array[1]}' #{group_name}".gsub("\n","") #remove new line in command
+        print_out_command = "aka g #{array.first}='#{array[1]}'"
+        str = checkConfigFile(readYML("#{Dir.home}/.aka/.config")["dotfile"])
+
+        File.open(str, 'a') { |file| file.write("\n" +full_command) }
+        # puts "#{print_out_command} is added to #{readYML("#{Dir.home}/.aka/.config")["dotfile"]}"
+        puts "Created: ".green +  "#{print_out_command} " + "in #{name_of_group} group."
+
+        return true
+      else
+        puts "The alias is already present. Use 'aka -h' to see all the useful commands."
+        return false
+      end
+    end
+
     # add
     def add input
-      if input and search_alias_return_alias_tokens(input).first == false and not_empty_alias(input) == false
+      if input && search_alias_return_alias_tokens(input).first == false && not_empty_alias(input) == false
         array = input.split("=")
         full_command = "alias #{array.first}='#{array[1]}'".gsub("\n","") #remove new line in command
         print_out_command = "aka g #{array.first}='#{array[1]}'"
@@ -471,6 +498,50 @@ module Aka
       return array[1].strip == ""
     end
 
+    #list
+    def search_alias_with_group_name name
+      if name == "group"
+        name = "default"
+        str = checkConfigFile(readYML("#{Dir.home}/.aka/.config")["dotfile"])
+
+        if content = File.open(str).read
+          content.gsub!(/\r\n?/, "\n")
+          content_array = content.split("\n")
+          content_array.each_with_index { |line, index|
+            value = line.split(" ")
+            containsCommand = line.split('=') #containsCommand[1]
+            if value.length > 1 && value.first == "alias"
+              answer = value[1].split("=") #contains the alias
+              group_name = line.scan(/# => ([a-zA-z]*)/).first if line.scan(/# => ([a-zA-z]*)/)
+              if group_name != nil && group_name.first == name
+                containsCommand[1].slice!(0) &&  containsCommand[1].slice!(containsCommand[1].length-1) if containsCommand[1] != nil && containsCommand[1][0] == "'" && containsCommand[1][containsCommand[1].length-1] == "'"
+                puts "aka g " + "#{answer.first}".red + "=#{containsCommand[1]}"
+              end
+            end
+          }
+        end
+      else
+
+        str = checkConfigFile(readYML("#{Dir.home}/.aka/.config")["dotfile"])
+        if content = File.open(str).read
+          content.gsub!(/\r\n?/, "\n")
+          content_array = content.split("\n")
+          content_array.each_with_index { |line, index|
+            value = line.split(" ")
+            containsCommand = line.split('=') #containsCommand[1]
+            if value.length > 1 && value.first == "alias"
+              answer = value[1].split("=") #contains the alias
+              group_name = line.scan(/# => ([a-zA-z]*)/).first if line.scan(/# => ([a-zA-z]*)/)
+              if group_name != nil && group_name.first == name
+                containsCommand[1].slice!(0) &&  containsCommand[1].slice!(containsCommand[1].length-1) if containsCommand[1] != nil && containsCommand[1][0] == "'" && containsCommand[1][containsCommand[1].length-1] == "'"
+                puts "aka g " + "#{answer.first}".red + "=#{containsCommand[1]}"
+              end
+            end
+          }
+        end
+      end
+    end
+
     # show alias
     def search_alias_return_alias_tokens argument
       str = checkConfigFile(readYML("#{Dir.home}/.aka/.config")["dotfile"])
@@ -482,7 +553,7 @@ module Aka
           value = line.split(" ")
           # puts "value -> #{value}"
           containsCommand = line.split('=') #containsCommand[1]
-          if value.length > 1 and value.first == "alias"
+          if value.length > 1 && value.first == "alias"
             # answer = value[1].split("=")
             answer = value[1].split("=") #contains the alias
 
@@ -491,7 +562,7 @@ module Aka
               this_alias = answer.first
               answer.slice!(0) #rmove the first
               # puts "before ->#{containsCommand[1]}"
-              containsCommand[1].slice!(0) and  containsCommand[1].slice!(containsCommand[1].length-1) if containsCommand[1] != nil and containsCommand[1][0] == "'" and containsCommand[1][containsCommand[1].length-1] == "'"
+              containsCommand[1].slice!(0) &&  containsCommand[1].slice!(containsCommand[1].length-1) if containsCommand[1] != nil && containsCommand[1][0] == "'" && containsCommand[1][containsCommand[1].length-1] == "'"
               # puts "before 2 ->#{containsCommand[1]}"
 
               # puts "join ->#{containsCommand[1]}"
@@ -517,10 +588,10 @@ module Aka
         content_array= content.split("\n")
         content_array.each_with_index { |line, index|
           value = line.split(" ")
-          if value.length > 1 and value.first == "alias"
+          if value.length > 1 && value.first == "alias"
             answer = value[1].split("=")
             if answer.first == input
-              content_array.delete_at(index) and write_with_newline(content_array)
+              content_array.delete_at(index) && write_with_newline(content_array)
               print_out_command = "aka g #{input}=#{line.split("=")[1]}"
               # puts  "removed: #{print_out_command} is removed from #{str}".red
 
@@ -548,7 +619,7 @@ module Aka
         content_array= content.split("\n")
         content_array.each_with_index { |line, index|
           if line == "source \"/home/ryan/.aka/autosource\""
-              content_array.delete_at(index) and write_with_newline(content_array)
+              content_array.delete_at(index) && write_with_newline(content_array)
               # puts "---> removed: source \"/home/ryan/.aka/autosource\""
               puts "Removed: ".red + "source \"/home/ryan/.aka/autosource\""
 
@@ -625,7 +696,7 @@ module Aka
         content_array= content.split("\n")
         content_array.each_with_index { |line, index|
           value = line.split(" ")
-          if value.length > 1 and value.first == "function"
+          if value.length > 1 && value.first == "function"
             answer = value[1].split("=")
             function_count += 1
           end
@@ -643,7 +714,7 @@ module Aka
         content_array= content.split("\n")
         content_array.each_with_index { |line, index|
           value = line.split(" ")
-          if value.length > 1 and value.first == "export"
+          if value.length > 1 && value.first == "export"
             answer = value[1].split("=")
             export_count += 1
           end
@@ -664,7 +735,7 @@ module Aka
         content_array= content.split("\n")
         content_array.each_with_index { |line, index|
           value = line.split(" ")
-          if value.length > 1 and value.first == "alias"
+          if value.length > 1 && value.first == "alias"
             answer = value[1].split("=")
             alias_count += 1
           end
@@ -793,7 +864,7 @@ module Aka
     # read location
     def read location
       answer = dot_location_exists?(location)
-      if answer == true and content = File.open(location).read
+      if answer == true && content = File.open(location).read
         return content
       end
       return ""
@@ -836,7 +907,41 @@ module Aka
         total_aliases = []
         content_array.each_with_index { |line, index|
           value = line.split(" ")
-          if value.length > 1 and value.first == "alias"
+          if value.length > 1 && value.first == "alias"
+            total_aliases.push(line)
+          end
+        }
+        puts ""
+        if total_aliases.count > howmany
+          total_aliases.last(howmany).each_with_index do |line, index|
+            splitted= line.split('=')
+            puts "#{total_aliases.count - howmany + index+1}. aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+            # puts "#{total_aliases.count - howmany + index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            # puts "#{total_aliases.count - howmany + index+1}. " + splitted[0] + "=" + splitted[1].red
+          end
+        else
+          total_aliases.last(howmany).each_with_index do |line, index|
+            splitted= line.split('=')
+            # puts "#{index+1}. " + splitted[0] + "=" + splitted[1].red
+            puts "#{index+1}. aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+            # puts "#{index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+          end
+        end
+        puts ""
+      end
+    end
+
+    def show_last_with_group(list_number=false, howmany=10, group)
+      str = checkConfigFile(readYML("#{Dir.home}/.aka/.config")["dotfile"])
+
+      if content = File.open(str).read
+        content.gsub!(/\r\n?/, "\n")
+        content_array = content.split("\n")
+
+        total_aliases = []
+        content_array.each_with_index { |line, index|
+          value = line.split(" ")
+          if value.length > 1 && value.first == "alias"
             total_aliases.push(line)
           end
         }
@@ -844,14 +949,26 @@ module Aka
         if total_aliases.count > howmany
           total_aliases.last(howmany).each_with_index do |line, index|
             splitted= line.split('=')
-            puts "#{total_aliases.count - howmany + index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            if list_number
+              puts "#{total_aliases.count - howmany + index+1}. aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+              # puts "#{total_aliases.count - howmany + index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            else
+              puts "aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+              # puts "aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            end
             # puts "#{total_aliases.count - howmany + index+1}. " + splitted[0] + "=" + splitted[1].red
           end
         else
           total_aliases.last(howmany).each_with_index do |line, index|
             splitted= line.split('=')
             # puts "#{index+1}. " + splitted[0] + "=" + splitted[1].red
-            puts "#{index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            if list_number
+              puts "#{index+1}. aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+              # puts "#{index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            else
+              puts "aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+              # puts "aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            end
           end
         end
         puts ""
@@ -869,7 +986,7 @@ module Aka
         total_aliases = []
         content_array.each_with_index { |line, index|
           value = line.split(" ")
-          if value.length > 1 and value.first == "alias"
+          if value.length > 1 && value.first == "alias"
             total_aliases.push(line)
           end
         }
@@ -878,9 +995,11 @@ module Aka
           total_aliases.last(howmany).each_with_index do |line, index|
             splitted= line.split('=')
             if list_number
-              puts "#{total_aliases.count - howmany + index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+              puts "#{total_aliases.count - howmany + index+1}. aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+              # puts "#{total_aliases.count - howmany + index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
             else
-              puts "aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+              puts "aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+              # puts "aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
             end
             # puts "#{total_aliases.count - howmany + index+1}. " + splitted[0] + "=" + splitted[1].red
           end
@@ -889,9 +1008,11 @@ module Aka
             splitted= line.split('=')
             # puts "#{index+1}. " + splitted[0] + "=" + splitted[1].red
             if list_number
-              puts "#{index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+              puts "#{index+1}. aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+              # puts "#{index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
             else
-              puts "aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+              puts "aka g " + splitted[0].split(" ")[1].red + "=" + splitted[1]
+              # puts "aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
             end
           end
         end
@@ -978,7 +1099,7 @@ module Aka
       countarray.each_with_index { |count, index|
         countarray[0..countarray.size-index].each_with_index { |x, thisindex|  #always one less than total
 
-          if index < countarray.size-1 and thisindex < countarray.size-1
+          if index < countarray.size-1 && thisindex < countarray.size-1
             if countarray[thisindex] < countarray[thisindex+1] #if this count is less than next count
               temp = countarray[thisindex]
               countarray[thisindex] = countarray[thisindex+1]
@@ -1012,7 +1133,7 @@ module Aka
         while check == false
           check = true
           content_array.each_with_index { |line, index|
-            if line == "" or line == "\n"
+            if line == "" || line == "\n"
               content_array.delete_at(index)
               check = false
             end
@@ -1039,7 +1160,7 @@ module Aka
     def showBar percent
       result = ""
       val = percent/100 * 50
-      val = 2 if val > 1 and val < 2
+      val = 2 if val > 1 && val < 2
       val = 1 if val.round <= 1 #for visibiity, show two bars if it's just one
       val.round.times do
         result += "+"
@@ -1178,7 +1299,6 @@ module Aka
       end
     end
 
-
   end
 
 

data/lib/aka/version.rb

@@ -1,3 +1,3 @@
 module Aka
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aka2
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Bryan Lim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The Missing Alias Manager