daptiv-chef-ci 0.0.15 → 0.1.0

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

@@ -1,92 +1,83 @@
 require 'log4r'
 require 'mixlib/shellout/exceptions'
-require_relative 'basebox_builder_factory'
 require_relative 'shell'
 
 module DaptivChefCI
+  # Drives Vagrant via the command shell
   class VagrantDriver
-    
     # Constructs a new Vagrant management instance
     #
-    # @param [String] The name of the Vagrant virtualization provider: virtualbox, vmware_fusion
-    # defaults to :virtualbox
+    # @param [String] The name of the Vagrant virtualization provider:
+    # => virtualbox (default), vmware_fusion
     # @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 || DaptivChefCI::Shell.new()
-      @basebox_builder_factory = basebox_builder_factory || DaptivChefCI::BaseBoxBuilderFactory.new()
+    def initialize(provider = :virtualbox, shell = nil)
+      @logger = Log4r::Logger.new('daptiv_chef_ci::vagrant')
+      @shell = shell || DaptivChefCI::Shell.new
       @provider = provider
     end
-    
-    def destroy(opts={})
+
+    def destroy(opts = {})
       opts = {
-        :cmd_timeout_in_seconds => 180,
-        :retry_attempts => 2,
-        :retry_wait_in_seconds => 20
+        cmd_timeout_in_seconds: 180,
+        retry_attempts: 2,
+        retry_wait_in_seconds: 20,
+        continue_on_error: true
       }.merge(opts)
       exec_cmd_with_retry('vagrant destroy -f', opts)
     end
-    
-    def halt(opts={})
+
+    def halt(opts = {})
       opts = {
-        :cmd_timeout_in_seconds => 180,
-        :retry_attempts => 2,
-        :retry_wait_in_seconds => 20
+        cmd_timeout_in_seconds: 180,
+        retry_attempts: 2,
+        retry_wait_in_seconds: 20
       }.merge(opts)
       exec_cmd_with_retry('vagrant halt', opts)
     end
-    
-    def up(opts={})
+
+    def up(opts = {})
       opts = {
-        :cmd_timeout_in_seconds => 7200,
-        :retry_attempts => 0
+        cmd_timeout_in_seconds: 7200,
+        retry_attempts: 0
       }.merge(opts)
       cmd = 'vagrant up'
-      cmd += ' --provider=' + @provider.to_s if @provider != :virtualbox
+      cmd += ' --provider=' + @provider.to_s
       exec_cmd_with_retry(cmd, opts)
     end
-    
-    def provision(opts={})
+
+    def provision(opts = {})
       opts = {
-        :cmd_timeout_in_seconds => 7200,
-        :retry_attempts => 0
+        cmd_timeout_in_seconds: 7200,
+        retry_attempts: 0
       }.merge(opts)
       exec_cmd_with_retry('vagrant provision', opts)
     end
-    
-    def reload(opts={})
-      opts = {
-        :cmd_timeout_in_seconds => 180,
-        :retry_attempts => 0
-      }.merge(opts)
-      exec_cmd_with_retry('vagrant reload', opts)
-    end
-    
-    def package(opts={})
-      base_dir = opts[:base_dir] || Dir.pwd
-      box_name = opts[:box_name] || File.basename(base_dir)
-      box_name += '.box' unless box_name.end_with?('.box')
-      
-      builder = @basebox_builder_factory.create(@shell, @provider, base_dir)
-      builder.build(box_name)
-    end
-    
-    
+
     private
-    
-    def exec_cmd_with_retry(cmd, opts)
+
+    def exec_cmd_with_retry(cmd, options)
       attempt ||= 1
-      environment ||= opts[:environment] || {}
-      timeout ||= opts[:cmd_timeout_in_seconds] || 600
-      @shell.exec_cmd(cmd, timeout, environment)
+      opts ||= ensure_defaults(options)
+      @shell.exec_cmd(cmd, opts[:cmd_timeout_in_seconds], opts[:environment])
     rescue Mixlib::ShellOut::ShellCommandFailed => e
       @logger.warn("#{cmd} failed with error: #{e.message}")
-      raise if attempt > (opts[:retry_attempts] || 0)
+      if attempt > opts[:retry_attempts]
+        return if opts[:continue_on_error]
+        raise
+      end
       attempt += 1
-      sleep(opts[:retry_wait_in_seconds] || 10)
+      sleep(opts[:retry_wait_in_seconds])
       retry
     end
-    
+
+    def ensure_defaults(opts)
+      {
+        environment: {},
+        cmd_timeout_in_seconds: 600,
+        retry_attempts: 0,
+        retry_wait_in_seconds: 10,
+        continue_on_error: false
+      }.merge(opts)
+    end
   end
-end
+end

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

@@ -6,7 +6,6 @@ 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|
@@ -18,14 +17,15 @@ class VagrantProvision
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined? ::Rake::DSL
     include DaptivChefCI::RakeTaskHelpers
-    
+
     attr_accessor :vagrant_driver
     attr_accessor :provision_timeout_in_seconds
     attr_accessor :environment
-    
+
     # @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
+    # @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
@@ -33,25 +33,22 @@ class VagrantProvision
       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,
-            :environment => @environment
-          })
-        }
+        execute do
+          vagrant_driver.provision(
+            cmd_timeout_in_seconds: @provision_timeout_in_seconds,
+            environment: @environment)
+        end
       end
     end
 
-    def vagrant_driver()
-      @vagrant_driver ||= DaptivChefCI::VagrantDriver.new()
+    def vagrant_driver
+      @vagrant_driver ||= DaptivChefCI::VagrantDriver.new
     end
-
   end
 end
-

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

@@ -5,14 +5,12 @@ require_relative 'vagrant_driver'
 require_relative 'raketask_helper'
 require_relative 'logger'
 
+# Drives Vagrant through Rake tasks
 class Vagrant
-  
   # Example usage, creates a vmware base box:
   #
   # Vagrant::RakeTask.new 'vagrant_fusion' do |t|
   #   t.provider = :vmware_fusion
-  #   t.create_box = true
-  #   t.box_name = 'windows-server-vmwarefusion.box'
   #   t.up_timeout_in_seconds = 3600
   #   t.environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
   # end
@@ -21,28 +19,25 @@ class 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
-    attr_accessor :box_name
     attr_accessor :up_timeout_in_seconds
     attr_accessor :halt_timeout_in_seconds
     attr_accessor :destroy_timeout_in_seconds
     attr_accessor :destroy_retry_attempts
     attr_accessor :halt_retry_attempts
     attr_accessor :environment
-    
+
     # @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 = 'Vagrant up, halt, destroy, package task')
+    # @param [String] provider vagrant provider to use if other than the default
+    # virtualbox provider
+    def initialize(name = 'vagrant', desc = 'Vagrant up, halt, destroy task')
       @name, @desc = name, desc
       @provider = :virtualbox
-      @create_box = false
       @vagrantfile_dir = Dir.pwd
-      @box_name = nil
       @up_timeout_in_seconds = 7200
       @halt_timeout_in_seconds = 180
       @destroy_timeout_in_seconds = 180
@@ -52,65 +47,47 @@ class Vagrant
       yield self if block_given?
       define_task
     end
-    
+
     private
 
     def define_task
       desc @desc
       task @name do
-        execute_vagrant_run()
+        execute_vagrant_run
       end
     end
-    
-    def execute_vagrant_run()
-      execute { destroy() }
-      try_vagrant_up()
-    end
-    
-    def try_vagrant_up()
-      begin
-        execute do
-          up()
-          package() if @create_box
-        end
-      ensure
-        destroy()
+
+    def execute_vagrant_run
+      execute do
+        destroy(0)
+        up
       end
+    ensure
+      destroy
     end
-    
-    def up()
-      vagrant_driver.up({
-        :cmd_timeout_in_seconds => @up_timeout_in_seconds,
-        :environment => @environment
-      })
-    end
-    
-    def package()
-      halt()
-      vagrant_driver.package({
-        :base_dir => @vagrantfile_dir,
-        :box_name => @box_name,
-        :environment => @environment })
+
+    def up
+      vagrant_driver.up(
+        cmd_timeout_in_seconds: @up_timeout_in_seconds,
+        environment: @environment)
     end
