huffshell 0.0.10 → 0.0.11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    huffshell (0.0.10)
+    huffshell (0.0.11)
       colorize
 
 GEM

data/Readme.md

@@ -1,7 +1,7 @@
 Huffshell
 ====================
 
-Huffshell is a gem for optimizing your ZSH aliases, programmatically.
+Huffshell is a gem for optimizing your aliases, programmatically.
 
 Huffshell looks at your shell history and generates aliases based on your typical usage. Memorable and short commands are suggested for the most common things you type to save you the most keystrokes.
 

data/bin/huffshell

@@ -4,21 +4,20 @@ require 'huffshell'
 
 cs = CommandSuggestor.new
 
-# TODOS
-# get largest history file
-# examine to see what format the file is in
-# let users tell me where their files is
-
-files = ['~/.zsh_history', '~/.zshhistory', '~/.zhistory']
-history_filename = files.map{|f| File.expand_path(f) }.select{|f| File.exist?(f) }.first
-
 puts "Huffshell"
 puts "============="
-puts ["History found:", history_filename, File.size(history_filename).to_s].join(" ")
 
-OhMyZshReader.new(history_filename).
-  shell_commands.
-  each{ |l| cs.add(l) }
+history_files = HistoryReader.files
+
+history_files.each do |history_filename|
+  if HistoryReader.timestamps?(history_filename)
+    shell_commands = OhMyZshReader.new(history_filename).shell_commands
+  else
+    shell_commands = HistoryReader.new(history_filename).shell_commands
+  end
+  puts "Importing #{history_filename} #{shell_commands.size} commands found"
+  shell_commands.each{ |l| cs.add(l) }
+end
 
 puts cs.wordtree.root.line_count
 

data/lib/huffshell.rb

@@ -1,5 +1,3 @@
-require 'readers/oh_my_zsh_reader'
-
 # ruby 1.8.6
 class String
   def initial
@@ -16,6 +14,9 @@ begin
 rescue LoadError
 end
 
+require 'readers/history_reader'
+require 'readers/oh_my_zsh_reader'
+
 require 'command/command_word'
 require 'command/command_suggestor'
 require 'command/command_suggestion'

data/lib/readers/history_reader.rb

@@ -0,0 +1,65 @@
+class HistoryReader
+  attr_accessor :filename, :file_contents
+
+  def initialize(filename)
+    @filename = filename
+
+    path = File.expand_path(filename)
+    if File.exist?(path)
+      file = File.open(path, 'r')
+    else
+      raise "File does not exist." + path.inspect
+    end
+
+    @file_contents = ""
+
+    if String.method_defined?(:encode)
+      @file_contents = file.read.encode!('UTF-8', 'UTF-8', :invalid => :replace)
+    else
+      ic = Iconv.new('UTF-8', 'UTF-8')
+      file.each do |l|
+        begin
+          @file_contents += ic.iconv(l) + "\n"
+        rescue
+          puts "Encoding error: #{l}"
+        end
+      end
+    end
+  end
+
+  def timestamps?
+    starts_with_timestamp?(raw_lines.first)
+  end
+
+  def self.timestamps?(filename)
+    reader = HistoryReader.new(filename)
+    reader.timestamps?
+  end
+
+  def shell_commands
+    raw_lines
+  end
+
+  def self.files
+    possible_files.map{|f| File.expand_path(f) }.select{|f| File.exist?(f) }
+  end
+
+private
+
+  def self.possible_files
+    zshfiles = ['~/.zsh_history', '~/.zshhistory', '~/.zhistory']
+    bashfiles = ['~/.bashhistory', '~/.bash_history']
+    shfiles = ['~/.shistory']
+    hfiles = ['~/.history']
+
+    files = (zshfiles + bashfiles + shfiles + hfiles).flatten
+  end
+
+  def raw_lines
+    file_contents.split("\n")
+  end
+
+  def starts_with_timestamp?(line)
+    line.initial == ":"
+  end
+end

data/lib/readers/oh_my_zsh_reader.rb

@@ -1,44 +1,14 @@
 require 'iconv' unless String.method_defined?(:encode)
 
-class OhMyZshReader
+class OhMyZshReader < HistoryReader
   attr_accessor :file_name, :file_contents
 
-  def initialize(file_name)
-    @file_name = file_name
-
-    path = File.expand_path(file_name)
-    if File.exists?(path)
-      file = File.open(path, 'r')
-    else
-      raise "File does not exist." + path.inspect
-    end
-
-    @file_contents = ""
-
-    if String.method_defined?(:encode)
-      @file_contents = file.read.encode!('UTF-8', 'UTF-8', :invalid => :replace)
-    else
-      ic = Iconv.new('UTF-8', 'UTF-8')
-      file.each do |l|
-        begin
-          @file_contents += ic.iconv(l) + "\n"
-        rescue
-          puts "Encoding error: #{l}"
-        end
-      end
-    end
-  end
-
   def shell_commands
     filtered_lines.map {|l| l.split(";").last.strip }
   end
 
 private
 
-  def raw_lines
-    file_contents.split("\n")
-  end
-
   def filtered_lines
     raw_lines.select{|l| valid_line?(l) }
   end

data/lib/tree/word_tree_node.rb

@@ -66,7 +66,7 @@ class WordTreeNode
 
   def to_print
     return "" if root?
-    "#{("\t" * (level - 1))}" + "#{word}".green + " #{line_count}:\n"
+    "#{("  " * (level - 1))}" + "#{word}".green + " #{line_count}:\n"
   end
 
   def minimum(min)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huffshell
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70344066070840 !ruby/object:Gem::Requirement
+  requirement: &70275366759860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344066070840
+  version_requirements: *70275366759860
 description: A parser and recommendation system for your shell aliases based on your
   shell history
 email: paul.mckellar@gmail.com
@@ -34,6 +34,7 @@ files:
 - lib/command/command_suggestor.rb
 - lib/command/command_word.rb
 - lib/huffshell.rb
+- lib/readers/history_reader.rb
 - lib/readers/oh_my_zsh_reader.rb
 - lib/shell/alias_checker.rb
 - lib/shell/alias_line.rb