theft from basiccache; fixes #8, fixes #13

.gitignore

@@ -1,2 +1,4 @@
+pkg/*.gem
+coverage/
+.coveralls.yml
 config.yml
-*.gem

.rspec

@@ -0,0 +1,2 @@
+--format Fuubar
+--color

.rubocop.yml

@@ -0,0 +1,2 @@
+Encoding:
+  Enabled: false

.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+cache: bundler
+rvm:
+- ruby-head
+- 2.0.0
+- 1.9.3
+- jruby-19mode
+notifications:
+  email: false
+  irc:
+    channels:
+      - ircs://irc.oftc.net:6697#akerl
+    channel_key: sekrit
+    template:
+      - '%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}'

Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

Gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: .
+  specs:
+    hss (0.2.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (1.1.0)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    diff-lcs (1.2.5)
+    docile (1.1.0)
+    fuubar (1.2.1)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.2.0)
+      ruby-progressbar (~> 1.0)
+    hashr (0.0.22)
+    mime-types (2.0)
+    multi_json (1.8.2)
+    parser (2.1.0.pre1)
+      ast (~> 1.1)
+      slop (~> 3.4, >= 3.4.5)
+    powerpack (0.0.9)
+    rainbow (1.1.4)
+    rake (10.1.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-instafail (0.2.4)
+    rspec-mocks (2.14.4)
+    rubocop (0.15.0)
+      parser (~> 2.0)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.1.4)
+    ruby-progressbar (1.2.0)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.4.7)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    tins (0.13.1)
+    travis-lint (1.7.0)
+      hashr (~> 0.0.22)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coveralls
+  fuubar
+  hss!
+  parser (~> 2.1.0.pre1)
+  rake
+  rspec
+  rubocop
+  travis-lint

Rakefile

@@ -1,2 +1,20 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+desc 'Run tests'
+RSpec::Core::RakeTask.new(:spec)
+
+desc 'Run Rubocop on the gem'
+Rubocop::RakeTask.new(:rubocop) do |task|
+  task.patterns = ['lib/**/*.rb', 'spec/**/*.rb', 'bin/*']
+  task.fail_on_error = true
+end
+
+desc 'Run travis-lint on .travis.yml'
+task :travislint do
+  fail 'There is an issue with your .travis.yml' unless system('travis-lint')
+end
+
+task default: [:spec, :travislint, :rubocop, :build, :install]
 

bin/hss

@@ -14,12 +14,11 @@ elsif ARGV == ['help'] || ARGV.empty?
   exit
 end
 
-Short_Host = ARGV.delete_at(ARGV.find_index { |x| x[0, 1] != '-' } || 0)
-Args = ARGV.reduce('') { |a, e| a + " '" + e.gsub(/([$"])/, '\1') + "'" }
-Command = ENV.include?('HSS_DEBUG') ? 'echo ssh' : 'ssh'
+short_host = ARGV.delete_at(ARGV.find_index { |x| x[0, 1] != '-' } || 0)
+args = ARGV.reduce('') { |a, e| a + " '" + e.gsub(/([$"])/, '\1') + "'" }
+command = ENV.include?('HSS_DEBUG') ? 'echo ssh' : 'ssh'
 
-Long_Host = My_Handler.handle Short_Host
-
-$stdout.syswrite "\033]0;#{Short_Host}\007" if $stdout.tty? and $stdin.tty?
-exec "#{Command} #{Long_Host} #{Args}"
+long_host = My_Handler.handle Short_Host
 
+$stdout.syswrite "\033]0;#{short_host}\007" if $stdout.tty? && $stdin.tty?
+exec "#{command} #{long_host} #{args}"

hss.gemspec

@@ -1,4 +1,5 @@
-require File.join(Dir.pwd, 'lib/hss.rb')
+$:.unshift File.expand_path('../lib/', __FILE__)
+require 'hss.rb'
 
 Gem::Specification.new do |s|
   s.name        = 'hss'
@@ -9,8 +10,14 @@ Gem::Specification.new do |s|
   s.authors     = ['Les Aker']
   s.email       = 'me@lesaker.org'
   s.files       = `git ls-files`.split
+  s.test_files  = `git ls-files spec/*`.split
   s.executables = ['hss']
   s.homepage    = 'https://github.com/akerl/hss'
   s.license     = 'MIT'
+
+  %w(rubocop travis-lint rake coveralls rspec fuubar).each do |gem|
+    s.add_development_dependency gem
+  end
+  s.add_development_dependency 'parser', '~> 2.1.0.pre1'
 end
 

lib/helpers/command.rb

@@ -1,6 +1,8 @@
+##
+# Runs a shell command and returns the output
+
 class HSS::Parser
   def command(input)
     IO.popen(input) { |cmd| cmd.read }
   end
 end
-

lib/helpers/default.rb

@@ -1,6 +1,8 @@
+##
+# Provides a helper to have default values
+
 class HSS::Parser
   def default(a, b)
     a.nil? || a.empty? ? b : a
   end
 end
-

lib/helpers/expand.rb

@@ -1,3 +1,6 @@
+##
+# Expand a shortcode based the config hash
+
 class HSS::Parser
   def expand(input)
     @config['expansions'].each do |long, shorts|
@@ -6,4 +9,3 @@ def expand(input)
     fail NameError, "No expansion found for: #{input}"
   end
 end
-

lib/helpers/external.rb

@@ -1,5 +1,11 @@
+require 'yaml'
+
+##
+# Load values from an external YAML hash
+
 class HSS::Parser
-  def external(cmd)
-    IO.popen(cmd).read
+  def external(source, key)
+    config = open(File.expand_path(source)) { |f| YAML.load f.read }
+    key.split('.').reduce(nil) { |a, e| config[e] }
   end
 end

lib/helpers/shortcut.rb

@@ -1,6 +1,8 @@
+##
+# Allow shortcut expansion from the config
+
 class HSS::Parser
   def shortcut(input)
     @config['shortcuts'][input]
   end
 end
-

lib/hss.rb

@@ -95,8 +95,7 @@ def check(input, short_form)
     # Evaluate the long_form using the stored context
 
     def parse(long_form)
-      eval '"' +  long_form + '"', @match_data
+      eval '"' +  long_form + '"', @match_data # rubocop:disable Eval
     end
   end
 end
-

spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'coveralls'
+Coveralls.wear!
+
+require 'rspec'
+require 'basiccache'