serverspec_launcher 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7f4e2ec421c549a1d9c00424757c4d14b671a53f7eec83b4628071f5554efd3
-  data.tar.gz: 903bd958354012b07b8896d3e82735a32900e08d450c875cc3ff3ea1070f3644
+  metadata.gz: 76cfad81b886a35a1ac5a27b3e6d2e756d7c46b8d3e32e4d6c8eb661220414bf
+  data.tar.gz: fb6bd787d1246aad83ac4e89a504be1c9a0d47c6f1369c038a59760dede06718
 SHA512:
-  metadata.gz: 434da33e43b8a283af112b1c3cbeba59ebf9f0586bd7305c41110a08a03446b754837e475b51fd30033482b865ebb75828f98ab38cb93f93a432d3f58dec837f
-  data.tar.gz: 7399373d264ee5207366c1b68e9eab1ab5ef455eae67663d3fcb7516e15223a5eedcb2fb6318d0095d35c311570d7f676d67632b7752c7e0d868caea15b5c2ab
+  metadata.gz: 9a719d32252a27fdf36853e46730f823d136b4432aea72a028643395b2de1cd99ea9ab41e3a5fe34d74ea25f9f21a521119dabd4ad442f1d5120448473e759bd
+  data.tar.gz: 5657731b4a4fd10086d0f4aed6e89c7d4348b6ddd361cde408477dd60524e8f42500e4fad7f8d8f8e57b8666a43dd78e9eba0c6fcd3515c9e5ce202bc5f3f14a

data/lib/serverspec_launcher/rake_tasks.rb

@@ -39,7 +39,7 @@ class ServerspecLauncherRakeTasks
       environments.keys.each do |key|
         environment = environments[key]
         environment[:targets].each do |target, hash|
-          process_target("#{key}:#{target}", hash)
+          process_target("#{key}:#{target}", hash, 'environment')
         end
       end
 
@@ -64,6 +64,7 @@ class ServerspecLauncherRakeTasks
       ENV['TARGET_HOST'] = host.to_s
       ENV['TARGET'] = key.to_s
       ENV['TASK_NAME'] = task_name.to_s
+      ENV['TASK_SOURCE'] = options[:source]
       t.pattern = "spec/#{spec_type}_spec.rb"
       t.fail_on_error = options[:fail_on_err]
       set_formatters(task_name, options, t)
@@ -128,11 +129,12 @@ class ServerspecLauncherRakeTasks
 
   private
 
-  def process_target(key, target)
+  def process_target(key, target, task_source = 'target')
     options = {
         fail_on_err: target[:fail_on_err] || @fail_on_err,
         formatters: target[:formatters] || @formatters,
-        color: target[:color].nil? ? @colorize : target[:color]
+        color: target[:color].nil? ? @colorize : target[:color],
+        source: task_source
     }
     spec_type = target[:spec_type] || 'role'
     if target[:hosts].is_a?(Array)

data/lib/serverspec_launcher/spec_helper.rb

@@ -20,11 +20,12 @@ class SpecHelper
   include ExampleHelper
   using SymbolizeHelper
 
-  attr_reader :properties, :target_properties
-  def initialize(host = ENV['TARGET_HOST'], target = ENV['TARGET'], properties = nil)
+  attr_reader :properties, :target_properties, :target_variables
+
+  def initialize(host = ENV['TARGET_HOST'], target = ENV['TARGET'], properties = nil, task_source = ENV['TASK_SOURCE'])
     @host = host
     @target = target
-
+    @source = task_source
     load_properties properties
   end
 
@@ -35,11 +36,17 @@ class SpecHelper
     else
       @target_properties = @properties[:targets][@target.to_sym]
     end
+    if @source == 'environment'
+      vars = @properties[:environments][@target.split(':')[0].to_sym][:variables] ? @properties[:environments][@target.split(':')[0].to_sym][:variables] : {}
+      @target_variables =  @properties[:variables] ? @properties[:variables].deep_merge(vars) : {}.deep_merge(vars)
+    else
+      @target_variables = @properties[:variables] ? @properties[:variables] : {}
+    end
 
     @backend = @target_properties[:backend] || 'ssh'
     @target_properties[:target] = ENV['TASK_NAME']
 
-    @target_properties[:variables] =  @properties[:variables] ? @properties[:variables].deep_merge(@target_properties[:variables]) : {}.deep_merge(@target_properties[:variables])
+    @target_properties[:variables] =  @target_variables.deep_merge(@target_properties[:variables])
     @target_properties[:environment] =  @properties[:environment] ? @properties[:variables].deep_merge(@target_properties[:environment]) : {}.deep_merge(@target_properties[:environment])
 
     set_property @target_properties
@@ -142,8 +149,8 @@ class SpecHelper
     end
   end
 
-  def self.load(host = ENV['TARGET_HOST'], target = ENV['TARGET'], properties = nil)
-    helper = SpecHelper.new host, target, properties
+  def self.load(host = ENV['TARGET_HOST'], target = ENV['TARGET'], properties = nil, task_source = ENV['TASK_SOURCE'])
+    helper = SpecHelper.new host, target, properties, task_source
     props = helper.properties[:shared_example_gems] || []
     helper.load_shared_examples props
     helper.setup_backend

data/lib/serverspec_launcher/version.rb

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

data/serverspec_launcher.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'debase'
+  spec.add_development_dependency 'ruby-debug-ide', '0.7.0.beta6'
   spec.add_runtime_dependency 'serverspec'
   spec.add_runtime_dependency 'rspec_junit_formatter'
   spec.add_runtime_dependency 'rspec-tick-formatter', '0.1.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec_launcher
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Wardrobe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug-ide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0.beta6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0.beta6
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement