tbm 0.1.2 → 0.2.0.rc1

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+def stub_messages
+  @messages = []
+  $stdout.stub( :write ) { |message| @messages << message  }
+end
+
+def surpress_messages
+  $stdout.stub( :write )
+end
+
+RSpec::Matchers.define :include_match do |expected|
+  match do |actual|
+     !actual.grep( expected ).empty?
+  end
+end

data/spec/target_spec.rb

@@ -0,0 +1,40 @@
+require 'TBM/target'
+require 'rspec'
+
+describe TBM::Target do
+	context "with name 'Foo'" do
+		subject { TBM::Target.new( 'Foo','host','user' ) }
+
+		it "should have name 'Foo'" do
+			subject.should have_name( 'Foo' )
+		end
+
+		it "should describe itself as 'Foo'" do
+			subject.to_s.should eq('Foo')
+		end
+
+		context "and aliases 'Bar', 'Baz'" do
+			before do
+				subject.add_alias('Bar')
+				subject.add_alias('Baz')
+			end
+
+			it "should have name 'Foo'" do
+				subject.should have_name( 'Foo' )
+			end
+
+			it "should have name 'Bar'" do
+				subject.should have_name( 'Foo' )
+			end
+
+			it "should have name 'Baz'" do
+				subject.should have_name( 'Foo' )
+			end
+
+			it "should describe itself as 'Foo (Bar, Baz)'" do
+				subject.to_s.should eq('Foo (Bar, Baz)')
+			end
+
+		end
+	end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tbm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Geoffrey Wiseman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -36,11 +36,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/TBM/cli.rb
+- lib/TBM/config.rb
+- lib/TBM/config_parser.rb
+- lib/TBM/machine.rb
+- lib/TBM/meta.rb
+- lib/TBM/target.rb
+- lib/TBM/tunnel.rb
 - lib/tbm.rb
-- lib/tunnel/cli.rb
-- lib/tunnel/config.rb
-- lib/tunnel/meta.rb
-- lib/tunnel/target.rb
+- spec/cli_spec.rb
+- spec/config_spec.rb
+- spec/spec_helper.rb
+- spec/target_spec.rb
 - bin/tbm
 - Rakefile
 - README.md
@@ -59,17 +66,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 518991908318749501
+      hash: -3696541644893645018
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Named SSH tunnels, like bookmarks.
+summary: Manages SSH Tunnels by creating an SSH connection and forwarding ports based
+  on named targets defined in configuration.
 test_files: []

data/lib/tunnel/cli.rb

@@ -1,69 +0,0 @@
-require 'net/ssh'
-
-module Tunnel
-	class CommandLineInterface
-		def initialize( config )
-			@config = config
-			@target = nil
-			@cancelled = false
-		end
-
-		def parse
-			if ARGV.size != 1 
-				print_targets "SYNTAX: tbm <target>\n\nWhere target is one of:" 
-			else
-				target_name = ARGV[0]
-				@target = @config.get_target( target_name )
-				print_targets( "Cannot find target: #{target_name}\n\nThese are the targets currently defined:" ) if @target.nil?
-			end
-		end
-
-		def print_targets( message )
-			puts message
-			@config.each_target { |target| puts "\t#{target.name}" }
-		end
-
-
-		def valid?
-			!@target.nil?
-		end
-
-		def bore
-			puts "Starting #{APP_NAME} v#{VERSION}"
-			puts
-
-			trap("INT") { @cancelled = true }
-			Net::SSH.start( @target.host, @target.username ) do |session|
-				forward_ports( session )
-			end
-
-			puts "Shutting down the machine."
-		end
-
-		def forward_ports( session )
-			begin
-				puts "Opened connection to #{@target.username}@#{@target.host}:"
-				@target.each_forward do |fwd|
-					remote_server, port = fwd
-					session.forward.local( port, remote_server, port )
-					puts "\tforwarded port #{port} to #{remote_server}:#{port}"
-				end
-				puts "\twaiting for Ctrl-C..."
-				session.loop(0.1) { not @cancelled }
-				puts "\n\tCtrl-C pressed. Exiting."
-			rescue Errno::EACCES
-				@cancelled = true
-				puts "\tCould not open all ports; you may need to sudo if port < 1000."
-			end
-		end
-
-		def self.parse_and_run
-			config = Config.new
-			if config.valid? 
-				cli = CommandLineInterface.new( config )
-				cli.parse
-				cli.bore if cli.valid?
-			end
-		end
-	end
-end

data/lib/tunnel/config.rb

@@ -1,94 +0,0 @@
-require 'etc'
-require 'yaml'
-
-module Tunnel
-	class Config
-		CONFIG_FILE = File.expand_path( '~/.tunnels' )
-
-		def initialize
-			@valid = nil
-			@targets = []
-			if File.file? CONFIG_FILE
-				config_data = YAML.load_file( CONFIG_FILE )
-				parse config_data if config_data.is_a? Hash
-			else
-				puts "Configure your tunnels in ~/.tunnels in YAML form."
-			end
-		end
-
-		def valid?
-			@valid
-		end
-
-		def get_target( name )
-			@targets.find { |target| target.has_name?(name) }
-		end
-
-		def each_target( &block )
-			@targets.each { |target| yield target }
-		end
-
-		private
-
-		def parse( targets )
-			targets.each_key { |name| parse_target name, targets[name] }
-			@valid = true if @valid.nil? && !@targets.empty?
-		end
-
-		def parse_target( name, config )
-			if config.is_a? Hash
-				target = create_target( name, config )
-				unless target.nil? 
-					@targets << target
-					parse_forward( target, config['forward'] )
-				end
-			else
-				puts "Cannot parse target '#{name}' (#{config.class})"
-				@valid = false
-			end
-		end
-
-		def create_target( name, config )
-			if config.has_key? 'host' then
-				if config.has_key? 'username' then
-					username = config['username']
-				else
-					username = Etc.getlogin
-				end
-				Target.new name, config['host'], username
-			else
-				puts "Cannot parse target '#{name}': no host found."
-				@valid = false
-			end
-		end
-
-		def parse_forward( target, config )
-			case config
-			when nil
-				puts "Target #{target.name} has no forwards defined."
-				@valid = false
-			when Fixnum
-				target.forward_port( config )
-			when Array
-				config.each { |port| target.forward_port(port) }
-			when Hash
-				config.each_key do |server|
-					server_config = config[ server ]
-					case server_config
-					when Fixnum
-						target.forward_port( server_config, server )
-					when Array
-						server_config.each { |port| target.forward_port( port, server ) }
-					else
- 						puts "Not sure how to handle forward from #{target.host} to #{server}: #{server_config.class}"
- 					end
-				end
-			else
-				puts "Not sure how to handle forward for '#{target.host}': #{config.class}"
-				@valid = false
-			end
-		end
-
-	end
-
-end

data/lib/tunnel/meta.rb

@@ -1,5 +0,0 @@
-module Tunnel
-	APP_NAME = "Tunnel Boring Machine"
-	VERSION = "0.1.2"
-	DATE = '2012-11-23'
-end

data/lib/tunnel/target.rb

@@ -1,24 +0,0 @@
-module Tunnel
-	class Target
-		attr_reader :name, :host, :username
-
-		def initialize( name, host, username )
-			@name = name
-			@host = host
-			@username = username
-			@forwards = []
-		end
-
-		def forward_port( port, server='localhost' ) 
-			@forwards << [ server, port ]
-		end
-
-		def has_name?( name )
-			@name==name
-		end
-
-		def each_forward( &block )
-			@forwards.each { |fwd| yield fwd }
-		end
-	end
-end