gusteau 1.0.5.dev → 1.0.6.dev

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.6.dev / 2013-07-09
+* Bugfix: Ruby 1.8.7 and Rubinius compatibility
+* Highlight node yaml with Coderay in `gusteau show`.
+
 ## 1.0.5.dev / 2013-07-09
 * Bugfix: `cookbooks_path` was not working properly
 * Add an ability to specify a custom bootstrap script

data/README.md

@@ -18,7 +18,7 @@ It aims to:
 
 Some of the features include:
 
-* YAML for readable infrastructure configuration
+* YAML for readable, flexible infrastructure configuration
 * Usage of a single SSH connection to stream compressed files and commands
 * Support for normal Chef CLI flags:
   * `-W` or `--why-run` (dry run mode)
@@ -31,7 +31,7 @@ Gettings started
 Gusteau is a Ruby gem:
 
 ```
-gem install gusteau
+gem install gusteau --pre
 ```
 
 The following command generates an example Chef-repo:
@@ -148,6 +148,12 @@ Notes
 
 By default, Gusteau installs the [Omnibus Chef](http://www.opscode.com/chef/install/). However if you're targetting an unsupported platform you might want to specify the `platform` value for a node: this invokes a specific [script](https://github.com/locomote/gusteau/tree/master/bootstrap).
 
+Alternatively, you can specify a custom script in `.gusteau.yml`:
+
+```
+bootstrap: ./scripts/freebsd.sh
+```
+
 ### Before and after hooks
 
 You can tell Gusteau to execute specific commands before and / or after `converge` or `apply` take place. They get executed on the host system. Example `.gusteau.yml` snippet:
@@ -158,9 +164,6 @@ before:
 
 after:
   - bundle exec rake spec
-
-environments:
-  ...
 ```
 
 ### Custom cookbooks path
@@ -170,7 +173,4 @@ By default, Gusteau uploads and sets Chef Solo up to use cookbooks from `./cookb
 ```
 cookbooks_path: [ './my-cookbooks', '../something-else' ]
 roles_path: './base-roles'
-
-environments:
-  ...
 ```

data/bin/gusteau

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'optitron'
+require 'coderay'
 
 $LOAD_PATH << File.expand_path("../..", __FILE__)
 require 'lib/gusteau'
@@ -45,7 +46,8 @@ class Gusteau::CLI < Optitron::CLI
 
   desc 'Show the configuration of a specific node'
   def show(node_name)
-    puts node(node_name).config.to_yaml
+    node_yaml = node(node_name).config.to_yaml
+    puts CodeRay.scan(node_yaml, :yaml).term
   end
 
   private

data/gusteau.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'optitron'
   gem.add_dependency 'inform'
+  gem.add_dependency 'coderay'
   gem.add_dependency 'json'
   gem.add_dependency 'hashie'
   gem.add_dependency 'hash-deep-merge'

data/lib/gusteau/chef.rb

@@ -10,8 +10,8 @@ module Gusteau
     def run(dna, opts)
       @server.run "rm -rf #{@dest_dir} && mkdir #{@dest_dir} && mkdir -p /tmp/chef"
 
-      with_src_files(dna[:path]) do |list|
-        @server.upload list, @dest_dir, :exclude => '.git/', :strip_c => 2
+      with_gusteau_dir(dna[:path]) do |dir|
+        @server.upload [dir], @dest_dir, :exclude => '.git/', :strip_c => 2
       end
 
       @server.run "sh /etc/chef/bootstrap.sh" if opts['bootstrap']
@@ -25,10 +25,8 @@ module Gusteau
 
     private
 
-    def with_src_files(dna_path)
-      tmp_dir       = FileUtils.mkdir_p("/tmp/gusteau-#{Time.now.to_i}")[0]
+    def files_list(dna_path)
       bootstrap_dir = File.expand_path('../../../bootstrap', __FILE__)
-
       bootstrap = Gusteau::Config.settings['bootstrap'] || "#{bootstrap_dir}/#{@platform}.sh"
 
       {
@@ -41,13 +39,18 @@ module Gusteau
         Gusteau::Config.settings['cookbooks_path'].each_with_index do |path, i|
           f[path] = "cookbooks-#{i}"
         end
+      end
+    end
 
-        f.each_pair do |src, dest|
-          FileUtils.cp_r(src, "#{tmp_dir}/#{dest}") if File.exists?(src)
-        end
+    def with_gusteau_dir(dna_path)
+      tmp_dir = "/tmp/gusteau-#{Time.now.to_i}"
+      FileUtils.mkdir_p(tmp_dir)
+
+      files_list(dna_path).each_pair do |src, dest|
+        FileUtils.cp_r(src, "#{tmp_dir}/#{dest}") if File.exists?(src)
       end
 
-      yield [ tmp_dir ]
+      yield tmp_dir
       FileUtils.rm_rf(tmp_dir)
     end
   end

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "1.0.5.dev"
+  VERSION = "1.0.6.dev"
 end

data/spec/config/emile.yml

@@ -3,3 +3,5 @@ cookbooks_path:
   - /home/user/.cookbooks
 
 roles_path: basic-roles
+
+bootstrap: ./bootstrap/osx.sh

data/spec/lib/gusteau/chef_spec.rb

@@ -37,4 +37,15 @@ describe Gusteau::Chef do
       end
     end
   end
+
+  describe "#files_list" do
+    subject { chef.send(:files_list, '/some/dna.json') }
+
+    it "should produce a files paths hash" do
+      subject['/some/dna.json'].must_equal     'dna.json'
+      subject['private-cookbooks'].must_equal  'cookbooks-0'
+      subject['basic-roles'].must_equal        'roles'
+      subject['./bootstrap/osx.sh'].must_equal 'bootstrap.sh'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 1.0.5.dev
+  version: 1.0.6.dev
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3825904995135051259
+      hash: -2949705327041746768
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: