aka 0.5.4 → 0.5.8

data/.gitignore

@@ -3,3 +3,4 @@ results.html
 pkg
 html
 .idea
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aka (0.5.4)
+    aka (0.5.8)
       methadone (~> 1.2.4)
 
 GEM

data/README.md

@@ -50,7 +50,7 @@ I really like this app, but I've got other things I want to work on. But there a
 
 1. Support for a config file that will let you use a file other than `~/.alias` for your aliases
 1. Grouping aliases
-    1. Aliases sorted alphabetically by default.
+    1. Aliases sorted alphabetically by default. -**DONE!**
 
 
 [David Copeland]:http://www.naildrivin5.com/

data/bin/aka

@@ -4,6 +4,7 @@ require 'optparse'
 require 'methadone'
 require 'aka'
 require 'fileutils'
+require 'yaml'
 
 class App
   include Methadone::Main
@@ -11,13 +12,15 @@ class App
   include Aka
 
   main do |aliasString,value|
-    al = AliasList.new
-    options.each do |key, value|
-      debug("#{key} : #{value}")
-    end
+    
+    al = AliasList.new options["alias-file"]
+    #options.each do |key, value|
+    #  debug("#{key} : #{value}")
+    #end
     al.backup  if options[:backup]
     al.list    if options[:list]
     al.showAll if options[:L]
+    al.change_defaults 'random', options[:D] if options[:D]
     if options[:show]
       if aliasString == nil
         fatal("Needs an alias string to show the related command!")
@@ -44,7 +47,7 @@ class App
   end
 
   # supplemental methods here
-
+  
   # Declare command-line interface here
 
   description "Manage your aliases without editing dot files."
@@ -55,7 +58,11 @@ class App
   on("-s", "--show",    "Show what the specified alias does")
   on("-b", "--backup",  "Create a backup copy of your alias file")
   on("-d", "--delete",  "Delete all keys from your alias file")
-  on("-L", "--list-all","Display all aliases and their associated commands.")
+  on("-L", "--list-all","Display all aliases and commands.")
+  on("--alias-file FILENAME","Create and use a new alias file.")
+  #on("-D NEW", "Create a random default value for testing purposes.")
+
+  defaults_from_config_file '.aka'
 
   arg :alias, :optional
   arg :value, :optional

data/features/delete.feature

@@ -3,5 +3,5 @@ Feature: Delete the entire file
     I can delete my alias file entirely
 
     Scenario: short code
-        When I run `aka -d`
+        When I run `aka -d` interactively
         Then the alias file should be empty.

data/features/new_file.feature

@@ -0,0 +1,18 @@
+Feature: Use an alternate alias file
+    In order to fit my personal workflow better
+    I want to be able to use a file other than `~/.alias` to store my aliases
+    So that I can be large and in charge.
+
+    Scenario: Create a new alias file
+        When I run `aka --alias-file .shortcuts` interactively
+        And I type "y"
+        And I close the stdin stream
+        Then a file named "/tmp/akaTest/.shortcuts" should exist
+        And the file "/tmp/akaTest/.shortcuts" should contain "alias test" 
+
+    Scenario: Check for a configuration file
+        When I run `aka --alias-file .newcuts` interactively
+        And I type "y"
+        And I close the stdin stream
+        Then a file named "/tmp/akaTest/.aka" should exist
+        And the file "/tmp/akaTest/.aka" should contain ".newcuts"

data/features/step_definitions/aka_steps.rb

@@ -17,3 +17,7 @@ Then /^the alias "(.*?)" should no longer be in the alias file\.$/ do |arg1|
     worked = false if line.start_with? "alias #{arg1}"
   end 
 end
+
+When /^I close the stdin stream$/ do
+    @interactive.stdin.close()
+end

data/lib/aka/version.rb

@@ -1,3 +1,3 @@
 module Aka
-  VERSION = "0.5.4"
+  VERSION = "0.5.8"
 end

data/lib/aka.rb

@@ -1,20 +1,33 @@
 require "aka/version"
 require "fileutils"
 require "methadone"
+require "yaml"
 module Aka
 
   class AliasList
     include Methadone::CLILogging
 
-    def initialize  
+    def initialize  incoming_alias_file = nil
         @aliasPattern = /alias (\S+)="(.+)"/
         @aliases = {}
-        @fileName = "#{ENV["HOME"]}/.alias"
+        @defaults_file = "#{ENV["HOME"]}/.aka"
+        @defaults = get_defaults_from_file
+        debug "Incoming Alias file is #{incoming_alias_file}"
+        if incoming_alias_file
+            @fileName = "#{ENV["HOME"]}/#{incoming_alias_file}"
+            if incoming_alias_file != @defaults['alias-file'] 
+                change_alias_file incoming_alias_file
+                change_defaults "alias-file", incoming_alias_file
+            end
+        else
+            @fileName = "#{ENV["HOME"]}/.alias"
+        end
+        debug "The File we're looking at is #{@fileName}"
         if !File.exists? @fileName
             FileUtils.touch @fileName
         end
-        debug ("made it to the class. filenName is #{@fileName}, aliasPattern is #{@aliasPattern}.")      
-        #Open the alias list
+        debug ("made it to the class. fileName is #{@fileName}, aliasPattern is #{@aliasPattern}.")
+
         File.foreach(@fileName) do |line|
             @aliasPattern.match(line)do |match|
                 #read them all into an array
@@ -82,5 +95,42 @@ module Aka
         @aliases.sort.each { |key, value| filestring = filestring + "alias #{key}=\"#{value}\"\n" }
         File.open(@fileName, "w") { |file| file.write filestring  }
     end
+
+    def change_alias_file new_file_name
+        new_file_name = "#{ENV['HOME']}/#{new_file_name}"
+        info "Copy current aliases into the new file?(Yna)"
+        copy = gets.chomp.downcase
+
+        if copy == "n"
+            FileUtils.touch(new_file_name)
+            @fileName = new_file_name
+        elsif copy == "a"
+            "creation of new aliases aborted!"
+        else
+            debug "Copying aliases from #{@defaults['alias-file']} to #{new_file_name}"
+            FileUtils.copy("#{ENV['HOME']}/#{@defaults['alias-file']}",new_file_name)
+            @fileName = new_file_name
+        end
+    end
+
+    def get_defaults_from_file
+        if File.exists? @defaults_file
+            YAML::load(File.read(@defaults_file))
+        else
+            {'alias-file'=>".alias"}
+        end
+    end
+
+    def change_defaults name, value
+        if @defaults[name] == nil ||@defaults[name] != value
+            @defaults[name] = value
+            File.open(@defaults_file,"w"){|file| file.write @defaults.to_yaml}
+            info "Changed the default for #{name} to #{value}"
+            true
+        else
+           debug "No changes required!"
+           false
+        end        
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aka
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -90,7 +90,6 @@ files:
 - README.md
 - README.rdoc
 - Rakefile
-- aka-0.5.2.gem
 - aka.gemspec
 - bin/aka
 - features/add.feature
@@ -98,6 +97,7 @@ files:
 - features/backup.feature
 - features/delete.feature
 - features/list.feature
+- features/new_file.feature
 - features/remove.feature
 - features/show.feature
 - features/step_definitions/aka_steps.rb
@@ -135,6 +135,7 @@ test_files:
 - features/backup.feature
 - features/delete.feature
 - features/list.feature
+- features/new_file.feature
 - features/remove.feature
 - features/show.feature
 - features/step_definitions/aka_steps.rb