agen 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac1f9e3386a6c2aa6a792d31040e869cd0cc2243335b0406d8636003cdd91737
-  data.tar.gz: c8465c062ca6dba68556e80a22ba7600688f7a60e237c1e2f01352c6fffd7a1e
+  metadata.gz: dcbe6011253c346bb0abe4d9147146610cbc9fc98f7769f31b960ba20304af17
+  data.tar.gz: 5e8035ec1fb0aec32b660395ea24d6d5a8a88aa9e8cc88d0122115d6a2358150
 SHA512:
-  metadata.gz: 2ce071d533b7af081c55e7cd1f91c8326a9145c4731c2e891e84c1b93544207df5159824646a78623707afd1e0bfb5d6062bdeab65bf94cd4afd1a8da0d58d7b
-  data.tar.gz: 66138b4626cb5c8b257e5325904a9efd8d9ee8e3623bc59ec78e2b58e46e654c4b3ff90e1e702bb5b03c57c5218f9bb844330b4bf659a0184e0f1d54157b0f0a
+  metadata.gz: 4ca5c06be491092c201c8dcbce7623f0a887d4fbd52e36ab9afc27281ced79fbc97ecb878fc016f4c958893e82bd6718cd08f978c2619fc7a8f59bee7e84358a
+  data.tar.gz: 6e62b98c8745005dd1c1632abdc44adef8b55c9e47cfab0318652248b6e5df125109f378b53ca549c8521b6fa07bb70554397b09bcdb63e6bfdb24342f20e30b

data/CHANGELOG.md

@@ -1,10 +1,9 @@
 ## [Released]
 
-## [0.1.4] - 2021-04-24
-- Avoids most alias naming conflicts with commands that already exist (e.g. `ls`)
-
-## [0.1.3] - 2021-04-24
+## [0.1.5] - 2021-04-24
 
 - Initial release that anyone should reasonably use.
     - Support for .zshrc/.zsh_history.
     - Automatically writes top 5 aliases for commands 6 characters or longer.
+    - Avoids most alias naming conflicts with commands that already exist (e.g. `ls`).
+    - Avoids duplicating aliases that have already been written.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    agen (0.1.4)
+    agen (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -23,24 +23,17 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Jonath
 
 ## Roadmap
 
-~~1. CLI will read 5 most common full commands from .zsh_history file, and create
-   an alias for them in the .zshrc file.~~
-   - [x] It should handle a very short or shell history without many different
-      commands.
-   - [x] It should not create the same alias for two different commands in the same
-       session.
-   - [x] It should not create aliases for very short commands.
-~~2. CLI should not duplicate aliases or commands that already exist on the system.~~
-3. CLI will let you see proposed aliases and accept/decline them interactively. Maybe auto should be the default?
-   OR, in "auto mode", commands will be added automatically (as in 1).
-4. CLI should have helpful output for `-h/--help`.
-5. CLI will let you specify number of aliases you want to create.
-6. CLI will support any (or most common) shells, and will find history and rc
+* CLI will let you specify number of aliases you want to create.
+* CLI will let you see proposed aliases and accept/decline them interactively.
+   OR, in "auto mode", commands will be added automatically (as in 1). Auto
+   should be default?
+* CLI should have helpful output for `-h/--help`.
+* CLI will support any (or most common) shells, and will find history and rc
    file dynamically.
-7. CLI will let you specific which history file to read form, and which file to output aliases to.
-8. CLI will let you interactively modify proposed aliases.
-9. CLI will let you "ignore" commands you don't want to alias, forever.
-10. CLI will let you specify "meta" vs "full" commands.
+* CLI will let you specific which history file to read form, and which file to output aliases to.
+* CLI will let you interactively modify proposed aliases.
+* CLI will let you "ignore" commands you don't want to alias, forever.
+* CLI will let you specify "meta" vs "full" commands.
   - Full command would be `git checkout branch-name`, meta command would be
       `git checkout`.
 

data/lib/agen/builder.rb

@@ -2,8 +2,9 @@
 
 module Agen
   class Builder
-    def initialize(commands)
+    def initialize(commands, rcfile = Runner::DEFAULT_RCFILE)
       @commands = commands
+      @rcfile = rcfile
     end
 
     def aliases
@@ -17,8 +18,15 @@ module Agen
           aliaz += aliaz[-1]
         end
 
-        "alias #{aliaz}=\"#{cmd}\""
-      end
+        candidate = "alias #{aliaz}=\"#{cmd}\""
+        candidate if alias_does_not_exist?(candidate)
+      end.compact
+    end
+
+    private
+
+    def alias_does_not_exist?(aliaz)
+      File.readlines(@rcfile).none? { |line| line.include?(aliaz) }
     end
 
     # Shoutout to Stack Overflow: https://stackoverflow.com/a/5471032

data/lib/agen/runner.rb

@@ -14,10 +14,10 @@ module Agen
 
     def run
       commands = Finder.new(histfile).commands
-      aliases = Builder.new(commands).aliases
+      aliases = Builder.new(commands, rcfile).aliases
 
       File.open(rcfile, "a") do |file|
-        puts "Writing aliases to #{rcfile}:"
+        puts "Writing new aliases to #{rcfile}:"
         aliases.each do |al|
           puts al
           file.puts(al)

data/lib/agen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Agen
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agen
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jonathan Thom