bakeConv 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77a23202d00aacf618f97272a61931f882fa737f
-  data.tar.gz: 8e4fc77e651741768e88d69a666b77edee2e1917
+  metadata.gz: ccbe0e179c3e775a3f7f819cd68a82c4409fd60d
+  data.tar.gz: 60b8a47bd1e81898a0c044f8f536e5fc93f29e49
 SHA512:
-  metadata.gz: 0aa01576efe2c7b8ffb74d35eaf7b1e6410d2cf912f55de0006da535d64cf4b308b14a17f395c9785b892c3a14a3dad72a95bfd888bb49a6b8a043975a5a961e
-  data.tar.gz: b8fa9751fac12a72ab778cdde8d168dac74a99df26cab54ecc8a93bfa4456101a9b822e436cf681f489b949ab4e6328ef40f699efecab3f2ba53db70ccc57acb
+  metadata.gz: d82e02edacee0453483d6031f29b0cbe1ec1388c1792637270857659cf0331d9720b99bd2e44edc0756e539fe8175c13d768fa8b1b95eb15e4846171a555e212
+  data.tar.gz: 96f207a4d45a0168495aa865df982b136f8f92989977031eb14b6b1a24ae179502310e37f7700a1644acd77dbb2b7f1017c9ac384b5a191acb5b9440e3e4001c

data/lib/Bake.rb

@@ -30,9 +30,9 @@ module BConv
       cmd << '--conversion_info'
       Util.strToArray('Workspace', @map).each { |w| cmd << '-w' << w }
 
-      #Dir.chdir(File.dirname(@configFile)) do   
+      Dir.chdir(File.dirname(@configFile)) do   
         bakeLines = `#{cmd.join(' ')}`
-      #end
+      end
       
       rescue Exception => e
         puts e.message

data/lib/ConfigParser.rb

@@ -2,6 +2,8 @@
 # Author: Frauke Blossey
 # 23.03.2015
 
+require_relative 'Util'
+
 module BConv
 
   class ConfigParser
@@ -21,7 +23,7 @@ module BConv
         j=0
         
         File.open(@filename) do |l|
-           while(line = l.gets) != nil  
+          while(line = l.gets) != nil  
             if line.include?("{")
               mapping.push({})
               i = i+1
@@ -32,6 +34,7 @@ module BConv
               if bracket == true
                 if @projToConvert != "" && @projToConvert != mapping[i]['Proj2Convert']
                   #do nothing and continue
+                  bracket = false
                 elsif @projToConvert != "" && @projToConvert == mapping[i]['Proj2Convert']
                   mappings.push({})
                   mappings[j] = mapping[i].clone
@@ -39,6 +42,7 @@ module BConv
                 else
                   mappings.push({})
                   mappings[j] = mapping[i].clone
+                  bracket = false
                 end
                 
                 if mappings.length != 0
@@ -60,6 +64,7 @@ module BConv
               getKeyValuePairs(line,mapping[i],lineNumber)
             end
           end
+          replaceWorkspaceElmInPath(mappings)
         end
         return 0, mappings
       rescue Exception => e
@@ -87,6 +92,18 @@ module BConv
       return hash
     end
     
+    def replaceWorkspaceElmInPath(mappings)
+      for j in 0..(mappings.length-1)
+        workspaceArr = Util.strToArray('Workspace',mappings[j])    
+        mappings[j].each do |key,value|
+          match = value.match(/Workspace\s*\[\s*(\d+)\s*\]/)
+          if match != nil
+            value.gsub!(/Workspace\s*\[\s*(\d+)\s*\]/,workspaceArr[match[1].to_i])
+          end
+        end
+      end
+    end
+    
   end
   
 end

data/lib/Converter.rb

@@ -15,13 +15,11 @@ module BConv
     end
     
     def convert
-      pwd = @map['Workspace'][1..-2]
+      pwd = @configFile
       
-      #outputfilename = Util.makeAbsolute(@map['OutputFile'], @configFile)
-      outputfilename = Util.makeAbsolute(@map['OutputFile'], pwd)
-      #templatefilename = Util.makeAbsolute(@map['TemplateFile'], @configFile)
+      outputfilename = @map['OutputFile']
       templatefilename = Util.makeAbsolute(@map['TemplateFile'], pwd)
