hostmanager 1.0.4 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.1.0

data/bin/hm

@@ -66,9 +66,9 @@ HostManager.phoenix($default_host_manager_store) do |host_manager|
 		end
 		puts "\n#############################################\n\n"
 	when 'add'
-		raise 'A host label can only be one letter or symbol' unless ARGV[1].length == 1
-		(puts 'This host already exists. Do you want to replace it? Press enter to replace it or Ctrl + C to cancel.'; $stdin.gets) if host_manager.host_list[ARGV[1]]
-		host_manager.host_list[ARGV[1]] = ARGV[2] + ($zeroconf ? "(zeroconf)" : "")
+		#host_manager.host_list[ARGV[1]] = ARGV[2] + ($zeroconf ? "(zeroconf)" : "")
+		(puts "Please specify a letter and a URL; e.g. hm add m myname@myhost.com"; exit) unless ARGV[1].is_a? String and ARGV[2].is_a? String
+		host_manager.add(ARGV[1], ARGV[2] + ($zeroconf ? "(zeroconf)" : ""))
 	when 'pf', 'portforward'
 		$command = host_manager.port_forward(*ARGV[-1].split(//))
 	when 'ssh'

data/hostmanager.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "hostmanager"
-  s.version = "1.0.4"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]

data/lib/hostmanager.rb

@@ -158,6 +158,8 @@ class HostManager
 			set(key, value)
 		end
 		@host_list ||= {}
+		@host_list['h'] = ''
+		@host_list['l'] = ENV['USER'] + '@localhost'
 		@host_list.each do |letter, string|
 			string.sub!(/:$/, '')
 		end
@@ -168,7 +170,7 @@ class HostManager
 		@host_list.each do |letter, host_string|
 			if @forwards[letter]
 				@hosts[letter] = Host::Forwarded.from_string(host_string, @forwards[letter])
-				unless (string =  "#{@hosts[letter].ssh} cd . 2>null"; system string)
+				unless (string =  "#{@hosts[letter].ssh} cd . 2>/dev/null"; system string)
 # 					puts 'port failed'
 					@forwards.delete(letter)
 					@hosts[letter] = Host.from_string(host_string)
@@ -184,6 +186,21 @@ class HostManager
 			end
 		end
 	end
+	def add(letter, hosturl)
+		raise 'A host label can only be one letter or symbol' unless letter.length == 1
+		case letter
+		when "h"
+			puts "h can only be used to mean 'home', i.e. an empty string"
+			return
+		when "l"
+			puts "l can only be used to mean $USER@localhost"
+			return
+		else
+			(puts 'This host already exists. Do you want to replace it? Press enter to replace it or Ctrl + C to cancel.'; $stdin.gets) if host_list[letter]
+			host_list[letter] = hosturl
+		end
+	end
+
 	def inspect
 		@hosts = "Don't edit this variable"
 		hash = instance_variables.inject({}) do |hash, var|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hostmanager
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: