ops_build 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 029c22f8a5e081ce0116366f250c629850c2594a
-  data.tar.gz: 11e03b09c7a12e6b3a9415828e1b601adca8b26a
+  metadata.gz: a3eb83554472d56df5bc322a5e55dbf3b3ce3beb
+  data.tar.gz: 64aaa3c055c93772ed287dbba74abc47f55ad99f
 SHA512:
-  metadata.gz: 938c7bf7943ed432b4d85f8e9486b9e4d895821655977e82c5d4f458c522bb11c8a363458a0ccc9c5e9fee5b78d300bafbc0ececddc6921b0375d1021230d18e
-  data.tar.gz: bc7aadbdd7457e14a7a9f9dd3464d29e123a37d74da955047646a782015141eece0e6b421d62fbe085e285badbe2bace1e569271586e144d9527252d26207a84
+  metadata.gz: 9ec7f55873aaf48a4465c60e567afdb1c612be18afc62de3bbbe2d4fe48b997f7c8bc73863d8fb547b1353877cbef3c1fc6ddc9266637d2a0488047bf6a32c7e
+  data.tar.gz: 9d2f4c52a48621edb8689cea62b839c37ef9960d4744650827a581a7a99266ddd0cb1813be3136284a2fe13a64ae5b87ff5f75b17998e797a7b2d9a259d531fb

data/lib/ops_build/packer.rb

@@ -41,9 +41,18 @@ module OpsBuild
     #
     # Validate packer template
     def packer_validate(packer_config)
-      unless system("packer validate #{packer_config}")
+      packer_options = ""
+
+      packer_create_var_file()
+
+      unless @user_var_file.nil?
+        puts(">>>> Customising packer build with variable file from: #{@user_var_file.path} ")
+        packer_options = "-var-file #{@user_var_file.path}"
+      end
+
+      unless system("packer validate #{packer_options} #{packer_config}")
         puts(">>> Packer template validation failed !")
-        exit(1)
+        raise
       end
     end
 
@@ -58,9 +67,11 @@ module OpsBuild
 
     private
     def packer_create_var_file()
-      @user_var_file = Tempfile.new('packer-var-file')
-      @user_var_file.write(@user_vars.to_json)
-      @user_var_file.rewind
+      if @user_var_file.nil?
+        @user_var_file = Tempfile.new('packer-var-file')
+        @user_var_file.write(@user_vars.to_json)
+        @user_var_file.rewind
+      end
     end
   end
 end

data/lib/ops_build/version.rb

@@ -1,3 +1,3 @@
 module OpsBuild
-  VERSION="1.0.0"
+  VERSION="1.0.1"
 end

data/lib/ops_build.rb

@@ -39,14 +39,20 @@ class OpsBuilder < Thor
     packer.packer_add_user_variable(:aws_secret_key, aws.aws_get_secret_key)
     packer.packer_add_user_variable(:cookbook_path, berkshelf.berkshelf_dir)
 
-    # Validate packer template
-    packer.packer_validate(template)
-
     # 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}"
 
     # Run packer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_build
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - HAMSIK Adam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler