daptiv-chef-ci 0.0.3 → 0.0.4

data/README.md

@@ -1,11 +1,13 @@
 # Daptiv Chef CI
+[![Build Status](https://travis-ci.org/daptiv/daptiv-chef-ci.png)](https://travis-ci.org/daptiv/daptiv-chef-ci)
+[![Gem Version](https://badge.fury.io/rb/daptiv-chef-ci.png)](http://badge.fury.io/rb/daptiv-chef-ci)
+
 Common tools to help automate Vagrant in CI
 
 This is a really thin wrapper around Vagrant that makes it a little easier to call Vagrant from a Rake build. Why on earth does this exist?
 
 1. Makes it easier to call your installed Vagrant from a Rake build.
 2. Ensures vagrant is loaded from your PATH and _not_ from a bundled gem.
-3. Reduces duplication between cookbook Vagrantfiles.
 
 ## Basic Usage
 
@@ -21,39 +23,9 @@ require 'daptiv-chef-ci/vagrant_task'
 Vagrant::RakeTask.new
 ```
 
-The rake task will attempt to load a Vagrantfile as an Erubis template from the following locations in order:
-
-- Vagrantfile.erb
-- Vagrantfile
-
-If none of those exist the task will use the Vagrantfile.erb template embedded in this gem. Here's an example that specifies a Windows Vagrant box using the embedded Vagrantfile:
-
-```
-require 'daptiv-chef-ci/vagrant_task'
-
-Vagrant::RakeTask.new do |task|
-  task.guest_os = :windows
-  task.box_name = 'vagrant-windows2008r2'
-  task.box_url = 'http://example.com/vagrant/boxes/vagrant-windows2008r2.box'
-  task.run_list = ['mycookbook::recipe']
-end
-```
-
-## Configuration
-
-The vagrant rake task provides the following configuration parameters to the ERB template, these can be configured using the same name in the rake task:
-
-- guest_os - defaults to :linux
-- chef_repo_dir - The chef-repo root directory, defaults to ~/src/chef-repo
-- box_name - defaults to 'Vagrant-hostname', this is optional.
-- node_name - The chef node name, defaults to 'Vagrant-hostname', this is optional.
-- box_url - URL to the box download location, this is optional.
-- run_list - The Chef run list, defaults to empty.
-- chef_json - Any additional Chef attributes in json format, this is optional.
-
 ## Logging
 
-By default this gem will not log anything other than errors to stderr, however quite often its useful to get more information from the running Vagrant process. To change the gem logging level set the CHEF_CI_LOG environment variable to one supported by log4r (DEBUG, INFO etc).
+To change the gem logging level set the CHEF_CI_LOG environment variable to one supported by log4r (DEBUG, INFO etc).
 
 `CHEF_CI_LOG=DEBUG bundle exec rake vagrant`
 

data/daptiv-chef-ci.gemspec

@@ -43,10 +43,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "daptiv-chef-ci"
   gem.require_paths = ["lib"]
-  gem.version       = '0.0.3'
+  gem.version       = '0.0.4'
   
   gem.add_runtime_dependency "log4r", "~> 1.1.10"
-  gem.add_runtime_dependency "erubis", "~> 2.7.0"
+  gem.add_runtime_dependency "mixlib-shellout", "~> 1.2.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec-core", "~> 2.12.2"

data/lib/daptiv-chef-ci/logger.rb

@@ -26,7 +26,7 @@ module DaptivChefCI
       level_i = Log4r::Log4rConfig::LogLevels.index(level)
       level_i + 1
     rescue
-      return 4 # error
+      return 2 # info
     end
     
   end

data/lib/daptiv-chef-ci/shell.rb

@@ -1,5 +1,6 @@
 require 'log4r'
 require 'bundler'
+require 'mixlib/shellout'
 
 module DaptivChefCI
   class Shell
@@ -16,14 +17,18 @@ module DaptivChefCI
     # @param [String] The command line to execute
     # @return [Array] Each entry represents a line from the stdout
     def exec_cmd(command)
-      @logger.info("Calling command [#{command}]")
       path_at_start = ENV['PATH']
       begin
         ENV['PATH'] = path_without_gem_dir()
         @logger.debug("Temporarily setting PATH: #{ENV['PATH']}")
-        out = `#{command}`
-        @logger.debug(out)
-        out.split("\n")
+        
+        @logger.info("Calling command [#{command}]")
+        shell_out = Mixlib::ShellOut.new(command)
+        shell_out.run_command()
+        shell_out.invalid! if shell_out.exitstatus != 0
+        
+        @logger.info(shell_out.stdout)
+        shell_out.stdout.split("\n")
       ensure
         @logger.debug("Resetting PATH: #{path_at_start}")
         ENV['PATH'] = path_at_start

data/lib/daptiv-chef-ci/vagrant_driver.rb

@@ -1,6 +1,4 @@
 require 'log4r'
-require 'socket'
-require 'erubis'
 require_relative 'shell'
 
 module DaptivChefCI
@@ -9,38 +7,9 @@ module DaptivChefCI
     # Constructs a new Vagrant management instance
     #
     # @param [Shell] The CLI
-    # @param [Hash] The options to pass to the Vagrantfile
-    #
-    # options[:guest_os] - defaults to :linux
-    # options[:chef_repo_dir] - The chef-repo root directory, defaults to ~/src/chef-repo
-    # options[:box_name] - defaults to 'Vagrant-hostname'
-    # options[:node_name] - The chef node name, defaults to 'Vagrant-hostname'
-    # options[:box_url] - URL to the box download location, this is optional.
-    # options[:run_list] - The Chef run list, defaults to empty.
-    # options[:chef_json] - Any additional Chef attributes in json format.
-    def initialize(shell, options)
+    def initialize(shell)
       @logger = Log4r::Logger.new("daptiv_chef_ci::vagrant")
       @shell = shell
-      
-      options[:guest_os] ||= :linux
-      options[:box_name] ||= "Vagrant-#{Socket.gethostname}"
-      options[:box_url] ||= nil
-      options[:node_name] ||= options[:box_name]
-      options[:run_list] ||= []
-      options[:chef_repo_dir] = "#{ENV['HOME']}/src/chef-repo"
-      options[:chef_json] ||= nil
-      @options = options
-    end
-    
-    def create_vagrantfile()
-      @logger.debug('Creating Vagrantfile')
-      File.open('Vagrantfile', 'w') do |f|
-        f.write render_vagrantfile()
-      end
-    end
-    
-    def render_vagrantfile()
-      Erubis::Eruby.new(vagrantfile_erb()).result(@options)
     end
     
     def destroy()
@@ -63,33 +32,5 @@ module DaptivChefCI
       @shell.exec_cmd('vagrant reload')
     end
     
-    
-    private
-    
-    def vagrantfile_erb()
-      path = vagrantfile_erb_path()
-      @logger.info("Using #{path} to render Vangrantfile")
-      File.read(vagrantfile_erb_path())
-    end
-    
-    def vagrantfile_erb_path()
-      erbs = [
-        File.join(Dir.pwd, 'Vagrantfile.erb'),
-        File.join(Dir.pwd, 'Vagrantfile'),
-        File.expand_path('Vagrantfile.erb', template_dir())
-      ]
-          
-      erbs.each do |erb|
-        @logger.debug("Searching for #{erb}")
-        return erb if File.exists?(erb)
-      end
-      # This should never happen
-      raise 'Couldn\'t find a Vagrantfile.erb!'
-    end
-    
-    def template_dir()
-      File.join(File.expand_path(File.dirname(__FILE__)), 'templates')
-    end
-    
   end
 end

data/lib/daptiv-chef-ci/vagrant_task.rb

@@ -16,92 +16,53 @@ DaptivChefCI::Logger.init()
 class Vagrant
   
   # This class lets you define Rake tasks to drive Vagrant.
-  #
-  # @example Run the Python and NGinx cookbooks on a Linux guest
-  #   Vagrant::RakeTask.new do |task|
-  #     task.box_name = 'vagrant-FreeBSD'
-  #     task.run_list = [ 'python', 'nginx' ]
-  #     task.chef_repo_dir = '/Users/me/chef-repo'
-  #   end
-  #
-  # @example Run the Python and NGinx cookbooks on a Windows guest
-  #   Vagrant::RakeTask.new do |task|
-  #     task.guest_os = :windows
-  #     task.box_name = 'vagrant-windows-server-r2'
-  #     task.box_url = 'http://example.com/boxes/vagrant-windows-server-r2.box'
-  #     task.run_list = [ 'python', 'nginx' ]
-  #     task.chef_repo_dir = '/Users/me/chef-repo'
-  #   end
-  #
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined? ::Rake::DSL
     
-    attr_accessor :guest_os
-    attr_accessor :box_url
-    attr_accessor :box_name
-    attr_accessor :run_list
-    attr_accessor :node_name
-    attr_accessor :chef_repo_dir
-    attr_accessor :chef_json
-    
     # @param [String] name The task name.
     # @param [String] desc Description of the task.
     def initialize(name = 'vagrant', desc = 'Daptiv Vagrant Tasks')
       @name, @desc = name, desc
-      @guest_os = nil
-      @box_url = nil
-      @box_name = nil
-      @run_list = []
-      @node_name = nil
-      @chef_repo_dir = nil
-      @chef_json = nil
-
       yield self if block_given?
-
       define_task
     end
     
-
     private
 
     def define_task
       desc @desc
       task @name do
-        
-        options = {
-          :guest_os => @guest_os,
-          :box_url => @box_url,
-          :box_name => @box_name,
-          :run_list => @run_list,
-          :node_name => @node_name,
-          :chef_repo_dir => @chef_repo_dir,
-          :chef_json => @chef_json }
-        
-        shell = DaptivChefCI::Shell.new()
-        vagrant = DaptivChefCI::VagrantDriver.new(shell, options)
-
-        vagrant.create_vagrantfile()
-        
-        begin
-          vagrant.destroy()
-        rescue SystemExit => ex
-          exit(ex.status)
-        rescue Exception => ex
-          print_err(ex)
-        end
-        
-        begin
-          vagrant.up()
-        rescue SystemExit => ex
-          exit(ex.status)
-        rescue Exception => ex
-          print_err(ex)
-          exit(1) 
-        ensure
-          vagrant.halt()
-          vagrant.destroy()
-        end
-      
+        vagrant = DaptivChefCI::VagrantDriver.new(DaptivChefCI::Shell.new())
+        execute_vagrant_run(vagrant)
+      end
+    end
+    
+    def execute_vagrant_run(vagrant)
+      try_destroy_before_vagrant_up(vagrant)
+      try_vagrant_up(vagrant)
+    end
+    
+    def try_destroy_before_vagrant_up(vagrant)
+      begin
+        vagrant.destroy()
+      rescue SystemExit => ex
+        exit(ex.status)
+      rescue Exception => ex
+        print_err(ex)
+      end
+    end
+    
+    def try_vagrant_up(vagrant)
+      begin
+        vagrant.up()
+      rescue SystemExit => ex
+        exit(ex.status)
+      rescue Exception => ex
+        print_err(ex)
+        exit(1) 
+      ensure
+        vagrant.halt()
+        vagrant.destroy()
       end
     end
     

data/spec/daptiv-chef-ci/logger_spec.rb

@@ -23,10 +23,10 @@ describe DaptivChefCI::Logger, :unit => true do
       DaptivChefCI::Logger.init()
     end
     
-    it 'should initialize logging to error by default' do
+    it 'should initialize logging to info by default' do
       DaptivChefCI::Logger.init()
       logger = Log4r::Logger.new("daptiv_chef_ci::logger_spec")
-      expect(logger.level).to eq(4)
+      expect(logger.level).to eq(2)
     end
     
     it 'should initialize logging to the specified level' do

data/spec/daptiv-chef-ci/shell_spec.rb

@@ -1,6 +1,7 @@
 require 'mocha/api'
 require 'daptiv-chef-ci/virtualbox_driver'
 require 'daptiv-chef-ci/logger'
+require 'mixlib/shellout/exceptions'
 require 'bundler'
 
 describe DaptivChefCI::Shell, :unit => true do
@@ -13,6 +14,11 @@ describe DaptivChefCI::Shell, :unit => true do
       expect(out.count).to be > 1
     end
     
+    it 'should raise exception if exit status is non-zero' do
+      shell = DaptivChefCI::Shell.new()
+      expect { shell.exec_cmd('rm') }.to raise_error(Mixlib::ShellOut::ShellCommandFailed)
+    end
+    
     it 'should revert path when method returns' do
       path_before = ENV['PATH']
       shell = DaptivChefCI::Shell.new()

data/spec/daptiv-chef-ci/vagrant_driver_spec.rb

@@ -6,45 +6,9 @@ describe DaptivChefCI::VagrantDriver, :unit => true do
   
   before(:each) do
     @shell = mock()
-    @options = {}
-    @vagrant = DaptivChefCI::VagrantDriver.new(@shell, @options)
+    @vagrant = DaptivChefCI::VagrantDriver.new(@shell)
   end
 
-  describe 'render_vagrantfile' do
-    it 'should default chef-repo dir to ~/src/chef-repo' do
-      vagrantfile = @vagrant.render_vagrantfile()
-      expect(vagrantfile).to include("chef_repo_dir = '#{ENV['HOME']}/src/chef-repo'")
-    end
-    
-    it 'should not include box url when not set' do
-      vagrantfile = @vagrant.render_vagrantfile()
-      expect(vagrantfile).not_to include("config.vm.box_url")
-    end
-    
-    it 'should include box url when set' do
-      @options[:box_url] = 'http://example.com/boxes/freebsd.box'
-      vagrantfile = @vagrant.render_vagrantfile()
-      expect(vagrantfile).to include("config.vm.box_url = 'http://example.com/boxes/freebsd.box'")
-    end
-
-    it 'should include windows section when guest is set to windows' do
-      @options[:guest_os] = :windows
-      vagrantfile = @vagrant.render_vagrantfile()
-      expect(vagrantfile).to include('config.vm.guest = :windows')
-      expect(vagrantfile).to include('config.windows.halt_timeout = 15')
-      expect(vagrantfile).to include('config.winrm.username = "vagrant"')
-      expect(vagrantfile).to include('config.winrm.password = "vagrant"')
-      expect(vagrantfile).to include('config.vm.network :forwarded_port, guest: 5985, host: 5985')
-    end
-    
-    it 'should expand runlist' do
-      @options[:run_list] = ['python', 'nginx']
-      vagrantfile = @vagrant.render_vagrantfile()
-      expect(vagrantfile).to include("chef.add_recipe 'python'")
-      expect(vagrantfile).to include("chef.add_recipe 'nginx'")
-    end
-  end
-  
   describe 'destroy' do
     it 'should force shutdown vagrant' do
       @shell.expects(:exec_cmd).with do |cmd|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daptiv-chef-ci
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.10
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -150,12 +150,13 @@ files:
 - Gemfile
 - lib/daptiv-chef-ci/logger.rb
 - lib/daptiv-chef-ci/shell.rb
-- lib/daptiv-chef-ci/templates/Vagrantfile.erb
 - lib/daptiv-chef-ci/vagrant_driver.rb
 - lib/daptiv-chef-ci/vagrant_task.rb
 - lib/daptiv-chef-ci/virtualbox_driver.rb
 - pkg/daptiv-chef-ci-0.0.1.gem
 - pkg/daptiv-chef-ci-0.0.2.gem
+- pkg/daptiv-chef-ci-0.0.3.gem
+- pkg/daptiv-chef-ci-0.0.4.gem
 - Rakefile
 - README.md
 - spec/daptiv-chef-ci/logger_spec.rb
@@ -177,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -504818496541812232
+      hash: -3669985751056624684
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -504818496541812232
+      hash: -3669985751056624684
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/daptiv-chef-ci/templates/Vagrantfile.erb

@@ -1,41 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  chef_repo_dir = '<%= chef_repo_dir %>'
-
-  config.berkshelf.enabled = true
-
-  config.vm.box = '<%= box_name %>'
-  <% if !box_url.nil? %>
-  config.vm.box_url = '<%= box_url %>'
-  <% end %>
-
-  <% if guest_os == :windows %>
-  config.vm.guest = :windows
-
-  config.windows.halt_timeout = 15
-  config.winrm.username = "vagrant"
-  config.winrm.password = "vagrant"
-
-  config.vm.network :forwarded_port, guest: 3389, host: 3389
-  config.vm.network :forwarded_port, guest: 5985, host: 5985
-  <% end %>
-
-  config.vm.provision :chef_solo do |chef|
-    chef.node_name = '<%= node_name %>'
-    chef.log_level = :info
-    chef.roles_path = File.join(chef_repo_dir, 'roles')
-    chef.data_bags_path = File.join(chef_repo_dir, 'data_bags')
-    chef.encrypted_data_bag_secret_key_path = '/etc/chef/encrypted_data_bag_secret'
-    chef.add_recipe 'minitest-handler'
-    <% run_list.each do |recipe| %>
-      chef.add_recipe '<%= recipe %>'
-    <% end %>
-    <% if !chef_json.nil? %>
-      chef.json = {
-        <%= chef_json %>
-      } 
-    <% end %>   
-  end
-end