hss 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3581eeed1ac365b90cffbdbfe549635ed110864
-  data.tar.gz: 57f02e1a14a2bba09e5e5dbb2471173dba77136b
+  metadata.gz: 293ae1e185a7269abc0019beaff526fc02bed9ed
+  data.tar.gz: 044f94139c54a7254e2f1ff4fa36da4966f42e38
 SHA512:
-  metadata.gz: 45354b0f2d9d9cf8f52ccb8dc88499b40641f64e540d30a94a4edeb2d7e133e8c742a669a5a770593d5d06df87dd3d46d5942e15fc3286259ec1d52a7b101936
-  data.tar.gz: f944b7dbf95e7087d668649ff0cff6d974d67dfb808cd9c7e39c054232218c5552331c7cd115b2a7868884b38d81ae43b15477028e81c9802652d907afe01d82
+  metadata.gz: 1fd26cacaa7d64fabc82c7e86b06d36f230c21f2b1c8dca08af4b17c480955d42b8df476db7a36527db5b95d35ca6a4caf3b4cc22478373b78a29df08c2cedfd
+  data.tar.gz: 3c9cd1b271b305c5828ad4b4e48d47d5c7b18bc6fa776329c8214ccd685f0e58f00405dfc160bcd605c00bb932d621ceec47807d2294f3cead69441f2a239804

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  Excludes:
+  Exclude:
     - spec/test/bad_helpers/module.rb
 Encoding:
   Enabled: false

data/.travis.yml

@@ -1,17 +1,18 @@
 before_script:
-  - "ssh-keygen -N '' -C 'build-test' -f ~/.ssh/id_rsa"
-  - "cp ~/.ssh/id_rsa.pub ~/.ssh/authorized_keys"
+- ssh-keygen -N '' -C 'build-test' -f ~/.ssh/id_rsa
+- cp ~/.ssh/id_rsa.pub ~/.ssh/authorized_keys
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
+- 2.1.2
+- 2.1.1
+- 2.1.0
+- 2.0.0
+- 1.9.3
 notifications:
   email: false
   irc:
     channels:
-      - ircs://irc.oftc.net:6697#akerl
-    channel_key: sekrit
+    - secure: Z3ypJ8MOTwGDrwpqR6mHidleA9jAp1cCV05ElH5VjS4fuWWZ3uBAhFVssKjfbB9fQl+4nesJpHO5cfOAXNBX1UO1w7d87692zgImux1MRo2P5n2sR+yGO/ZTtYyCF0oQF2u1RU4bybI91f8mX69tcM4f+Ggi3yjQvbubnaXVPn0=
     template:
-      - '%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}'
+    - "%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}"

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Les Aker
+Copyright (c) 2014 Les Aker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,11 +1,12 @@
 hss
 =========
 
-[![Gem Version](https://badge.fury.io/rb/hss.png)](http://badge.fury.io/rb/hss)
-[![Dependency Status](https://gemnasium.com/akerl/hss.png)](https://gemnasium.com/akerl/hss)
-[![Code Climate](https://codeclimate.com/github/akerl/hss.png)](https://codeclimate.com/github/akerl/hss)
-[![Coverage Status](https://coveralls.io/repos/akerl/hss/badge.png)](https://coveralls.io/r/akerl/hss)
-[![Build Status](https://travis-ci.org/akerl/hss.png?branch=master)](https://travis-ci.org/akerl/hss)
+[![Gem Version](https://img.shields.io/gem/v/hss.svg)](https://rubygems.org/gems/hss)
+[![Dependency Status](https://img.shields.io/gemnasium/akerl/hss.svg)](https://gemnasium.com/akerl/hss)
+[![Code Climate](https://img.shields.io/codeclimate/github/akerl/hss.svg)](https://codeclimate.com/github/akerl/hss)
+[![Coverage Status](https://img.shields.io/coveralls/akerl/hss.svg)](https://coveralls.io/r/akerl/hss)
+[![Build Status](https://img.shields.io/travis/akerl/hss.svg)](https://travis-ci.org/akerl/hss)
+[![MIT Licensed](https://img.shields.io/badge/license-MIT-green.svg)](https://tldrlegal.com/license/mit-license)
 
 SSH helper that uses regex and fancy expansion to dynamically manage SSH shortcuts
 

data/Rakefile

@@ -2,24 +2,13 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-desc 'Update bundle'
-task :bundle do
-  `bundle update`
-end
-
 desc 'Run tests'
 RSpec::Core::RakeTask.new(:spec)
 
-desc 'Run Rubocop on the gem'
-Rubocop::RakeTask.new(:rubocop) do |task|
+desc 'Run RuboCop on the gem'
+RuboCop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['lib/**/*.rb', 'spec/*.rb', 'spec/helpers/*.rb', 'bin/*']
   task.fail_on_error = true
 end
 
-desc 'Run travis-lint on .travis.yml'
-task :travislint do
-  print 'There may be an issue with your .travis.yml' unless system('travis-lint')
-end
-
-task :default => [:spec, :travislint, :rubocop, :build, :install]
-task :release => [:bundle]
+task :default => [:spec, :rubocop, :build, :install]

data/hss.gemspec

@@ -16,12 +16,9 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files spec/*`.split
   s.executables = ['hss']
 
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'travis-lint'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'fuubar'
-  s.add_development_dependency 'parser'
+  s.add_development_dependency 'rubocop', '~> 0.23.0'
+  s.add_development_dependency 'rake', '~> 10.3.2'
+  s.add_development_dependency 'coveralls', '~> 0.7.0'
+  s.add_development_dependency 'rspec', '~> 3.0.0'
+  s.add_development_dependency 'fuubar', '~> 2.0.0.rc1'
 end
-

data/lib/helpers/command.rb

@@ -1,15 +1,17 @@
 require 'English'
 
-##
-# Runs a shell command and returns the output
-class HSS::Parser
-  private
+module HSS
+  ##
+  # Runs a shell command and returns the output
+  class Parser
+    private
 
-  def command(input)
-    result = IO.popen(input) { |cmd| cmd.read.chomp }
-    fail "Command failed: #{input}" unless $CHILD_STATUS == 0
-    result
-  rescue Errno::ENOENT
-    raise "Command not found: #{input}"
+    def command(input)
+      result = IO.popen(input) { |cmd| cmd.read.chomp }
+      fail "Command failed: #{input}" unless $CHILD_STATUS == 0
+      result
+    rescue Errno::ENOENT
+      raise "Command not found: #{input}"
+    end
   end
 end

data/lib/helpers/default.rb

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

data/lib/helpers/expand.rb

@@ -1,12 +1,14 @@
-##
-# Expand a shortcode based the config hash
-class HSS::Parser
-  private
+module HSS
+  ##
+  # Expand a shortcode based the config hash
+  class Parser
+    private
 
-  def expand(input)
-    @config['expansions'].each do |long, shorts|
-      return long if shorts.include? input
+    def expand(input)
+      @config['expansions'].each do |long, shorts|
+        return long if shorts.include? input
+      end
+      fail NameError, "No expansion found for: #{input}"
     end
-    fail NameError, "No expansion found for: #{input}"
   end
 end

data/lib/helpers/external.rb

@@ -1,20 +1,22 @@
 require 'yaml'
 
-##
-# Load values from an external YAML hash
-class HSS::Parser
-  private
+module HSS
+  ##
+  # Load values from an external YAML hash
+  class Parser
+    private
 
-  def external(source, key)
-    begin
-      config = open(File.expand_path(source)) { |f| YAML.load f.read }
-    rescue Psych::SyntaxError, Errno::ENOENT
-      raise "Failed to open YAML file: #{source}"
-    end
-    begin
-      key.split('.').reduce(config) { |a, e| a[e] } || fail
-    rescue
-      raise NameError, "Key not found in YAML: #{key}"
+    def external(source, key)
+      begin
+        config = open(File.expand_path(source)) { |f| YAML.load f.read }
+      rescue Psych::SyntaxError, Errno::ENOENT
+        raise "Failed to open YAML file: #{source}"
+      end
+      begin
+        key.split('.').reduce(config) { |a, e| a[e] } || fail
+      rescue
+        raise NameError, "Key not found in YAML: #{key}"
+      end
     end
   end
 end

data/lib/helpers/shortcut.rb

@@ -1,11 +1,13 @@
-##
-# Allow shortcut expansion from the config
-class HSS::Parser
-  private
+module HSS
+  ##
+  # Allow shortcut expansion from the config
+  class Parser
+    private
 
-  def shortcut(input)
-    @config['shortcuts'][input] || fail
-  rescue
-    raise NameError, "Shortcut does not exist #{input}"
+    def shortcut(input)
+      @config['shortcuts'][input] || fail
+    rescue
+      raise NameError, "Shortcut does not exist #{input}"
+    end
   end
 end

data/lib/hss.rb

@@ -50,7 +50,8 @@ module HSS
 
     def load_config(config_path = nil)
       path = File.expand_path(config_path || HSS::DEFAULT_CONFIG)
-      @config = YAML.load open(path).read
+      files = path.split(':').map { |x| YAML.load File.read x }
+      @config = files.reverse.reduce(&:deep_merge)
       @patterns = @config.delete('patterns') || fail
     rescue Psych::SyntaxError, RuntimeError, Errno::ENOENT
       raise "Failed to load config: #{config_path}"
@@ -89,7 +90,7 @@ module HSS
 
     def check(input, short_form)
       return false unless input.match short_form
-      x = Regexp.last_match # rubocop:disable UselessSetterCall
+      x = Regexp.last_match # rubocop:disable UselessAssignment
       @match_data = binding
       true
     end
@@ -103,3 +104,22 @@ module HSS
     end
   end
 end
+
+##
+# Time to monkeypatch Hash to support smarter merging
+class Hash
+  ##
+  # Define a method to merge config hashes
+
+  def deep_merge(new)
+    merge(new) do |_, oldval, newval|
+      if oldval.is_a? Hash
+        deep_merge oldval, newval
+      elsif oldval.is_a? Array
+        oldval + newval
+      else
+        newval
+      end
+    end
+  end
+end

data/lib/version.rb

@@ -1,5 +1,5 @@
 ##
 # Define the version
 module HSS
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

data/spec/bin_spec.rb

@@ -21,6 +21,6 @@ describe 'HSS script' do
   end
   it 'connects via SCP' do
     `scp -S hss spec/test/config.yml l:#{Dir.pwd}/scp_test`
-    expect(File.exists? 'scp_test').to be_true
+    expect(File.exist? 'scp_test').to be_truthy
   end
 end

data/spec/hss_spec.rb

@@ -26,6 +26,7 @@ describe HSS do
     describe '#load_config' do
       let(:invalid) { 'spec/test/invalid.yml' }
       let(:incomplete) { 'spec/test/incomplete.yml' }
+      let(:other) { 'spec/test/other.yml' }
 
       it 'loads the specified YAML file' do
         expect(handler.config).to be_an_instance_of Hash
@@ -41,18 +42,27 @@ describe HSS do
         expect { HSS::Handler.new 'foobaz' }.to raise_error RuntimeError
       end
       it 'uses the default config if none is provided' do
-        if File.exists? File.expand_path(HSS::DEFAULT_CONFIG)
+        if File.exist? File.expand_path(HSS::DEFAULT_CONFIG)
           expect(HSS::Handler.new.config).to be_an_instance_of Hash
         else
           expect { HSS::Handler.new }.to raise_error RuntimeError
         end
       end
+      it 'supports loading multiple configs' do
+        handler = HSS::Handler.new(config: "#{config}:#{other}")
+        expect(handler.patterns.map { |x| x['note'] }).to include(
+          'Basic test',
+          'Other test',
+          'Connection test'
+        )
+        expect(handler.patterns.first['long']).to match(/^new/)
+      end
     end
 
     describe '#load_helpers' do
       it 'loads helper modules' do
         expect(handler.helpers).to be_an_instance_of Array
-        expect(handler.helpers).to have_at_least(3).items
+        expect(handler.helpers.size).to be >= 3
       end
       it 'accepts a helper_path' do
         h = HSS::Handler.new(config: config, helpers: 'spec/test/good_helpers')
@@ -104,8 +114,8 @@ describe HSS do
 
     describe '#check' do
       it 'compares an input to a short form' do
-        expect(parser.check('a', '[a-z]')).to be_true
-        expect(parser.check('1', '[a-z]')).to be_false
+        expect(parser.check('a', '[a-z]')).to be_truthy
+        expect(parser.check('1', '[a-z]')).to be_falsey
       end
     end
 

data/spec/test/other.yml

@@ -0,0 +1,11 @@
+---
+patterns:
+  - note: Basic test
+    example: g -> github
+    short: '^g$'
+    long: 'new@github.com'
+  - note: Other test
+    example: z -> other
+    short: '^z$'
+    long: 'other@example.com'
+...

metadata

@@ -1,113 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: hss
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: travis-lint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.rc1
 description: Regex-based SSH shortcut tool
 email: me@lesaker.org
 executables:
@@ -147,6 +119,7 @@ files:
 - spec/test/good_helpers/shortcut.rb
 - spec/test/incomplete.yml
 - spec/test/invalid.yml
+- spec/test/other.yml
 homepage: https://github.com/akerl/hss
 licenses:
 - MIT
@@ -187,3 +160,5 @@ test_files:
 - spec/test/good_helpers/shortcut.rb
 - spec/test/incomplete.yml
 - spec/test/invalid.yml
+- spec/test/other.yml
+has_rdoc: