semi 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fce5fc892b8b2580065e3ea26962266cc3c5e94
-  data.tar.gz: e7838ad1cd46b5eeb41bdc0c900035620e43db85
+  metadata.gz: 2c505c74d8b3a177675808de5458154eb98e562f
+  data.tar.gz: 1fa3bdb689b9fa0a92bf959abcfaab0f40b8ae6c
 SHA512:
-  metadata.gz: 3c77242bcc00ffdc56f833534aa8aea287012e9b8bb6ecb6916f8037b89acd0133e72f4075049c1032ce20acc6c3902607b4c58c077595693f8c55aaa4eae6fd
-  data.tar.gz: 7895df9833744e8d0e8528865bad7017932da4fb1582b7d95b669bba12758284aa68169e423610d849c675108b64d05b51415dee5f0f7659999ae58ccc3cc144
+  metadata.gz: 5bcd802480e24a8d688217e2c86d1a3ac144a211ef1b641bedbe06e6c444d3cc34159299191754db7af87b647519eb23f63b3ce186559a6acf24a1f3dccecc8d
+  data.tar.gz: 6a12312e2f8b73f204f705f743338b8b320842e92f6a56676c97ca20470f8868cce36411cc35acbba7b5a52e57cafe6e1792380e2482fb6a49c7ff3f3deabd06

data/lib/semi/variable.rb

@@ -52,15 +52,17 @@ module Semi
 
 
     def self.expand(val, dict)
+      unless ['Semi::Variables::String', 'String'].include? val.class.to_s
+        return val
+      end
+      
       check = true
       while check
         # Look for simple variable expansion
-        if val =~ /\$\{?(\w+)\}?/
-          Regexp.last_match
-          val = $` + expand($1, dict) + $'
-        elsif val =~ /\$\((.*)\)/
-          Regexp.last_match
-          val = $` + `$1` + $'
+        if match = /\$\{?(\w+)\}?/.match(val)
+          val = match.pre_match + dict[match[1].downcase] + match.post_match
+        elsif match = /\$\((.*)\)/.match(val)
+          val = match.pre_match + `#{match[1]} 2>/dev/null` + match.post_match
         else
           # no more matches... we must be done...
           check = false

data/lib/semi/variables/integer.rb

@@ -26,7 +26,7 @@ module Semi::Variables
       end
       false
     end
-    
+
     def method_missing(m, *args, &block)
         @value.to_i.send(m, *args, &block)
       end

data/lib/semi/version.rb

@@ -1,3 +1,3 @@
 module Semi
-  version = '0.5.1'
+  version = '0.6.0'
 end

data/spec/semi_variable_spec.rb

@@ -102,4 +102,23 @@ describe Semi::Variable do
     end
   end
 
+  dictionary = {'one'   => Semi::Variables::Integer.new(1),
+                'two'   => Semi::Variables::Integer.new(2),
+                'alpha' => Semi::Variables::String.new('a'),
+                'beta'  => Semi::Variables::String.new('b')}
+
+  [  #value,                 #expected
+    ['abc123',               'abc123'],
+    ['a$alpha',                'aa'],
+    ['a$ALPHA',                'aa'],
+    ['a${alpha}',              'aa'],
+    ['a${ALPHA}',              'aa'],
+    ['## $alpha / $beta ++',   '## a / b ++'],
+    ['## $ALPHA / $BETA ++',   '## a / b ++'],
+  ].each do |test|
+    it "#expand transforms '#{test[0]}' to '#{test[1]}'" do
+      expect(Semi::Variable::expand(test[0], dictionary)).to eql test[1]
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semi
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Gerard Hickey