aka2 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ce68093db94e2fdabd4c8644207634a49e763d8
-  data.tar.gz: 0546cded6eb946d58d2a5e3e277bd6d87cfee66c
+  metadata.gz: 23306527f5f14dff1376ec38781c574c1bc087f6
+  data.tar.gz: 9e17ad0b8def61e51a0f22aea50c8588453011cd
 SHA512:
-  metadata.gz: 396a3c82379e22bb5be5bd77888c92210597ca09f186fb8a09b01aa7dafc3529e9bf99c3d91e6c142873d9207572606c72f8cebf5bc4e15cbdd19f9a2e56de67
-  data.tar.gz: 742e9a4bb8db9c418f9c8c03e183af6d3be4c51d2c8bdd8851ae730e2f0640f5d2b9d854964ef59800016cbbccce546d31c48f02283e1691e2c9d12e6527cc3d
+  metadata.gz: c5ecc7170e2431375731d8a9fe0b6a5bfd616da4e00cbff7e9943c8041d940c2b6284ec9ee98d2ff3cbaaafac16e92d1f5a6c39754243e5ac364b756f1772e76
+  data.tar.gz: 1e748466b93b74facfa5236bcaa297988e6d526cde128b860a82157fa1dfe6800be507a06bcf187fae4cc3f37ec9977ad2bb8d5493de058560f814496de82e42

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aka2 (0.1.6)
+    aka2 (0.1.7)
       colorize (~> 0)
       net-scp (~> 1.2, >= 1.2.1)
       safe_yaml (~> 1.0, >= 1.0.4)

data/README.md

@@ -41,8 +41,9 @@ To find a aka command
 
 To list all aka created
 
-    $ aka
     $ aka list
+    $ aka list 20
+    $ aka list --number
 
 To list down available command
 

data/changelog.md

@@ -1,3 +1,9 @@
+## v0.1.7
+
+* Add numbering option for list
+* Add validation for list method
+* Beautify aka output
+
 ## v0.1.6
 
 * Remove unnecessary print out

data/lib/aka.rb

@@ -23,35 +23,50 @@ module Aka
         "h" => "help"
 
     #
-    # DOWNLOAD
-    # aka download --to ~/Desktop/ --login admin@162.243.249.154:22000 --from /home/admin/hello  desc "download [path]", "download a dot file"
-    desc "download", "download dotfile from server"
+    # Where is your dotfile
+    # aka where
+    desc "where", "locate your dotfile"
+    def where
+      puts readYML("#{Dir.home}/.aka/.config")["dotfile"]
+    end
+
+    #
+    # UPLOAD
+    #
+    #aka upload --from ~/Desktop/TwitterAPI.rb --login admin@162.243.249.154:22000  --to /home/admin
+    desc "upload", "upload a dot file"
     method_options :from => :string
     method_options :to => :string
     method_options :login => :string
-    def download
+    def upload
       if options.from and options.to and options.login
-        success = true
-        arr = split(options.login)
-        pw = get_password()
-        begin
-          result = Net::SCP.download!(arr[1], #remote
-          arr.first,#username
-          options.from, #remote_path
-          options.to, #local_path
-          :ssh => {:password => pw,
-                   :port => arr[2]})
-        rescue Exception => e
-           puts "\n#{e}"
-           success = false
+        password = get_password()
+
+        if File.exists?(options.from)
+          success = true
+          begin
+            arr = split(options.login)
+            result = Net::SCP.upload!(arr[1], #remote
+            arr.first, #username
+            options.from, #local_path
+            options.to, #remote_path
+            :ssh => {:port => arr[2],
+                     :password => password})
+          rescue Exception => e
+            puts "\n#{e}"
+            success = false
+          end
+
+          puts "\nDone." if success
+        else
+          puts "Cannot find #{options.from}"
         end
-        puts "\nDone." if success
       else
-        puts "Some options are missing."
-        puts "--login: #{options.login}"
-        puts "--to: #{options.to}"
-        puts "--from: #{options.from}"
-        puts "aka dl --login some_login_string --to some_local_path_string --from some_remote_path_string"
+        puts "Some options are missing:"
+        puts "--of -> #{options.of}"
+        puts "--to -> #{options.to}"
+        puts "--from -> #{options.from}"
+        puts "aka up --of some_string --to some_string --from some_string"
       end
     end
 
@@ -127,15 +142,6 @@ module Aka
       end
     end
 
-    #
-    # SETUP_old
-    #
-    # desc "setup_old", "setup aka"
-    # method_options :force => :boolean
-    # def setup_old
-    #   setup_aka_old
-    # end
-
     #
     # first step: set config file
     #
@@ -222,35 +228,24 @@ module Aka
       end #if args
     end
 
-    #
-    # 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
-
     #
     # LIST OUT - ryan - remove numbering
     #
     desc "list", "list alias (short alias: l)"
     method_options :force => :boolean
+    method_options :number => :boolean
     def list(args=nil)
       if args != nil
-        showlast(args.to_i)
+        showlast(options.number,args.to_i) #user input
       else
         value = readYML("#{Dir.home}/.aka/.config")["list"]
-        showlast(value.to_i) #this is unsafe
+        puts value.class
+        if value.class == Fixnum
+          showlast(options.number,value.to_i)
+        else
+          puts "List value is not defined in #{Dir.home}/.aka/.config"
+          showlast(options.number,50)
+        end
       end
 
       #total of #{} exports #functions
@@ -259,34 +254,6 @@ module Aka
       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
-
     #
     # USAGE - ryan - remove numbering in front
     #
@@ -315,29 +282,6 @@ module Aka
       end
     end
 
-
-    #
-    # 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
-
     #
     # INIT
     #
@@ -511,7 +455,9 @@ module Aka
         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 "#{print_out_command} is added to #{readYML("#{Dir.home}/.aka/.config")["dotfile"]}"
+        puts "Created: ".green +  "#{print_out_command}"
+
         return true
       else
         puts "The alias is already present."
@@ -577,7 +523,10 @@ module Aka
             if answer.first == input
               content_array.delete_at(index) and write_with_newline(content_array)
               print_out_command = "aka g #{input}=#{line.split("=")[1]}"
-              puts "removed: #{print_out_command} is removed from #{str}".red
+              # puts  "removed: #{print_out_command} is removed from #{str}".red
+
+              puts "Removed: ".red  + "#{print_out_command}"
+
               return true
             end
           end
@@ -601,7 +550,9 @@ module Aka
         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\""
+              # puts "---> removed: source \"/home/ryan/.aka/autosource\""
+              puts "Removed: ".red + "source \"/home/ryan/.aka/autosource\""
+
               return true
           end
         }
@@ -723,41 +674,7 @@ module Aka
       end
     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
+
 
     # setup_aka by ryan - set value in config file
     def setup_aka
@@ -943,7 +860,7 @@ module Aka
     end
 
     # show last2 - ryan - remove number
-    def showlast howmany=10
+    def showlast(list_number=false,howmany=10)
       str = checkConfigFile(readYML("#{Dir.home}/.aka/.config")["dotfile"])
 
       if content = File.open(str).read
@@ -961,14 +878,22 @@ module Aka
         if total_aliases.count > howmany
           total_aliases.last(howmany).each_with_index do |line, index|
             splitted= line.split('=')
-            puts "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] + "=" + splitted[1].red
+            else
+              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 "aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            if list_number
+              puts "#{index+1}. aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            else
+              puts "aka g " + splitted[0].split(" ")[1] + "=" + splitted[1].red
+            end
           end
         end
         puts ""
@@ -1129,61 +1054,6 @@ module Aka
       return result + " #{percent.round(2)}%"
     end
 
-
-    # command :config do |c|
-    #   c.action do |args, options|
-    #     # theyml = Hash.new
-    #     # theyml["location"] = "~/.aka/.location"
-    #     # theyml["global"] = "/Users/ytbryan/.bash_profile"
-    #     # theyml["groups"] = "~/.aka/groups"
-    #     # theyml["remote"] = "255, admin, 12.12.12.233"
-    #     # theyml["path"] = "~/.aka"
-    #     # writeYML("#{Dir.home}/.aka/.config", theyml)
-    #     FileUtils.touch(readYML("#{Dir.home}/.aka/.config")["location"])
-    #   end
-    # end
-    #
-    # command :readconfig do |c|
-    #   c.action do |args, options|
-    #     puts "readYML('#{Dir.home}/.aka/.config')['location'] ->#{readYML("#{Dir.home}/.aka/.config")["location"].class} -> #{readYML("#{Dir.home}/.aka/.config")["location"]}"
-    #     puts "readYML("#{Dir.home}/.aka/.config")["location"] -> #{ readYML("#{Dir.home}/.aka/.config")["location"].class} -> #{ readYML("#{Dir.home}/.aka/.config")["location"]}"
-    #     puts "#{program(:path_to_location).class} -> #{program(:path_to_location)}"
-    #   end
-    # end
-    #
-
-    ###########################
-    ### DEVELOPMENT
-    ###########################
-
-    # command :build do |c|
-    #   c.syntax = 'aka build [options]'
-    #   c.summary = 'build the VERSION file and run tests'
-    #   c.action do |args, options|
-    #     write(program(:version), './VERSION')
-    #     puts "VERSION #{program(:version)} created at #{Time.now.strftime("%I:%M%p, %A, %d %b %Y")}"
-    #   end
-    # end
-
-    # command :install do |c|
-    #   c.syntax = 'aka copy [options]'
-    #   c.summary = 'copy a local copy of aka to /usr/local/bin'
-    #   c.action do |args, options|
-    #     result = system("sudo cp aka /usr/local/bin")
-    #     puts "Installed aka #{program(:version)} into /usr/local/bin (#{Time.now.strftime("%I:%M%p,%a,%d %b %Y")}).".red if result == true
-    #     puts "" if result == true
-    #   end
-    # end
-    #
-    # command :uninstall do |c|
-    #   c.syntax = 'aka uninstall [options]'
-    #   c.summary = 'uninstall aka'
-    #   c.action do |args, options|
-    #     input = ask "Confirm that you want to uninstall aka? (y/N)"
-    #     system("sudo rm -rf ~/.aka; sudo rm -rf /usr/local/bin/aka;") if input == "y"
-    #   end
-    # end
-
     def add_to_proj fullalias
       values = fullalias.split("=")
       yml = readYML("#{Dir.pwd}/.aka")
@@ -1324,3 +1194,176 @@ class String
     !!(self =~ /\A[-+]?[0-9]+\z/)
   end
 end
+
+__END__
+
+#
+# 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
+
+
+
+    # command :config do |c|
+    #   c.action do |args, options|
+    #     # theyml = Hash.new
+    #     # theyml["location"] = "~/.aka/.location"
+    #     # theyml["global"] = "/Users/ytbryan/.bash_profile"
+    #     # theyml["groups"] = "~/.aka/groups"
+    #     # theyml["remote"] = "255, admin, 12.12.12.233"
+    #     # theyml["path"] = "~/.aka"
+    #     # writeYML("#{Dir.home}/.aka/.config", theyml)
+    #     FileUtils.touch(readYML("#{Dir.home}/.aka/.config")["location"])
+    #   end
+    # end
+    #
+    # command :readconfig do |c|
+    #   c.action do |args, options|
+    #     puts "readYML('#{Dir.home}/.aka/.config')['location'] ->#{readYML("#{Dir.home}/.aka/.config")["location"].class} -> #{readYML("#{Dir.home}/.aka/.config")["location"]}"
+    #     puts "readYML("#{Dir.home}/.aka/.config")["location"] -> #{ readYML("#{Dir.home}/.aka/.config")["location"].class} -> #{ readYML("#{Dir.home}/.aka/.config")["location"]}"
+    #     puts "#{program(:path_to_location).class} -> #{program(:path_to_location)}"
+    #   end
+    # end
+    #
+
+    ###########################
+    ### DEVELOPMENT
+    ###########################
+
+    # command :build do |c|
+    #   c.syntax = 'aka build [options]'
+    #   c.summary = 'build the VERSION file and run tests'
+    #   c.action do |args, options|
+    #     write(program(:version), './VERSION')
+    #     puts "VERSION #{program(:version)} created at #{Time.now.strftime("%I:%M%p, %A, %d %b %Y")}"
+    #   end
+    # end
+
+    # command :install do |c|
+    #   c.syntax = 'aka copy [options]'
+    #   c.summary = 'copy a local copy of aka to /usr/local/bin'
+    #   c.action do |args, options|
+    #     result = system("sudo cp aka /usr/local/bin")
+    #     puts "Installed aka #{program(:version)} into /usr/local/bin (#{Time.now.strftime("%I:%M%p,%a,%d %b %Y")}).".red if result == true
+    #     puts "" if result == true
+    #   end
+    # end
+    #
+    # command :uninstall do |c|
+    #   c.syntax = 'aka uninstall [options]'
+    #   c.summary = 'uninstall aka'
+    #   c.action do |args, options|
+    #     input = ask "Confirm that you want to uninstall aka? (y/N)"
+    #     system("sudo rm -rf ~/.aka; sudo rm -rf /usr/local/bin/aka;") if input == "y"
+    #   end
+    # end
+
+    #
+    # SETUP_old
+    #
+    # desc "setup_old", "setup aka"
+    # method_options :force => :boolean
+    # def setup_old
+    #   setup_aka_old
+    # 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
+
+
+    #
+    # 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
+
+
+    # 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

data/lib/aka/version.rb

@@ -1,3 +1,3 @@
 module Aka
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

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