huffshell 0.0.5 → 0.0.7

data/Gemfile.lock

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

data/bin/huffshell

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'huffshell'
-require 'colorize'
 
 cs = CommandSuggestor.new
 
@@ -21,6 +20,8 @@ OhMyZshReader.new(history_filename).
   shell_commands.
   each{ |l| cs.add(l) }
 
+puts cs.wordtree.root.line_count
+
 puts ""
 puts "============="
 puts [cs.commands.size.to_s.green, "unique keywords"].join(" ")

data/lib/command/command_suggestion.rb

@@ -1,5 +1,3 @@
-require 'colorize'
-
 class CommandSuggestion
   attr_accessor :wordlist
 

data/lib/command/command_word.rb

@@ -4,7 +4,9 @@ class CommandWord
   end
 
   def self.suggested_letter(word)
-    word.gsub(/(^\W)+/,"")[0].downcase
+    char = word.gsub(/(^\W)+/,"")[0,1].downcase
+    return nil if char.empty?
+    char
   rescue
     nil
   end

data/lib/huffshell.rb

@@ -1,5 +1,21 @@
 require 'readers/oh_my_zsh_reader'
 
+# ruby 1.8.6
+class String
+  def initial
+    self[0,1]
+  end
+
+  def green
+    self
+  end
+end
+
+begin
+  require 'colorize'
+rescue LoadError
+end
+
 require 'command/command_word'
 require 'command/command_suggestor'
 require 'command/command_suggestion'

data/lib/readers/oh_my_zsh_reader.rb

@@ -6,7 +6,12 @@ class OhMyZshReader
   def initialize(file_name)
     @file_name = file_name
 
-    file = File.open(File.expand_path(file_name), 'r')
+    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 = ""
 
@@ -16,7 +21,7 @@ class OhMyZshReader
       ic = Iconv.new('UTF-8', 'UTF-8')
       file.each do |l|
         begin
-          @file_contents += ic.iconv(l)
+          @file_contents += ic.iconv(l) + "\n"
         rescue
           puts "Encoding error: #{l}"
         end
@@ -30,15 +35,15 @@ class OhMyZshReader
 
 private
 
-  def filtered_lines
-    raw_lines(file_contents).select{|l| valid_line?(l) }
+  def raw_lines
+    file_contents.split("\n")
   end
 
-  def valid_line?(line)
-    line[0] == ":"
+  def filtered_lines
+    raw_lines.select{|l| valid_line?(l) }
   end
 
-  def raw_lines(file_contents)
-    file_contents.split("\n")
+  def valid_line?(line)
+    line.initial == ":"
   end
 end

data/lib/shell/binary_checker.rb

@@ -6,6 +6,6 @@ class BinaryChecker
   def exist?
     # would love something better
     out = `command -v #{@command} >/dev/null 2>&1`
-    $?.to_s.scan("exit 0") != []
+    $?.to_s.scan("0") != []
   end
 end

data/lib/shell/script_line.rb

@@ -18,7 +18,7 @@ class ScriptLine
 private
 
   def comment?
-    @line[0] == "#"
+    @line.initial == "#"
   end
 
   def empty?

data/lib/tree/word_tree_node.rb

@@ -1,5 +1,3 @@
-require 'colorize'
-
 class WordTreeNode
   include Enumerable
 
@@ -46,7 +44,13 @@ class WordTreeNode
   end
 
   def truncate!(minimum)
-    children.select!{|k, v| v.line_count >= minimum }
+    # Ruby 1.9.2
+    # children.select!{|k, v| v.line_count >= minimum }
+
+    ret = {}
+    children.each{|k, v| ret[k] = v if v.line_count >= minimum }
+    self.children = ret
+
     children.each{|k, v| v.truncate!(minimum) }
   end
 
@@ -66,7 +70,11 @@ class WordTreeNode
   end
 
   def minimum(min)
-    children.select{|k, v| v.line_count >= min }
+    # 1.9.2 compatibility
+    # children.select{|k, v| v.line_count >= min }
+    ret = {}
+    children.each{|k, v| ret[k] = v if v.line_count >= min }
+    ret
   end
 
 end

metadata

@@ -1,45 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: huffshell
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Paul McKellar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: colorize
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70228294016280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: A parser and recommendation system for your shell aliases based on your shell history
+  prerelease: false
+  version_requirements: *70228294016280
+description: A parser and recommendation system for your shell aliases based on your
+  shell history
 email: paul.mckellar@gmail.com
-executables: 
+executables:
 - huffshell
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/command/command_suggestion.rb
 - lib/command/command_suggestor.rb
 - lib/command/command_word.rb
@@ -58,36 +48,26 @@ files:
 - Readme.md
 homepage: https://github.com/paulmars/huffshell
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Automatic shell alias recommondations based on usage!
 test_files: []
-