daptiv-chef-ci 0.0.8 → 0.0.9

data/daptiv-chef-ci.gemspec

@@ -43,7 +43,7 @@ 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.8'
+  gem.version       = '0.0.9'
   
   gem.add_runtime_dependency "log4r", "~> 1.1.10"
   gem.add_runtime_dependency "mixlib-shellout", "~> 1.2.0"

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

@@ -30,4 +30,6 @@ module DaptivChefCI
     end
     
   end
-end
+end
+
+DaptivChefCI::Logger.init()

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

@@ -0,0 +1,18 @@
+module DaptivChefCI
+  module RakeTaskHelpers
+    extend self
+    
+    def execute(&block)
+      begin
+        block.call()
+      rescue SystemExit => ex
+        exit(ex.status)
+      rescue Exception => ex
+        STDERR.puts("#{ex.message} (#{ex.class})")
+        STDERR.puts(ex.backtrace.join("\n"))
+        exit(1)
+      end
+    end
+    
+  end
+end

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

@@ -0,0 +1,45 @@
+require 'rake'
+require 'rake/tasklib'
+require 'rake/dsl_definition'
+require_relative 'vagrant_driver'
+require_relative 'raketask_helper'
+require_relative 'logger'
+
+class VagrantDestroy
+  
+  # Example usage, destroys a Vagrant box.
+  #
+  # VagrantUp::RakeTask.new 'up' do |t|
+  #   t.destroy_timeout_in_seconds = 180
+  # end
+  #
+  # This class lets you define Rake tasks to drive Vagrant.
+  class RakeTask < ::Rake::TaskLib
+    include ::Rake::DSL if defined? ::Rake::DSL
+    include DaptivChefCI::RakeTaskHelpers
+    
+    attr_accessor :vagrant_driver
+    attr_accessor :destroy_timeout_in_seconds
+    
+    # @param [String] name The task name.
+    # @param [String] desc Description of the task.
+    def initialize(name = 'vagrant_destroy', desc = 'Vagrant destroy task')
+      @name, @desc = name, desc
+      @destroy_timeout_in_seconds = 180
+      @vagrant_driver = DaptivChefCI::VagrantDriver.new()
+      yield self if block_given?
+      define_task
+    end
+    
+    private
+
+    def define_task
+      desc @desc
+      task @name do
+        execute { @vagrant_driver.destroy({ :cmd_timeout_in_seconds => @destroy_timeout_in_seconds }) }
+      end
+    end
+
+  end
+end
+

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

@@ -1,5 +1,6 @@
 require 'log4r'
 require 'mixlib/shellout/exceptions'
+require_relative 'basebox_builder_factory'
 require_relative 'shell'
 
 module DaptivChefCI
@@ -7,13 +8,14 @@ module DaptivChefCI
     
     # Constructs a new Vagrant management instance
     #
-    # @param [Shell] The CLI
-    # @param [BaseBoxBuilderFactory] The base box builder factory instance
     # @param [String] The name of the Vagrant virtualization provider: virtualbox, vmware_fusion
-    def initialize(shell, basebox_builder_factory, provider = :virtualbox)
+    # defaults to :virtualbox
+    # @param [Shell] The CLI, optional
+    # @param [BaseBoxBuilderFactory] The base box builder factory instance, optional
+    def initialize(provider = :virtualbox, shell = nil, basebox_builder_factory = nil)
       @logger = Log4r::Logger.new("daptiv_chef_ci::vagrant")
-      @shell = shell
-      @basebox_builder_factory = basebox_builder_factory
+      @shell = shell || DaptivChefCI::Shell.new()
+      @basebox_builder_factory = basebox_builder_factory || DaptivChefCI::BaseBoxBuilderFactory.new()
       @provider = provider
     end
     

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

@@ -0,0 +1,46 @@
+require 'rake'
+require 'rake/tasklib'
+require 'rake/dsl_definition'
+require_relative 'vagrant_driver'
+require_relative 'raketask_helper'
+require_relative 'logger'
+
+class VagrantProvision
+  
+  # Example usage, provisions a vmware box (box must already be up):
+  #
+  # VagrantProvision::RakeTask.new 'provision' do |t|
+  #   t.provision_timeout_in_seconds = 3600
+  # end
+  #
+  # This class lets you define Rake tasks to drive Vagrant.
+  class RakeTask < ::Rake::TaskLib
+    include ::Rake::DSL if defined? ::Rake::DSL
+    include DaptivChefCI::RakeTaskHelpers
+    
+    attr_accessor :vagrant_driver
+    attr_accessor :provision_timeout_in_seconds
+    
+    # @param [String] name The task name.
+    # @param [String] desc Description of the task.
+    # @param [String] provider vagrant provider to use if other than the default virtualbox provider
+    def initialize(name = 'vagrant_provision', desc = 'Vagrant provision task')
+      @name, @desc = name, desc
+      @provision_timeout_in_seconds = 7200
+      @vagrant_driver = DaptivChefCI::VagrantDriver.new()
+      yield self if block_given?
+      define_task
+    end
+    
+    private
+
+    def define_task
+      desc @desc
+      task @name do
+        execute { @vagrant_driver.provision({ :cmd_timeout_in_seconds => @provision_timeout_in_seconds }) }
+      end
+    end
+
+  end
+end
+

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

@@ -1,19 +1,10 @@
 require 'rake'
 require 'rake/tasklib'
+require 'rake/dsl_definition'
 require_relative 'vagrant_driver'
-require_relative 'virtualbox_driver'
-require_relative 'basebox_builder_factory'
-require_relative 'shell'
+require_relative 'raketask_helper'
 require_relative 'logger'
 
-begin
-  # Support Rake > 0.8.7
-  require 'rake/dsl_definition'
-rescue LoadError
-end
-
-DaptivChefCI::Logger.init()
-
 class Vagrant
   
   # Example usage, creates a vmware base box:
@@ -28,7 +19,9 @@ class Vagrant
   # This class lets you define Rake tasks to drive Vagrant.
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined? ::Rake::DSL
+    include DaptivChefCI::RakeTaskHelpers
     
+    attr_accessor :vagrant_driver
     attr_accessor :provider
     attr_accessor :create_box
     attr_accessor :vagrantfile_dir
@@ -42,7 +35,7 @@ class Vagrant
     # @param [String] name The task name.
     # @param [String] desc Description of the task.
     # @param [String] provider vagrant provider to use if other than the default virtualbox provider
-    def initialize(name = 'vagrant', desc = 'Daptiv Vagrant Tasks')
+    def initialize(name = 'vagrant', desc = 'Vagrant up, halt, destroy, package task')
       @name, @desc = name, desc
       @provider = :virtualbox
       @create_box = false
@@ -53,6 +46,7 @@ class Vagrant
       @destroy_timeout_in_seconds = 180
       @destroy_retry_attempts = 2
       @halt_retry_attempts = 2
+      @vagrant_driver = DaptivChefCI::VagrantDriver.new(@provider)
       yield self if block_given?
       define_task
     end
@@ -62,63 +56,42 @@ class Vagrant
     def define_task
       desc @desc
       task @name do
-        shell = DaptivChefCI::Shell.new()
-        basebox_builder_factory = DaptivChefCI::BaseBoxBuilderFactory.new()
-        vagrant = DaptivChefCI::VagrantDriver.new(shell, basebox_builder_factory, @provider)
-        execute_vagrant_run(vagrant)
+        execute_vagrant_run()
       end
     end
     
-    def execute_vagrant_run(vagrant)
-      try_destroy_before_vagrant_up(vagrant)
-      try_vagrant_up(vagrant)
+    def execute_vagrant_run()
+      execute { destroy() }
+      try_vagrant_up()
     end
     
-    def try_destroy_before_vagrant_up(vagrant)
+    def try_vagrant_up()
       begin
-        destroy(vagrant)
-      rescue SystemExit => ex
-        exit(ex.status)
-      rescue Exception => ex
-        print_err(ex)
-      end
-    end
-    
-    def try_vagrant_up(vagrant)
-      begin
-        up(vagrant)
-        halt(vagrant)
-        package(vagrant) if @create_box
-      rescue SystemExit => ex
-        exit(ex.status)
-      rescue Exception => ex
-        print_err(ex)
-        exit(1) 
+        execute do
+          up()
+          halt()
+          package() if @create_box
+        end
       ensure
-        halt(vagrant)
-        destroy(vagrant)
+        halt()
+        destroy()
       end
     end
     
-    def up(vagrant)
-      vagrant.up({ :cmd_timeout_in_seconds => @up_timeout_in_seconds })
-    end
-    
-    def package(vagrant)
-      vagrant.package({ :base_dir => @vagrantfile_dir, :box_name => @box_name })
+    def up()
+      @vagrant_driver.up({ :cmd_timeout_in_seconds => @up_timeout_in_seconds })
     end
     
-    def destroy(vagrant)
-      vagrant.destroy({ :cmd_timeout_in_seconds => @destroy_timeout_in_seconds, :retry_attempts => @destroy_retry_attempts })
+    def package()
+      @vagrant_driver.package({ :base_dir => @vagrantfile_dir, :box_name => @box_name })
     end
     
-    def halt(vagrant)
-      vagrant.halt({ :cmd_timeout_in_seconds => @halt_timeout_in_seconds, :retry_attempts => @halt_retry_attempts })
+    def destroy()
+      @vagrant_driver.destroy({ :cmd_timeout_in_seconds => @destroy_timeout_in_seconds, :retry_attempts => @destroy_retry_attempts })
     end
     
-    def print_err(ex)
-      STDERR.puts("#{ex.message} (#{ex.class})")
-      STDERR.puts(ex.backtrace.join("\n"))
+    def halt()
+      @vagrant_driver.halt({ :cmd_timeout_in_seconds => @halt_timeout_in_seconds, :retry_attempts => @halt_retry_attempts })
     end
     
   end

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

@@ -0,0 +1,49 @@
+require 'rake'
+require 'rake/tasklib'
+require 'rake/dsl_definition'
+require_relative 'vagrant_driver'
+require_relative 'raketask_helper'
+require_relative 'logger'
+
+class VagrantUp
+  
+  # Example usage, ups and provisions a Vagrant box without halting or destroying it.
+  #
+  # VagrantUp::RakeTask.new 'up' do |t|
+  #   t.provider = :vmware_fusion
+  #   t.up_timeout_in_seconds = 3600
+  # end
+  #
+  # This class lets you define Rake tasks to drive Vagrant.
+  class RakeTask < ::Rake::TaskLib
+    include ::Rake::DSL if defined? ::Rake::DSL
+    include DaptivChefCI::RakeTaskHelpers
+    
+    attr_accessor :vagrant_driver
+    attr_accessor :provider
+    attr_accessor :up_timeout_in_seconds
+    
+    # @param [String] name The task name.
+    # @param [String] desc Description of the task.
+    # @param [String] provider vagrant provider to use if other than the default virtualbox provider
+    def initialize(name = 'vagrant_up', desc = 'Vagrant up task')
+      @name, @desc = name, desc
+      @provider = :virtualbox
+      @up_timeout_in_seconds = 7200
+      @vagrant_driver = DaptivChefCI::VagrantDriver.new(@provider)
+      yield self if block_given?
+      define_task
+    end
+    
+    private
+
+    def define_task
+      desc @desc
+      task @name do
+        execute { @vagrant_driver.up({ :cmd_timeout_in_seconds => @up_timeout_in_seconds }) }
+      end
+    end
+
+  end
+end
+

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

@@ -0,0 +1,18 @@
+require 'daptiv-chef-ci/vagrant_destroy_task'
+require_relative '../shared_contexts/rake'
+
+describe VagrantDestroy::RakeTask, :unit => true do
+  include_context 'rake'
+
+  describe 'vagrant_destroy' do
+    it 'should destroy the box' do
+
+      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180 })
+      
+      task = rake['vagrant_destroy']
+      task.invoke()
+
+    end
+  end
+  
+end

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

@@ -7,7 +7,7 @@ describe DaptivChefCI::VagrantDriver, :unit => true do
   before(:each) do
     @shell = mock()
     @basebox_builder_factory = stub()
-    @vagrant = DaptivChefCI::VagrantDriver.new(@shell, @basebox_builder_factory)
+    @vagrant = DaptivChefCI::VagrantDriver.new(:virtualbox, @shell, @basebox_builder_factory)
   end
 
   describe 'destroy' do
@@ -44,7 +44,7 @@ describe DaptivChefCI::VagrantDriver, :unit => true do
     end
 
     it 'should up vagrant and specify the provider if not virtualbox' do
-      @vagrant = DaptivChefCI::VagrantDriver.new(@shell, @basebox_builder_factory, :my_custom_provider)
+      @vagrant = DaptivChefCI::VagrantDriver.new(:my_custom_provider, @shell, @basebox_builder_factory)
       @shell.should_receive(:exec_cmd).with('vagrant up --provider=my_custom_provider', 7200)
       @vagrant.up()
     end
@@ -73,7 +73,7 @@ describe DaptivChefCI::VagrantDriver, :unit => true do
 
     it 'should use the specified provider' do
       builder = double('builder').as_null_object
-      @vagrant = DaptivChefCI::VagrantDriver.new(@shell, @basebox_builder_factory, :vmware_fusion)
+      @vagrant = DaptivChefCI::VagrantDriver.new(:vmware_fusion, @shell, @basebox_builder_factory)
       @basebox_builder_factory.should_receive(:create).with(@shell, :vmware_fusion, Dir.pwd).and_return(builder)
       @vagrant.package()
     end

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

@@ -0,0 +1,18 @@
+require 'daptiv-chef-ci/vagrant_provision_task'
+require_relative '../shared_contexts/rake'
+
+describe VagrantProvision::RakeTask, :unit => true do
+  include_context 'rake'
+
+  describe 'vagrant_provision' do
+    it 'should provision the box' do
+
+      vagrant_driver.should_receive(:provision).with({ :cmd_timeout_in_seconds => 7200 })
+      
+      task = rake['vagrant_provision']
+      task.invoke()
+
+    end
+  end
+  
+end

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

@@ -0,0 +1,21 @@
+require 'daptiv-chef-ci/vagrant_task'
+require_relative '../shared_contexts/rake'
+
+describe Vagrant::RakeTask, :unit => true do
+  include_context 'rake'
+
+  describe 'vagrant' do
+    it 'should destroy, up, halt, then destroy the box' do
+      
+      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2 })
+      vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200 })
+      vagrant_driver.should_receive(:halt).at_least(1).times.with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2 })
+      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2 })
+      
+      task = rake['vagrant']
+      task.invoke()
+
+    end
+  end
+  
+end

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

@@ -0,0 +1,18 @@
+require 'daptiv-chef-ci/vagrant_up_task'
+require_relative '../shared_contexts/rake'
+
+describe VagrantUp::RakeTask, :unit => true do
+  include_context 'rake'
+
+  describe 'vagrant_up' do
+    it 'should up the box' do
+
+      vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200 })
+      
+      task = rake['vagrant_up']
+      task.invoke()
+
+    end
+  end
+  
+end

data/spec/shared_contexts/rake.rb

@@ -0,0 +1,13 @@
+require "rake"
+
+shared_context "rake" do
+  let(:rake)           { create_rake_application() }
+  let(:vagrant_driver) { stub() }
+  
+  def create_rake_application
+    Rake.application = Rake::Application.new
+    subject.vagrant_driver = vagrant_driver
+    Rake::Task.define_task(subject)
+    Rake.application
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daptiv-chef-ci
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -118,9 +118,13 @@ files:
 - Gemfile
 - lib/daptiv-chef-ci/basebox_builder_factory.rb
 - lib/daptiv-chef-ci/logger.rb
+- lib/daptiv-chef-ci/raketask_helper.rb
 - lib/daptiv-chef-ci/shell.rb
+- lib/daptiv-chef-ci/vagrant_destroy_task.rb
 - lib/daptiv-chef-ci/vagrant_driver.rb
+- lib/daptiv-chef-ci/vagrant_provision_task.rb
 - lib/daptiv-chef-ci/vagrant_task.rb
+- lib/daptiv-chef-ci/vagrant_up_task.rb
 - lib/daptiv-chef-ci/virtualbox_basebox_builder.rb
 - lib/daptiv-chef-ci/virtualbox_driver.rb
 - lib/daptiv-chef-ci/vmware_basebox_builder.rb
@@ -131,15 +135,21 @@ files:
 - pkg/daptiv-chef-ci-0.0.5.gem
 - pkg/daptiv-chef-ci-0.0.6.gem
 - pkg/daptiv-chef-ci-0.0.7.gem
+- pkg/daptiv-chef-ci-0.0.8.gem
 - Rakefile
 - README.md
 - spec/daptiv-chef-ci/basebox_builder_factory_spec.rb
 - spec/daptiv-chef-ci/logger_spec.rb
 - spec/daptiv-chef-ci/shell_spec.rb
+- spec/daptiv-chef-ci/vagrant_destroy_task_spec.rb
 - spec/daptiv-chef-ci/vagrant_driver_spec.rb
+- spec/daptiv-chef-ci/vagrant_provision_task_spec.rb
+- spec/daptiv-chef-ci/vagrant_task_spec.rb
+- spec/daptiv-chef-ci/vagrant_up_task_spec.rb
 - spec/daptiv-chef-ci/virtualbox_basebox_builder_spec.rb
 - spec/daptiv-chef-ci/virtualbox_driver_spec.rb
 - spec/daptiv-chef-ci/vmware_basebox_builder_spec.rb
+- spec/shared_contexts/rake.rb
 - .gitignore
 homepage: ''
 licenses: []
@@ -155,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1439606401422604689
+      hash: -3145193294758643333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1439606401422604689
+      hash: -3145193294758643333
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -175,7 +185,12 @@ test_files:
 - spec/daptiv-chef-ci/basebox_builder_factory_spec.rb
 - spec/daptiv-chef-ci/logger_spec.rb
 - spec/daptiv-chef-ci/shell_spec.rb
+- spec/daptiv-chef-ci/vagrant_destroy_task_spec.rb
 - spec/daptiv-chef-ci/vagrant_driver_spec.rb
+- spec/daptiv-chef-ci/vagrant_provision_task_spec.rb
+- spec/daptiv-chef-ci/vagrant_task_spec.rb
+- spec/daptiv-chef-ci/vagrant_up_task_spec.rb
 - spec/daptiv-chef-ci/virtualbox_basebox_builder_spec.rb
 - spec/daptiv-chef-ci/virtualbox_driver_spec.rb
 - spec/daptiv-chef-ci/vmware_basebox_builder_spec.rb
+- spec/shared_contexts/rake.rb