gusteau 0.4.1 → 0.4.2

data/README.md

@@ -88,6 +88,13 @@ Gusteau provides a useful shortcut that you may use to ssh into a node. If you h
 ```
 gusteau ssh node-name
 ```
+Please note that `expect` utility must be installed for `gusteau ssh` to work.
+
+If you prefer calling ssh directly, you will find the `gusteau ssh_config` subcommand useful:
+
+```
+gusteau ssh_config >> ~/.ssh/config
+```
 
 Using with Vagrant
 ------------------

data/bin/gusteau

@@ -28,13 +28,9 @@ class Gusteau::CLI < Optitron::CLI
     node(node_name).ssh
   end
 
-  desc 'Generate an SSH config from nodes/'
+  desc 'Generate an SSH config'
   def ssh_config
-    nodes_list.each do |name|
-      node = node(name)
-      puts node.name
-      puts node.server.host
-    end
+    puts Gusteau::SSHConfig.new
   end
 
   desc 'Generate an example project (a bureau)'

data/lib/gusteau.rb

@@ -3,4 +3,5 @@ $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
 module Gusteau
   require 'gusteau/node'
   require 'gusteau/bureau'
+  require 'gusteau/ssh_config'
 end

data/lib/gusteau/node.rb

@@ -6,7 +6,7 @@ require 'gusteau/chef'
 
 module Gusteau
   class Node
-    attr_reader :name, :server
+    attr_reader :server
 
     def initialize(path)
       raise "Node YAML file #{path} not found" unless path && File.exists?(path)

data/lib/gusteau/ssh_config.rb

@@ -0,0 +1,33 @@
+require 'yaml'
+require 'gusteau/server'
+
+module Gusteau
+  class SSHConfig
+    def initialize(root_dir = ".")
+      @config = Dir.glob("#{root_dir}/nodes/**/*.yml").sort.map do |n|
+        name   = File.basename(n, '.*')
+        config = YAML::load_file(n)['server']
+
+        section name, Gusteau::Server.new(config)
+      end.join("\n")
+    end
+
+    def section(name, server)
+      <<-eos
+Host #{name}
+  HostName #{server.host}
+  Port #{server.port}
+  User #{server.user}
+      eos
+    end
+
+    def to_s
+      <<-eos
+# BEGIN GUSTEAU NODES
+
+#{@config}
+# END GUSTEAU NODES
+      eos
+    end
+  end
+end

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/lib/gusteau/node_spec.rb

@@ -6,7 +6,7 @@ describe Gusteau::Node do
   end
 
   describe "#dna" do
-    let(:node) { Gusteau::Node.new('spec/nodes/example.yml') }
+    let(:node) { Gusteau::Node.new('spec/nodes/production.yml') }
 
     let(:dna)         { node.send(:dna, include_all, recipes) }
     let(:include_all) { true }

data/spec/lib/gusteau/ssh_config_spec.rb

@@ -0,0 +1,27 @@
+require './spec/spec_helper.rb'
+
+describe Gusteau::SSHConfig do
+  subject { Gusteau::SSHConfig.new('./spec') }
+
+  let(:config) do
+    <<-eos
+# BEGIN GUSTEAU NODES
+
+Host production
+  HostName www.example.com
+  Port 22
+  User root
+
+Host staging
+  HostName staging.example.com
+  Port 2222
+  User devops
+
+# END GUSTEAU NODES
+    eos
+  end
+
+  it "should generate a valid SSH config" do
+    subject.to_s.must_equal config
+  end
+end

data/spec/nodes/{example.yml → production.yml}

@@ -13,5 +13,5 @@ recipes:
   - rails::apps
 
 server:
-  host: server.example.com
+  host: www.example.com
   platform: redhat

data/spec/nodes/staging.yml

@@ -0,0 +1,12 @@
+json:
+  mysql:
+    server_root_password: correcthorsebatterystaple
+
+recipes:
+  - mysql::serverr
+
+server:
+  host: staging.example.com
+  port: 2222
+  user: devops
+  platform: redhat

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -156,11 +156,14 @@ files:
 - lib/gusteau/node.rb
 - lib/gusteau/server.rb
 - lib/gusteau/ssh.rb
+- lib/gusteau/ssh_config.rb
 - lib/gusteau/version.rb
 - spec/lib/gusteau/chef_spec.rb
 - spec/lib/gusteau/node_spec.rb
 - spec/lib/gusteau/server_spec.rb
-- spec/nodes/example.yml
+- spec/lib/gusteau/ssh_config_spec.rb
+- spec/nodes/production.yml
+- spec/nodes/staging.yml
 - spec/spec_helper.rb
 - template/.gitignore
 - template/Cheffile
@@ -199,5 +202,7 @@ test_files:
 - spec/lib/gusteau/chef_spec.rb
 - spec/lib/gusteau/node_spec.rb
 - spec/lib/gusteau/server_spec.rb
-- spec/nodes/example.yml
+- spec/lib/gusteau/ssh_config_spec.rb
+- spec/nodes/production.yml
+- spec/nodes/staging.yml
 - spec/spec_helper.rb