Narnach-simple_gate 0.5.1 → 0.5.2

data/README.rdoc

@@ -50,6 +50,13 @@ connection.
 
 == Recent changes
 
+=== Version 0.5.2
+
+* Added -V verbose flag to gate_cp
+* Use STDERR for status messages. STDOUT is used to output SSH responses
+* Updated executables to support direct server connections
+* SimpleGate#through_to can connect directly to a server without gateways
+
 === Version 0.5.1
 
 * Updated readme and simple_gate documentation

data/bin/gate_cp

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 # Copy a single local file to a remote server.
-#   Syntax: gate_cp <server> <source_file> <target_file>
+#   Syntax: gate_cp [-V] <server> <source_file> <target_file>
 #     server: a server listed in ~/.servers.yml and reachable by a
 #             series of connections described in ~/.servers.connections.yml
 #     source_file: filename or full path+filename of local source file
 #     target_file: filename or full path+filename of target file
+#     Set -V for verbose output.
 #
 #   Example: gate_cp foobar ~/foo.txt foo.txt
 #     This copies ~/foo.txt too the server foobar as foo.txt in the home dir
@@ -15,38 +16,35 @@ require 'simple_gate'
 require 'simple_gate/router'
 require 'net/sftp'
 
+verbose = !ARGV.delete('-V').nil?
+
 connections = YAML.load_file(File.expand_path('~/.servers.connections.yml'))
 from = 'local'
 target = ARGV.shift.to_s.strip
 
 cmd = ARGV.join(" ")
 if cmd.strip.size == 0
-  puts "No command was given"
+  STDERR.puts "No command was given"
   exit 1
 end
 
 router = Router.new(connections)
 route = router.find(from, target)
 if route.nil?
-  puts "No route to #{target}"
+  STDERR.puts "No route to #{target}"
   exit 1
 end
 
 route.shift if route.first == 'local'
 
-if route.size==1
-  puts "No gateway needed to reach #{route.last}"
-  exit 2
-end
-
 source = File.expand_path(ARGV.shift.to_s.strip)
 target = ARGV.shift.to_s.strip
 
-puts "Connecting to #{route.last}, using #{route.size - 1} gateway(s)"
+STDERR.puts "Connecting to #{route.last}, using #{route.size - 1} gateway(s)" if verbose
 
-gate = SimpleGate.new
+gate = SimpleGate.new(:verbose=>verbose)
 gate.through_to(route) do |ssh|
-  puts "Transferring: #{source} => #{target}"
+  STDERR.puts "Transferring: #{source} => #{target}" if verbose
   ssh.sftp.upload!(source, target)
 end
 

data/bin/simple_gate

@@ -34,25 +34,20 @@ target = ARGV.shift.to_s.strip
 
 cmd = ARGV.join(" ")
 if cmd.strip.size == 0
-  puts "No command was given"
+  STDERR.puts "No command was given"
   exit 1
 end
 
 router = Router.new(connections)
 route = router.find(from, target)
 if route.nil?
-  puts "No route to #{target}"
+  STDERR.puts "No route to #{target}"
   exit 1
 end
 
 route.shift if route.first == 'local'
 
-if route.size==1
-  puts "No gateway needed to reach #{route.last}"
-  exit 2
-end
-
-puts "Executing '#{cmd}' in #{route.last}, using #{route.size - 1} gateway(s)" if verbose
+STDERR.puts "Executing '#{cmd}' in #{route.last}, using #{route.size - 1} gateway(s)" if verbose
 
 gate = SimpleGate.new(:verbose=>verbose)
 gate.through_to(route) do |ssh|

data/lib/simple_gate.rb

@@ -17,11 +17,18 @@ class SimpleGate
 
   # Connect through a list of gateways to the real server.
   # Treats the last 'gateway' as the real server and the others as gateways.
-  # Needs at least one real gateway and a real server.
   def through_to(*gateways) # :yields: ssh session
     gateways = gateways.flatten
-    raise ArgumentError.new("Need at least 2 servers") if gateways.size < 2
+    raise ArgumentError.new("No target chosen") if gateways.size == 0
     target = ServerDefinition.find(gateways.pop)
+    if gateways.size == 0
+      target.connection_info do |host, user, options|
+        Net::SSH.start(host,user,options) do |session|
+          yield(session)
+        end
+      end
+      return
+    end
     through(gateways) do |gate|
       target.connection_info do |host, user, options|
         gate.ssh(host, user, options) do |session|
@@ -29,6 +36,7 @@ class SimpleGate
         end
       end
     end
+    nil
   end
 
   # Most of the code was taken from Capistrano and then changed to work
@@ -38,18 +46,18 @@ class SimpleGate
     @open_connections ||= []
     @gateways = gateways.flatten.collect { |g| ServerDefinition.find(g) }
     tunnel = @gateways[0].connection_info do |host, user, connect_options|
-      puts "Setting up tunnel #{@gateways[0]}" if verbose?
+      STDERR.puts "Setting up tunnel #{@gateways[0]}" if verbose?
       gw = Net::SSH::Gateway.new(host, user, connect_options)
       @open_connections << gw
       gw
     end
     @gateway = (@gateways[1..-1]).inject(tunnel) do |tunnel, destination|
-      puts "Connecting to #{destination}" if verbose?
+      STDERR.puts "Connecting to #{destination}" if verbose?
       tunnel_port = tunnel.open(destination.host, (destination.port || 22))
       localhost_options = {:user => destination.user, :port => tunnel_port, :password => destination.password}
       local_host = ServerDefinition.new("127.0.0.1", localhost_options)
       local_host.connection_info do |host, user, connect_options|
-        puts "Connecting using local info #{local_host}" if verbose?
+        STDERR.puts "Connecting using local info #{local_host}" if verbose?
         gw = Net::SSH::Gateway.new(host, user, connect_options)
         @open_connections << gw
         gw

data/simple_gate.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.name         = 'simple_gate'
   s.summary      = "SimpleGate makes it possible to use net/ssh/gateway's capabilities in a simple to use way."
   s.description  = s.summary
-  s.version      = '0.5.1'
+  s.version      = '0.5.2'
   s.date         = '2009-04-18'
   s.platform     = Gem::Platform::RUBY
   s.authors      = ["Wes Oldenbeuving"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Narnach-simple_gate
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Wes Oldenbeuving