-    
-    def destroy()
-      vagrant_driver.destroy({
-        :cmd_timeout_in_seconds => @destroy_timeout_in_seconds,
-        :retry_attempts => @destroy_retry_attempts,
-        :environment => @environment })
+
+    def destroy(destroy_retry_attempts = @destroy_retry_attempts)
+      vagrant_driver.destroy(
+        cmd_timeout_in_seconds: @destroy_timeout_in_seconds,
+        retry_attempts: destroy_retry_attempts,
+        environment: @environment)
     end
-    
-    def halt()
-      vagrant_driver.halt({
-        :cmd_timeout_in_seconds => @halt_timeout_in_seconds,
-        :retry_attempts => @halt_retry_attempts,
-        :environment => @environment })
+
+    def halt
+      vagrant_driver.halt(
+        cmd_timeout_in_seconds: @halt_timeout_in_seconds,
+        retry_attempts: @halt_retry_attempts,
+        environment: @environment)
     end
-    
-    def vagrant_driver()
+
+    def vagrant_driver
       @vagrant_driver ||= DaptivChefCI::VagrantDriver.new(@provider)
     end
-    
   end
 end
-

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

@@ -6,8 +6,8 @@ require_relative 'raketask_helper'
 require_relative 'logger'
 
 class VagrantUp
-  
-  # Example usage, ups and provisions a Vagrant box without halting or destroying it.
+  # Example usage, ups and provisions a Vagrant box without halting or
+  # destroying it.
   #
   # VagrantUp::RakeTask.new 'up' do |t|
   #   t.provider = :vmware_fusion
@@ -19,15 +19,16 @@ class VagrantUp
   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
     attr_accessor :environment
-    
+
     # @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
+    # @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
@@ -36,25 +37,22 @@ class VagrantUp
       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,
-            :environment => @environment
-          })
-        }
+        execute do
+          vagrant_driver.up(
+            cmd_timeout_in_seconds: @up_timeout_in_seconds,
+            environment: @environment)
+        end
       end
     end
-    
-    def vagrant_driver()
+
+    def vagrant_driver
       @vagrant_driver ||= DaptivChefCI::VagrantDriver.new(@provider)
     end
-
   end
 end
-

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

@@ -0,0 +1,69 @@
+require 'rake'
+require 'rake/tasklib'
+require 'rake/dsl_definition'
+require 'versionomy'
+require_relative 'raketask_helper'
+
+class VersionCookbook
+  # Example usage, versions a cookbook to 1.0.x for usage in CI
+  #
+  # VersionCookbook::RakeTask.new 'version_cookbook' do |t|
+  #   t.bump = false
+  #   t.version = "1.0.#{ENV['BUILD_NUMBER']}"
+  #   t.version_file = 'version.txt'
+  # end
+  #
+  # This class lets you define Rake tasks to manage a cookbook
+  # version.txt file
+  class RakeTask < ::Rake::TaskLib
+    include ::Rake::DSL if defined? ::Rake::DSL
+    include DaptivChefCI::RakeTaskHelpers
+
+    attr_accessor :bump
+    attr_accessor :version
+    attr_accessor :version_file
+
+    # @param [String] name The task name.
+    # @param [String] desc Description of the task.
+    def initialize(name = 'version_cookbook', desc = 'Version cookbook task')
+      @logger = Log4r::Logger.new('daptiv_chef_ci::version_cookbook_task')
+      @name, @desc = name, desc
+      @version_file = File.join(Dir.pwd, 'version.txt')
+      @bump = true
+      yield self if block_given?
+      define_task
+    end
+
+    private
+
+    def define_task
+      desc @desc
+      task @name do
+        execute do
+          create_or_update_version_file
+        end
+      end
+    end
+
+    def create_or_update_version_file
+      version = ::Versionomy.parse(start_version)
+      version = version.bump(:tiny) if @bump
+      write_version(version)
+    end
+
+    def start_version
+      raw_version = @version
+      if !raw_version && File.exist?(@version_file)
+        raw_version = IO.read(@version_file).chomp
+      end
+      raw_version = '0.0.1' unless raw_version
+      @logger.debug("Found starting cookbook version: #{raw_version}")
+      raw_version
+    end
+
+    def write_version(version)
+      @logger.debug("Setting cookbook version: #{version}")
+      IO.write(@version_file, version.to_s)
+    end
+  end
+end