-
+     
       lineIdx = 0
       tmpLineIdx = 0
       set = true
@@ -48,7 +46,6 @@ module BConv
                   postfix = preAndPostfixOpt[0][1]
                 end
                 
-                #filename = Util.makeAbsolute(@map[key], @configFile)
                 filename = Util.makeAbsolute(@map[key], pwd)
                 raise "Error: Template file #{File.basename(filename)} is empty!" if File.zero?(filename)
                 raise "Error: File #{File.basename(filename)} does not exist!" if !File.exist?(filename)

data/lib/PathAdapt.rb

@@ -10,14 +10,24 @@ module BConv
     SLASH = "/"
     COLON = ":"
     
+    def self.adapt_outputPath(bhash,outputFile)
+      bhash.each do |key,value|
+        if key == "BAKE_PROJECTDIR"
+          outputFile.gsub!("$$(BAKE_PROJECTDIR)",value[0])
+        end
+      end
+      
+      return outputFile
+    end
+    
     def self.adapt_path(outputFilePath, bhash, pwd, debugMode)
       diffPathLevels, diffPathLevelsDown = 0, 0
       dir, diffUp = "", ""
       diffArr = []
       
       begin
-      #splitOutputFile = File.expand_path(File.dirname(outputFilePath),File.dirname(pwd)).split("/") 
-      splitOutputFile = File.expand_path(File.dirname(outputFilePath),pwd).split("/")
+      splitOutputFile = File.expand_path(File.dirname(outputFilePath),File.dirname(pwd)).split("/") 
+      #splitOutputFile = File.expand_path(File.dirname(outputFilePath),pwd).split("/")
       splitProjMeta   = bhash['BAKE_PROJECTDIR'][0].split("/") if bhash['BAKE_PROJECTDIR'][0].include?("/") && bhash['BAKE_PROJECTDIR'] != nil
       #raise "Error: BAKE_PROJDIR is missing!" if bhash['BAKE_PROJECTDIR'] == nil
   

data/lib/Util.rb

@@ -10,7 +10,8 @@ class Util
     if File.isAbsolute?(file)
       outputfilename = file
     else
-      outputfilename = File.join(pwd,file)
+      #outputfilename = File.dirname(pwd) + "/" + file
+      outputfilename = File.expand_path(file)
     end
     return outputfilename    
   end

data/lib/Version.rb

@@ -2,7 +2,7 @@ module BConv
   
   class Version
     def self.number
-      return "1.5.3"
+      return "1.5.4"
     end
   end
   

data/lib/bakeConverter.rb

@@ -125,14 +125,16 @@ def main
     puts bakeLines if debugMode == true
     abort "Error while trying to call bake!" unless $?.success?
     bhash = bake.getHash(bakeLines)
+    outputFile = BConv::PathAdapt.adapt_outputPath(bhash,map['OutputFile'])
+    map['OutputFile'] = outputFile
     if bhash != nil
       map.each do |k,v|
         if (k == "EXCLUDE_BAKE_SOURCES") || (k == "EXCLUDE_BAKE_INCLUDES") || (k == "EXCLUDE_BAKE_DEPENDENCIES")          
           bhash = BConv::Filter.hashFilter(k, v, bhash)
         end
       end
-     # bhash_adapted = BConv::PathAdapt.adapt_path(map['OutputFile'], bhash, cfgFleFromCmdLne, debugMode)
-      bhash_adapted = BConv::PathAdapt.adapt_path(map['OutputFile'], bhash, map['Workspace'][1..-2], debugMode)
+      bhash_adapted = BConv::PathAdapt.adapt_path(map['OutputFile'], bhash, cfgFleFromCmdLne, debugMode)
+     # bhash_adapted = BConv::PathAdapt.adapt_path(map['OutputFile'], bhash, map['Workspace'][1..-2], debugMode)
     end
     
     if bhash_adapted != nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bakeConv
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Frauke Blossey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy