gusteau 1.0.4.dev → 1.0.5.dev

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.5.dev / 2013-07-09
+* Bugfix: `cookbooks_path` was not working properly
+* Add an ability to specify a custom bootstrap script
+* Streamline file uploading logic in `chef.rb`
+
 ## 1.0.4.dev / 2013-07-08
 * Bugfix: `after` hook was not taking effect
 * Add a quick `show nodename` subcommand for printing out individual node configuration

data/README.md

@@ -31,7 +31,7 @@ Gettings started
 Gusteau is a Ruby gem:
 
 ```
-gem install gusteau --pre
+gem install gusteau
 ```
 
 The following command generates an example Chef-repo:
@@ -144,7 +144,33 @@ vagrant plugin install gusteau
 
 Notes
 -----
+### Bootstrapping
 
-* Feel free to contribute a [bootstrap script](https://github.com/locomote/gusteau/tree/master/bootstrap) for your platform.
+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).
 
+### 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:
+
+```
+before:
+  - bundle exec librarian-chef install
+
+after:
+  - bundle exec rake spec
+
+environments:
+  ...
+```
+
+### Custom cookbooks path
+
+By default, Gusteau uploads and sets Chef Solo up to use cookbooks from `./cookbooks` and `./site-cookbooks` directories. If it doesn't work for you, you can override these values in `.gusteau.yml`:
+
+```
+cookbooks_path: [ './my-cookbooks', '../something-else' ]
+roles_path: './base-roles'
+
+environments:
+  ...
+```

data/bootstrap/solo.rb

@@ -1,5 +1,5 @@
 file_cache_path "/tmp/chef"
-cookbook_path   "/etc/chef/cookbooks", "/etc/chef/site-cookbooks"
+cookbook_path  *Dir.glob("/etc/chef/cookbooks-*")
 role_path       "/etc/chef/roles"
 data_bag_path   "/etc/chef/data_bags"
 

data/lib/gusteau/chef.rb

@@ -1,5 +1,6 @@
 module Gusteau
   class Chef
+
     def initialize(server, platform = nil, dest_dir = '/etc/chef')
       @server   = server
       @platform = platform || 'omnibus'
@@ -9,14 +10,13 @@ module Gusteau
     def run(dna, opts)
       @server.run "rm -rf #{@dest_dir} && mkdir #{@dest_dir} && mkdir -p /tmp/chef"
 
-      @server.upload(src_files(dna[:path]), @dest_dir, :exclude => '.git/')
-
-      # move bootstrap directory to the top level
-      @server.run "cd #{@dest_dir} && mv `find . -type d -name bootstrap` #{@dest_dir}/"
+      with_src_files(dna[:path]) do |list|
+        @server.upload list, @dest_dir, :exclude => '.git/', :strip_c => 2
+      end
 
-      @server.run "sh /etc/chef/bootstrap/#{@platform}.sh" if opts['bootstrap']
+      @server.run "sh /etc/chef/bootstrap.sh" if opts['bootstrap']
 
-      cmd  = "chef-solo -c #{@dest_dir}/bootstrap/solo.rb -j #{@dest_dir + dna[:path]} --color"
+      cmd  = "chef-solo -c #{@dest_dir}/solo.rb -j #{@dest_dir}/dna.json --color"
       cmd << " -F #{opts['format']}"    if opts['format']
       cmd << " -l #{opts['log_level']}" if opts['log_level']
       cmd << " -W"                      if opts['why-run']
@@ -25,13 +25,30 @@ module Gusteau
 
     private
 
-    def src_files(dna_path)
-      list = %W(
-        #{dna_path}
-        #{File.expand_path("../../../bootstrap", __FILE__)}
-        data_bags
-      ) + Gusteau::Config.settings['cookbooks_path'] + [ Gusteau::Config.settings['roles_path']]
-      list.select { |file| File.exists? file }
+    def with_src_files(dna_path)
+      tmp_dir       = FileUtils.mkdir_p("/tmp/gusteau-#{Time.now.to_i}")[0]
+      bootstrap_dir = File.expand_path('../../../bootstrap', __FILE__)
+
+      bootstrap = Gusteau::Config.settings['bootstrap'] || "#{bootstrap_dir}/#{@platform}.sh"
+
+      {
+        dna_path                               => "dna.json",
+        bootstrap                              => "bootstrap.sh",
+        "#{bootstrap_dir}/solo.rb"             => "solo.rb",
+        'data_bags'                            => "data_bags",
+        Gusteau::Config.settings['roles_path'] => "roles"
+      }.tap do |f|
+        Gusteau::Config.settings['cookbooks_path'].each_with_index do |path, i|
+          f[path] = "cookbooks-#{i}"
+        end
+
+        f.each_pair do |src, dest|
+          FileUtils.cp_r(src, "#{tmp_dir}/#{dest}") if File.exists?(src)
+        end
+      end
+
+      yield [ tmp_dir ]
+      FileUtils.rm_rf(tmp_dir)
     end
   end
 end

data/lib/gusteau/config.rb

@@ -44,7 +44,8 @@ module Gusteau
     def settings
       {
         'cookbooks_path' => @config['cookbooks_path'] || ['cookbooks', 'site-cookbooks'],
-        'roles_path'     => @config['roles_path'] || 'roles'
+        'roles_path'     => @config['roles_path'] || 'roles',
+        'bootstrap'      => @config['bootstrap']
       }
     end
 

data/lib/gusteau/server.rb

@@ -23,7 +23,7 @@ module Gusteau
         Find.find(*files_and_dirs) do |f|
           files << f unless(opts[:exclude] && f.include?(opts[:exclude]))
         end
-        send_files(files, dest_dir)
+        send_files(files, dest_dir, opts[:strip_c])
       end
     end
 

data/lib/gusteau/ssh.rb

@@ -33,9 +33,11 @@ module Gusteau
       exit_code == 0
     end
 
-    def send_files(files, dest_dir)
+    def send_files(files, dest_dir, strip_c = nil)
+      strip_arg = strip_c ? "--strip-components=#{strip_c}" : ''
+
       conn.open_channel { |ch|
-        ch.exec(prepared_cmd "tar zxf - -C #{dest_dir}")
+        ch.exec(prepared_cmd "tar zxf - -C #{dest_dir} #{strip_arg}")
         ch.send_data(compressed_tar_stream(files))
         ch.eof!
       }.wait

data/lib/gusteau/version.rb

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

data/spec/lib/gusteau/chef_spec.rb

@@ -17,7 +17,7 @@ describe Gusteau::Chef do
 
     before do
       server.expects(:upload)
-      server.expects(:run).times(2)
+      server.expects(:run)
     end
 
     context "bootstrap option is not specified" do
@@ -31,7 +31,7 @@ describe Gusteau::Chef do
       let(:bootstrap) { true }
 
       it "should run the bootstrap script and chef solo" do
-        server.expects(:run).with('sh /etc/chef/bootstrap/centos.sh')
+        server.expects(:run).with('sh /etc/chef/bootstrap.sh')
         expects_run_chef_solo
         chef.run({ :path => '/tmp/node.json' }, opts)
       end

data/spec/lib/gusteau/config_spec.rb

@@ -40,9 +40,10 @@ describe Gusteau::Config do
     describe "#settings" do
       let(:settings) { Gusteau::Config.settings }
 
-      it "should have defaults for cookbooks_path, roles_path" do
+      it "should have defaults for cookbooks_path, roles_path, bootstrap" do
         settings['cookbooks_path'].must_equal ['cookbooks', 'site-cookbooks']
         settings['roles_path'].must_equal 'roles'
+        settings['bootstrap'].must_equal nil
       end
 
       context "settings defined in the config yml" do

data/spec/lib/gusteau/server_spec.rb

@@ -61,7 +61,7 @@ describe Gusteau::Server do
     after  { FileUtils.rm_rf(pr) }
 
     it "skips the excluded files" do
-      server.expects(:send_files).with(["#{pr}/cookbooks"], "/etc/chef")
+      server.expects(:send_files).with(["#{pr}/cookbooks"], "/etc/chef", nil)
       server.upload(["#{pr}/cookbooks", "#{pr}/.git"], "/etc/chef", { :exclude => "#{pr}/.git" })
     end
   end

data/spec/lib/gusteau/ssh_spec.rb

@@ -97,14 +97,18 @@ describe Gusteau::SSH do
       before do
         connector.user = 'root'
         connector.expects(:compressed_tar_stream).returns(mock())
+        channel.expects(:send_data)
       end
 
       it "should execute the extraction command and send the data" do
-        channel.expects(:exec).with("tar zxf - -C /etc/chef")
-        channel.expects(:send_data)
-
+        channel.expects(:exec).with("tar zxf - -C /etc/chef ")
         connector.send_files(%w{ a b }, '/etc/chef')
       end
+
+      it "should strip tar components" do
+        channel.expects(:exec).with("tar zxf - -C /etc/chef --strip-components=3")
+        connector.send_files(%w{ c d }, '/etc/chef', 3)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 1.0.4.dev
+  version: 1.0.5.dev
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -286,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 201267403645685756
+      hash: -3825904995135051259
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: