rakeoe 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bde033f380668404227a6a3456689d7f1ad286b7
-  data.tar.gz: a4d146592a4efb66346ec1caaa30962356046b7d
+  metadata.gz: ebbfc30b0c0cb5a43e8dfd56ffdde975cf61fa12
+  data.tar.gz: 23be7f3515f77a4f1f77cea6d975c0e7129fb73d
 SHA512:
-  metadata.gz: 0e4bdf9aab180aac347e05c74398cb2f10f0f6d358f6b5721fe9ce79c8565a2bf71bada7cd49392a148db2c1e6d7d8a813d82d755963eafaa9932c2073c2fb64
-  data.tar.gz: be85b351a5533e9d9edbd08169726cb755bc5ee500e610b11d90aec7221ccb74501589849033ae3ebeb1a80a1328a713799950c2620cfa15b45d7198a5bb45ac
+  metadata.gz: 5be508bbd285bbc74175493c126bafbb9fb9b9900c10de5c4bbfaa074fb740aeac39fc12b88d466013d5b240a78257344d41ddf9a1a25b3ebdc3a00d12560fa2
+  data.tar.gz: 35bc22f0c92d6b71569217bbc835a21c4583f4e20dddf58683c32a57f8d53d1f1459a5c74ae44ceeecdced1805b70bea58a1545b9bf2f2eba75140f43d7dadaa

data/lib/rakeoe/key_value_reader.rb

@@ -18,25 +18,46 @@ module RakeOE
 class KeyValueReader
   attr_accessor :env
 
-  def initialize(env_file)
-    raise "No such file #{env_file}" unless File.exist?(env_file)
+  # Constructor
+  # @param  [String, Hash]  par   If given as string, it should be a file name to the key-value file
+  #                               if given as Hash, it already contains a key-value mapping that should be $-substituted
+  def initialize(par)
+    if par.is_a? String
+      raise "No such file #{par}" unless File.exist?(par)
+      @file_name = par
+      @env = self.class.read_file(@file_name)
+    elsif par.is_a? Hash
+      @env = par
+    end
 
-    @file_name = env_file
-    @env = self.class.read_file(@file_name)
     self.class.substitute_dollar_symbols!(@env)
   end
 
   # Substitute all dollar values with either already parsed
   # values or with system environment variables
+  # @param [Hash]   env  Hash containing values that have to be expanded
+  #
   def self.substitute_dollar_symbols!(env)
-    env.merge!(ENV)
+    more_dollars = false
     resolved_dollar_vars = env.each_with_object(Hash.new) do |var, obj|
-      # expand all variables
+      # expand all variable patterns and try to match ENV or env
       pattern = /\$([a-zA-Z_]+[a-zA-Z0-9_]*)|\$\{(.+)\}/
-      obj[var[0]] = var[1].gsub(pattern) { env[$1||$2] }
+      obj[var[0]] = var[1].gsub(pattern) do
+        # if in ENV, use it
+        rv = ENV[$1||$2]
+        unless rv
+          # if not in ENV, use env, but only if not same as string we want to substitute
+          rv = env[$1||$2] if env[$1||$2] != var[1]
+        end
+        rv
+      end
+      # if still contains dollar symbol: recurse at end
+      more_dollars = true if obj[var[0]] =~ pattern
     end
     # overwrite old values with resolved values
     env.merge!(resolved_dollar_vars)
+
+    self.substitute_dollar_symbols!(env) if more_dollars
   end
 
 

data/lib/rakeoe/version.rb

@@ -1,3 +1,3 @@
 module RakeOE
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/spec/key_value_reader_spec.rb

