daptiv-chef-ci 0.0.15 → 0.1.0

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

@@ -2,16 +2,17 @@ require 'log4r'
 require_relative 'shell'
 
 module DaptivChefCI
+  # Wrapper around VBox CLI for VM cleanup
+  # Currently unused
   class VirtualBoxDriver
-    
     def initialize(shell)
-      @logger = Log4r::Logger.new("daptiv_chef_ci::virtual_box")
+      @logger = Log4r::Logger.new('daptiv_chef_ci::virtual_box')
       @shell = shell
     end
-    
+
     # Remove any running vms that have the same name as this box
     def cleanup_vms(box_name)
-      list_all_running_vms().each do |vm|
+      list_all_running_vms.each do |vm|
         if vm.include?(box_name)
           machine_name = vm.split[0]
           @logger.debug("Found matching VBox #{machine_name} - Running")
@@ -22,10 +23,9 @@ module DaptivChefCI
         end
       end
     end
-    
-    
-    private 
-    
+
+    private
+
     # Power off the named virtual box
     def poweroff(machine_name)
       @logger.info("Powering off VM: #{machine_name}")
@@ -39,10 +39,9 @@ module DaptivChefCI
     end
 
     # Get a list of running vms
-    def list_all_running_vms()
-      @logger.info("List running VMs")
+    def list_all_running_vms
+      @logger.info('List running VMs')
       @shell.exec_cmd('vboxmanage list runningvms') || ''
     end
-    
   end
-end
+end

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

@@ -1,40 +1,36 @@
 require 'daptiv-chef-ci/logger'
 require 'log4r'
 
-describe DaptivChefCI::Logger, :unit => true do
-
+describe DaptivChefCI::Logger, unit: true do
   describe 'init' do
-    
     # get logging level before running any of these tests
     before(:all) do
       @chef_ci_log = ENV['CHEF_CI_LOG']
     end
-    
+
     # reset logging back to starting state before this fixture
     after(:all) do
       ENV['CHEF_CI_LOG'] = @chef_ci_log
-      DaptivChefCI::Logger.init()
+      DaptivChefCI::Logger.init
     end
-    
+
     # reset logging back to default state before every test
     before(:each) do
       ENV['CHEF_CI_LOG'] = ''
-      DaptivChefCI::Logger.init()
+      DaptivChefCI::Logger.init
     end
-    
+
     it 'should initialize logging to info by default' do
-      DaptivChefCI::Logger.init()
-      logger = Log4r::Logger.new("daptiv_chef_ci::logger_spec")
+      DaptivChefCI::Logger.init
+      logger = Log4r::Logger.new('daptiv_chef_ci::logger_spec')
       expect(logger.level).to eq(2)
     end
-    
+
     it 'should initialize logging to the specified level' do
       ENV['CHEF_CI_LOG'] = 'DEBUG'
-      DaptivChefCI::Logger.init()
-      logger = Log4r::Logger.new("daptiv_chef_ci::logger_spec")
+      DaptivChefCI::Logger.init
+      logger = Log4r::Logger.new('daptiv_chef_ci::logger_spec')
       expect(logger.level).to eq(1)
     end
-    
   end
-
 end

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

@@ -3,46 +3,46 @@ require 'daptiv-chef-ci/logger'
 require 'mixlib/shellout/exceptions'
 require 'bundler'
 
-describe DaptivChefCI::Shell, :unit => true do
-
+describe DaptivChefCI::Shell, unit: true do
   describe 'exec_cmd' do
-    
     it 'should split output by line' do
-      shell = DaptivChefCI::Shell.new()
+      shell = DaptivChefCI::Shell.new
       out = shell.exec_cmd('ls -l')
       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)
+      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()
+      shell = DaptivChefCI::Shell.new
       shell.exec_cmd('ls -l')
       expect(ENV['PATH']).to eq(path_before)
     end
-    
+
     it 'should pass long environment vars' do
-      shell = DaptivChefCI::Shell.new()
-      out = shell.exec_cmd('echo $ENV_VAR1', 600, { 'ENV_VAR1' => 'val1' })
+      shell = DaptivChefCI::Shell.new
+      out = shell.exec_cmd('echo $ENV_VAR1', 600, 'ENV_VAR1' => 'val1')
       expect(out[0]).to eq('val1')
     end
-    
+
     it 'should convert environment symbol keys to strings' do
-      shell = DaptivChefCI::Shell.new()
-      out = shell.exec_cmd('echo $ENV_VAR1', 600, { :ENV_VAR1 => 'val1' })
+      shell = DaptivChefCI::Shell.new
+      out = shell.exec_cmd('echo $ENV_VAR1', 600, ENV_VAR1: 'val1')
       expect(out[0]).to eq('val1')
     end
 
     it 'should default LC_ALL environment var to nil' do
-      # On TravisCI (Linux) this ENV var is set to en_US.UTF-8, on OS X it is nil
+      # On TravisCI (Linux) this ENV var is set to en_US.UTF-8,
+      # on OS X it is nil
       original_lc_all = ENV['LC_ALL']
       ENV.delete('LC_ALL') if original_lc_all
 
-      shell = DaptivChefCI::Shell.new()
+      shell = DaptivChefCI::Shell.new
       out = shell.exec_cmd('echo $LC_ALL', 600)
       expect(out[0]).to be nil
 
@@ -50,22 +50,18 @@ describe DaptivChefCI::Shell, :unit => true do
     end
 
     it 'should allow override of LC_ALL environment var' do
-      shell = DaptivChefCI::Shell.new()
-      out = shell.exec_cmd('echo $LC_ALL', 600, { :LC_ALL => 'en_US.UTF-8' })
+      shell = DaptivChefCI::Shell.new
+      out = shell.exec_cmd('echo $LC_ALL', 600, LC_ALL: 'en_US.UTF-8')
       expect(out[0]).to eq('en_US.UTF-8')
     end
-    
   end
-  
+
   describe 'path_without_gem_dir' do
-    
     it 'should not be prefixed by the system gem dir' do
-      shell = DaptivChefCI::Shell.new()
-      path = shell.path_without_gem_dir()
-      expect(path).not_to include(Bundler.bundle_path.to_s() + ':')
+      shell = DaptivChefCI::Shell.new
+      path = shell.path_without_gem_dir
+      expect(path).not_to include(Bundler.bundle_path.to_s + ':')
       expect(ENV['PATH']).to include(path)
     end
-    
   end
-  
 end

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

@@ -1,18 +1,16 @@
 require 'daptiv-chef-ci/vagrant_destroy_task'
 require_relative '../shared_contexts/rake'
 
-describe VagrantDestroy::RakeTask, :unit => true do
+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, :environment => {} })
-      
+      vagrant_driver.should_receive(:destroy).with(
+        cmd_timeout_in_seconds: 180,
+        environment: {})
       task = rake['vagrant_destroy']
-      task.invoke()
-
+      task.invoke
     end
   end
-  
 end

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

@@ -2,113 +2,75 @@ require 'mixlib/shellout/exceptions'
 require 'daptiv-chef-ci/vagrant_driver'
 require 'daptiv-chef-ci/logger'
 
-describe DaptivChefCI::VagrantDriver, :unit => true do
-  
+describe DaptivChefCI::VagrantDriver, unit: true do
   before(:each) do
-    @shell = mock()
-    @basebox_builder_factory = stub()
-    @vagrant = DaptivChefCI::VagrantDriver.new(:virtualbox, @shell, @basebox_builder_factory)
+    @shell = mock
+    @vagrant = DaptivChefCI::VagrantDriver.new(:virtualbox, @shell)
   end
 
   describe 'destroy' do
     it 'should force shutdown vagrant with a timeout of 180 seconds' do
       @shell.should_receive(:exec_cmd).with('vagrant destroy -f', 180, {})
-      @vagrant.destroy()
+      @vagrant.destroy
     end
   end
-  
+
   describe 'halt' do
     it 'should halt vagrant with a timeout of 180 seconds' do
       @shell.should_receive(:exec_cmd).with('vagrant halt', 180, {})
-      @vagrant.halt()
+      @vagrant.halt
     end
-    
+
     it 'should retry when exec fails' do
-      @shell.should_receive(:exec_cmd).and_raise(Mixlib::ShellOut::ShellCommandFailed)
+      @shell.should_receive(:exec_cmd)
+        .and_raise(Mixlib::ShellOut::ShellCommandFailed)
       @shell.should_receive(:exec_cmd).and_return('success')
       # shell cmd fails then succeeds, the vagrant.halt should succeed overall
-      @vagrant.halt({ :retry_wait_in_seconds => 0 })
+      @vagrant.halt(retry_wait_in_seconds: 0)
     end
-    
+
     it 'should fail after retrying twice' do
       # shell always fails, vagrant.halt should fail after a couple retries
-      @shell.should_receive(:exec_cmd).exactly(3).times.and_raise(Mixlib::ShellOut::ShellCommandFailed)
-      expect { @vagrant.halt({ :retry_wait_in_seconds => 0 }) }.to raise_error(Mixlib::ShellOut::ShellCommandFailed)
+      @shell.should_receive(:exec_cmd)
+        .exactly(3).times.and_raise(Mixlib::ShellOut::ShellCommandFailed)
+      expect { @vagrant.halt(retry_wait_in_seconds: 0) }
+        .to raise_error(Mixlib::ShellOut::ShellCommandFailed)
     end
   end
-  
+
   describe 'up' do
     it 'should up vagrant with a timeout of 7200 seconds' do
-      @shell.should_receive(:exec_cmd).with('vagrant up', 7200, {})
-      @vagrant.up()
+      @shell.should_receive(:exec_cmd).with(
+        'vagrant up --provider=virtualbox', 7200, {})
+      @vagrant.up
     end
 
     it 'should up vagrant and specify the provider if not virtualbox' do
-      @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()
+      @vagrant = DaptivChefCI::VagrantDriver.new(:my_custom_provider, @shell)
+      @shell.should_receive(:exec_cmd).with(
+        'vagrant up --provider=my_custom_provider', 7200, {})
+      @vagrant.up
     end
-    
+
     it 'should pass along environment variables' do
-      environment = { :A => 'A' }
-      @shell.should_receive(:exec_cmd).with('vagrant up', 7200, environment)
-      @vagrant.up({ :environment => environment })
+      environment = { A: 'A' }
+      @shell.should_receive(:exec_cmd)
+        .with('vagrant up --provider=virtualbox', 7200, environment)
+      @vagrant.up(environment: environment)
     end
   end
 
   describe 'provision' do
     it 'should provision vagrant with a timeout of 7200 seconds' do
       @shell.should_receive(:exec_cmd).with('vagrant provision', 7200, {})
-      @vagrant.provision()
-    end
-    
-    it 'should pass along environment variables' do
-      environment = { :A => 'A' }
-      @shell.should_receive(:exec_cmd).with('vagrant provision', 7200, environment)
-      @vagrant.provision({ :environment => environment })
-    end
-  end
-  
-  describe 'reload' do
-    it 'should reload vagrant with a timeout of 180 seconds' do
-      @shell.should_receive(:exec_cmd).with('vagrant reload', 180, {})
-      @vagrant.reload()
-    end
-  end
-  
-  describe 'package' do
-    it 'should default to virtualbox and base_dir to current working dir' do
-      builder = double('builder').as_null_object
-      @basebox_builder_factory.should_receive(:create).with(@shell, :virtualbox, Dir.pwd).and_return(builder)
-      @vagrant.package()
+      @vagrant.provision
     end
 
-    it 'should use the specified provider' do
-      builder = double('builder').as_null_object
-      @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
-
-    it 'should use the specified base_dir' do
-      builder = double('builder').as_null_object
-      @basebox_builder_factory.should_receive(:create).with(@shell, :virtualbox, '/Users/admin/mybox').and_return(builder)
-      @vagrant.package({ :base_dir => '/Users/admin/mybox' })
-    end
-
-    it 'should default box_name to directory name' do
-      builder = mock('builder')
-      builder.should_receive(:build).with('mybox.box')
-      @basebox_builder_factory.stub(:create).and_return(builder)
-      @vagrant.package({ :base_dir => '/Users/admin/mybox' })
-    end
-
-    it 'should ensure box name ends with .box' do
-      builder = mock('builder')
-      builder.should_receive(:build).with('mybox.box')
-      @basebox_builder_factory.stub(:create).and_return(builder)
-      @vagrant.package({ :box_name => 'mybox' })
+    it 'should pass along environment variables' do
+      environment = { A: 'A' }
+      @shell.should_receive(:exec_cmd)
+        .with('vagrant provision', 7200, environment)
+      @vagrant.provision(environment: environment)
     end
   end
-  
 end

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

@@ -1,29 +1,25 @@
 require 'daptiv-chef-ci/vagrant_provision_task'
 require_relative '../shared_contexts/rake'
 
-describe VagrantProvision::RakeTask, :unit => true do
+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, :environment => {} })
-      
+      vagrant_driver.should_receive(:provision)
+        .with(cmd_timeout_in_seconds: 7200, environment: {})
       task = rake['vagrant_provision']
-      task.invoke()
-
+      task.invoke
     end
-    
+
     it 'should up the box with the specified environment vars' do
+      environment = { ENV_VAR1: 'val1', ENV_VAR2: 'val2' }
+      vagrant_driver.should_receive(:provision)
+        .with(cmd_timeout_in_seconds: 7200, environment: environment)
 
-      environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
-      vagrant_driver.should_receive(:provision).with({ :cmd_timeout_in_seconds => 7200, :environment => environment })
-      
       task = rake['vagrant_provision']
       subject.environment = environment
-      task.invoke()
-
+      task.invoke
     end
   end
-  
 end

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

@@ -1,37 +1,45 @@
 require 'daptiv-chef-ci/vagrant_task'
 require_relative '../shared_contexts/rake'
 
-describe Vagrant::RakeTask, :unit => true do
+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, :environment => {} })
-      vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200, :environment => {} })
-      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2, :environment => {} })
-      
-      task = rake['vagrant']
-      task.invoke()
+      vagrant_driver.should_receive(:destroy).with(
+        cmd_timeout_in_seconds: 180,
+        retry_attempts: 0,
+        environment: {})
+      vagrant_driver.should_receive(:up).with(
+        cmd_timeout_in_seconds: 7200,
+        environment: {})
+      vagrant_driver.should_receive(:destroy).with(
+        cmd_timeout_in_seconds: 180,
+        retry_attempts: 2,
+        environment: {})
 
+      task = rake['vagrant']
+      task.invoke
     end
-    
+
     it 'should up the box with the specified environment vars' do
+      environment = { ENV_VAR1: 'val1', ENV_VAR2: 'val2' }
+
+      vagrant_driver.should_receive(:destroy).with(
+        cmd_timeout_in_seconds: 180,
+        retry_attempts: 0,
+        environment: environment)
+      vagrant_driver.should_receive(:up).with(
+        cmd_timeout_in_seconds: 7200,
+        environment: environment)
+      vagrant_driver.should_receive(:destroy).with(
+        cmd_timeout_in_seconds: 180,
+        retry_attempts: 2,
+        environment: environment)
 
-      environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
-      
-      vagrant_driver.should_receive(:destroy).with({
-        :cmd_timeout_in_seconds => 180, :retry_attempts => 2, :environment => environment })
-      vagrant_driver.should_receive(:up).with({
-        :cmd_timeout_in_seconds => 7200, :environment => environment })
-      vagrant_driver.should_receive(:destroy).with({
-        :cmd_timeout_in_seconds => 180, :retry_attempts => 2, :environment => environment })
-      
       task = rake['vagrant']
       subject.environment = environment
-      task.invoke()
-
+      task.invoke
     end
   end
-  
 end