agen 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 774809f0ab3f7e1b8bab9f9209f71f2e616f5da62edf2bf74f8f47f15d82b5ad
-  data.tar.gz: 20e8af719cc7093968b107a32d98963febb0b03e1c9dddda3a111e1170cded9a
+  metadata.gz: 567b4d1df4a054da853eb05a9476bcf9579758cac435e562842c74655e773198
+  data.tar.gz: 86e7947aac95a1fc80822158509b1d2e762a11727eca8abda0001b7de87d2115
 SHA512:
-  metadata.gz: 66e2e642b09fc276d27ad922f219be8431c2dc2014726227189c1d2a2cb28960a061cb2da11d45fddc9dce5ff292bb70136b71fd8ebd0ca36f9f015385048686
-  data.tar.gz: 1b6beea0fb2a953cd710dc02974ce50aa1198234807cc776e1a5dfd0010dad241f9dbc160c89456b455749381601d9e5d0e03ab198997590068e48cec650cdae
+  metadata.gz: cbaead32095bc304c5bf657426fa66f5b7196c90715a8b8466b597fc578d2c49414f25533bc815946b6bdf20c51af877299bdc3bcba886b4d575864fca04f324
+  data.tar.gz: 1c2b2388b097b4f7a95036be7395569d81b3de1e33630a2ffa1b5c262898dbda59742a62a6d88e9d0eb615dcba2375cbf7430472aeb99a77efe03fefa61e60c5

data/CHANGELOG.md

@@ -1,7 +1,11 @@
 ## [Released]
 
+## [0.2.1] - 2021-05-01
+- Adds ability to modify aliases before writing them in interactive mode.
+
 ## [0.2.0] - 2021-04-30
-- Fix: Ensures the same aliases is not built for multiple commands in the same run.
+- Adds interactive mode, allowing aliases to be accepted or rejected. On by
+default.
 
 ## [0.1.7] - 2021-04-26
 - Fix: Ensures the same aliases is not built for multiple commands in the same run.

data/Gemfile.lock

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

data/lib/agen/builder.rb

@@ -2,7 +2,7 @@
 
 module Agen
   class Builder
-    def initialize(commands, rcfile = Runner::DEFAULT_RCFILE)
+    def initialize(commands = [], rcfile = Runner::DEFAULT_RCFILE)
       @commands = commands
       @rcfile = rcfile
     end
@@ -19,14 +19,18 @@ module Agen
           aliaz += aliaz[-1]
         end
 
-        candidate = "alias #{aliaz}=\"#{cmd}\""
+        candidate = construct_alias(aliaz, cmd)
         if alias_does_not_exist?(candidate)
           aliases << aliaz
-          candidate
+          {alias: aliaz, full_alias: candidate, command: cmd}
         end
       end.compact
     end
 
+    def construct_alias(aliaz, cmd)
+      "alias #{aliaz}=\"#{cmd}\""
+    end
+
     private
 
     def alias_does_not_exist?(aliaz)

data/lib/agen/runner.rb

@@ -22,13 +22,15 @@ module Agen
 
     def run
       commands = Finder.new(histfile).commands(limit: @number)
-      aliases = Builder.new(commands, rcfile).aliases
+      @builder = Builder.new(commands, rcfile)
+      aliases = builder.aliases
 
+      # TODO: This could be its own class too
       File.open(rcfile, "a") do |file|
-        puts "Writing new aliases to #{rcfile}:"
+        puts "Writing new aliases to #{rcfile}:\n\n"
         aliases.each do |al|
           if auto
-            write_auto(file, al)
+            write_auto(file, al[:full_alias])
           else
             write_interactive(file, al)
           end
@@ -38,25 +40,40 @@ module Agen
 
     private
 
-    attr_reader :auto
+    attr_reader :auto, :builder
 
-    def write_auto(file, aliaz)
-      puts aliaz
-      file.puts(aliaz)
+    def write_auto(file, full_alias)
+      puts full_alias
+      file.puts(full_alias)
     end
 
     def write_interactive(file, aliaz)
-      puts "Proposed alias: #{aliaz}"
-      print "Accept? [n to reject, any other key to accept]: "
+      puts "Proposed alias: #{aliaz[:full_alias]}"
+      print "Accept? [n to reject, m to modify alias, any other key to accept]: "
       response = gets.chomp
-      if response != "n"
-        file.puts(aliaz)
-        puts "Alias written"
-      else
+      case response
+      when "n"
         puts "Alias skipped"
+      when "m"
+        modify_alias(file, aliaz)
+      else
+        file.puts(aliaz[:full_alias])
+        puts "Alias written"
       end
 
       puts
     end
+
+    def modify_alias(file, aliaz)
+      print "Enter new alias [replacing #{aliaz[:alias]}]: "
+      replacement = gets.chomp
+      if replacement == ""
+        modify_alias(file, aliaz)
+        return
+      end
+
+      file.puts(builder.construct_alias(replacement, aliaz[:command]))
+      puts "Alias written"
+    end
   end
 end

data/lib/agen/version.rb

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

metadata

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