hsume2-aka 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9c12245b08544fb9d60f66311be76887244bc34
-  data.tar.gz: 9f9df10ff81c6eadde4b92dc3be8b2063155880c
+  metadata.gz: 8f0b27b609206bce2e4823a1a725eb4cd306a1df
+  data.tar.gz: 3722a3fb045fd6de7ccb08d76ced37375d96a3a0
 SHA512:
-  metadata.gz: 98608e94159c7df89ad75b2557c57226e05c848c8d03a042b0d101460bde9723463223b28a6ffd0112397818c48464356b5fc4814078a1bad8373ad5186075bd
-  data.tar.gz: 717ad752d5aadc2ffe7a82c1d2e2b8439b5ced1680b6ef5db821adc31315c44d7d8f5afeec550f4e1febdbe6e86815f02c5ddeb784bee3d222a98a2567519a9e
+  metadata.gz: 2112b82f8e06dfb5396cb85ba2abc7612438f6e4b3dd0364e53c40da3ee852400bd86dea97445a0891640fc20c4baa9d47a1979aeee21840b22541718047f338
+  data.tar.gz: 070aa70d2079222da19ae3b193b30ffdfe4946c088c4050bca63141183d5a7f7f55868eb68cfe72a9a2080b18416ead2cc02ce95da508a8d0ce023622b0488ef

data/README.md

@@ -38,6 +38,14 @@ With **aka**, you can add, show, edit, remove, list keyboard shortcuts. On top o
 
     $ gem install hsume2-aka
 
+### Debian/Ubuntu
+
+    $ curl -OL https://github.com/hsume2/aka/raw/v0.4.0/pkg/aka_0.4.0_amd64.deb && sudo dpkg -i aka_0.4.0_amd64.deb
+
+### OS X
+
+    $ curl -OL https://github.com/hsume2/aka/raw/v0.4.0/pkg/aka-0.4.0.pkg && open aka-0.4.0.pkg
+
 ## EXAMPLES
 
 Add a keyboard shortcut and generate the output script:
@@ -117,10 +125,10 @@ Synchronize links:
 Upgrade links from v0 to v1:
 
     $ aka upgrade
-    Upgraded ~/.aka.yml.
-    Backed up to ~/.aka.yml.backup.
+    Upgraded ~/.aka.db.
+    Backed up to ~/.aka.db.backup.
 
 ## ENVIRONMENT
 
   * `AKA`:<br>
-    The file where **aka** stores everything. Default: ~/.aka.yml
+    The file where **aka** stores everything. Default: ~/.aka.db

data/bin/aka

@@ -1,5 +1,23 @@
 #!/usr/bin/env ruby
 
+# resolve bin path, ignoring symlinks
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+
+# add locally vendored gems to libpath
+gem_dir = File.expand_path("../../vendor/gems", bin_file)
+Dir["#{gem_dir}/**/lib"].each do |libdir|
+  $:.unshift libdir
+end
+
+# add self to libpath
+$:.unshift File.expand_path("../../lib", bin_file)
+
+if RUBY_VERSION < '1.9.0' # this is a string comparison, but it should work for any old ruby version
+  $stderr.puts "aka requires Ruby 1.9+."
+  exit 1
+end
+
 require 'aka.rb'
 
 Aka::App.go!

data/bin/build

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'shellwords'
+require "bundler/setup"
+require "aka"
+
+GEM_BLACKLIST = %w( bundler aka )
+
+target_dir = Dir.pwd
+
+FileUtils.rm_rf "#{target_dir}/vendor/gems"
+
+%x{env BUNDLE_WITHOUT="development:test" bundle show}.split("\n").each do |line|
+  if line =~ /^  \* (.*?) \((.*?)\)/
+    next if GEM_BLACKLIST.include?($1)
+    gem_dir = %x{ bundle show #{$1} }.strip
+    FileUtils.mkdir_p "#{target_dir}/vendor/gems"
+    %x{ cp -R "#{gem_dir}" "#{target_dir}/vendor/gems" }
+  end
+end
+
+FileUtils.mkdir_p "#{target_dir}/pkg"
+
+description = Gem::Specification.find_by_name('aka').description
+
+system("rake man:build")
+
+%x{which pkgbuild}
+
+if $?.success?
+  package_type = 'osxpkg'
+else
+  package_type = 'deb'
+end
+
+system(%{fpm -s dir -t #{package_type} -n aka -v #{Aka::VERSION} --after-install #{target_dir}/bin/postinstall --after-remove #{target_dir}/bin/postremove --prefix /usr/local/aka --description #{Shellwords.escape(description)} -x .git -x pkg -x man -x test -x features -x tmp -x .bundle -p pkg .})

data/bin/postinstall

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ln -sf /usr/local/aka/bin/aka /usr/local/bin/aka

data/bin/postremove

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rm /usr/local/bin/aka

data/lib/aka/configuration.pb.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf/message'
+
+
+##
+# Message Classes
+#
+class Configuration < ::Protobuf::Message
+  class Shortcut < ::Protobuf::Message; end
+  class Link < ::Protobuf::Message; end
+
+end
+
+
+
+##
+# Message Fields
+#
+class Configuration
+  class Shortcut
+    required :string, :shortcut, 1
+    required :string, :command, 2
+    repeated :string, :tag, 3
+    optional :string, :description, 4
+    optional :bool, :function, 5
+  end
+
+  class Link
+    repeated :string, :tag, 1
+    required :string, :output, 2
+  end
+
+  required :string, :version, 1
+  repeated ::Configuration::Shortcut, :shortcuts, 2
+  repeated ::Configuration::Link, :links, 3
+end
+

data/lib/aka/configuration.proto

@@ -0,0 +1,20 @@
+message Configuration {
+  required string version = 1;
+
+  message Shortcut {
+    required string shortcut = 1;
+    required string command = 2;
+    repeated string tag = 3;
+    optional string description = 4;
+    optional bool function = 5;
+  }
+
+  repeated Shortcut shortcuts = 2;
+
+  message Link {
+    repeated string tag = 1;
+    required string output = 2;
+  }
+
+  repeated Link links = 3;
+}

data/lib/aka/link_manager.rb

@@ -0,0 +1,30 @@
+module Aka
+  class LinkManager
+    def initialize(links)
+      @links = links
+    end
+
+    def find(link)
+      @links.find do |item|
+        item == link
+      end
+    end
+
+    def add(new_link)
+      return if found = find(new_link)
+      @links << new_link
+    end
+
+    def remove(key)
+      @links.delete_at(key.to_i - 1)
+    end
+
+    def any?(&block)
+      @links.any?(&block)
+    end
+
+    def each(&block)
+      @links.each(&block)
+    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" "April 2014" "" ""
+.TH "AKA\-ADD" "1" "August 2016" "" ""
 .
 .SH "NAME"
 \fBaka\-add\fR \- Add keyboard shortcuts

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

@@ -28,4 +28,4 @@ SEE ALSO
 
 
 
-				  April 2014			    AKA-ADD(1)
+				  August 2016			    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" "April 2014" "" ""
+.TH "AKA\-EDIT" "1" "August 2016" "" ""
 .
 .SH "NAME"
 \fBaka\-edit\fR \- Edit keyboard shortcuts

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

@@ -72,4 +72,4 @@ SEE ALSO
 
 
 
-				  April 2014			   AKA-EDIT(1)
+				  August 2016			   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" "April 2014" "" ""
+.TH "AKA\-GENERATE" "1" "August 2016" "" ""
 .
 .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
 
 
 
-				  April 2014		       AKA-GENERATE(1)
+				  August 2016		       AKA-GENERATE(1)

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "AKA\-LINK" "1" "April 2014" "" ""
+.TH "AKA\-LINK" "1" "August 2016" "" ""
 .
 .SH "NAME"
 \fBaka\-link\fR \- Link keyboard shortcuts

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

@@ -59,4 +59,4 @@ SEE ALSO
 
 
 
-				  April 2014			   AKA-LINK(1)
+				  August 2016			   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" "April 2014" "" ""
+.TH "AKA\-LIST" "1" "August 2016" "" ""
 .
 .SH "NAME"
 \fBaka\-list\fR \- List keyboard shortcuts

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

@@ -60,4 +60,4 @@ SEE ALSO
 
 
 
-				  April 2014			   AKA-LIST(1)
+				  August 2016			   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" "April 2014" "" ""
+.TH "AKA\-REMOVE" "1" "August 2016" "" ""
 .
 .SH "NAME"
 \fBaka\-remove\fR \- Remove keyboard shortcuts

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

@@ -26,4 +26,4 @@ SEE ALSO
 
 
 
-				  April 2014			 AKA-REMOVE(1)
+				  August 2016			 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" "April 2014" "" ""
+.TH "AKA\-SHOW" "1" "August 2016" "" ""
 .
 .SH "NAME"
 \fBaka\-show\fR \- Show keyboard shortcuts

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

@@ -28,4 +28,4 @@ SEE ALSO
 
 
 
-				  April 2014			   AKA-SHOW(1)
+				  August 2016			   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" "April 2014" "" ""
+.TH "AKA\-SYNC" "1" "August 2016" "" ""
 .
 .SH "NAME"
 \fBaka\-sync\fR \- Synchronize keyboard shortcuts

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

@@ -35,4 +35,4 @@ SEE ALSO
 
 
 
-				  April 2014			   AKA-SYNC(1)
+				  August 2016			   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" "April 2014" "" ""
+.TH "AKA\-UPGRADE" "1" "August 2016" "" ""
 .
 .SH "NAME"
 \fBaka\-upgrade\fR \- Upgrade keyboard shortcuts
@@ -20,8 +20,8 @@ Upgrade links from v0 to v1:
 .nf
 
 $ aka upgrade
-Upgraded ~/\.aka\.yml\.
-Backed up to ~/\.aka\.yml\.backup\.
+Upgraded ~/\.aka\.db\.
+Backed up to ~/\.aka\.db\.backup\.
 .
 .fi
 .

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

@@ -17,8 +17,8 @@ EXAMPLES
 
 
 	   $ aka upgrade
-	   Upgraded ~/.aka.yml.
-	   Backed up to ~/.aka.yml.backup.
+	   Upgraded ~/.aka.db.
+	   Backed up to ~/.aka.db.backup.
 
 
 
@@ -27,4 +27,4 @@ SEE ALSO
 
 
 
-				  April 2014			AKA-UPGRADE(1)
+				  August 2016			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" "April 2014" "" ""
+.TH "AKA" "7" "August 2016" "" ""
 .
 .SH "NAME"
 \fBaka\fR \- Manage Shell Keyboard Shortcuts
@@ -228,8 +228,8 @@ Upgrade links from v0 to v1:
 .nf
 
 $ aka upgrade
-Upgraded ~/\.aka\.yml\.
-Backed up to ~/\.aka\.yml\.backup\."
+Upgraded ~/\.aka\.db\.
+Backed up to ~/\.aka\.db\.backup\."
 .
 .fi
 .
@@ -241,6 +241,6 @@ Backed up to ~/\.aka\.yml\.backup\."
 \fBAKA\fR:
 .
 .br
-The file where \fBaka\fR stores everything\. Default: ~/\.aka\.yml
+The file where \fBaka\fR stores everything\. Default: ~/\.aka\.db
 
 

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

@@ -155,17 +155,17 @@ EXAMPLES
 
 
 	   $ aka upgrade
-	   Upgraded ~/.aka.yml.
-	   Backed up to ~/.aka.yml.backup."
+	   Upgraded ~/.aka.db.
+	   Backed up to ~/.aka.db.backup."
 
 
 
 ENVIRONMENT
        AKA:
-	      The file where aka stores everything. Default: ~/.aka.yml
+	      The file where aka stores everything. Default: ~/.aka.db
 
 
 
 
 
-				  April 2014				AKA(7)
+				  August 2016				AKA(7)

data/lib/aka/shortcut.rb

@@ -0,0 +1,43 @@
+module Aka
+  class Shortcut
+    def self.parse(options)
+      self.new.tap do |row|
+        row.shortcut = options['shortcut']
+        row.command = options['command']
+        row.tag = options['tag'] if options['tag']
+        row.description = options['description'] if options['description']
+        row.function = options['function'] if options['function']
+      end
+    end
+
+    def self.generate_output(row)
+      string = if row.function
+        <<-EOS.gsub(/^        /, '')
+        function #{row.shortcut} {
+          #{row.command}
+        }
+        EOS
+      else
+        %{alias #{row.shortcut}="#{row.command.gsub(%{"}, %{\\"})}"}
+      end
+
+      string
+    end
+
+    attr_accessor :shortcut
+    attr_accessor :command
+    attr_accessor :tag
+    attr_accessor :description
+    attr_accessor :function
+
+    def to_hash
+      {
+        :shortcut => self.shortcut,
+        :command => self.command,
+        :tag => self.tag,
+        :description => self.description,
+        :function => self.function
+      }
+    end
+  end
+end

data/lib/aka/{shortcuts.rb → shortcut_manager.rb}

@@ -1,42 +1,31 @@
 module Aka
-  class Shortcuts
+  class ShortcutManager
     def initialize(shortcuts)
-      @shortcuts = shortcuts.dup
+      @shortcuts = shortcuts
     end
 
-    def append(shortcut)
-      @shortcuts[count + 1] = shortcut
+    def add(shortcut)
+      @shortcuts << shortcut
     end
 
-    def replace(key, shortcut)
-      @shortcuts[key] = shortcut
-    end
-
-    def delete(key)
-      @shortcuts.delete(key)
-    end
-
-    def count
-      result, _ = @shortcuts.max { |(n, _)| n }
-      result || 0
-    end
-
-    def all
-      @shortcuts.dup
+    def remove(shortcut)
+      @shortcuts.delete_if do |item|
+        item == shortcut
+      end
     end
 
     def find(options)
       if options[:tag]
-        @shortcuts.select do |_, row|
-          next unless row.shortcut == options[:shortcut]
+        @shortcuts.select do |shortcut|
+          next unless shortcut.shortcut == options[:shortcut]
 
           options[:tag].find do |tag|
-            row.tag && row.tag.include?(tag)
+            shortcut.tag && shortcut.tag.include?(tag)
           end
         end
       else
-        @shortcuts.select do |_, row|
-          row.shortcut == options[:shortcut]
+        @shortcuts.select do |shortcut|
+          shortcut.shortcut == options[:shortcut]
         end
       end
     end
@@ -48,9 +37,9 @@ module Aka
       excluded = match_by_tag(options[:tag] || []) do |tag, rows|
         rows.each do |row|
           unless row.function
-            scripts << Configuration::Shortcut.generate_output(row)
+            scripts << Shortcut.generate_output(row)
           else
-            functions << Configuration::Shortcut.generate_output(row)
+            functions << Shortcut.generate_output(row)
           end
         end
       end
@@ -80,13 +69,6 @@ module Aka
       excluded
     end
 
-    def excluded_output(excluded)
-      return if excluded[:tags].empty?
-
-      tags = excluded[:tags].map { |t| '#' + t }.join(', ')
-      $stderr.puts "#{excluded[:shortcuts]} shortcut(s) excluded (#{tags})."
-    end
-
     def match_by_tag(tags, &blk)
       excluded = { :tags => [], :shortcuts => 0 }
 
@@ -105,7 +87,7 @@ module Aka
     end
 
     def by_tag
-      @shortcuts.inject({ :default => [] }) do |acc, (_, row)|
+      @shortcuts.inject({ :default => [] }) do |acc, row|
         if row.tag && !row.tag.empty?
           row.tag.each do |tag|
             acc[tag] ||= []