ops_build 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abd14ce613f0f247e14d4929e61873cf070328be
-  data.tar.gz: 7f8304798ab543df0fa83f84e03f8a59907593cc
+  metadata.gz: 75752053b417d9c74d7d2ab6bd2072f2847d403a
+  data.tar.gz: 68b39a5adbc7ba53c8e548ab18449db28eecf9b5
 SHA512:
-  metadata.gz: 2e9763210ba906274add19441068dc6e2a461bf48dee209f142c9efd8f9128041f8a1f170ebe750458e95be536f43e3a9924ef5de6ab18822c8a7e62289f0d94
-  data.tar.gz: 78a1fc713225188114e3a9d3d81119aa04ddd40f31b4e42124bbb5e270b809d21c776d14eccb813da32ade6b9b7736e5ce139164d60872e1b59522148729a04f
+  metadata.gz: c174cf62071c344e2feab44acc79dbb8ce9972caefc6df2007a9fbde4cc03f981d050d58ca3d7a2d294056cd8c8038d9a33bcfebe147cc22f72d64b0fc1f555d
+  data.tar.gz: 86cbdcf58832e01d8a2d9beb17cf5f1f1a7a2e94af87c35bbc5e76aa8490bfb1e06e30666ad651e801944b7291261daf8c50089d45a05867a266ea7bc99e32d9

data/.gitignore

@@ -1,3 +1,6 @@
+# Rubymine project files
+.idea/
+
 *.gem
 *.rbc
 .bundle

data/Gemfile

@@ -1,5 +1,4 @@
+source 'https://rubygems.org'
 
-source "https://rubygems.org"
-
-gem 'rake'
-gem 'erubis'
+gem 'rake', '~> 10.4.2'
+gem 'thor', '~> 0.19.1'

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/TODO

@@ -0,0 +1 @@
+- process manager? (when opsbuild is interrupted, packer build process continues ... )

data/bin/opsbuild

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'ops_build'
-
-OpsBuilder.start(ARGV)
-
+require File.dirname(__FILE__) + '/../lib/ops_build'
 
+OpsBuild::Runner.start(ARGV)

data/lib/ops_build/aws.rb

@@ -2,7 +2,7 @@
 # AWS management class
 #
 module OpsBuild
-  class AwsSupport
+  class Aws
     def aws_get_account_id
       ENV['AWS_ACCOUNT_ID']
     end

data/lib/ops_build/berkshelf.rb

@@ -2,45 +2,36 @@
 # Berkshelf management class
 #
 module OpsBuild
-  class BerkshelfSupport
-    attr_accessor :berkshelf_dir, :berkshelf_opts
+  class Berkshelf
+    attr_reader :dir, :opts
 
-    def initialize(berks_dir=nil, silent=true)
-      unless system("berks version -q")
-        puts(">>> Berks not installed !")
-        exit(1)
-      end
+    def initialize(dir: nil, silent: true)
+      Validations::check_binary!('berks')
 
-      if @berks_dir.nil?
-        # Create temporary directory for packer/docker communication
-        @berkshelf_dir = Dir::tmpdir+"/"+Dir::Tmpname.make_tmpname('berks', nil)
-      else
-        @berkshelf_dir = berks_dir
-      end
+      @dir = dir || Dir.mktmpdir('berks')
+      @opts = ''
 
-      if silent
-        @berkshelf_opts = '-q'
-      else
-        @berkshelf_opts = ''
-      end
+      @opts << '-q' if silent
     end
 
     #
     # Run berks vendor
-    def berks_vendor()
-      system("berks vendor #{@berkshelf_opts} #{@berkshelf_dir}")
+    def vendor
+      OpsBuild.logger.info("Vendoring cookbooks with berks to #{@dir}")
+      Utils::execute("berks vendor #{@opts} #{@dir}", log_prefix: 'berks:')
     end
 
     #
     # Run berks install
-    def berks_install
-      system("berks install #{@berkshelf_opts}")
+    def install
+      OpsBuild.logger.info('Installing cookbooks with berks')
+      Utils::execute("berks install #{@opts}", log_prefix: 'berks:')
     end
 
     #
     # Cleanup Berks directory
-    def berks_cleanup()
-      FileUtils.rm_rf(@berkshelf_dir)
+    def cleanup
+      FileUtils.rm_rf(@dir)
     end
   end
 end

data/lib/ops_build/chefspec.rb

@@ -2,7 +2,7 @@
 # Chefspec management class
 #
 module OpsBuild
-  class ChefspecSupport
+  class Chefspec
 
   end
 end

data/lib/ops_build/commands/build.rb

@@ -0,0 +1,69 @@
+module OpsBuild
+  module Commands
+    class Build < Thor
+      def self.shared_options
+        option :ec2_region, type: :string, aliases: '-R', desc: 'AWS EC2 region', default: 'us-east-1'
+        option :aws_access, type: :string, aliases: '-A', desc: 'AWS Access key'
+        option :aws_secret, type: :string, aliases: '-S', desc: 'AWS Secret key'
+      end
+
+      desc 'packer TEMPLATE', 'build packer template'
+      shared_options
+      option :berk_dir,   type: :string, aliases: '-b', desc: 'Berkshelf cookbook directory path'
+      def packer(template)
+        packer = Packer.new
+        berkshelf = Berkshelf.new(dir: options[:berk_dir], silent: false)
+        # aws = Aws.new
+
+        OpsBuild.logger.info("Building VM using packer from template #{template}")
+
+        # aws_access_key = options[:aws_access] || aws.aws_get_access_key
+        # aws_secret_key = options[:aws_secret] || aws.aws_get_secret_key
+        # aws_region = options[:ec2_region] || aws.aws_get_ec2_region
+
+        aws_access_key = options[:aws_access] || ENV['AWS_ACCESS_KEY']
+        aws_secret_key = options[:aws_secret] || ENV['AWS_SECRET_KEY']
+        aws_region     = options[:ec2_region] || ENV['AWS_EC2_REGION']
+
+        # Validations::not_empty!(aws_access_key, :aws_access)
+        # Validations::not_empty!(aws_secret_key, :aws_secret)
+        # Validations::not_empty!(aws_region, :ec2_region)
+
+        # Add some config variables
+        packer.add_user_variable(:aws_access_key, aws_access_key) if aws_access_key
+        packer.add_user_variable(:aws_secret_key, aws_secret_key) if aws_secret_key
+        packer.add_user_variable(:aws_region, aws_region) if aws_region
+        packer.add_user_variable(:cookbook_path, berkshelf.dir)
+
+        begin
+          # Install missing cookbooks
+          berkshelf.install
+
+          # Load cookbooks to correct dir.
+          berkshelf.vendor
+
+          # Validate packer template
+          packer.validate(template)
+
+          # Run packer
+          packer.build(template)
+
+          packer.get_ami_id
+        rescue => e
+          OpsBuild.logger.error(e.message)
+          exit(1)
+        ensure
+          OpsBuild.logger.info("Cleaning up cookbooks/packer files from system.")
+          berkshelf.cleanup
+          packer.cleanup
+        end
+      end
+
+      desc 'vagrant TEMPLATE', 'build vagrant box'
+      shared_options
+      def vagrant(template)
+        # TODO
+      end
+    end
+  end
+end

data/lib/ops_build/commands/kitchen.rb

@@ -0,0 +1,23 @@
+module OpsBuild
+  module Commands
+    class Kitchen < Thor
+      desc 'coverage SUITE', 'Run kitchen converge for given suite'
+      def converge_kitchen(suite)
+        kitchen = OpsBuild::Kitchen.new
+        kitchen.kitchen_converge(suite)
+      end
+
+      desc 'verify SUITE', 'Run kitchen verify for given suite'
+      def verify_kitchen(suite)
+        kitchen = OpsBuild::Kitchen.new
+        kitchen.kitchen_verify(suite)
+      end
+
+      desc 'test SUITE', 'Run kitchen test for given platform'
+      def test_kitchen(suite)
+        kitchen = OpsBuild::Kitchen.new
+        kitchen.kitchen_test(suite)
+      end
+    end
+  end
+end

data/lib/ops_build/commands/validate.rb

@@ -0,0 +1,11 @@
+module OpsBuild
+  module Commands
+    class Validate < Thor
+      desc 'packer TEMPLATE', 'validate packer template'
+      def packer(template)
+        packer = OpsBuild::Packer.new
+        packer.packer_validate(template)
+      end
+    end
+  end
+end

data/lib/ops_build/kitchen.rb

@@ -2,7 +2,7 @@
 # Kitchen test management class
 #
 module OpsBuild
-  class KitchenSupport
+  class Kitchen
     def kitchen_converge(suite)
       system("kitchen converge #{suite}")
     end

data/lib/ops_build/packer.rb

@@ -2,24 +2,17 @@
 # Packer management class
 #
 module OpsBuild
-  require 'json'
-  require 'tempfile'
+  class Packer
+    attr_accessor :user_vars, :user_var_file
 
-  class PackerSupport
-    attr_accessor :user_vars, :user_var_file, :packer_log
-
-    def initialize()
+    def initialize
+      Validations::check_binary!('packer')
       @user_vars = {}
-
-      unless system("packer version 1>/dev/null")
-        puts(">>> Packer not installed !")
-        exit(1)
-      end
     end
 
     #
     # Add name/value pair to users_vars hash which is going to be used later for packer var-file
-    def packer_add_user_variable(name, value)
+    def add_user_variable(name, value)
       unless name.nil? and value.nil?
         @user_vars[name] = value
       end
@@ -27,81 +20,45 @@ module OpsBuild
 
     #
     # Run packer build
-    def packer_build(packer_config)
-      packer_options = ""
+    def build(config)
+      options = ''
 
-      packer_create_var_file()
+      create_var_file
 
       unless @user_var_file.nil?
-        puts(">>>> Changing packer build with variables file from: #{@user_var_file.path} ")
-        packer_options = "-machine-readable -var-file #{@user_var_file.path}"
-      end
-
-      if @packer_log.nil?
-        packer_create_log_file()
-        puts(">>>> Using file #{@packer_log.path} as log file.")
-      end
-
-      unless system("packer build #{packer_options} #{packer_config} | tee -a #{@packer_log.path}")
-        puts(">>>> Packer build failed.")
-        raise
+        OpsBuild.logger.info("Changing packer build with variables file from: #{@user_var_file.path}")
+        options = " -var-file #{@user_var_file.path}"
       end
-      puts(">>>>> packer run exit $?")
-    end
 
-    def packer_get_ami_id()
-      # Get AMI id by greping log for given string and then getting last value
-      ami = File.foreach(@packer_log.path).grep(/amazon-ebs,artifact.*,id/).first
-
-      if ami.nil?
-        puts(">>>> Packer build failed.")
-        exit(1)
-      else
-        puts(">>>> Packer built ami: #{ami}")
-        ami.chomp.split(':').last
-      end
+      Utils::execute("packer build -color=false -machine-readable #{options} #{config}")
     end
 
     #
     # Validate packer template
-    def packer_validate(packer_config)
-      packer_options = ""
+    def validate(config)
+      options = ''
 
-      packer_create_var_file()
+      create_var_file
 
       unless @user_var_file.nil?
-        puts(">>>> Customizing packer build with variable file from: #{@user_var_file.path} ")
-        packer_options = "-var-file #{@user_var_file.path}"
+        OpsBuild.logger.info("Customizing packer build with variable file from: #{@user_var_file.path}")
+        options = "-var-file #{@user_var_file.path}"
       end
 
-      unless system("packer validate #{packer_options} #{packer_config}")
-        puts(">>> Packer template validation failed !")
-        raise
-      end
+      Utils::execute("packer validate #{options} #{config}")
     end
 
     #
-    # Clean user_var-file/packer_log from system
-    def packer_cleanup()
+    # Clean user_var-file/log from system
+    def cleanup
       unless @user_var_file.nil?
         @user_var_file.unlink
         @user_var_file.close
       end
-
-      unless @packer_log.nil?
-        @packer_log.unlink
-        @packer_log.close
-      end
     end
 
     private
-    def packer_create_log_file()
-      if @packer_log.nil?
-        @packer_log = Tempfile.new('packer-log-file')
-      end
-    end
-
-    def packer_create_var_file()
+    def create_var_file
       if @user_var_file.nil?
         @user_var_file = Tempfile.new('packer-var-file')
         @user_var_file.write(@user_vars.to_json)

data/lib/ops_build/runner.rb

@@ -0,0 +1,14 @@
+module OpsBuild
+  class Runner < Thor
+    class_option :verbose, :type => :boolean
+
+    desc 'build SUBCOMMAND ...ARGS', 'build'
+    subcommand 'build', Commands::Build
+
+    desc 'validate SUBCOMMAND ...ARGS', 'validate'
+    subcommand 'validate', Commands::Validate
+
+    desc 'kitchen SUBCOMMAND ...ARGS', 'kitchen'
+    subcommand 'kitchen', Commands::Kitchen
+  end
+end

data/lib/ops_build/utils.rb

@@ -0,0 +1,18 @@
+module OpsBuild
+  class Utils
+    def self.execute(cmd, log_level: :debug, log_prefix: '', raise_on_failure: true)
+      OpsBuild.logger.debug("Running command '#{cmd}'")
+      _, out, wait_thr = Open3.popen2e(cmd)
+
+      while line = out.gets
+        OpsBuild.logger.__send__(log_level, "#{log_prefix} #{line}")
+      end
+
+      code = wait_thr.value.exitstatus # #value is blocking call
+      raise "Error executing '#{cmd}'. Exit code: #{code}" if code != 0 && raise_on_failure
+      out.close
+
+      code
+    end
+  end
+end

data/lib/ops_build/vagrant.rb

@@ -2,7 +2,7 @@
 # Vagrant management class
 #
 module OpsBuild
-  class VagrantSupport
+  class Vagrant
 
   end
 end

data/lib/ops_build/validations.rb

@@ -0,0 +1,11 @@
+module OpsBuild
+  class Validations
+    def self.not_empty!(val, var_name)
+      raise "'#{var_name}' cannot be empty!" if val.nil? || val.empty?
+    end
+
+    def self.check_binary!(bin)
+      raise "Binary '#{bin}' not found!" if `command -v #{bin}`.empty?
+    end
+  end
+end

data/lib/ops_build/version.rb

@@ -1,3 +1,3 @@
 module OpsBuild
-  VERSION="1.0.6"
+  VERSION = '1.1.0'
 end

data/lib/ops_build.rb

@@ -3,95 +3,38 @@ require 'rubygems'
 require 'fileutils'
 require 'json'
 require 'rbconfig'
-require 'tempfile'
+require 'tmpdir'
 require 'thor'
+require 'open3'
 require 'yaml'
+require 'logger'
 
-require "ops_build/version"
+lib = File.expand_path('..', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'ops_build/commands/build'
+require 'ops_build/commands/kitchen'
+require 'ops_build/commands/validate'
+require 'ops_build/runner'
+require 'ops_build/version'
 require 'ops_build/aws'
 require 'ops_build/berkshelf'
 require 'ops_build/chefspec'
 require 'ops_build/kitchen'
 require 'ops_build/packer'
 require 'ops_build/vagrant'
-
-lib = File.expand_path('.', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-class OpsBuilder < Thor
-  class_option :verbose, :type => :boolean
-
-  desc 'validate template', 'validate packer template'
-  def validate_packer(template)
-    packer = OpsBuild::PackerSupport.new
-    packer.packer_validate(template)
-  end
-
-  desc 'build template', 'build packer template'
-  option :ec2_region, :type => :string, :aliases => 'R', :desc => 'AWS EC2 region'
-  option :aws_access, :type => :string, :aliases => 'A', :desc => 'AWS Access key'
-  option :aws_secret, :type => :string, :aliases => 'S', :desc => 'AWS Secret key'
-  option :berk_dir,   :type => :string, :aliases => 'b', :desc => 'Berkshelf cookbook directory path'
-  def build_packer(template)
-    packer = OpsBuild::PackerSupport.new
-    berkshelf = OpsBuild::BerkshelfSupport.new
-    aws = OpsBuild::AwsSupport.new
-
-    puts ">> Building VM using packer from template #{template}"
-
-    # Add some config variables
-    packer.packer_add_user_variable(:aws_access_key, options[:aws_access].nil? ? aws.aws_get_access_key : options[:aws_access])
-    packer.packer_add_user_variable(:aws_secret_key, options[:aws_secret].nil? ? aws.aws_get_secret_key : options[:aws_secret])
-    packer.packer_add_user_variable(:aws_region, options[:ec2_region].nil? ? aws.aws_get_ec2_region : options[:ec2_region])
-    packer.packer_add_user_variable(:cookbook_path, berkshelf.berkshelf_dir)
-
-    # Install missing cookbooks
-    berkshelf.berks_install()
-
-    # Load cookbooks to correct dir.
-    berkshelf.berks_vendor()
-
-    begin
-      # Validate packer template
-      packer.packer_validate(template)
-    rescue
-      berkshelf.berks_cleanup()
-      packer.packer_cleanup()
-      exit(1)
-    end
-    puts ">>>> Vendoring cookbooks with berks to #{berkshelf.berkshelf_dir}"
-
-    begin
-      # Run packer
-      packer.packer_build(template)
-    rescue
-      berkshelf.berks_cleanup()
-      packer.packer_cleanup()
-      exit(1)
+require 'ops_build/validations'
+require 'ops_build/utils'
+
+module OpsBuild
+  def self.logger
+    if @logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+        "[#{severity}] [#{datetime.strftime('%Y-%m-%d %H:%M:%S')}] #{msg.strip}\n"
+      end
     end
 
-    packer.packer_get_ami_id()
-
-    puts ">>>> Cleaning up cookbooks/packer files from system."
-    berkshelf.berks_cleanup()
-    packer.packer_cleanup()
-  end
-
-  desc 'cnv suite', 'Run kitchen converge for given suite'
-  def converge_kitchen(suite)
-    kitchen = OpsBuild::KitchenSupport.new
-    kitchen.kitchen_converge(suite)
-  end
-
-  desc 'vrf suite', 'Run kitchen verify for given suite'
-  def verify_kitchen(suite)
-    kitchen = OpsBuild::KitchenSupport.new
-    kitchen.kitchen_verify(suite)
-  end
-
-  desc 'tst suite', 'Run kitchen test for given platform'
-  def test_kitchen(suite)
-    kitchen = OpsBuild::KitchenSupport.new
-    kitchen.kitchen_test(suite)
+    @logger
   end
 end

data/ops_build.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = OpsBuild::VERSION
   spec.authors       = ['HAMSIK Adam']
   spec.email         = ['adh@rsd.com']
-  spec.summary       = %q{RSD Devops related build tool to run packer, berkshelf}
-  spec.description   = %q{RSD Devops related build tool to run packer, berkshelf}
-  spec.homepage      = "http://www.rsd.com"
+  spec.summary       = %q(RSD Devops related build tool to run packer, berkshelf)
+  spec.description   = %q(RSD Devops related build tool to run packer, berkshelf)
+  spec.homepage      = 'http://www.rsd.com'
   spec.license       = 'BSD'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_path = 'lib'
   #spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency 'bundler', '~> 1.6'
   #spec.add_development_dependency "rake"
   #spec.add_development_dependency "thor"
   #spec.add_development_dependency "pry"
 
-  spec.add_runtime_dependency 'thor'
-  spec.add_runtime_dependency 'net-scp'
+  spec.add_runtime_dependency 'thor', '~> 0.19.1'
+  #spec.add_runtime_dependency 'net-scp'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_build
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - HAMSIK Adam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,30 +28,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
 description: RSD Devops related build tool to run packer, berkshelf
 email:
 - adh@rsd.com
@@ -65,14 +51,21 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - bin/opsbuild
 - lib/ops_build.rb
 - lib/ops_build/aws.rb
 - lib/ops_build/berkshelf.rb
 - lib/ops_build/chefspec.rb
+- lib/ops_build/commands/build.rb
+- lib/ops_build/commands/kitchen.rb
+- lib/ops_build/commands/validate.rb
 - lib/ops_build/kitchen.rb
 - lib/ops_build/packer.rb
+- lib/ops_build/runner.rb
+- lib/ops_build/utils.rb
 - lib/ops_build/vagrant.rb
+- lib/ops_build/validations.rb
 - lib/ops_build/version.rb
 - ops_build.gemspec
 homepage: http://www.rsd.com