hsume2-aka 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a332ce58ae2a121737edee3fc627727f0fcba0c0
-  data.tar.gz: 1a0f345cb28c9464c937187b079774a1e97ff0d3
+  metadata.gz: ff1a4426d8acd44942815927f6598abeced762cf
+  data.tar.gz: 5c595720a99c74f596a9ea20a47daf510d75af34
 SHA512:
-  metadata.gz: 2235293919da1a0b43f0b382018c668f2cc0c4326e8e7efeacbbadbe7acd1aac97ed743a6d3cf4b7feb8b153862197ee4ed265b2414a13588f535c80fcea5800
-  data.tar.gz: 49fe5054009caaa9106bb4eb840705dbe99bdf46e52af4bcce5a0aaeb6b29683e4fe01cbb8370a190a4274aeeed005f4fb4f6fe555fe6bcf6669d7e8f5412c9a
+  metadata.gz: 660d9898f7a0e020ee5f847d52eba91cb686d1b41414b13aa56ee92db4780ceb3d2a9363914593e7d66522683d149705f7f64f46e1d94b9cea2be23e97e5718c
+  data.tar.gz: e757d3583c75e7670a66aad84b75d5442024f170ab28c14325f7ecca254194b2d22d803541bc2a9b70a0f453ab7ebd3de7cc30037ecae6e73da2512352d7cb93

data/README.md

@@ -12,7 +12,8 @@ aka(7) -- Manage Shell Keyboard Shortcuts
 `aka` list \[options\]<br>
 `aka` link \[options\]<br>
 `aka` generate \[options\]<br>
-`aka` sync
+`aka` sync<br>
+`aka` upgrade
 
 ## DESCRIPTION
 

data/features/aka/help.feature

@@ -29,7 +29,7 @@ Feature: Help with aka
     Then the exit status should be 0
     And the output should contain exactly:
     """
-    aka version 0.2.1
+    aka version 0.3.0
 
     """
 

data/features/aka/link.feature

@@ -55,12 +55,12 @@ Feature: Link keyboard shortcuts
           :command: cd ..
         modifiable: true
     :links:
-    - !ruby/object:OpenStruct
-      table:
-        :tag:
-        - os:darwin
-        :output: .aka.zsh
-      modifiable: true
+      1: !ruby/object:OpenStruct
+        table:
+          :tag:
+          - os:darwin
+          :output: .aka.zsh
+        modifiable: true
 
     """
 
@@ -110,12 +110,12 @@ Feature: Link keyboard shortcuts
           :command: cd ..
         modifiable: true
     :links:
-    - !ruby/object:OpenStruct
-      table:
-        :tag:
-        - os:darwin
-        :output: .aka.zsh
-      modifiable: true
+      1: !ruby/object:OpenStruct
+        table:
+          :tag:
+          - os:darwin
+          :output: .aka.zsh
+        modifiable: true
 
     """
 
@@ -174,7 +174,7 @@ Feature: Link keyboard shortcuts
     And I run `aka add ls "ls -FG" --tag os:darwin`
     And I run `aka add .. "cd .."`
     And I run `aka link --tag os:darwin --output .aka.zsh`
-    When I run `aka link --delete --tag os:darwin --output .aka.zsh`
+    When I run `aka link delete 1`
     Then the exit status should be 0
     And the stdout should contain exactly:
     """
@@ -217,12 +217,37 @@ Feature: Link keyboard shortcuts
 
     """
 
