tbm 0.2.0.rc1 → 0.2.0

data/README.md

@@ -26,20 +26,23 @@ You configure the tunnel boring machine by creating a configuration file in YAML
 
 An example configuration file follows:
 
-    jira:
-        host: ssh.example.com
-        forward: 8080
-    teamcity:
-        host: ssh.example.com
-        forward: 8111
+    dev.example.com:
+      jira: 2222
+      teamcity:
+        tunnel: 8888
         alias: tc
-    jdbc-as400:
-        host: ssh.example.com
-        forward:
-          greenmachine: [ 449, 8470, 8471, 8476 ]
-        alias: [ ja, j400 ] 
+      jdbc-as400:
+        as400: [ 449, 8470, 8471, 8476 ]
+        alias: [ ju, ussi ]
+      qa:
+        forward: 8080
+      staging:
+        alias: [ stage, st ]
+        tunnel: 8080:80
+      5250: 8023:as400:23
+      webfacing: as400:10905
 
-This configuration file is still evolving -- I expect the format to continue to change, the above simply represents the current state.
+Although the above configuration format is still subject to flux, I feel like it's starting to stabilize, so I'm going to need to document it more thoroughly. For the time being, you might want to look at the [closed issue](https://github.com/geoffreywiseman/tunnel-boring-machine/issues/38) regarding the format change.
 
 ## License ##
 I've put it under the UNLICENSE. Basically, I don't care if you use it, bundle it inside commercial software, or otherwise make use of it, and I don't offer any kind of warranty or support guarantees, nor do I guarantee that any of the projects dependencies are suited for whatever purpose you have in mind. That's all up to you. That said, if you want to talk about it, see the next section.

data/lib/TBM/meta.rb

@@ -1,6 +1,6 @@
 # The namespace for this application/gem.
 module TBM
   APP_NAME = "Tunnel Boring Machine"
-  VERSION = "0.2.0.rc1"
-  RELEASE_DATE = '2012-12-30'
-end
+  VERSION = "0.2.0"
+  RELEASE_DATE = '2013-01-22'
+end

data/spec/config_spec.rb

@@ -73,7 +73,7 @@ describe ConfigParser do
 			context "keyed by a non-String" do
 				let(:gateway) { Array.new }
 				let(:targets) { Hash.new }
-				specify { subject.errors.should include( "Cannot parse gateway name: [] (Array)" ) }
+				specify { subject.errors.should include_match( /Cannot parse gateway name/ ) }
 			end
 
 			context "with target hash of tunnels" do
@@ -191,130 +191,6 @@ describe ConfigParser do
 
 		end
 
-# target-details is a string (connection), array (array of connection) or hash (target-hash)
-# connection is an integer or string, matching any of: <port> or <localport>:<remoteport> or <localport>:host:<remoteport>
-# target-hash contains: alias, forward, remote-host
-# alias is string or array of strings containing aliases for the tunnel name.
-# forward contains a connection or array of connections
-# remote-host maps to a remote connection or array of remote connections
-# remote connection is an integer or a string in the following formats: <port>, <local-port>:<remote-port>
-
-		# 			context "and no forward" do
-		# 				it { should_not be_valid }
-		# 				specify { subject.errors.should include_match(/no forward/) }
-		# 			end
-
-		# 			context "and a forward" do
-		# 				let(:target) { { 'host' => 'host', 'username' => 'username', 'forward' => forward } }
-		# 				let(:targetmock) { double(Tunnel::Target) }
-
-		# 				before do
-		# 					Tunnel::Target.stub(:new) { targetmock }
-		# 					targetmock.stub( :host ) { 'host' }
-		# 				end
-
-		# 				context "of 8080" do
-		# 					let(:forward) { 8080 }
-		# 					it "should forward port 8080 on localhost" do
-		# 						targetmock.should_receive( :forward_port ).with( 8080, nil )
-		# 						subject.should be_valid
-		# 					end
-		# 				end
-
-		# 				context "of [ 8000, 8443 ]" do
-		# 					let(:forward) { [8000,8443] }
-		# 					it "should forward ports 8080 and 8443" do
-		# 						targetmock.should_receive( :forward_port ).with( 8000, nil )
-		# 						targetmock.should_receive( :forward_port ).with( 8443, nil )
-		# 						subject.should be_valid
-		# 					end
-		# 				end
-
-		# 				context "of { alpha => 3000, beta => [ 8080, 8443 ] } ]" do
-		# 					let(:forward) { { 'alpha' => 3000, 'beta' => [ 8080, 8443 ] } }
-		# 					it "should forward port 3000 to alpha" do
-		# 						targetmock.should_receive( :forward_port ).with( 3000, 'alpha' )
-		# 						targetmock.stub( :forward_port ).with( anything(), 'beta' )
-		# 						subject.should be_valid
-		# 					end
-		# 					it "should forward ports 8080, 8443 to alpha" do
-		# 						targetmock.should_receive( :forward_port ).with( 8080, 'beta' )
-		# 						targetmock.should_receive( :forward_port ).with( 8443, 'beta' )
-		# 						targetmock.stub( :forward_port ).with( anything(), 'alpha' )
-		# 						subject.should be_valid
-		# 					end
-		# 				end
-
-		# 				context "of 8000.5" do
-		# 					let(:forward) { 8000.5 }
-		# 					it { should_not be_valid }
-		# 					specify { subject.errors.should include_match(/Not sure how to handle forward .*: Float/) }
-		# 				end
-
-		# 				context "of -8080" do
-		# 					let(:forward) { -8080 }
-		# 					it { should_not be_valid }
-		# 					specify { subject.errors.should include_match(/Invalid port/) }
-		# 				end
-
-		# 				context "of 'blueberry'" do
-		# 					let(:forward) { 'blueberry' }
-		# 					it { should_not be_valid }
-		# 					specify { subject.errors.should include_match(/Not sure how to handle forward .*: String/) }
-		# 				end
-
-		# 				context "of 'blueberry'" do
-		# 					let(:forward) { [ 80.80, -443, 'blueberry' ] }
-		# 					it { should_not be_valid }
-		# 					specify { subject.errors.should include_match(/Invalid port/) }
-		# 				end
-
-		# 			end
-
-		# 			context "and an alias" do
-		# 				let(:target) { { 'host' => 'host', 'username' => 'username', 'forward' => 8080 } }
-		# 				let(:targetmock) { double(Tunnel::Target) }
-
-		# 				before do
-		# 					Tunnel::Target.stub(:new) { targetmock }
-		# 					targetmock.stub(:forward_port)
-		# 				end
-
-		# 				it "should treat string as single alias" do
-		# 					target['alias']= 'mr-smith'
-		# 					targetmock.should_receive( :alias ).with( 'mr-smith' )
-		# 					subject.should be_valid
-		# 				end
-
-		# 				it "should treat an array as a series of aliases" do
-		# 					target['alias']= 'mr-smith'
-		# 					targetmock.should_receive( :alias ).with( 'mr-smith' )
-		# 					subject.should be_valid
-		# 				end
-
-		# 				it "should warn with any other content" do
-		# 					target['alias'] = Hash.new
-		# 					subject.should_not be_valid
-		# 					subject.errors.should include_match( /Cannot parse alias/ )
-		# 				end
-		# 			end
-		# 		end
-
-		# 	end
-
-		# 	context "containing a hash of five targets" do
-		# 		let(:config) { { 'alpha' => { 'host' => 'host', 'forward' => 3001 }, 'beta' => { 'host' => 'host', 'forward' => 3002 }, 'gamma' => { 'host' => 'host', 'forward' => 3003 }, 'delta' => { 'host' => 'host', 'forward' => 3004 },
-		# 			'omega' => { 'host' => 'host', 'forward' => 3005 } } }
-		# 		it "should return all five targets specified" do
-		# 			subject.should be_valid
-		# 			subject.get_target( 'alpha' ).should be_instance_of(Tunnel::Target)
-		# 			subject.get_target( 'beta' ).should be_instance_of(Tunnel::Target)
-		# 			subject.get_target( 'gamma' ).should be_instance_of(Tunnel::Target)
-		# 			subject.get_target( 'delta' ).should be_instance_of(Tunnel::Target)
-		# 			subject.get_target( 'omega' ).should be_instance_of(Tunnel::Target)
-		# 		end
-		# 	end
-
 	end
 end
 
@@ -336,9 +212,10 @@ end
 RSpec::Matchers.define :have_tunnels do |expected|
 	match do |actual|
 		actual.should_not be_nil
-		actual.tunnels.size.should eql(expected.size) 
+		tunnels = actual.tunnels.sort_by { |t| t.port }
+		tunnels.size.should eql(expected.size)
 		(0...expected.size).each do |index|
-			tunnel = actual.tunnels[index]
+			tunnel = tunnels[index]
 			properties = expected[index]
 			properties.each do |k,v|
 				tunnel.send(k).should eql(v)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tbm
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc1
-  prerelease: 6
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Geoffrey Wiseman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -66,13 +66,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3696541644893645018
+      hash: -1799474746480285819
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24