gusteau 0.3.9 → 0.4.0

data/README.md

@@ -4,6 +4,7 @@ Gusteau
 *"Anyone can cook."*
 
 [![Build Status](https://www.travis-ci.org/locomote/gusteau.png?branch=master)](https://www.travis-ci.org/locomote/gusteau)
+[![Dependency Status](https://gemnasium.com/locomote/gusteau.png)](https://gemnasium.com/locomote/gusteau)
 
 Introduction
 ------------
@@ -80,6 +81,14 @@ You may choose to run a few recipes instead of full provisioning.
 gusteau node-name run redis::server ntp unicorn
 ```
 
+SSH
+---
+Gusteau provides a useful shortcut that you may use to ssh into a node. If you haven't got passwordless authentication set up, Gusteau will use `user` and `password` values from the node configuration.
+
+```
+gusteau ssh node-name
+```
+
 Using with Vagrant
 ------------------
 At the moment Gusteau doesn't come with Vagrant integration. However, using it with Vagrant is easy, just make sure that you provide the correct IP address of the VM in node's YAML file.

data/bin/gusteau

@@ -23,6 +23,11 @@ class Gusteau::CLI < Optitron::CLI
     node(node_name).run(params, recipe)
   end
 
+  desc 'SSH into a node'
+  def ssh(node_name)
+    node(node_name).ssh
+  end
+
   desc 'Generate an example project (a bureau)'
   def generate(bureau_name)
     Gusteau::Bureau.new(bureau_name)

data/bin/gusteau_ssh_expect

@@ -0,0 +1,13 @@
+#!/usr/bin/expect -f
+
+set ssh_string [lrange $argv 0 0]
+set port       [lrange $argv 1 1]
+set password   [lrange $argv 2 2]
+
+spawn ssh $ssh_string -p $port
+if { $password != "" } {
+  match_max 100000
+  expect "*?assword:*"
+  send -- "$password\r"
+}
+interact

data/lib/gusteau/node.rb

@@ -26,12 +26,17 @@ module Gusteau
       @server.chef.run opts, dna(false, recipes.flatten)
     end
 
+    def ssh
+      @server.ssh
+    end
+
     private
 
     def dna(include_all, recipes = [])
       node_dna = {
         :path => @dna_path,
         :hash => {
+          :name => @name,
           :instance_role => @name,
           :run_list      => run_list(include_all, recipes)
         }.merge(@config['json'])

data/lib/gusteau/server.rb

@@ -10,7 +10,7 @@ module Gusteau
 
     def initialize(config, opts={})
       @host     = config['host']
-      @port     = (config['port'] || '22').to_i
+      @port     = config['port'] || 22
       @user     = config['user'] || 'root'
       @password = config['password']
       @chef = Gusteau::Chef.new(self, config['platform'])
@@ -34,5 +34,10 @@ module Gusteau
       end
       true
     end
+
+    def ssh
+      ssh_expect = File.expand_path("../../../bin/gusteau_ssh_expect", __FILE__)
+      Kernel.system "#{ssh_expect} #{@user}@#{@host} #{@port} #{@password}"
+    end
   end
 end

data/lib/gusteau/ssh.rb

@@ -6,8 +6,8 @@ module Gusteau
   module SSH
     include Gusteau::CompressedTarStream
 
-    def ssh
-      @ssh ||= begin
+    def conn
+      @conn ||= begin
         opts = { :port => port }
         opts.update(:password => password) if @password
         log "#setting up ssh connection #{@user}@#{host}, #{opts.inspect})" do
@@ -18,7 +18,7 @@ module Gusteau
 
     def send_command(cmd)
       exit_code = -1
-      ssh.open_channel do |ch|
+      conn.open_channel do |ch|
         ch.exec(prepared_cmd cmd) do |_, success|
           if success
             ch.on_data { |_,data| puts data }
@@ -29,12 +29,12 @@ module Gusteau
           end
         end
       end
-      ssh.loop
+      conn.loop
       exit_code == 0
     end
 
     def send_files(files, dest_dir)
-      ssh.open_channel { |ch|
+      conn.open_channel { |ch|
         ch.exec(prepared_cmd "tar zxf - -C #{dest_dir}")
         ch.send_data(compressed_tar_stream(files))
         ch.eof!

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/spec/lib/gusteau/server_spec.rb

@@ -4,7 +4,7 @@ describe Gusteau::Server do
   let(:config) do
     {
       'host'     => 'demo.com',
-      'port'     => '2222',
+      'port'     => 2222,
       'platform' => 'ubuntu'
     }
   end
@@ -31,7 +31,7 @@ describe Gusteau::Server do
       let(:config) do
       {
         'host'     => 'demo.com',
-        'port'     => '2222',
+        'port'     => 2222,
         'user'     => 'oneiric',
         'platform' => 'ubuntu',
       }
@@ -66,4 +66,11 @@ describe Gusteau::Server do
       it     { subject.must_equal "sudo -- sh -c 'cd /etc/chef && touch test'" }
     end
   end
+
+  describe "#ssh" do
+    it "should call gusteau_ssh_expect with connection arguments" do
+      Kernel.expects(:system).with { |arg| arg =~ /gusteau_ssh_expect root@demo.com 2222/ }
+      server.ssh
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -130,6 +130,7 @@ email:
 - chris@locomote.com
 executables:
 - gusteau
+- gusteau_ssh_expect
 extensions: []
 extra_rdoc_files: []
 files:
@@ -140,6 +141,7 @@ files:
 - README.md
 - Rakefile
 - bin/gusteau
+- bin/gusteau_ssh_expect
 - bootstrap/centos.sh
 - bootstrap/gentoo.sh
 - bootstrap/redhat.sh