-  Scenario: Sync a link
+  Scenario: Sync link
+    Given a file named ".aka.zsh" should not exist
+    And I run `aka add ls "ls -F --color=auto" --description "ls\nls\nls" --function --tag os:linux`
+    And I run `aka add ls "ls -FG" --tag os:darwin`
+    And I run `aka add .. "cd .."`
+    And I run `aka link --tag os:darwin --output .aka.zsh`
+    When I run `aka sync`
+    Then the exit status should be 0
+    And the stdout should contain exactly:
+    """
+    Created shortcut.
+    Created shortcut.
+    Created shortcut.
+    Saved link.
+    Generated .aka.zsh.
+
+    """
+    And the file ".aka.zsh" should contain exactly:
+    """
+    alias ..="cd .."
+    alias ls="ls -FG"
+
+    """
+
+  Scenario: Sync links
     Given a file named ".aka.zsh" should not exist
     And I run `aka add ls "ls -F --color=auto" --description "ls\nls\nls" --function --tag os:linux`
     And I run `aka add ls "ls -FG" --tag os:darwin`
     And I run `aka add .. "cd .."`
     And I run `aka link --tag os:darwin --output .aka.zsh`
+    And I run `aka link --tag os:linux --output .aka2.zsh`
     When I run `aka sync`
     Then the exit status should be 0
     And the stdout should contain exactly:
@@ -231,7 +256,9 @@ Feature: Link keyboard shortcuts
     Created shortcut.
     Created shortcut.
     Saved link.
+    Saved link.
     Generated .aka.zsh.
+    Generated .aka2.zsh.
 
     """
     And the file ".aka.zsh" should contain exactly:
@@ -240,6 +267,43 @@ Feature: Link keyboard shortcuts
     alias ls="ls -FG"
 
     """
+    And the file ".aka2.zsh" should contain exactly:
+    """
+    alias ..="cd .."
+    function ls {
+      ls -F --color=auto
+    }
+
+    """
+
+  Scenario: Sync specific link
+    Given a file named ".aka.zsh" should not exist
+    And I run `aka add ls "ls -F --color=auto" --description "ls\nls\nls" --function --tag os:linux`
+    And I run `aka add ls "ls -FG" --tag os:darwin`
+    And I run `aka add .. "cd .."`
+    And I run `aka link --tag os:darwin --output .aka.zsh`
+    And I run `aka link --tag os:linux --output .aka2.zsh`
+    When I run `aka sync 2`
+    Then the exit status should be 0
+    And the stdout should contain exactly:
+    """
+    Created shortcut.
+    Created shortcut.
+    Created shortcut.
+    Saved link.
+    Saved link.
+    Generated .aka2.zsh.
+
+    """
+    And the file ".aka.zsh" should not exist
+    And the file ".aka2.zsh" should contain exactly:
+    """
+    alias ..="cd .."
+    function ls {
+      ls -F --color=auto
+    }
+
+    """
 
   Scenario: List links
     Given I run `aka add ls "ls -F --color=auto" --description "ls\nls\nls" --function --tag os:linux`
@@ -270,6 +334,6 @@ Feature: Link keyboard shortcuts
     Links
     =====
 
-    .aka.zsh: #os:darwin
+    [1] .aka.zsh: #os:darwin
 
     """

data/features/aka/upgrade.feature

@@ -49,3 +49,89 @@ Feature: Upgrade aka
       modifiable: true
 
     """
+
+  Scenario: Upgrade from v1 to v2
+    Given a file named ".aka.yml" with:
+    """
+    ---
+    :version: '1'
+    :shortcuts:
+      1: !ruby/object:OpenStruct
+        table:
+          :shortcut: ls
+          :command: ls -F --color=auto
+          :tag:
+          - os:linux
+          :description: |-
+            ls
+            ls
+            ls
+          :function: true
+        modifiable: true
+    :links:
+    - !ruby/object:OpenStruct
+      table:
+        :tag:
+        - os:darwin
+        :output: .aka.zsh
+      modifiable: true
+
+    """
+    When I run `aka upgrade`
+    Then the exit status should be 0
+    And the file ".aka.yml" should contain exactly:
+    """
+    ---
+    :version: '2'
+    :shortcuts:
+      1: !ruby/object:OpenStruct
+        table:
+          :shortcut: ls
+          :command: ls -F --color=auto
+          :tag:
+          - os:linux
+          :description: |-
+            ls
+            ls
+            ls
+          :function: true
+        modifiable: true
+    :links:
+      1: !ruby/object:OpenStruct
+        table:
+          :tag:
+          - os:darwin
+          :output: .aka.zsh
+        modifiable: true
+
+    """
+    And the stdout should contain "Upgraded"
+    And the stdout should contain ".aka.yml"
+    And the stdout should contain "Backed up to"
+    And the stdout should contain ".aka.yml.backup"
+    And the file ".aka.yml.backup" should contain exactly:
+    """
+    ---
+    :version: '1'
+    :shortcuts:
+      1: !ruby/object:OpenStruct
+        table:
+          :shortcut: ls
+          :command: ls -F --color=auto
+          :tag:
+          - os:linux
+          :description: |-
+            ls
+            ls
+            ls
+          :function: true
+        modifiable: true
+    :links:
+    - !ruby/object:OpenStruct
+      table:
+        :tag:
+        - os:darwin
+        :output: .aka.zsh
+      modifiable: true
+
+    """

data/lib/aka/app.rb

@@ -44,11 +44,15 @@ module Aka
       when 'show'
         store.show(options)
       when 'link'
-        store.link(options)
+        if shortcut == 'delete'
+          store.unlink(script.to_i)
+        else
+          store.link(options)
+        end
       when 'upgrade'
         store.upgrade(options)
       when 'sync'
-        store.sync
+        store.sync(shortcut ? shortcut.to_i : nil)
       else
         store.help(command, options)
       end

data/lib/aka/configuration.rb

@@ -76,12 +76,14 @@ module Aka
     end
 
     def links
-      @links ||= Links.new(@configuration[:links] || [])
+      @links ||= Links.new(@configuration[:links] || {})
     end
 
     def upgrade
       if !version
-        Upgrader::FromV0.run(aka_yml)
+        Upgrader::FromV0ToV1.run(aka_yml)
+      elsif version == '1'
+        Upgrader::FromV1ToV2.run(aka_yml)
       end
     end
 

data/lib/aka/links.rb

@@ -6,12 +6,11 @@ module Aka
 
     def add(link)
       link = Configuration::Link.parse(link)
-      @links << link unless @links.include?(link)
+      @links[count + 1] = link unless @links.find { |_, l| l == link }
     end
 
-    def delete(link)
-      link = Configuration::Link.parse(link)
-      @links.delete(link)
+    def delete(key)
+      @links.delete(key)
     end
 
     def any?
@@ -25,5 +24,10 @@ module Aka
     def each(&blk)
       @links.each(&blk)
     end
+
+    def count
+      result, _ = @links.max { |(n, _)| n }
+      result || 0
+    end
   end
 end

data/lib/aka/man/aka-add.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-ADD" "1" "February 2014" "" ""
+.TH "AKA\-ADD" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\-add\fR \- Add keyboard shortcuts

data/lib/aka/man/aka-add.1.txt

@@ -28,4 +28,4 @@ SEE ALSO
 
 
 
-				 February 2014			    AKA-ADD(1)
+				  April 2014			    AKA-ADD(1)

data/lib/aka/man/aka-edit.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-EDIT" "1" "February 2014" "" ""
+.TH "AKA\-EDIT" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\-edit\fR \- Edit keyboard shortcuts

data/lib/aka/man/aka-edit.1.txt

@@ -72,4 +72,4 @@ SEE ALSO
 
 
 
-				 February 2014			   AKA-EDIT(1)
+				  April 2014			   AKA-EDIT(1)

data/lib/aka/man/aka-generate.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-GENERATE" "1" "February 2014" "" ""
+.TH "AKA\-GENERATE" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\-generate\fR \- Generate commands for loading keyboard shortcuts into your shell

data/lib/aka/man/aka-generate.1.txt

@@ -67,4 +67,4 @@ SEE ALSO
 
 
 
-				 February 2014		       AKA-GENERATE(1)
+				  April 2014		       AKA-GENERATE(1)

data/lib/aka/man/aka-link.1

@@ -1,13 +1,16 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-LINK" "1" "March 2014" "" ""
+.TH "AKA\-LINK" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\-link\fR \- Link keyboard shortcuts
 .
 .SH "SYNOPSIS"
-\fBaka link\fR [\fB\-t\fR \fItag1\fR[,\fItag2\fR\.\.\.]] [\fB\-o\fR \fIoutput\fR] [\fB\-\-delete\fR]
+\fBaka link\fR [\fB\-t\fR \fItag1\fR[,\fItag2\fR\.\.\.]] [\fB\-o\fR \fIoutput\fR]
+.
+.br
+\fBaka link\fR \fBdelete\fR \fIlink\fR
 .
 .SH "DESCRIPTION"
 This command manages keyboard shortcuts links in \fBaka(7)\fR\.
@@ -26,8 +29,8 @@ A comma\-separated list of tags to filter with\. Shortcuts tagged with \fItag1\f
 The location to link the output to\.
 .
 .TP
-\fB\-\-delete\fR
-Delete the link with the given options\.
+\fBdelete\fR \fIlink\fR
+Delete the link with id \fIlink\fR\.
 .
 .SH "EXAMPLES"
 Add a link:
@@ -36,7 +39,7 @@ Add a link:
 .
 .nf
 
-$ aka link \-\-tag os:linux \-\-output ~/\.aka\.zsh
+$ aka link \-\-tag os:linux \-\-output \e~/\.aka\.zsh
 Saved link\.
 .
 .fi
@@ -50,7 +53,15 @@ Remove a link:
 .
 .nf
 
-$ aka link \-\-delete \-\-tag os:linux \-\-output ~/\.aka\.zsh
+$ aka list
+\.\.\.
+=====
+Links
+=====
+
+[1] ~/\.aka\.zsh: #osx, #git
+[2] ~/\.aka\.zsh: #linux, #git
+$ aka link delete 2
 Removed link\.
 .
 .fi

data/lib/aka/man/aka-link.1.txt

@@ -6,7 +6,8 @@ NAME
        aka-link - Link keyboard shortcuts
 
 SYNOPSIS
-       aka link [-t tag1[,tag2...]] [-o output] [--delete]
+       aka link [-t tag1[,tag2...]] [-o output]
+       aka link delete link
 
 DESCRIPTION
        This command manages keyboard shortcuts links in aka(7).
@@ -24,15 +25,15 @@ OPTIONS
        -o <output>
 	      The location to link the output to.
 
-       --delete
-	      Delete the link with the given options.
+       delete link
+	      Delete the link with id link.
 
 EXAMPLES
        Add a link:
 
 
 
-	   $ aka link --tag os:linux --output ~/.aka.zsh
+	   $ aka link --tag os:linux --output \~/.aka.zsh
 	   Saved link.
 
 
@@ -41,7 +42,14 @@ EXAMPLES
 
 
 
-	   $ aka link --delete --tag os:linux --output ~/.aka.zsh
+	   $ aka list
+	   =====
+	   Links
+	   =====
+
+	   [1] ~/.aka.zsh: #osx, #git
+	   [2] ~/.aka.zsh: #linux, #git
+	   $ aka link delete 2
 	   Removed link.
 
 
@@ -51,4 +59,4 @@ SEE ALSO
 
 
 
-				  March 2014			   AKA-LINK(1)
+				  April 2014			   AKA-LINK(1)

data/lib/aka/man/aka-list.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-LIST" "1" "March 2014" "" ""
+.TH "AKA\-LIST" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\-list\fR \- List keyboard shortcuts

data/lib/aka/man/aka-list.1.txt

@@ -60,4 +60,4 @@ SEE ALSO
 
 
 
-				  March 2014			   AKA-LIST(1)
+				  April 2014			   AKA-LIST(1)

data/lib/aka/man/aka-remove.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-REMOVE" "1" "February 2014" "" ""
+.TH "AKA\-REMOVE" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\-remove\fR \- Remove keyboard shortcuts

data/lib/aka/man/aka-remove.1.txt

@@ -26,4 +26,4 @@ SEE ALSO
 
 
 
-				 February 2014			 AKA-REMOVE(1)
+				  April 2014			 AKA-REMOVE(1)

data/lib/aka/man/aka-show.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-SHOW" "1" "February 2014" "" ""
+.TH "AKA\-SHOW" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\-show\fR \- Show keyboard shortcuts

data/lib/aka/man/aka-show.1.txt

@@ -28,4 +28,4 @@ SEE ALSO
 
 
 
-				 February 2014			   AKA-SHOW(1)
+				  April 2014			   AKA-SHOW(1)

data/lib/aka/man/aka-sync.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-SYNC" "1" "March 2014" "" ""
+.TH "AKA\-SYNC" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\-sync\fR \- Synchronize keyboard shortcuts
@@ -15,6 +15,12 @@ This command manages synchronizes keyboard shortcuts links in \fBaka(7)\fR\.
 .P
 Any links you\'ve created will be generated to the designated \fBoutput\fR with the given \fBtags\fR\.
 .
+.SH "OPTIONS"
+.
+.TP
+\fB<link>\fR
+Provide the id of a specific link to synchronize\.
+.
 .SH "EXAMPLES"
 Synchronize links:
 .
@@ -33,4 +39,4 @@ Generated ~/\.aka\.zsh\.
 .IP "" 0
 .
 .SH "SEE ALSO"
-\fBaka(7)\fR, \fBaka\-link(1)\fR
+\fBaka(7)\fR, \fBaka\-link(1)\fR, \fBaka\-list(1)\fR

data/lib/aka/man/aka-sync.1.txt

@@ -14,6 +14,9 @@ DESCRIPTION
        Any  links  you've  created  will be generated to the designated output
        with the given tags.
 
+OPTIONS
+       <link> Provide the id of a specific link to synchronize.
+
 EXAMPLES
        Synchronize links:
 
@@ -28,8 +31,8 @@ EXAMPLES
 
 
 SEE ALSO
-       aka(7), aka-link(1)
+       aka(7), aka-link(1), aka-list(1)
 
 
 
-				  March 2014			   AKA-SYNC(1)
+				  April 2014			   AKA-SYNC(1)

data/lib/aka/man/aka-upgrade.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-UPGRADE" "1" "March 2014" "" ""
+.TH "AKA\-UPGRADE" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\-upgrade\fR \- Upgrade keyboard shortcuts
@@ -21,7 +21,7 @@ Upgrade links from v0 to v1:
 
 $ aka upgrade
 Upgraded ~/\.aka\.yml\.
-Backed up to ~/\.aka\.yml\.backup\."
+Backed up to ~/\.aka\.yml\.backup\.
 .
 .fi
 .

data/lib/aka/man/aka-upgrade.1.txt

@@ -9,7 +9,7 @@ SYNOPSIS
        aka upgrade
 
 DESCRIPTION
-       This  command manages upgrades the keyboard shortcuts format in aka(7).
+       This command manages upgrades the keyboard shortcuts format in aka(7).
 
 EXAMPLES
        Upgrade links from v0 to v1:
@@ -18,7 +18,7 @@ EXAMPLES
 
 	   $ aka upgrade
 	   Upgraded ~/.aka.yml.
-	   Backed up to ~/.aka.yml.backup."
+	   Backed up to ~/.aka.yml.backup.
 
 
 
@@ -27,4 +27,4 @@ SEE ALSO
 
 
 
-				  March 2014			AKA-UPGRADE(1)
+				  April 2014			AKA-UPGRADE(1)

data/lib/aka/man/aka.7

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA" "7" "March 2014" "" ""
+.TH "AKA" "7" "April 2014" "" ""
 .
 .SH "NAME"
 \fBaka\fR \- Manage Shell Keyboard Shortcuts
@@ -30,6 +30,9 @@
 .br
 \fBaka\fR sync
 .
+.br
+\fBaka\fR upgrade
+.
 .SH "DESCRIPTION"
 \fBaka\fR is an easy way to manage keyboard shortcuts in UNIX shells\.
 .
@@ -185,7 +188,15 @@ Remove a link:
 .
 .nf
 
-$ aka link \-\-delete \-\-tag os:linux \-\-output ~/\.aka\.zsh
+$ aka list
+\.\.\.
+=====
+Links
+=====
+
+[1] ~/\.aka\.zsh: #osx, #git
+[2] ~/\.aka\.zsh: #linux, #git
+$ aka link delete 2
 Removed link\.
 .
 .fi

data/lib/aka/man/aka.7.txt

@@ -14,6 +14,7 @@ SYNOPSIS
        aka link [options]
        aka generate [options]
        aka sync
+       aka upgrade
 
 DESCRIPTION
        aka is an easy way to manage keyboard shortcuts in UNIX shells.
@@ -125,7 +126,14 @@ EXAMPLES
 
 
 
-	   $ aka link --delete --tag os:linux --output ~/.aka.zsh
+	   $ aka list
+	   =====
+	   Links
+	   =====
+
+	   [1] ~/.aka.zsh: #osx, #git
+	   [2] ~/.aka.zsh: #linux, #git
+	   $ aka link delete 2
 	   Removed link.
 
 
@@ -160,4 +168,4 @@ ENVIRONMENT
 
 
 
-				  March 2014				AKA(7)
+				  April 2014				AKA(7)

data/lib/aka/shortcuts.rb

@@ -8,12 +8,12 @@ module Aka
       @shortcuts[count + 1] = shortcut
     end
 
-    def replace(index, shortcut)
-      @shortcuts[index] = shortcut
+    def replace(key, shortcut)
+      @shortcuts[key] = shortcut
     end
 
-    def delete(index)
-      @shortcuts.delete(index)
+    def delete(key)
+      @shortcuts.delete(key)
     end
 
     def count
@@ -56,7 +56,7 @@ module Aka
       end
 
       if options[:output]
-        File.open(options[:output], 'w+') do |f|
+        File.open(File.expand_path(options[:output]), 'w+') do |f|
           scripts.each do |script|
             f.puts script
           end

data/lib/aka/store.rb

@@ -73,8 +73,8 @@ module Aka
         puts "====="
         puts
 
-        configuration.links.each do |link|
-          puts "#{link.output}: #{link.tag.map { |tag| "##{tag}" }.join(', ')}"
+        configuration.links.each do |index, link|
+          puts "[#{index}] #{link.output}: #{link.tag.map { |tag| "##{tag}" }.join(', ')}"
         end
       end
 
@@ -104,19 +104,20 @@ module Aka
     end
 
     def link(options)
-      unless options[:delete]
-        configuration.links.add(options)
-        configuration.save
-        puts "Saved link."
-      else
-        configuration.links.delete(options)
-        configuration.save
-        puts "Deleted link."
-      end
+      configuration.links.add(options)
+      configuration.save
+      puts "Saved link."
+    end
+
+    def unlink(key)
+      configuration.links.delete(key)
+      configuration.save
+      puts "Deleted link."
     end
 
-    def sync
-      configuration.links.each do |config|
+    def sync(match)
+      configuration.links.each do |index, config|
+        next if match && match != index
         excluded = configuration.shortcuts.generate(config.marshal_dump)
         excluded_output(excluded)
       end

data/lib/aka/upgrader.rb

@@ -1,22 +1,46 @@
 module Aka
   module Upgrader
-    module FromV0
+    module FromV0ToV1
       def self.run(aka_yml)
         v0 = YAML::load_file(aka_yml)
 
         current = {
-          :version => Aka::Configuration::FORMAT,
+          :version => '1',
           :shortcuts => v0
         }
 
         FileUtils.cp(aka_yml, "#{aka_yml}.backup")
+        puts "Backed up to #{aka_yml}.backup."
 
         File.open(aka_yml, 'w+') do |f|
           f.write current.to_yaml
         end
-
         puts "Upgraded #{aka_yml}."
+      end
+    end
+
+    module FromV1ToV2
+      def self.run(aka_yml)
+        v1 = YAML::load_file(aka_yml)
+
+        v2 = v1.merge(:version => '2')
+        links = v2.delete(:links)
+        v2[:links] = new_links = {}
+        if links
+          index = 0
+          links.each do |element|
+            index += 1
+            new_links[index] = element
+          end
+        end
+
+        FileUtils.cp(aka_yml, "#{aka_yml}.backup")
         puts "Backed up to #{aka_yml}.backup."
+
+        File.open(aka_yml, 'w+') do |f|
+          f.write v2.to_yaml
+        end
+        puts "Upgraded #{aka_yml}."
       end
     end
   end

data/lib/aka/version.rb

@@ -1,3 +1,3 @@
 module Aka
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/man/aka-link.1.ronn

@@ -4,8 +4,8 @@ aka-link(1) -- Link keyboard shortcuts
 ## SYNOPSIS
 
 `aka link` [`-t` <tag1>[,<tag2>...]]
-           [`-o` <output>]
-           [`--delete`]
+           [`-o` <output>]<br>
+`aka link` `delete` *link*
 
 ## DESCRIPTION
 
@@ -21,19 +21,27 @@ After creating a link, you can easily synchronize changes to shortcuts to design
 * `-o <output>`:
   The location to link the output to.
 
-* `--delete`:
-  Delete the link with the given options.
+* `delete` *link*:
+  Delete the link with id *link*.
 
 ## EXAMPLES
 
 Add a link:
 
-    $ aka link --tag os:linux --output ~/.aka.zsh
+    $ aka link --tag os:linux --output \~/.aka.zsh
     Saved link.
 
 Remove a link:
 
-    $ aka link --delete --tag os:linux --output ~/.aka.zsh
+    $ aka list
+    ...
+    =====
+    Links
+    =====
+
+    [1] ~/.aka.zsh: #osx, #git
+    [2] ~/.aka.zsh: #linux, #git
+    $ aka link delete 2
     Removed link.
 
 ## SEE ALSO

data/man/aka-sync.1.ronn

@@ -3,7 +3,7 @@ aka-sync(1) -- Synchronize keyboard shortcuts
 
 ## SYNOPSIS
 
-`aka sync`
+`aka sync` <link>
 
 ## DESCRIPTION
 
@@ -11,6 +11,11 @@ This command manages synchronizes keyboard shortcuts links in `aka(7)`.
 
 Any links you've created will be generated to the designated `output` with the given `tags`.
 
+## OPTIONS
+
+* `<link>`:
+  Provide the id of a specific link to synchronize.
+
 ## EXAMPLES
 
 Synchronize links:
@@ -23,4 +28,4 @@ Synchronize links:
 
 ## SEE ALSO
 
-`aka(7)`, `aka-link(1)`
+`aka(7)`, `aka-link(1)`, `aka-list(1)`

data/man/aka.7.ronn

@@ -10,7 +10,8 @@ aka(7) -- Manage Shell Keyboard Shortcuts
 `aka` list \[options\]<br>
 `aka` link \[options\]<br>
 `aka` generate \[options\]<br>
-`aka` sync
+`aka` sync<br>
+`aka` upgrade
 
 ## DESCRIPTION
 
@@ -88,7 +89,15 @@ Add a link:
 
 Remove a link:
 
-    $ aka link --delete --tag os:linux --output ~/.aka.zsh
+    $ aka list
+    ...
+    =====
+    Links
+    =====
+
+    [1] ~/.aka.zsh: #osx, #git
+    [2] ~/.aka.zsh: #linux, #git
+    $ aka link delete 2
     Removed link.
 
 Synchronize links:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hsume2-aka
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Henry Hsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Manage Shell Keyboard Shortcuts