aka2 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 786de0de3b83d830707958649eefe21a15ea2170
-  data.tar.gz: b96dee6dba6635ce7246a7df16a79527f2f377b0
+  metadata.gz: 1dd3054713f6cd4b14b82d735ebcbb3ba45b8681
+  data.tar.gz: 342f7668d15f7fa58ac224e3c781ca0aac586fcc
 SHA512:
-  metadata.gz: 227a648cf372eaf4f8cc5c8318538883f150572212caf46484605bfc6b673972eb9ae6b02357aa904da18fc15d395aa45e40d241bb7503ab59075246fa804bf9
-  data.tar.gz: 99cfb490b8e746df54e169ca41b508182ce3c4abe3407b4eba43fb0fde0215c104f3445b4feebb4ebaca52e47161903336da7619274dd22ebac4397cb5c8c1ea
+  metadata.gz: 4075e00f23a0a803010096dfc4cadd3a7defa860f6f4ddb323284a0428ee4feedc020b32b03248eb851be6b5853ddc47b7585f3288b17656bf6196488178b348
+  data.tar.gz: 5b8291f3a7aed0702ff01b73bdb55c14361de14db168dca3a354029d606a7b6bce36c09cfe70d7e6b8c915f84dd252f3c77fbe71d49960411b57a802b0e393b1

data/README.md

@@ -1,5 +1,7 @@
 # aka - The Missing Alias Manager
 
+[![Gem Version](https://badge.fury.io/rb/aka2.svg)](http://badge.fury.io/rb/aka2)
+
 aka generate/edit/destroy/find permanent aliases with a single command.
 
 aka2 requires ruby and is built for bash and zsh users.
@@ -10,17 +12,40 @@ aka2 requires ruby and is built for bash and zsh users.
     $ aka setup
 
 If you wish to reinstall aka setup
-    
+
     $ aka setup --reset
-    
+
 ## Usage
 
+To generate new aka
+
     $ aka generate hello="echo helloworld"
+    $ aka g hello="echo helloworld"
+
+To destroy aka
+
     $ aka destroy hello
+    $ aka d hello
+
+To edit aka command
+
     $ aka edit hello
+
+To edit aka alias name
+
+    $ aka edit hello --name
+
+To find a aka command
+
     $ aka find hello
-    $ aka usage
+
+To list all aka created
+
     $ aka
+    $ aka list
+
+To list down available command
+
     $ aka help
 
 ## Requirement

data/changelog.md

@@ -1,3 +1,9 @@
+## v0.1.5
+
+* If more than one bashfile exist, user can choose setup destination
+* Add edit alias's name function for user
+* Add remove source from dotfile
+
 ## v0.1.4
 
 * Rename method names

data/lib/aka.rb

@@ -128,13 +128,13 @@ module Aka
     end
 
     #
-    # SETUP
+    # SETUP_old
     #
-    desc "setup_old", "setup aka"
-    method_options :force => :boolean
-    def setup_old
-      setup_aka_old
-    end
+    # desc "setup_old", "setup aka"
+    # method_options :force => :boolean
+    # def setup_old
+    #   setup_aka_old
+    # end
 
     #
     # first step: set config file
@@ -144,6 +144,7 @@ module Aka
     def setup
       configDir = "#{Dir.home}/.aka"
       if options.reset? && File.exist?("#{configDir}")
+        remove_autosource
         FileUtils.rm_r("#{configDir}")
         puts "#{configDir} is removed"
       end
@@ -154,6 +155,7 @@ module Aka
       else
         setup_config      # create and setup .config file
         setup_aka         # put value in .config file
+        puts "setting up autosource"
         setup_autosource  # create, link source file
         puts "Congratulation, aka is setup in #{configDir}"
       end
@@ -166,7 +168,7 @@ module Aka
     method_options :force => :boolean
     def find *args
       args.each_with_index do |value, index|
-        show_alias(value)
+        search_alias_return_alias_tokens(value)
       end
     end
 
@@ -175,39 +177,40 @@ module Aka
     #
     desc "edit", "edit an alias(short alias: e)"
     method_options :force => :boolean
+    method_options :name => :boolean #--name
     def edit args
       if args
         values = args.split("=")
         if values.size > 1
-          truth, _alias = show_alias(args)
+          truth, _alias = search_alias_return_alias_tokens(args)
           if truth == true
             if options.name
               remove(_alias) #remove that alias
-              edit_alias(values[1], _alias) #edit that alias
+              edit_alias_name(values[1], _alias) #edit that alias
               reload_dot_file() if !options.noreload
             else
               remove(_alias) #remove that alias
-              edit_this(values[1], _alias) #edit that alias
+              edit_alias_command(values[1], _alias) #edit that alias
               reload_dot_file() if !options.noreload
             end
           else
             puts "Alias '#{args}' cannot be found".red
           end
         else
-          truth, _alias, command = show_alias(args)
+          truth, _alias, command = search_alias_return_alias_tokens(args)
           if truth == true
             if options.name
               input = ask "Enter a new alias for command '#{command}'?\n"
               if yes? "Please confirm the new alias? (y/N)"
                 remove(_alias) #remove that alias
-                edit_alias(input, _alias) #edit that alias
+                edit_alias_name(input, command) #edit that alias
                 reload_dot_file() if !options.noreload
               end
             else
               input = ask "Enter a new command for alias '#{args}'?\n"
               if yes? "Please confirm the new command? (y/N)"
                 remove(_alias) #remove that alias
-                edit_this(input, _alias) #edit that alias
+                edit_alias_command(input, _alias) #edit that alias
                 reload_dot_file() if !options.noreload
               end
             end
@@ -222,20 +225,20 @@ module Aka
     #
     # LIST OUT
     #
-    desc "list_old", "list alias (short alias: l)"
-    method_options :force => :boolean
-    def list_old(args=nil)
-      if args != nil
-        showlast_old(args.to_i)
-      else
-        value = readYML("#{Dir.home}/.aka/.config")["list"]
-        showlast_old(value.to_i) #this is unsafe
-      end
-
-      #total of #{} exports #functions
-      puts "A total of #{count()} aliases,#{count_export} exports and #{count_function} functions from #{readYML("#{Dir.home}/.aka/.config")["dotfile"]}"
-      reload_dot_file
-    end
+    # desc "list_old", "list alias (short alias: l)"
+    # method_options :force => :boolean
+    # def list_old(args=nil)
+    #   if args != nil
+    #     showlast_old(args.to_i)
+    #   else
+    #     value = readYML("#{Dir.home}/.aka/.config")["list"]
+    #     showlast_old(value.to_i) #this is unsafe
+    #   end
+    #
+    #   #total of #{} exports #functions
+    #   puts "A total of #{count()} aliases,#{count_export} exports and #{count_function} functions from #{readYML("#{Dir.home}/.aka/.config")["dotfile"]}"
+    #   reload_dot_file
+    # end
 
     #
     # LIST OUT - ryan - remove numbering
@@ -252,37 +255,37 @@ module Aka
 
       #total of #{} exports #functions
       puts "A total of #{count()} aliases,#{count_export} exports and #{count_function} functions from #{readYML("#{Dir.home}/.aka/.config")["dotfile"]}"
-      reload_dot_file
       puts "\nUse 'aka -h' to see all the useful commands.\n\n"
+      reload_dot_file
     end
 
     #
     # USAGE
     #
-    desc "usage_old [number]", "show commands usage based on history"
-    # method_options :least, :type => :boolean, :aliases => '-l', :desc => 'show the least used commands'
-    # method_options :clear, :type => :boolean, :aliases => '-c', :desc => 'clear the dot history file'
-    def usage_old(args=nil)
-      if args
-        if options.least
-          showUsage(args.to_i, true) if args
-        else
-          showUsage(args.to_i) if args
-        end
-      else
-        if options.least
-          value = readYML("#{Dir.home}/.aka/.config")["usage"]
-          showlast_old(value.to_i, true) #this is unsafe
-        else
-          value = readYML("#{Dir.home}/.aka/.config")["usage"]
-          showlast_old(value.to_i) #this is unsafe
-        end
-      end
-
-      if options[:clear]
-        puts "clear the dot history file"
-      end
-    end
+    # desc "usage_old [number]", "show commands usage based on history"
+    # # method_options :least, :type => :boolean, :aliases => '-l', :desc => 'show the least used commands'
+    # # method_options :clear, :type => :boolean, :aliases => '-c', :desc => 'clear the dot history file'
+    # def usage_old(args=nil)
+    #   if args
+    #     if options.least
+    #       showUsage(args.to_i, true) if args
+    #     else
+    #       showUsage(args.to_i) if args
+    #     end
+    #   else
+    #     if options.least
+    #       value = readYML("#{Dir.home}/.aka/.config")["usage"]
+    #       showlast_old(value.to_i, true) #this is unsafe
+    #     else
+    #       value = readYML("#{Dir.home}/.aka/.config")["usage"]
+    #       showlast_old(value.to_i) #this is unsafe
+    #     end
+    #   end
+    #
+    #   if options[:clear]
+    #     puts "clear the dot history file"
+    #   end
+    # end
 
     #
     # USAGE - ryan - remove numbering in front
@@ -316,24 +319,24 @@ module Aka
     #
     # INSTALL
     #
-    desc "install [name]", "install aka"
-    method_options :force => :boolean
-    def install
-      if File.exist? "#{Dir.pwd}/aka"
-        if File.exist? "/usr/local/bin/aka"
-          if  yes? "aka exists. Do you want to replace it? (yN)"
-            FileUtils.rm("/usr/local/bin/aka")
-            system("ln -s #{Dir.pwd}/aka /usr/local/bin/aka")
-            puts "aka replaced."
-          end
-        else
-          result = system("ln -s #{Dir.pwd}/aka /usr/local/bin/aka")
-          puts "aka installed."
-        end
-      else
-        puts "Cannot find aka.".red
-      end
-    end
+    # desc "install [name]", "install aka"
+    # method_options :force => :boolean
+    # def install
+    #   if File.exist? "#{Dir.pwd}/aka"
+    #     if File.exist? "/usr/local/bin/aka"
+    #       if  yes? "aka exists. Do you want to replace it? (yN)"
+    #         FileUtils.rm("/usr/local/bin/aka")
+    #         system("ln -s #{Dir.pwd}/aka /usr/local/bin/aka")
+    #         puts "aka replaced."
+    #       end
+    #     else
+    #       result = system("ln -s #{Dir.pwd}/aka /usr/local/bin/aka")
+    #       puts "aka installed."
+    #     end
+    #   else
+    #     puts "Cannot find aka.".red
+    #   end
+    # end
 
     #
     # INIT
@@ -409,7 +412,7 @@ module Aka
       if File.exists? path
         return YAML.load_file(path)
       else
-        puts "#{Dir.home}/.aka/.config does not exist. Type `aka setup2` to setup the config file".red
+        puts "#{Dir.home}/.aka/.config does not exist. Type `aka setup` to setup the config file".red
       end
     end
 
@@ -500,7 +503,7 @@ module Aka
 
     # add
     def add input
-      if input and show_alias(input).first == false and not_empty_alias(input) == false
+      if input and search_alias_return_alias_tokens(input).first == false and 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]}'"
@@ -524,18 +527,30 @@ module Aka
     end
 
     # show alias
-    def show_alias argument
+    def search_alias_return_alias_tokens argument
       str = checkConfigFile(readYML("#{Dir.home}/.aka/.config")["dotfile"])
-
+      # alias something="echo something"
       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(" ")
+          puts "value -> #{value}"
+          containsCommand = line.split('=') #containsCommand[1]
           if value.length > 1 and value.first == "alias"
-            answer = value[1].split("=")
+            # answer = value[1].split("=")
+            answer = value[1].split("=") #contains the alias
+
+            puts "answer -> #{answer}"
             if found?(answer.first, argument.split("=").first, line) == true
-              return [true, answer.first, answer[1]]
+              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] == "'"
+              puts "before 2 ->#{containsCommand[1]}"
+
+              puts "join ->#{containsCommand[1]}"
+              return [true, this_alias, containsCommand[1]]
             end
           end
         }
@@ -575,6 +590,28 @@ module Aka
       end
     end
 
+    # remove autosource in dotfile
+    def remove_autosource
+
+      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|
+          if line == "source \"/home/ryan/.aka/autosource\""
+              content_array.delete_at(index) and write_with_newline(content_array)
+              puts "---> removed: source \"/home/ryan/.aka/autosource\""
+              return true
+          end
+        }
+
+      else
+        puts "---> autosource cannot be found in dotfile.".red
+        return false
+      end
+    end
+
     # history
     def history
 
@@ -618,15 +655,14 @@ module Aka
       end
     end
 
-    # edit_this
-    def edit_this newcommand, this_alias
+    def edit_alias_command newcommand, this_alias
       puts "new: aka g #{this_alias}='#{newcommand}'"
       return append("alias " + this_alias + "='" + newcommand + "'", readYML("#{Dir.home}/.aka/.config")["dotfile"] )
     end
 
     # edit alias
-    def edit_alias newalias, thiscommand
-      puts "new: aka g #{this_alias}='#{newcommand}'"
+    def edit_alias_name newalias, thiscommand
+      puts "new: aka g #{newalias}='#{thiscommand}'"
       return append("alias " + newalias + "='" + thiscommand + "'", readYML("#{Dir.home}/.aka/.config")["dotfile"] )
     end
 
@@ -688,55 +724,105 @@ module Aka
     end
 
     # setup_aka_old
-    def setup_aka_old
-      append_with_newline("export HISTSIZE=10000","/etc/profile")
-      trap = "sigusr2() { unalias $1;}
-sigusr1() { source #{readYML("#{Dir.home}/.aka/.config")["dotfile"]}; history -a; echo 'reloaded dot file'; }
-trap sigusr1 SIGUSR1
-trap 'sigusr2 $(cat ~/sigusr1-args)' SIGUSR2\n".pretty
-      append(trap, readYML("#{Dir.home}/.aka/.config")['profile'])
-    puts "Done. Please restart this shell.".red
-  end
-
-    # setup_aka_old2 by ryan - check bash file first
-    def setup_aka_old2
-        if File.exist?("#{Dir.home}/.zshrc") #if zshec exist
-          setZSHRC2
-          append_with_newline("\nexport HISTSIZE=10000","#{Dir.home}/.zshrc")
-        elsif
-          File.exist?("#{Dir.home}/.bashrc") #if bashrc exist
-          setBASHRC2
-          append_with_newline("\nexport HISTSIZE=10000","#{Dir.home}/.bashrc")
-        elsif File.exist?("#{Dir.home}/.bash_profile") #if bash_profile exist
-          setBASH2
-          append_with_newline("\nexport HISTSIZE=10000","#{Dir.home}/.bash_profile")
-        else
-          puts "Currently aka2 just support zshrc, bashrc and bash_profile"
-          puts "Pleaes contact aka2 creator for more info."
-        end
-
-        trap = "sigusr2() { unalias $1;}
-  sigusr1() { source #{readYML("#{Dir.home}/.aka/.config")["dotfile"]}; history -a; echo 'reloaded dot file'; }
-  trap sigusr1 SIGUSR1
-  trap 'sigusr2 $(cat ~/sigusr1-args)' SIGUSR2\n".pretty
-        append(trap, readYML("#{Dir.home}/.aka/.config")['profile'])
-        puts "Done. Please restart this shell.".red
-    end
+#     def setup_aka_old
+#       append_with_newline("export HISTSIZE=10000","/etc/profile")
+#       trap = "sigusr2() { unalias $1;}
+# sigusr1() { source #{readYML("#{Dir.home}/.aka/.config")["dotfile"]}; history -a; echo 'reloaded dot file'; }
+# trap sigusr1 SIGUSR1
+# trap 'sigusr2 $(cat ~/sigusr1-args)' SIGUSR2\n".pretty
+#       append(trap, readYML("#{Dir.home}/.aka/.config")['profile'])
+#     puts "Done. Please restart this shell.".red
+#   end
+#
+#     # setup_aka_old2 by ryan - check bash file first
+#     def setup_aka_old2
+#         if File.exist?("#{Dir.home}/.zshrc") #if zshec exist
+#           setZSHRC2
+#           append_with_newline("\nexport HISTSIZE=10000","#{Dir.home}/.zshrc")
+#         elsif
+#           File.exist?("#{Dir.home}/.bashrc") #if bashrc exist
+#           setBASHRC2
+#           append_with_newline("\nexport HISTSIZE=10000","#{Dir.home}/.bashrc")
+#         elsif File.exist?("#{Dir.home}/.bash_profile") #if bash_profile exist
+#           setBASH2
+#           append_with_newline("\nexport HISTSIZE=10000","#{Dir.home}/.bash_profile")
+#         else
+#           puts "Currently aka2 just support zshrc, bashrc and bash_profile"
+#           puts "Pleaes contact aka2 creator for more info."
+#         end
+#
+#         trap = "sigusr2() { unalias $1;}
+#   sigusr1() { source #{readYML("#{Dir.home}/.aka/.config")["dotfile"]}; history -a; echo 'reloaded dot file'; }
+#   trap sigusr1 SIGUSR1
+#   trap 'sigusr2 $(cat ~/sigusr1-args)' SIGUSR2\n".pretty
+#         append(trap, readYML("#{Dir.home}/.aka/.config")['profile'])
+#         puts "Done. Please restart this shell.".red
+#     end
 
     # setup_aka by ryan - set value in config file
     def setup_aka
-        if File.exist?("#{Dir.home}/.zshrc") #if zshec exist
-          setZSHRC2
-        elsif File.exist?("#{Dir.home}/.bashrc") #if bashrc exist
-          setBASHRC2
-        elsif File.exist?("#{Dir.home}/.bash_profile") #if bash_profile exist
-          setBASH2
-        else
-          puts "Currently aka2 just support zshrc, bashrc and bash_profile"
-          puts "Pleaes contact aka2 creator for more info."
+      userBash = []
+      # 1. check for each type of file without setting anything.
+      if File.exist?("#{Dir.home}/.zshrc") #if zshrc exist
+        userBash.push(".zshrc")
+      end
+      if File.exist?("#{Dir.home}/.bashrc") #if bashrc exist
+        userBash.push(".bashrc")
+      end
+      if File.exist?("#{Dir.home}/.bash_profile") #if bash_profile exist
+        userBash.push(".bash_profile")
+      end
+
+      #2. count the number of types
+
+      #3 if number of types is 1, proceed to set it
+      if userBash.count == 1
+        set_to_dotfile(userBash.first)
+
+      elsif userBash.count > 1
+        #4 if the number of types is more than 1, proceed to ask which one does the users want to uses.
+        userBash.each_with_index do |choice,i|
+          puts "#{i+1}. Setup in #{Dir.home}/#{choice}"
+        end
+        choice = ask "Please choose which location you wish to setup? (Choose a number and enter)\n"
+
+        #5 once you receive input, then you set it according to input
+        case choice
+          when "1"
+            set_to_dotfile(userBash[0]) if userBash[0]
+          when "2"
+            if userBash[1] then set_to_dotfile(userBash[1]) else abort "No file choosen" end
+          when "3"
+            if userBash[2] then set_to_dotfile(userBash[2]) else abort "No file choosen" end
+          else
+            puts "Invalid input, Please enter the number between 1 and #{userBash.count}. Please try again"
+            abort "No file choosen"
         end
+      end #if userBash > 1
+
+        # if File.exist?("#{Dir.home}/.zshrc") #if zshec exist
+        #   setZSHRC2
+        # elsif File.exist?("#{Dir.home}/.bashrc") #if bashrc exist
+        #   setBASHRC2
+        # elsif File.exist?("#{Dir.home}/.bash_profile") #if bash_profile exist
+        #   setBASH2
+        # else
+        #   puts "Aka2 only supports zshrc, bashrc and bash_profile"
+        #   puts "Please contact http://github.com/ytbryan for more info."
+        # end
+    end
+
+    def set_to_dotfile(filename)
+      if filename == ".zshrc"
+        setZSHRC2
+      elsif filename == ".bashrc"
+        setBASHRC2
+      elsif filename == ".bash_profile"
+        setBASH2
+      end
     end
 
+
     # setup_autosource by ryan - create source file
     def setup_autosource
       configDir = "#{Dir.home}/.aka"

data/lib/aka/version.rb

@@ -1,3 +1,3 @@
 module Aka
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aka2
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Bryan Lim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp