serverspec_launcher 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94b6abf5943ddf44a2fc1b6dc78ef00c1a78f4ac
-  data.tar.gz: 077248c5cb91c5abb4f42caebbe0e098ac8319a6
+  metadata.gz: 891ea8cb71652465b8417496a93c2d0501b53893
+  data.tar.gz: 1e50c3cc5d1e8649c005e15f2b7724606502aa14
 SHA512:
-  metadata.gz: 78aff3c3c69939a3c19e84ffd26dad1349b13c3fb883af3db0cdee4fdbcbbaf42c9196aab6e05438b8561da41422564d2de48e821b7d1607b15322b7bf75cdb0
-  data.tar.gz: a97e0b6fed3d2dd17a9dfccf01d40e0c7a8fab7b446b3a372e18bb06d637543c3e1255dfa959ae96338e425df4f4842cc8c4d3442b233ddbb46f204e015c5b7f
+  metadata.gz: a86196cff783fd78dfd115d30ccd1c5dd619aa820b6f4e614defdebf0c5d0b5914c68ccae96194a641b0c0307466df62200920e2b04b712d6a729145bc257fa3
+  data.tar.gz: 8b9eef0a2887366b550085b46d6e806dc4f52dec14b69656befe73d4e64da80ee76319a2b15cbce1260740b177dc9c5f711acc52bd923040a9aa6dd2a2e4e3a8

data/lib/serverspec_launcher/rake_tasks.rb

@@ -68,7 +68,7 @@ class ServerspecLauncherRakeTasks
       ENV['TASK_NAME'] = task_name
       t.pattern = "spec/#{spec_type}_spec.rb"
       t.fail_on_error = options[:fail_on_err]
-      set_formatters(key, options, t)
+      set_formatters(task_name, options, t)
     end
   end
 

data/lib/serverspec_launcher/spec_helper.rb

@@ -119,11 +119,18 @@ class SpecHelper
   end
 
   def set_docker_image
-    if @target_properties[:docker_build_dir]
+    if @target_properties[:dockerfile]
+      puts "Building Docker Image from #{@target_properties[:dockerfile]}"
+      commands = File.read(@target_properties[:dockerfile])
+      image = Docker::Image.build(commands)
+      set :docker_image, image.id
+    elsif @target_properties[:docker_build_dir]
+      puts "Building Docker Image in dir #{@target_properties[:docker_build_dir]}"
       image = Docker::Image.build_from_dir(@target_properties[:docker_build_dir])
       set :docker_image, image.id
+    else
+      set :docker_image, @target_properties[:docker_image] if @target_properties[:docker_image]
     end
-    set :docker_image, @target_properties[:docker_image] if @target_properties[:docker_image]
   end
 
   def self.load(host = ENV['TARGET_HOST'], target = ENV['TARGET'], properties = nil)

data/lib/serverspec_launcher/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ServerspecLauncher
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec_launcher
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Andrew Wardrobe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2017-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler