bakeConv 1.1.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de0d62b2e4b4cb0a0d2031a14bd2d7b06c2e1021
-  data.tar.gz: 355d0d8980667abe73f3796a29f8984ae5182259
+  metadata.gz: 52b4f2a1ff3c69ac8093291b4d8ace6342b5f011
+  data.tar.gz: 969558efc184b693f78d5ce6e301909ab92d6c5d
 SHA512:
-  metadata.gz: f2bd923915408545869109aaa1474f3e31726b07ba1e0ee5c313d82fc69cd687ecfb455c6ca8e2fdcaee5ac3fb327089196a9672bc13a8c41247d042ed259c04
-  data.tar.gz: 85000592bd3b112b6648bbb87ccc588c9696d3a0d636d8eb2d43b202f5a749ca46b8e60474c1d0d00372b52f4a7d1d8d588e18e8396fb92336680a2384e6e8de
+  metadata.gz: e786e52fdad316208fbdd8d93acf5f685bd9b938e3fb5069c4e41e82e3592bb0c46ec1d17b6f191e5e5f033a6c144039643a67ec006cb94b74cd251fbd28b1b0
+  data.tar.gz: 211d6aac9f67465dd75b8cc47307cefbd8fcd9cb7fcbd30a58e769e458b52cf117ca59fd504f9d64aaf99b93d95d80757ba39cd76c4446169a3e52caa768287a

data/lib/Bake.rb

@@ -25,6 +25,7 @@ module BConv
     
     def run
       bakeLines = ''
+      begin
       cmd = @setMock ? ['ruby','C:/_dev/projects/bakeMock/bakeMock/bakeMock.rb'] : ['bake']
       cmd << '-b' << @map['BuildConfig']
       cmd << '-m' << @map['MainProj']
@@ -36,6 +37,12 @@ module BConv
         bakeLines = `#{cmd.join(' ')}`
       end
       
+      rescue Exception => e
+        puts e.message
+        puts e.back_trace    #for debug mode
+        abort
+      end  
+      
       abort "Error while trying to call bake!" unless $?.success?
       return bakeLines
     end

data/lib/Converter.rb

@@ -26,8 +26,8 @@ module BConv
           File.readlines(fread).each do |line|
             lineIdx += 1
             wroteLine = false
-            @map.keys.each do |key|               
-
+            @map.keys.each do |key|
+                           
               if line.include?(key.to_s) && @map[key].include?(".txt")
                 preAndPostfix = line.scan(/(.*)\$\$\(#{key}\)(.*)/)
                 if preAndPostfix.length == 1
@@ -53,7 +53,6 @@ module BConv
                       if m
                         puts "Info: Key $$(#{m[1]}) in #{File.basename(filename)}, line #{tmpLineIdx.to_s} wasn\'t replaced!" if m  
                       end
-                      puts l
                       fout.write(l)
                       set = false
                     end
@@ -63,7 +62,7 @@ module BConv
                 @map.store(key,Util.strToArray(key, @map))
                 wroteLine = findAndReplace(key, line, fout, "", "")
                 break
-              elsif line.match(/#{key.to_s}/)
+              elsif line.match(/\$\$\(#{key}\)/)
                 wroteLine = findAndReplace(key, line, fout, "", "")
                 break
               end

data/lib/Filter.rb

@@ -0,0 +1,41 @@
+# Class Filter: provides function for filtering special values from hash 
+# Author: Frauke Blossey
+# 06.08.2015
+
+require_relative 'Util'
+
+module BConv
+  
+  class Filter
+    
+    def self.hashFilter(keySearched, doFilter, hash)
+      hash.each do |key, value|
+        if keySearched == "GMOCK_FILTER"
+          value.each { |elm| value.delete(elm) if elm.match(/\/?gmock\/?/) }
+        elsif keySearched == "DEPENDENCIES_FILTER"  
+          if doFilter == "true"
+            hash.delete(key) if key == "BAKE_DEPENDENCIES"
+          else
+            hash.delete(key) if key == "BAKE_DEPENDENCIES_FILTERED"
+          end
+        end          
+      end
+            
+      if keySearched == "DEPENDENCIES_FILTER"
+        hvalues = []
+        if doFilter == "false"
+          hash["BAKE_DEPENDENCIES"].each { |v| hvalues << v }
+          hash.store("DEPENDENCIES_FILTER", hvalues)
+          hash.delete("BAKE_DEPENDENCIES")
+        else  
+          hash["BAKE_DEPENDENCIES_FILTERED"].each { |v| hvalues << v }
+          hash.store("DEPENDENCIES_FILTER", hvalues)
+          hash.delete("BAKE_DEPENDENCIES_FILTERED")
+        end
+      end 
+      return hash
+    end
+    
+  end
+  
+end

data/lib/PathAdapt.rb

@@ -0,0 +1,81 @@
+# Class PathAdapt (methods to adapt paths relative to the location of the e.g. CMakeLists file)
+# Author: Frauke Blossey
+# 04.08.2015
+
+module BConv
+  
+  require_relative 'Util'
+  
+  class PathAdapt
+    SLASH = "/"
+    COLON = ":"
+    
+    def self.adapt_path(outputFilePath, bhash)
+      diffPathLevels, diffPathLevelsDown = 0, 0
+      dir, diffUp = "", ""
+      diffArr = []
+      
+      splitOutputFile = File.expand_path(File.dirname(outputFilePath)).split("/")
+      splitProjMeta   = bhash['BAKE_PROJECTDIR'][0].split("/")
+  
+      if splitOutputFile.length > splitProjMeta.length
+        diffPathLevels = splitOutputFile.length-splitProjMeta.length
+        for j in (splitOutputFile.length-diffPathLevels)..(splitOutputFile.length-1)
+          diffUp += splitOutputFile[j] + "/"
+          diffArr << splitOutputFile[j]
+        end
+        for i in 0..diffPathLevels-1
+          dir += "../"
+        end
+      elsif splitOutputFile.length < splitProjMeta.length
+        diffPathLevelsDown = splitProjMeta.length-splitOutputFile.length
+        puts "Warning: this case is not supported!"
+        return nil
+      else
+        return bhash
+      end
+  
+      pathNames = []
+      directories = {}
+    
+      if File.dirname(outputFilePath).eql? File.dirname(bhash['BAKE_PROJECTDIR'][0])
+        #files do not have to be adapted
+      else
+        bhash.each do |key, value|
+          if key == 'BAKE_SOURCES' || key == 'BAKE_INCLUDES'
+            value.each do |pathElm|
+              if pathElm[0] == SLASH || pathElm[1] == COLON
+                pathNames << pathElm #nothing to do - is already absolute
+              elsif pathElm[0..diffUp.length-1].eql? diffUp
+                pathNames << pathElm.split(/^#{diffUp}/)[-1]
+              else 
+                tmpElmArr = pathElm.split("/")
+                cnt = 0
+                dirLoc = ""
+                if tmpElmArr[0] != ".." #string does not start with ".."
+                  for j in (0..diffArr.length-1)
+                    if diffArr[j] != tmpElmArr[j]
+                      cnt = cnt + 1
+                      dirLoc << "../"
+                    end
+                  end 
+                  tmpElm = Util.truncateStr(diffUp,pathElm)
+                  pathNames << (dirLoc + tmpElm)
+                else #string starts with ".." -> don't have to cut
+                  pathNames << (dir + pathElm)
+                end
+              end
+            end
+            directories.store(key, pathNames)
+            pathNames = []
+          else
+            directories.store(key, value)
+          end
+        end
+      end
+      return directories
+    end
+      
+  end
+  
+end

data/lib/Util.rb

@@ -17,5 +17,19 @@ class Util
   def self.strToArray(key, map)
     map[key][1..-2].split(",").map {|elem| elem.strip}
   end
+  
+  def self.truncateStr(refStr, toTruncStr)
+    posOfSlash = refStr.index("/")
+    while posOfSlash != nil && toTruncStr[0..1] != ".."
+      if refStr[0..posOfSlash] == toTruncStr[0..posOfSlash]
+        toTruncStr = toTruncStr[posOfSlash+1..-1]
+        refStr = refStr[posOfSlash+1..-1]
+      else
+        break
+      end
+      posOfSlash = refStr.index("/")
+    end
+    return toTruncStr
+  end
 
 end

data/lib/Version.rb

@@ -2,7 +2,7 @@ module BConv
   
   class Version
     def self.number
-      "1.1.1"
+      "1.2.2"
     end
   end
   

data/lib/bakeConverter.rb

@@ -9,6 +9,8 @@ require_relative 'Bake'
 require_relative 'Converter'
 require_relative 'Version'
 require_relative 'Help'
+require_relative 'PathAdapt'
+require_relative 'Filter'
 
 def main
   #-------------------------------------------------------
@@ -69,7 +71,8 @@ def main
       BConv::Help.printHelp
       exit(0)
     when "--show_doc"
-      Launchy.open(File.expand_path("../doc/doc.html", File.dirname(__FILE__)))
+      #Launchy.open(File.expand_path("../doc/doc.html", File.dirname(__FILE__)))
+      Launchy.open("http://esrlabs.github.io/bakeConv/")
       exit(0)
     when "--show_license"
       puts
@@ -112,10 +115,19 @@ def main
     puts "Call Bake..."
     bake = BConv::Bake.new(map, setMock, configFile)
     bakeLines = bake.run
+    #puts bakeLines
     bhash = bake.getHash(bakeLines)
     if bhash != nil
-      bhash.each {|k,v| map[k] = v unless map.has_key?k}
-      #map.merge!(bhash)
+      map.each do |k,v|
+        if (k == "GMOCK_FILTER" && v == "true") || k == "DEPENDENCIES_FILTER" 
+          bhash = BConv::Filter.hashFilter(k, v, bhash)
+        end
+      end
+    end
+    bhash_adapted = BConv::PathAdapt.adapt_path(map['OutputFileName'], bhash)
+    
+    if bhash_adapted != nil
+      bhash_adapted.each {|k,v| map[k] = v unless (map.has_key?k && k!="DEPENDENCIES_FILTER")}
       conv = BConv::Converter.new(map, configFile)
       puts "Convert..."
       conv.convert

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bakeConv
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Frauke Blossey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -36,11 +36,12 @@ files:
 - lib/ConfigParser.rb
 - lib/Converter.rb
 - lib/File_ext.rb
+- lib/Filter.rb
 - lib/Help.rb
+- lib/PathAdapt.rb
 - lib/Util.rb
 - lib/Version.rb
 - lib/bakeConverter.rb
-- doc/doc.html
 - license.txt
 - bin/bakeConv
 homepage: 

data/doc/doc.html

@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Documentation of bakeConv</title>
-<style type="text/css">
-#rundrum {
-  border-width:1px;
-  border-style:dashed;
-  border-color:blue;
-  padding:0.2cm;
-  text-align:justify; }
-</style>
-</head>
-
-<body>
-
-<h1>bakeConv</h1>
-bake converter is used to convert from bake to some other file, e.g. CMake file, which depends on your template file.
-
-<h2>GuideLines</h2>
-<h3>Concepts</h3>
-<ul>
-<li><a href="concepts/configfile.html">The configuration file Converter.config</a>
-<li><a href="concepts/templatefile.html">The template file</a>
-</ul>
-
-<h3>Command Line</h3>
-<ul>
-<li><a href="cmd/install.html">How to install bake converter</a>
-<li><a href="cmd/usecmd.html">How to use bake converter on command line</a>
-</ul>
-
-<h3>Further readings</h3>
-<ul>
-<li><a href="further/change.html">Changelog</a>
-</ul>
-
-<p>
-<hr>
-<table width="100%" border="0"><tr><td align="left">Described bakeConv version: 1.0.2</td><td align="right">June 11, 2015</td></tr></table>
-
-
-</body>
-</html>