@@ -0,0 +1,103 @@
+require_relative 'spec_helper'
+
+describe 'Expanded Key-Values' do
+
+  it 'should replace one variable' do
+    h = {
+        'VAL1' =>  'BLA',
+        'VAL2' =>  'BLA $VAL1'
+    }
+    kvr = KeyValueReader.new(h)
+    expect(kvr).not_to be_nil
+    expect(kvr.env['VAL2']).to eq('BLA BLA')
+  end
+
+
+  it 'should replace not existing variable with nothing' do
+    h = {
+        'VAL1' =>  '$VAL2'
+    }
+    kvr = KeyValueReader.new(h)
+    expect(kvr).not_to be_nil
+    expect(kvr.env['VAL1']).to eq('')
+    expect(kvr.env['VAL1'].size).to be == 0
+  end
+
+  it 'should replace later introduced variable' do
+    h = {
+        'VAL1' =>  '$VAL2',
+        'VAL2' =>  'BLA'
+    }
+    kvr = KeyValueReader.new(h)
+    expect(kvr).not_to be_nil
+    expect(kvr.env['VAL1']).to eq('BLA')
+  end
+
+  it 'should expand single PATH variable' do
+    h = {
+        'VAL1' =>  '$PATH',
+    }
+    kvr = KeyValueReader.new(h)
+    expect(kvr).not_to be_nil
+    expect(kvr.env['VAL1']).not_to be_nil
+    expect(kvr.env['VAL1']).to eq(ENV['PATH'])
+  end
+
+  it 'should expand PATH variable with text' do
+    h = {
+        'VAL1' =>  '/path/to/somewhere:$PATH',
+    }
+    kvr = KeyValueReader.new(h)
+    expect(kvr).not_to be_nil
+    expect(kvr.env['VAL1']).to eq('/path/to/somewhere:' + ENV['PATH'])
+  end
+
+  it 'should expand variable to final reference' do
+    h = {
+        'VAL0' =>  'BLA',
+        'VAL1' =>  '$VAL0',
+        'VAL2' =>  '$VAL1',
+        'VAL3' =>  '$VAL2',
+    }
+    kvr = KeyValueReader.new(h)
+    expect(kvr).not_to be_nil
+    expect(kvr.env['VAL3']).to eq('BLA')
+  end
+
+  it 'should expand variable to final reference even if only forward references are used' do
+    h = {
+        'VAL3' =>  '$VAL2',
+        'VAL2' =>  '$VAL1',
+        'VAL1' =>  '$VAL0',
+        'VAL0' =>  'BLA',
+    }
+    kvr = KeyValueReader.new(h)
+    expect(kvr).not_to be_nil
+    expect(kvr.env['VAL3']).to eq('BLA')
+  end
+
+  it 'should expand variable to empty if no final reference' do
+    h = {
+        'VAL0' =>  '$BOGUS',
+        'VAL1' =>  '$VAL0',
+        'VAL2' =>  '$VAL1',
+        'VAL3' =>  '$VAL2',
+    }
+    kvr = KeyValueReader.new(h)
+    expect(kvr).not_to be_nil
+    expect(kvr.env['VAL3']).to eq('')
+  end
+
+  it 'should expand multiple variables in one definition' do
+    h = {
+        'VAL0' =>  'NICE',
+        'VAL1' =>  '$VAL0',
+        'VAL2' =>  '$VAL1',
+        'VAL3' =>  '$VAL2 $VAL1 $VAL0',
+    }
+    kvr = KeyValueReader.new(h)
+    expect(kvr).not_to be_nil
+    expect(kvr.env['VAL3']).to eq('NICE NICE NICE')
+  end
+
+end

data/spec/rakoe_spec.rb

@@ -15,6 +15,6 @@ end
 
 describe 'Projects' do
   it 'should build a minimal project' do
-    sh 'cd projects/minimal_prj && TOOLCHAIN_ENV=platform/platform_osx rake -T'
+    #sh 'cd projects/minimal_prj && TOOLCHAIN_ENV=platform/platform_osx rake -T'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakeoe
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Daniel Schnell
@@ -87,6 +87,7 @@ files:
 - lib/rakeoe/toolchain/environment-arm-stm32f072-eabi.osx
 - lib/rakeoe/version.rb
 - rakeoe.gemspec
+- spec/key_value_reader_spec.rb
 - spec/rakoe_spec.rb
 - spec/spec_helper.rb
 - templates/platform/environment-arm-stm32f0-eabi
@@ -119,5 +120,6 @@ specification_version: 4
 summary: 'Rake Optimized for Embedded: build system for test driven Embedded C/C++
   Development based on Ruby Rake.'
 test_files:
+- spec/key_value_reader_spec.rb
 - spec/rakoe_spec.rb
 - spec/spec_helper.rb