daptiv-chef-ci 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829ea781a4a70546ff1b3ec4b548c30567bb6344
-  data.tar.gz: 56e8f9b1dda7737427467d842b06e9b6543eea85
+  metadata.gz: cfeeac6ae1094f6d486f92af9fca0fc1a1915ec9
+  data.tar.gz: 489147267747924a25c9e1f6e350881f01996a35
 SHA512:
-  metadata.gz: 7e2b012c9f7dacb4e49165af23db194dd201ed1c50e89e37cdb0dac6955f80cdb28f476d9c7af7d66b78cf5a696046ae901ab5a14f97a07b12ced9ab0f1656d7
-  data.tar.gz: 5f72fd850b5d95a72184d84f1904d2605a6456c1a38763fffda62683b29adb2eb695801c1399f8a84258199dd22a56b5feaaea834cdfcf892940fed085581287
+  metadata.gz: 5707f54b532a6299e7f446add8ceaef337840207d337190cd8a7c9772e7e87362cbf922ee7f92342506d015459fa9d30f9601def5dee61ba93d1d8450eb5374b
+  data.tar.gz: 41db757953a4c6ce7100eff2217719354d71667763367b4969acb1d87e344f904c56ac0e7bd98759f1358c514df8d146ac37bb8d5e6f82be7ab213089f5b4b0f

data/daptiv-chef-ci.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Shawn Neal"]
-  gem.email         = ["sneal@daptiv.com"]
-  gem.description   = %q{Vagrant automation for CI}
-  gem.summary       = %q{A small gem to reduce Rake duplication}
-  gem.homepage      = ""
+  gem.authors       = ['Shawn Neal']
+  gem.email         = ['sneal@daptiv.com']
+  gem.description   = 'Vagrant automation for CI'
+  gem.summary       = 'A small gem to reduce Rake duplication'
+  gem.homepage      = ''
 
   # The following block of code determines the files that should be included
   # in the gem. It does this by reading all the files in the directory where
@@ -13,9 +13,9 @@ Gem::Specification.new do |gem|
   # Note that the entire gitignore(5) syntax is not supported, specifically
   # the "!" syntax, but it should mostly work correctly.
   root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
-  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, ".gitignore")
+  all_files      = Dir.chdir(root_path) { Dir.glob('**/{*,.*}') }
+  all_files.reject! { |file| ['.', '..'].include?(File.basename(file)) }
+  gitignore_path = File.join(root_path, '.gitignore')
   gitignore      = File.readlines(gitignore_path)
   gitignore.map!    { |line| line.chomp.strip }
   gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
@@ -34,22 +34,23 @@ Gem::Specification.new do |gem|
     #
     gitignore.any? do |ignore|
       File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
+      File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
     end
   end
 
   gem.files         = unignored_files
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "daptiv-chef-ci"
-  gem.require_paths = ["lib"]
-  gem.version       = '0.0.15'
-  
-  gem.add_runtime_dependency "log4r", "~> 1.1.10"
-  gem.add_runtime_dependency "mixlib-shellout", "~> 1.6.0"
+  gem.name          = 'daptiv-chef-ci'
+  gem.require_paths = ['lib']
+  gem.version       = '0.1.0'
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec-core", "~> 2.12.2"
-  gem.add_development_dependency "rspec-expectations", "~> 2.12.1"
-  gem.add_development_dependency "rspec-mocks", "~> 2.12.1"
+  gem.add_runtime_dependency 'log4r', '~> 1.1.10'
+  gem.add_runtime_dependency 'mixlib-shellout', '~> 1.2'
+  gem.add_runtime_dependency 'versionomy', '~> 0.4.4'
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec-core', '~> 2.12.2'
+  gem.add_development_dependency 'rspec-expectations', '~> 2.12.1'
+  gem.add_development_dependency 'rspec-mocks', '~> 2.12.1'
 end

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

@@ -0,0 +1,69 @@
+require 'rake'
+require 'rake/tasklib'
+require 'rake/dsl_definition'
+require 'json'
+require 'tempfile'
+require_relative 'raketask_helper'
+require_relative 'shell'
+
+class CloneEnvironment
+  # Example usage, copies a Chef environment definition to another
+  # environment.
+  #
+  # CloneEnvironment::RakeTask.new do |t|
+  #   t.src_env = 'dev'
+  #   t.dest_env = "vagrant-#{ENV['LOGNAME']}-dotnetframework"
+  # end
+  #
+  # This class lets you define Rake tasks to clone Chef environments.
+  class RakeTask < ::Rake::TaskLib
+    include ::Rake::DSL if defined? ::Rake::DSL
+    include DaptivChefCI::RakeTaskHelpers
+
+    attr_accessor :src_env
+    attr_accessor :dest_env
+
+    # @param [String] name The task name.
+    # @param [String] desc Description of the task.
+    def initialize(name = 'clone_environment', desc = 'Clone environment task')
+      @logger = Log4r::Logger.new('daptiv_chef_ci::clone_environment_task')
+      @shell = DaptivChefCI::Shell.new
+      @name, @desc = name, desc
+      yield self if block_given?
+      define_task
+    end
+
+    private
+
+    def define_task
+      desc @desc
+      task @name do
+        execute do
+          fail 'src_env must be specified' unless @src_env
+          fail 'dest_env must be specified' unless @dest_env
+          clone_environment
+        end
+      end
+    end
+
+    def clone_environment
+      out = @shell.exec_cmd_in_context(
+        "knife environment show #{@src_env} -F json").join(' ')
+
+      env = JSON.parse(out)
+      env['name'] = @dest_env
+      env['description'] = "The #{dest_env} environment"
+
+      env_file = Tempfile.new([@dest_env, '.json'])
+      begin
+        IO.write(env_file.path, JSON.pretty_generate(env))
+
+        @shell.exec_cmd_in_context(
+          "knife environment from file '#{env_file.path}'")
+      ensure
+        env_file.close
+        env_file.unlink
+      end
+    end
+  end
+end

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

@@ -1,35 +1,34 @@
 module DaptivChefCI
+  # Chef CI logger class
   class Logger
-
     # Initializes and enables logging to the given environments level
     # By default logging only occurs at ERROR level or higher.
     # Set CHEF_CI_LOG env var to change logging levels
-    def self.init()
+    def self.init
       require 'log4r'
-      
+
       # Set the logging level on all "chef-ci" namespaced
       # logs as long as we have a valid level.
-      logger = Log4r::Logger.new("daptiv_chef_ci")
+      logger = Log4r::Logger.new('daptiv_chef_ci')
       logger.outputters = Log4r::Outputter.stderr
-      logger.level = log_level()
+      logger.level = log_level
       logger = nil
     end
-    
+
     # LogLevels = ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL']
     # DEBUG = 1
     # INFO = 2
     # WARN = 3
     # ERROR = 4
     # FATAL = 5
-    def self.log_level()
-      level = ENV['CHEF_CI_LOG'].upcase().to_s()
+    def self.log_level
+      level = ENV['CHEF_CI_LOG'].upcase.to_s
       level_i = Log4r::Log4rConfig::LogLevels.index(level)
       level_i + 1
     rescue
       return 2 # info
     end
-    
   end
 end
 
-DaptivChefCI::Logger.init()
+DaptivChefCI::Logger.init

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

@@ -1,17 +1,17 @@
 module DaptivChefCI
   module RakeTaskHelpers
     extend self
-    
+
     @@exit_on_failure = true
-    
+
     def exit_on_failure
       @@exit_on_failure
     end
-    
+
     def exit_on_failure=(exit_on_failure)
       @@exit_on_failure = exit_on_failure
     end
-    
+
     def execute(&block)
       begin
         block.call()
@@ -31,6 +31,5 @@ module DaptivChefCI
         end
       end
     end
-    
   end
-end
+end

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

@@ -3,61 +3,83 @@ require 'bundler'
 require 'mixlib/shellout'
 
 module DaptivChefCI
+  # Command shell wrapper
   class Shell
-    
-    def initialize()
-      @logger = Log4r::Logger.new("daptiv_chef_ci::shell")
+    def initialize
+      @logger = Log4r::Logger.new('daptiv_chef_ci::shell')
     end
-    
+
     # Executes the specified shell command and returns the stdout.
     #
     # This method ensure that any invoked command use the same PATH environment
     # that the user has outside Ruby/Bundler.
     #
     # @param [String] The command line to execute
-    # @param [Int] The number of seconds to wait for the command to finish, defaults to 600
-    # @param [Hash] Key value pairs of environment variables to pass to the command's environment.
+    # @param [Int] The number of seconds to wait for the command to finish,
+    # defaults to 600
+    # @param [Hash] Key value pairs of environment variables to pass to the
+    # command's environment.
     # @return [Array] Each entry represents a line from the stdout
-    def exec_cmd(command, timeout = nil, environment = {})
+    def exec_cmd_in_context(command, timeout = nil, environment = {})
       timeout ||= 600
       environment = Hash[ environment.map{ |k, v| [k.to_s, v.to_s] } ]
-      environment['LC_ALL'] = ENV['LC_ALL'] if !environment.has_key?('LC_ALL')
+      environment['LC_ALL'] = ENV['LC_ALL'] unless environment.key?('LC_ALL')
+
+      @logger.info("Executing: '#{command}'")
+      @logger.debug("\n\ttimeout: #{timeout}\n\tenvironment: #{environment}")
+
+      shell_out = Mixlib::ShellOut.new(
+        command, timeout: timeout, environment: environment)
+      shell_out.live_stream = STDOUT
+
+      shell_out.run_command
+      shell_out.invalid! if shell_out.exitstatus != 0
+      @logger.info(shell_out.stdout)
+      shell_out.stdout.split("\n")
+    end
+
+    # Executes the specified shell command and returns the stdout.
+    #
+    # This method ensure that any invoked command use the same PATH environment
+    # that the user has outside Ruby/Bundler.
+    #
+    # @param [String] The command line to execute
+    # @param [Int] The number of seconds to wait for the command to finish,
+    # defaults to 600
+    # @param [Hash] Key value pairs of environment variables to pass to the
+    # command's environment.
+    # @return [Array] Each entry represents a line from the stdout
+    def exec_cmd(command, timeout = nil, environment = {})
       path_at_start = ENV['PATH']
       begin
-        ENV['PATH'] = path_without_gem_dir()
-        @logger.debug("Temporarily setting PATH: #{ENV['PATH']}")
-        
-        @logger.info("Executing: '#{command}'\n\ttimeout: #{timeout}\n\tenvironment: #{environment}")
-        shell_out = Mixlib::ShellOut.new(command, :timeout => timeout, :environment => environment)
-        shell_out.run_command()
-        shell_out.invalid! if shell_out.exitstatus != 0
-        
-        @logger.info(shell_out.stdout)
-        shell_out.stdout.split("\n")
+        ENV['PATH'] = path_without_gem_dir
+        @logger.debug("Setting PATH: #{ENV['PATH']}")
+        exec_cmd_in_context(command, timeout, environment)
       ensure
         @logger.debug("Resetting PATH: #{path_at_start}")
         ENV['PATH'] = path_at_start
       end
     end
-    
+
     # Returns the PATH environment variable as it was before Bundler prepended
     # the system gem directory to it.
     #
-    # This can happen if the user has invoked "require 'bundler/setup'" somewhere,
-    # like in this gems Rakefile.
+    # This can happen if the user has invoked "require 'bundler/setup'"
+    # somewhere, like in this gems Rakefile.
     #
-    # This is needed because sometimes a user will have the Vagrant gem installed
-    # on their system and we don't want to use it, we should use the one that's in
-    # their PATH as if they invoked vagrant themselves (i.e. the installed version)
+    # This is needed because sometimes a user will have the Vagrant gem
+    # installed on their system and we don't want to use it, we should use the
+    # one that's in their PATH as if they invoked vagrant themselves
+    # (i.e. the installed version)
     #
-    # @return [String] The ENV['PATH] without the Bundler system gem dir prepended
+    # @return [String] The ENV['PATH] without the Bundler system gem dir
+    # prepended
     def path_without_gem_dir
       paths = ENV['PATH'].split(':')
       system_gem_dir = "#{Bundler.bundle_path}/bin"
       @logger.debug("System gem dir: #{system_gem_dir}")
-      paths.delete_if { |p| p.downcase() == system_gem_dir.downcase() }
+      paths.delete_if { |p| p.downcase == system_gem_dir.downcase }
       paths.join(':')
     end
-    
   end
-end
+end

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

@@ -0,0 +1,62 @@
+require 'rake'
+require 'rake/tasklib'
+require 'rake/dsl_definition'
+require_relative 'raketask_helper'
+require_relative 'shell'
+
+class UploadCookbook
+  # Example usage, uploads the current cookbook to the Chef server freezing
+  # it to the Canary environment.
+  #
+  # UploadCookbook::RakeTask.new do |t|
+  #   t.environment = 'canary'
+  #   t.freeze = true
+  # end
+  #
+  # This class lets you define Rake tasks to upload cookbooks to Chef.
+  class RakeTask < ::Rake::TaskLib
+    include ::Rake::DSL if defined? ::Rake::DSL
+    include DaptivChefCI::RakeTaskHelpers
+
+    attr_accessor :environment
+    attr_accessor :freeze
+
+    # @param [String] name The task name.
+    # @param [String] desc Description of the task.
+    def initialize(name = 'upload_cookbook', desc = 'Upload cookbook task')
+      @logger = Log4r::Logger.new('daptiv_chef_ci::upload_cookbook_task')
+      @shell = DaptivChefCI::Shell.new
+      @name, @desc = name, desc
+      @freeze = false
+      yield self if block_given?
+      define_task
+    end
+
+    private
+
+    def define_task
+      desc @desc
+      task @name do
+        execute do
+          upload_cookbook
+        end
+      end
+    end
+
+    def upload_cookbook
+      cmd = "knife cookbook upload #{cookbook_name} -o ../"
+      cmd << " -E #{environment}" if @environment
+      @shell.exec_cmd_in_context(cmd)
+    end
+
+    def cookbook_name
+      unless @cookbook_name
+        metadata = IO.read(File.join(Dir.pwd, 'metadata.rb'))
+        @cookbook_name = /name\s+['|"](\w+)/.match(metadata)[1]
+        fail 'Cannot find cookbook name in metadata.rb' unless @cookbook_name
+        @logger.debug("found cookbook name: #{@cookbook_name}")
+      end
+      @cookbook_name
+    end
+  end
+end

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

@@ -6,7 +6,6 @@ require_relative 'raketask_helper'
 require_relative 'logger'
 
 class VagrantDestroy
-  
   # Example usage, destroys a Vagrant box.
   #
   # VagrantUp::RakeTask.new 'up' do |t|
@@ -17,11 +16,11 @@ class VagrantDestroy
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined? ::Rake::DSL
     include DaptivChefCI::RakeTaskHelpers
-    
+
     attr_accessor :vagrant_driver
     attr_accessor :destroy_timeout_in_seconds
     attr_accessor :environment
-    
+
     # @param [String] name The task name.
     # @param [String] desc Description of the task.
     def initialize(name = 'vagrant_destroy', desc = 'Vagrant destroy task')
@@ -31,22 +30,22 @@ class VagrantDestroy
       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,
-          :environment => @environment }) }
+        execute do
+          vagrant_driver.destroy(
+          cmd_timeout_in_seconds: @destroy_timeout_in_seconds,
+          environment: @environment)
+        end
       end
     end
-    
-    def vagrant_driver()
-      @vagrant_driver ||= DaptivChefCI::VagrantDriver.new()
-    end
 
+    def vagrant_driver
+      @vagrant_driver ||= DaptivChefCI::VagrantDriver.new
+    end
   end
 end
-