daptiv-chef-ci 0.0.15 → 0.1.0

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

@@ -1,29 +1,26 @@
 require 'daptiv-chef-ci/vagrant_up_task'
 require_relative '../shared_contexts/rake'
 
-describe VagrantUp::RakeTask, :unit => true do
+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, environment: {})
 
-      vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200, :environment => {} })
-      
       task = rake['vagrant_up']
-      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(:up)
+        .with(cmd_timeout_in_seconds: 7200, environment: environment)
 
-      environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
-      vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200, :environment => environment })
-      
       task = rake['vagrant_up']
       subject.environment = environment
-      task.invoke()
-
+      task.invoke
     end
   end
-  
 end

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

@@ -1,8 +1,7 @@
 require 'daptiv-chef-ci/virtualbox_driver'
 require 'daptiv-chef-ci/logger'
 
-describe DaptivChefCI::VirtualBoxDriver, :unit => true do
-
+describe DaptivChefCI::VirtualBoxDriver, unit: true do
   describe 'cleanup_vms' do
     it 'should poweroff and unregister all machines with a matching name' do
       boxes = [
@@ -10,22 +9,28 @@ describe DaptivChefCI::VirtualBoxDriver, :unit => true do
         '"aspnet_1379346156" {7bb1bbce-c6cc-47a2-9c51-57ede42e02b5}',
         '"python_1372120178" {c1937a1c-c6c4-4777-88d0-dfa9066fb156}'
       ]
-      @shell = mock()
+      @shell = mock
       @vbox = DaptivChefCI::VirtualBoxDriver.new(@shell)
-      
-      @shell.should_receive(:exec_cmd).with('vboxmanage list runningvms').and_return(boxes)
-      
-      @shell.should_receive(:exec_cmd).with('vboxmanage controlvm "aspnet_1372120179" poweroff').once()
-      @shell.should_receive(:exec_cmd).with('vboxmanage unregistervm "aspnet_1372120179"').once()
-      
-      @shell.should_receive(:exec_cmd).with('vboxmanage controlvm "aspnet_1379346156" poweroff').once()
-      @shell.should_receive(:exec_cmd).with('vboxmanage unregistervm "aspnet_1379346156"').once()
-      
-      @shell.should_receive(:exec_cmd).with('vboxmanage controlvm "python_1372120178" poweroff').never()
-      @shell.should_receive(:exec_cmd).with('vboxmanage unregistervm "python_1372120178"').never()
-      
+
+      @shell.should_receive(:exec_cmd)
+        .with('vboxmanage list runningvms').and_return(boxes)
+
+      @shell.should_receive(:exec_cmd)
+        .with('vboxmanage controlvm "aspnet_1372120179" poweroff').once
+      @shell.should_receive(:exec_cmd)
+        .with('vboxmanage unregistervm "aspnet_1372120179"').once
+
+      @shell.should_receive(:exec_cmd)
+        .with('vboxmanage controlvm "aspnet_1379346156" poweroff').once
+      @shell.should_receive(:exec_cmd)
+        .with('vboxmanage unregistervm "aspnet_1379346156"').once
+
+      @shell.should_receive(:exec_cmd)
+        .with('vboxmanage controlvm "python_1372120178" poweroff').never
+      @shell.should_receive(:exec_cmd)
+        .with('vboxmanage unregistervm "python_1372120178"').never
+
       @vbox.cleanup_vms('aspnet')
     end
   end
-  
 end

data/spec/shared_contexts/rake.rb

@@ -1,17 +1,17 @@
-require "rake"
+require 'rake'
 require 'daptiv-chef-ci/raketask_helper'
 
-shared_context "rake" do
-  let(:rake)           { create_rake_application() }
-  let(:vagrant_driver) { stub() }
-  
+shared_context 'rake' do
+  let(:rake)           { create_rake_application }
+  let(:vagrant_driver) { stub }
+
   # let the errors bubble up normally, don't exit the app
   before { DaptivChefCI::RakeTaskHelpers.exit_on_failure = false }
-  
+
   def create_rake_application
     Rake.application = Rake::Application.new
     subject.vagrant_driver = vagrant_driver
     Rake::Task.define_task(subject)
     Rake.application
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daptiv-chef-ci
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - Shawn Neal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -103,22 +117,20 @@ extra_rdoc_files: []
 files:
 - daptiv-chef-ci.gemspec
 - Gemfile
-- lib/daptiv-chef-ci/basebox_builder_factory.rb
+- lib/daptiv-chef-ci/clone_environment_task.rb
 - lib/daptiv-chef-ci/logger.rb
 - lib/daptiv-chef-ci/raketask_helper.rb
 - lib/daptiv-chef-ci/shell.rb
+- lib/daptiv-chef-ci/upload_cookbook_task.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/version_cookbook_task.rb
 - lib/daptiv-chef-ci/virtualbox_driver.rb
-- lib/daptiv-chef-ci/vmware_basebox_builder.rb
-- pkg/daptiv-chef-ci-0.0.14.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
@@ -126,9 +138,7 @@ files:
 - 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: ''
@@ -155,7 +165,6 @@ signing_key:
 specification_version: 4
 summary: A small gem to reduce Rake duplication
 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
@@ -163,7 +172,5 @@ test_files:
 - 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

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

@@ -1,19 +0,0 @@
-require 'log4r'
-require_relative 'shell'
-require_relative 'vmware_basebox_builder'
-require_relative 'virtualbox_basebox_builder'
-
-module DaptivChefCI
-  
-  # Abstract factory to produce base box builder instances based off the specified provider
-  class BaseBoxBuilderFactory
-    
-    # Creates a new base box builder instance
-    def create(shell, provider, base_dir)
-      provider == :vmware_fusion ?
-        DaptivChefCI::VMwareBaseBoxBuilder.new(base_dir) :
-        DaptivChefCI::VirtualBoxBaseBoxBuilder.new(base_dir, shell)
-    end
-    
-  end
-end

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

@@ -1,33 +0,0 @@
-require 'log4r'
-require 'fileutils'
-require_relative 'shell'
-
-module DaptivChefCI
-  
-  # This class builds VBox Vagrant boxes
-  class VirtualBoxBaseBoxBuilder
-    
-    # Creates a new box builder instance
-    #
-    # @param [String] The full path to the directory where the Vagrantfile exists
-    # of the box we want to package, i.e. /Users/admin/src/dotnetframework
-    # @param [Shell] A shell instance
-    def initialize(base_dir, shell)
-      @shell = shell
-      @base_dir = base_dir
-      @logger = Log4r::Logger.new("daptiv_chef_ci::vmware_base_box_builder")
-    end
-    
-    # Packages a VBox Vagrant box. This can take 15 minutes or so.
-    #
-    # @param [String] base box file name, i.e. 'windows-server-2008.box'
-    def build(box_file)
-      Dir.chdir(@base_dir) {
-        @logger.info("Packaging box #{box_file}")
-        FileUtils.rm(box_file) if File.exists?(box_file)
-        @shell.exec_cmd("vagrant package --output #{box_file}", 3600)
-      }
-    end
-    
-  end
-end

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

@@ -1,103 +0,0 @@
-require 'log4r'
-require 'fileutils'
-require_relative 'shell'
-
-module DaptivChefCI
-  
-  # This class builds VMware Fusion 6 Vagrant boxes on OS X
-  #
-  # NOTE - This class makes a lot of assumptions that hopefully won't break until
-  # after Vagrant natively supports packaging VMware Fusion boxes.
-  class VMwareBaseBoxBuilder
-    
-    # Creates a new box builder instance
-    #
-    # @param [String] The full path to the directory where the Vagrantfile exists
-    # of the box we want to package, i.e. /Users/admin/src/dotnetframework
-    def initialize(base_dir)
-      @base_dir = base_dir
-      @logger = Log4r::Logger.new("daptiv_chef_ci::vmware_base_box_builder")
-    end
-    
-    # Packages a VMware Fusion Vagrant box. This can take 15 minutes or so.
-    #
-    # @param [String] base box file name, i.e. 'windows-server-2008.box'
-    def build(box_file)
-      # /Users/admin/src/mybox/.vagrant/machines/default/vmware_fusion/0f721388-a327-4ba3-b203-c09f69016b43/
-      box_root_path = "#{@base_dir}/.vagrant/machines/default/vmware_fusion"
-      
-      sub_dir = Dir["#{box_root_path}/*/"]
-        .map { |d| File.basename(d) }
-        .find { |d| d =~ /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/ }
-        
-      box_path = "#{box_root_path}/#{sub_dir}"
-      @logger.debug("box_path: #{box_path}")
-      
-      build_box(box_path, box_file)
-    end
-    
-    
-    protected
-    
-    def build_box(box_path, box_file)
-      tar_list_path = "#{box_path}/boxfilelist.txt"
-      completed_box_path = "#{@base_dir}/#{box_file}"
-      
-      @logger.debug("tar_list_path: #{tar_list_path}")
-      @logger.debug("completed_box_path: #{completed_box_path}")
-      
-      Dir.chdir(box_path) {
-        vmdk_file = File.expand_path(Dir.glob("*.vmdk").first())
-  
-        args = [vdiskmanager_path]
-        args << '-d'
-        args << vmdk_file
-        @logger.info("Defragging #{vmdk_file}")
-        system(*args)
-  
-        args = [vdiskmanager_path]
-        args << '-k'
-        args << vmdk_file
-        @logger.info("Shrinking #{vmdk_file}")
-        system(*args)
-        
-        create_json_manifest(box_path)
-        create_tar_manifest(tar_list_path)
-        
-        @logger.info("Packaging box #{box_file}")
-        tar_cmd = "tar -czvf #{box_file} -T #{tar_list_path}"
-        %x[#{tar_cmd}]
-        FileUtils.rm(completed_box_path) if File.exists?(completed_box_path)
-        FileUtils.mv(box_file, completed_box_path)
-      }
- 
-      @logger.info("Done creating box #{completed_box_path}")
-    end
-    
-    def create_tar_manifest(tar_list_path)
-      @logger.debug("Creating manifest #{tar_list_path}")
-      
-      files = Dir.glob("*.{vmdk,nvram,plist,vmsd,vmx,vmxf,json}").join("\n")
-      @logger.debug("Found the following files to pack: #{files}")
-      
-      FileUtils.rm(tar_list_path) if File.exists?(tar_list_path)
-      IO.write(tar_list_path, files)
-    end
-    
-    def create_json_manifest(box_path)
-      json_manifest_path = File.join(box_path, "metadata.json")
-      FileUtils.rm(json_manifest_path) if File.exists?(json_manifest_path)
-      manifest = <<-EOH
-{
-    "provider":"vmware_fusion"
-}
-      EOH
-      IO.write(json_manifest_path, manifest)
-    end
-    
-    def vdiskmanager_path
-      '/Applications/VMware Fusion.app/Contents/Library/vmware-vdiskmanager'
-    end
-    
-  end
-end

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

@@ -1,25 +0,0 @@
-require 'daptiv-chef-ci/basebox_builder_factory'
-require 'daptiv-chef-ci/virtualbox_basebox_builder'
-require 'daptiv-chef-ci/vmware_basebox_builder'
-
-describe DaptivChefCI::BaseBoxBuilderFactory, :unit => true do
-  
-  before(:each) do
-    @shell = stub()
-    @factory = DaptivChefCI::BaseBoxBuilderFactory.new()
-  end
-
-  describe 'create' do
-    
-    it 'should create VMware builder when provider is vmware_fusion' do
-      builder = @factory.create(@shell, :vmware_fusion, Dir.pwd)
-      expect(builder).to be_an_instance_of(DaptivChefCI::VMwareBaseBoxBuilder)
-    end
-    
-    it 'should create VMware builder when provider is virtualbox' do
-      builder = @factory.create(@shell, :virtualbox, Dir.pwd)
-      expect(builder).to be_an_instance_of(DaptivChefCI::VirtualBoxBaseBoxBuilder)
-    end
-    
-  end
-end

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

@@ -1,20 +0,0 @@
-require 'daptiv-chef-ci/virtualbox_basebox_builder'
-require 'daptiv-chef-ci/logger'
-
-describe DaptivChefCI::VirtualBoxBaseBoxBuilder, :integration => true do
-
-  #Note- This test requires you have
-  # 1. the dotnetframework cookbook cloned to ~/src/dotnetframework
-  # 2. From ~/src/dotnetframework previously ran: vagrant up
-  # 3. vagrant halt
-
-  describe 'build' do
-    it 'should build a VBox Vagrant base box' do
-      base_dir = "#{ENV['HOME']}/src/dotnetframework"
-      builder = DaptivChefCI::VirtualBoxBaseBoxBuilder.new(base_dir, DaptivChefCI::Shell.new())
-      builder.build('dotnettest-vbox.box')
-      expect(File.exists?("#{base_dir}/dotnettest-vbox.box"))
-    end
-  end
-  
-end

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

@@ -1,20 +0,0 @@
-require 'daptiv-chef-ci/vmware_basebox_builder'
-require 'daptiv-chef-ci/logger'
-
-describe DaptivChefCI::VMwareBaseBoxBuilder, :integration => true do
-
-  #Note- This test requires you have
-  # 1. the dotnetframework cookbook cloned to ~/src/dotnetframework
-  # 2. From ~/src/dotnetframework previously ran: vagrant up --provider vmware_fusion
-  # 3. vagrant halt
-
-  describe 'build' do
-    it 'should build a VMware Vagrant base box' do
-      base_dir = "#{ENV['HOME']}/src/dotnetframework"
-      builder = DaptivChefCI::VMwareBaseBoxBuilder.new(base_dir)
-      builder.build('dotnettest-vmware.box')
-      expect(File.exists?("#{base_dir}/dotnettest-vmware.box"))
-    end
-  end
-  
-end