ops_build 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 036131a41813271b80ae97f7e95ecb81ae53cf9e
-  data.tar.gz: 3eab0e8a3ebb95ae7e1aa3cc1b310f0a73f13fd9
+  metadata.gz: 8edb28512aa51341dcc8555e8f79ad53f05c76c0
+  data.tar.gz: ec0c1e7f1575e04a0b5b8fae56ed5f3110a878e1
 SHA512:
-  metadata.gz: f2204e88274a20b65a034395c6cfdd3c44acfd95c128944477d72b08af93f36b103a50abac6fcc7fb6de11b7dba26ec0de82e7f79f7735e6dcebfb638e3f6805
-  data.tar.gz: 48fa041a056fb111330317685eeaf1443313c50df220deaf714974a287c8099cdd01975b36878afe3d1ed9a3b0889ae84bdb91cc8df5fbed912cec46268ed6cc
+  metadata.gz: 608bcea2efb907015fd8549f04c19f16f352f14f5038454a05eceafb83cc554a47d16f06e7093a19f61a6c09b5294f0fc198a3d79441c54bb0630d6b262b2309
+  data.tar.gz: cf15e5624e52360b17ba668578059b27828d2180b50db50c030fbf7e2affca3f3c357abee37b65d02fb34a356bb9c097141c02dd96622cac251da85d86703952

data/TODO

@@ -1 +1,4 @@
-- process manager? (when opsbuild is interrupted, packer build process continues ... )
+- process manager? (when opsbuild is interrupted, packer build process continues ... )
+- .ovf file
+  - https://www.packer.io/intro/getting-started/vagrant.html
+  - http://pretengineer.com/post/packer-vagrant-infra/

data/lib/ops_build/box_indexer.rb

@@ -0,0 +1,69 @@
+module OpsBuild
+  class BoxIndexer
+    def initialize(dir:, out:, name:, desc:, root_url:, checksum_type: :sha1)
+      @dir           = File.expand_path(dir)
+      @out           = out
+      @name          = name
+      @desc          = desc
+      @root_url      = root_url
+      @checksum_type = checksum_type
+
+      check_dir!
+      check_checksum_type!
+    end
+
+    def index
+      OpsBuild.logger.debug("Indexing directory '#{@dir}'")
+      out = {
+          name:        @name,
+          description: @desc,
+          versions:    []
+      }
+
+      Dir.glob("#{@dir}/*.box").each do |path|
+        filename = File.basename(path)
+        m = /^#{@name}_(?<version>[0-9]+\.[0-9]+\.[0-9]+)\.box$/.match(filename)
+        next if m.nil?
+
+        OpsBuild.logger.debug("Found box '#{filename}'")
+
+        out[:versions] << box_info(File.expand_path(path), m[:version])
+      end
+
+      out
+    end
+
+    def index!
+      write(index)
+    end
+
+    private
+    def check_dir!
+      raise "Folder '#{@dir}' does not exist!" unless Dir.exists?(@dir)
+    end
+
+    def check_checksum_type!
+      raise "Unknown checksum type '#{@checksum_type}'!" unless %w(sha1 sha2 md5 rmd160).include?(@checksum_type.to_s.downcase)
+    end
+
+
+    def write(hash)
+      File.open(@out, 'w+') { |f| f.write(JSON.pretty_generate(hash)) }
+    end
+    def box_info(path, version)
+      {
+          version:   version,
+          providers: [{
+                          name:          'virtualbox',
+                          url:           File.join(@root_url, File.basename(path)),
+                          checksum_type: @checksum_type.to_s,
+                          checksum:      checksum(path)
+                      }]
+      }
+    end
+
+    def checksum(path)
+      Digest.const_get(@checksum_type.upcase).file(path).hexdigest
+    end
+  end
+end

data/lib/ops_build/commands/build.rb

@@ -10,29 +10,23 @@ module OpsBuild
 
       desc 'packer TEMPLATE', 'build packer template'
       shared_options
-      option :berk_dir,   type: :string, aliases: '-b', desc: 'Berkshelf cookbook directory path'
+      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
-
-        raise "JSON #{options[:params]} not found!" unless File.exists?(options[:params])
-        params = JSON.parse(File.read(options[:params]), symbolize_names: true)
+        params = if options[:params]
+                   raise "JSON #{options[:params]} not found!" unless File.exists?(options[:params])
+                   JSON.parse(File.read(options[:params]), symbolize_names: true)
+                 else
+                   {}
+                 end
 
         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
@@ -52,8 +46,6 @@ module OpsBuild
 
           # Run packer
           packer.build(template)
-
-          packer.get_ami_id
         rescue => e
           OpsBuild.logger.error(e.message)
           exit(1)
@@ -64,11 +56,34 @@ module OpsBuild
         end
       end
 
-      desc 'vagrant TEMPLATE', 'build vagrant box'
+      desc 'vagrant VAGRANTFILE', 'build vagrant box'
       shared_options
-      def vagrant(template)
-        # TODO
+      option :only,   type: :string, aliases: '-l', desc: 'Do not create all boxes, just the one passed as argument'
+      option :output, type: :string, aliases: '-o', desc: 'Name of the output (box)', default: 'package.box'
+      def vagrant(path)
+        path = File.expand_path(path)
+        raise "Vagrantfile #{path} not found!" unless File.exists?(path)
+
+        env = { 'VAGRANT_CWD' => File.dirname(path) }
+        if options[:params]
+         raise "JSON #{options[:params]} not found!" unless File.exists?(options[:params])
+         JSON.parse(File.read(options[:params])).each do |k, v|
+           env[k.to_s.upcase] = v
+         end
+        end
+
+        OpsBuild.logger.info('Running vagrant up')
+        Utils::execute(
+            "vagrant up #{options[:only]}", # still correct even if --only not provided, because nil.to_s == ""
+            log_prefix: 'vagrant:',
+            env: env)
+
+        OpsBuild.logger.info('Running vagrant package')
+        Utils::execute(
+            "vagrant package #{options[:only]} --output #{options[:output]}",
+            log_prefix: 'vagrant:',
+            env: env)
       end
     end
   end
-end
+end

data/lib/ops_build/commands/generate.rb

@@ -0,0 +1,22 @@
+module OpsBuild
+  module Commands
+    class Generate < Thor
+      desc 'box-index', ' vagrant box folder and write json'
+      option :directory, type: :string, aliases: '-d', required: true, desc: 'Directory to search vagrant boxes in, e.g. \'/var/www/centos65/boxes\''
+      option :json_path, type: :string, aliases: '-j', required: true, desc: 'Path to output json, e.g. \'/var/www/centos65/centos.json\''
+      option :name,      type: :string, aliases: '-n', required: true, desc: 'Box name, e.g. \'centos65\''
+      option :desc,      type: :string, aliases: '-e', required: true, desc: 'Description of box collection, e.g. \'This box contains CentOS 6.5 build XYZ 64-bit\''
+      option :root_url,  type: :string, aliases: '-r', required: true, desc: 'Root URL of boxes, e.g. \'http://example.com/centos65/boxes\''
+      def box_index
+        BoxIndexer.new(dir:      options[:directory],
+                       out:      options[:json_path],
+                       name:     options[:name],
+                       desc:     options[:desc],
+                       root_url: options[:root_url]).index!
+      rescue => e
+        OpsBuild.logger.error(e.message)
+        exit(1)
+      end
+    end
+  end
+end

data/lib/ops_build/commands/validate.rb

@@ -4,7 +4,7 @@ module OpsBuild
       desc 'packer TEMPLATE', 'validate packer template'
       def packer(template)
         packer = OpsBuild::Packer.new
-        packer.packer_validate(template)
+        packer.validate(template)
       end
     end
   end

data/lib/ops_build/packer.rb

@@ -30,7 +30,7 @@ module OpsBuild
         options = " -var-file #{@user_var_file.path}"
       end
 
-      Utils::execute("packer build -color=false -machine-readable #{options} #{config}")
+      Utils::execute("packer build -color=false -machine-readable #{options} #{config}", log_prefix: 'packer:')
     end
 
     #
@@ -45,7 +45,7 @@ module OpsBuild
         options = "-var-file #{@user_var_file.path}"
       end
 
-      Utils::execute("packer validate #{options} #{config}")
+      Utils::execute("packer validate #{options} #{config}", log_prefix: 'packer:')
     end
 
     #

data/lib/ops_build/runner.rb

@@ -1,6 +1,13 @@
 module OpsBuild
   class Runner < Thor
-    class_option :verbose, :type => :boolean
+    class_option :verbose, type: :boolean, default: false
+
+    #
+    # Adjust global options
+    def initialize(*args, &block)
+      super(*args, &block)
+      OpsBuild.logger.level = Logger::DEBUG if options[:verbose]
+    end
 
     desc 'build SUBCOMMAND ...ARGS', 'build'
     subcommand 'build', Commands::Build
@@ -10,5 +17,8 @@ module OpsBuild
 
     desc 'kitchen SUBCOMMAND ...ARGS', 'kitchen'
     subcommand 'kitchen', Commands::Kitchen
+
+    desc 'generate SUBCOMMAND ...ARGS', 'generate'
+    subcommand 'generate', Commands::Generate
   end
 end

data/lib/ops_build/utils.rb

@@ -1,11 +1,14 @@
 module OpsBuild
   class Utils
-    def self.execute(cmd, log_level: :debug, log_prefix: '', raise_on_failure: true)
+    def self.execute(cmd, log_level: :debug, log_prefix: '', raise_on_failure: true, env: nil)
+      log_prefix << " " unless log_prefix.end_with?(" ")
       OpsBuild.logger.debug("Running command '#{cmd}'")
-      _, out, wait_thr = Open3.popen2e(cmd)
+      args = [cmd]
+      args.unshift(env) if env
+      _, out, wait_thr = Open3.popen2e(*args)
 
       while line = out.gets
-        OpsBuild.logger.__send__(log_level, "#{log_prefix} #{line}")
+        OpsBuild.logger.__send__(log_level, "#{log_prefix}#{line}")
       end
 
       code = wait_thr.value.exitstatus # #value is blocking call

data/lib/ops_build/version.rb

@@ -1,3 +1,3 @@
 module OpsBuild
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/lib/ops_build.rb

@@ -8,13 +8,16 @@ require 'thor'
 require 'open3'
 require 'yaml'
 require 'logger'
+require 'digest'
 
 lib = File.expand_path('..', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'ops_build/commands/build'
+require 'ops_build/commands/generate'
 require 'ops_build/commands/kitchen'
 require 'ops_build/commands/validate'
+require 'ops_build/box_indexer'
 require 'ops_build/runner'
 require 'ops_build/version'
 require 'ops_build/aws'
@@ -33,6 +36,7 @@ module OpsBuild
       @logger.formatter = proc do |severity, datetime, progname, msg|
         "[#{severity}] [#{datetime.strftime('%Y-%m-%d %H:%M:%S')}] #{msg.strip}\n"
       end
+      @logger.level = Logger::INFO
     end
 
     @logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_build
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - HAMSIK Adam
@@ -56,8 +56,10 @@ files:
 - lib/ops_build.rb
 - lib/ops_build/aws.rb
 - lib/ops_build/berkshelf.rb
+- lib/ops_build/box_indexer.rb
 - lib/ops_build/chefspec.rb
 - lib/ops_build/commands/build.rb
+- lib/ops_build/commands/generate.rb
 - lib/ops_build/commands/kitchen.rb
 - lib/ops_build/commands/validate.rb
 - lib/ops_build/kitchen.rb
@@ -88,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: RSD Devops related build tool to run packer, berkshelf