tbm 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fb1dd4edda87be9428377a06d5041a648d7d5f28
+  data.tar.gz: 499437f869395fc830f35727181b5127a2be7d0a
+SHA512:
+  metadata.gz: d1f4457502f87d2875089f976d93245069b363281ae88e900bf3367109c50a457f5772beea36720016c10c123b845de3ff56f94bcffdef22da00ffd9431f9fc9
+  data.tar.gz: 9e99a047453d865df54e0f41c3a914779204fde2b9af76defa349d42b0da870ba14e386d49353a9848e3e6adf8fd467b21f9aaf2f93a0f765b3f02e2f7a02e07

data/lib/TBM/cli.rb

@@ -16,8 +16,10 @@ module TBM
 
 		# Parses the command-line arguments by seeking targets, and print errors/usage if necessary.
 		def parse
-			if ARGV.empty? then 
-				print_targets "SYNTAX: tbm <targets>\n\nWhere <targets> is a comma-separated list of:" 
+			if ARGV.empty?
+				print_targets "SYNTAX: tbm <targets>\n\nWhere <targets> is a comma-separated list of:"
+			elsif ARGV == ['--version']
+				puts "Tunnel Boring Machine v#{VERSION}"
 			else
 				parse_targets( ARGV )
 			end
@@ -41,8 +43,8 @@ module TBM
 					machine.bore
 				end
 			else
-				formatted_errors = config.errors.join( "\n\t" )
-				puts "Cannot parse configuration. Errors:\n\t#{formatted_errors}\n"
+				joined_errors = config.errors.join("\n\t")
+				puts "Cannot parse configuration:\n\t#{joined_errors}"
 			end
 		end
 
@@ -53,7 +55,7 @@ module TBM
 			missing_targets = []
 			targets.each do |target_name|
 				target = @config.get_target( target_name )
-				if target.nil? then
+				if target.nil?
 					missing_targets << target_name
 				else
 					found_targets << target
@@ -81,4 +83,4 @@ module TBM
 		end
 
 	end
-end
+end

data/lib/TBM/config_parser.rb

@@ -4,9 +4,11 @@ require 'tbm'
 
 module TBM
 	class ConfigParser
+		# The configuration file before expansion
+		CONFIG_FILE = '~/.tbm'
 
 		# The configuration file used for parsing config.
-		CONFIG_FILE = File.expand_path( '~/.tbm' )
+		EXPANDED_CONFIG_FILE = File.expand_path( CONFIG_FILE )
 
 		# Pattern for Gateway Server with Optional Username
 		GATEWAY_PATTERN = /^([^@]+)(@([^@]+))?$/
@@ -32,14 +34,14 @@ module TBM
 		\))?\s*$/x 																	# end of parenthesized aliases
 
 
-		# Parses the tunnel boring machine configuration to get a list of targets which can 
+		# Parses the tunnel boring machine configuration to get a list of targets which can
 		# be invoked to bore tunnels.
 		#
 		# @return [Config] the parsed configuration for TBM
 		def self.parse
 			config = Config.new
-			if File.file? CONFIG_FILE
-				config_data = YAML.load_file( CONFIG_FILE )
+			if File.file? EXPANDED_CONFIG_FILE
+				config_data = YAML.load_file( EXPANDED_CONFIG_FILE )
 				case config_data
 				when Hash
 					parse_gateways( config_data, config ) if config_data.is_a? Hash
@@ -47,7 +49,7 @@ module TBM
 					config.errors << "Cannot parse TBM configuration of type: #{config_data.class}"
 				end
 			else
-				config.errors << "No configuration file found. Specify your tunnels in YAML form in: ~/.tunnels"
+				config.errors << "No configuration file found. Specify your tunnels in YAML form in: #{CONFIG_FILE}"
 			end
 			return config
 		rescue Psych::SyntaxError => pse
@@ -121,7 +123,7 @@ module TBM
 
 		def self.configure_target( target, target_config, config )
 			case target_config
-			when Fixnum, String
+			when Integer, String
 				tunnel( target, target_config, config )
 			when Array
 				target_config.each { |tunnel_config| tunnel(target, tunnel_config, config) }
@@ -138,10 +140,10 @@ module TBM
 
 		def self.tunnel( target, tunnel_config, config )
 			case tunnel_config
-			when Fixnum
+			when Integer
 					config.errors.concat validate_and_add( tunnel_config, tunnel_config, target )
 			when String
-				case tunnel_config 
+				case tunnel_config
 				when PORT_PATTERN
 					config.errors.concat validate_and_add( tunnel_config.to_i, tunnel_config, target )
 				when PORTPORT_PATTERN
@@ -196,10 +198,10 @@ module TBM
 				else
 					target.add_alias( attribute_value.to_s )
 				end
-			else 
+			else
 				remote_host = attribute_name.to_s
 				case attribute_value
-				when Fixnum, String
+				when Integer, String
 					remote_tunnel( target, remote_host, attribute_value, config )
 				when Array
 					attribute_value.each { |tunnel_config| remote_tunnel(target, remote_host, tunnel_config, config) }
@@ -214,10 +216,10 @@ module TBM
 
 		def self.remote_tunnel( target, remote_host, tunnel_config, config )
 			case tunnel_config
-			when Fixnum
+			when Integer
 				config.errors.concat validate_and_add( tunnel_config, tunnel_config, target, :remote_host => remote_host )
 			when String
-				case tunnel_config 
+				case tunnel_config
 				when PORT_PATTERN
 					config.errors.concat validate_and_add( tunnel_config.to_i, tunnel_config, target, :remote_host => remote_host )
 				when PORTPORT_PATTERN
@@ -232,4 +234,4 @@ module TBM
 
 
 	end
-end
+end

data/lib/TBM/meta.rb

@@ -1,6 +1,6 @@
 # The namespace for this application/gem.
 module TBM
   APP_NAME = "Tunnel Boring Machine"
-  VERSION = "0.3.0"
-  RELEASE_DATE = '2013-03-07'
+  VERSION = "0.4.0"
+  RELEASE_DATE = '2017-12-14'
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: tbm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Geoffrey Wiseman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
 description: The "Tunnel Boring Machine" is meant to bore ssh tunnels through the
@@ -36,6 +33,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- Rakefile
+- UNLICENSE
+- bin/tbm
 - lib/TBM/cli.rb
 - lib/TBM/config.rb
 - lib/TBM/config_parser.rb
@@ -48,37 +49,29 @@ files:
 - spec/config_spec.rb
 - spec/spec_helper.rb
 - spec/target_spec.rb
-- bin/tbm
-- Rakefile
-- README.md
-- UNLICENSE
 homepage: http://github.com/geoffreywiseman/tunnel-boring-machine
 licenses:
 - UNLICENSE
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 450154189210157473
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manages SSH Tunnels by creating an SSH connection and forwarding ports based
   on named targets defined in configuration.
 test_files: []