bakeConv 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54c74fa0b572d947cfc10c64e2cb9bdde2b65cdb
-  data.tar.gz: 2063ac52ef08aded42b620c16bd2c41fddc110ca
+  metadata.gz: a564dfac3eb6816f428188a0ab0b3674be29d392
+  data.tar.gz: fe91e06eb189d0399d00f7cbad600b3374a0d4ba
 SHA512:
-  metadata.gz: 97f2d4efcdec98c419a6d3e43c0a67efee0dd795713ee7d6d02dcfe2d091155a494741d7e38fb9584eef4e7a4afb681ae31a1037b503bfdb8c9a54ee833c7d89
-  data.tar.gz: 3785de4d0adc21601ee3accf9b844b4cd03e31d8e769c0416f83c51ba316c91515023732a4c9385d5b86d94cfe702b9cc772fa9c475f64652f2cff05c952fa42
+  metadata.gz: 50d3805099bb35d0095317ef413611f13002309950759e412db711948ccbe2c2a55209ceb23382687a2f815b868c6132a53cba713540a03445521ad378b41717
+  data.tar.gz: 53ecea82597d2200b8cd72ca90f6d9a014229d08d64585c82249d5cff185558e673edc6c8fedf66a0c4c16294305e50875ae9e077e7dacc9246cc540f087262e

data/lib/Bake.rb

@@ -59,7 +59,6 @@ module BConv
               value << line.strip if value != nil
               value = line.strip if value == nil
               b_hash.store(key,value)
-             
             end
         elsif line.start_with?(" ") && line[1] != " "
           if state == Bake::START_INFO || state == Bake::VAR

data/lib/ConfigParser.rb

@@ -26,10 +26,13 @@ module BConv
               while(line = l.gets) != nil
                 line.gsub!('\\','/')
                 ar = line.split("=")
+                
                 if (ar.length == 2)
-                  comPos = ar[1].index("#")
-                  ar[1] = ar[1][0..comPos-1] if comPos != nil
-                  mapping.store(ar[0].strip,ar[1].strip)
+                  if ar[0].strip[0] != "#"
+                    comPos = ar[1].index("#")
+                    ar[1] = ar[1][0..comPos-1] if comPos != nil
+                   mapping.store(ar[0].strip,ar[1].strip)
+                  end
                 elsif ar[1] == ""
                   mapping.store(ar[0].strip,"")
                 end
@@ -39,27 +42,19 @@ module BConv
                   raise "Error: MainProj parameter from Mapping in line #{lineNumber} is missing!" if mapping.has_key?('MainProj') == false
                   raise "Error: BuildConfig parameter from Mapping in line #{lineNumber} is missing!" if mapping.has_key?('BuildConfig') == false
                   raise "Error: Proj2Convert parameter from Mapping in line #{lineNumber} is missing!" if mapping.has_key?('Proj2Convert') == false
-                  raise "Error: OutputFileName parameter from Mapping in line #{lineNumber} is missing!" if mapping.has_key?('OutputFileName') == false
+                  raise "Error: OutputFile parameter from Mapping in line #{lineNumber} is missing!" if mapping.has_key?('OutputFile') == false
                   raise "Error: TemplateFile parameter from Mapping in line #{lineNumber} is missing!" if mapping.has_key?('TemplateFile') == false
                   
+                  #raise "Error: Parameter in #{File.basename(@filename)}, Mapping line #{lineNumber} is missing!" if ar[0].strip == ""
+                  
                   if @projToConvert != "" && @projToConvert != mapping['Proj2Convert']
                     mapping = {}
                   else
                     mappings << mapping
                   end
-                  
-                  # if @projToConvert.length != 0
-                    # @projToConvert.each do |val|
-                      # if val == mapping['Proj2Convert']
-                        # mappings << mapping
-                      # end
-                    # end
-                  # else
-                    # mappings << mapping
-                  # end
-                  
                   setEndLabel = true
                   break
+                  
                 elsif line.include?("Mapping")
                   raise "Error: end label } from Mapping in line #{lineNumber} is missing!"
                 end
@@ -70,7 +65,7 @@ module BConv
               raise "Error: Mapping keyword in front of line #{lineNumber} is missing?"
             end
           end
-          return mappings
+          return 0, mappings
         end
       rescue Exception => e
         puts e.message

data/lib/Converter.rb

@@ -15,26 +15,36 @@ module BConv
     end
     
     def convert
-      outputfilename = Util.makeAbsolute(@map['OutputFileName'], @configFile)
+      outputfilename = Util.makeAbsolute(@map['OutputFile'], @configFile)
       templatefilename = Util.makeAbsolute(@map['TemplateFile'], @configFile)
 
       lineIdx = 0
       tmpLineIdx = 0
       set = true
+     
+      @map.delete_if{|k,_| (k=="EXCLUDE_BAKE_DEPENDENCIES" || k=="EXCLUDE_BAKE_SOURCES" || k=="EXCLUDE_BAKE_INCLUDES") } #not useful anymore
+      
       begin
       File.open(outputfilename, 'w') do |fout|
         File.open(templatefilename) do |fread|
           File.readlines(fread).each do |line|
             lineIdx += 1
             wroteLine = false
+            
             @map.keys.each do |key|
-                           
               if line.include?(key.to_s) && @map[key].include?(".txt")
                 preAndPostfix = line.scan(/(.*)\$\$\(#{key}\)(.*)/)
+                preAndPostfixOpt = line.scan(/(.*)\$OPTION\(#{key}\)(.*)/)
+                
                 if preAndPostfix.length == 1
                   prefix = preAndPostfix[0][0]
                   postfix = preAndPostfix[0][1]
                 end
+                #need some cosmetics!
+                if preAndPostfixOpt.length == 1
+                  prefix = preAndPostfixOpt[0][0]
+                  postfix = preAndPostfixOpt[0][1]
+                end
                 
                 filename = Util.makeAbsolute(@map[key], @configFile)
                 raise "Error: Template file #{File.basename(filename)} is empty!" if File.zero?(filename)
@@ -46,14 +56,15 @@ module BConv
                     @map.keys.each do |k|
                       wroteLine = findAndReplace(k, l, fout, prefix, postfix)
                       break if wroteLine == true
-                    end
+                    end                   
+                    
                     if wroteLine == false 
                       l.strip!
                       l = prefix + l + postfix + "\n"
                       m = l.match(/\$\$\((.*)\)/)
-                      if m
-                        puts "Info: Key $$(#{m[1]}) in #{File.basename(filename)}, line #{tmpLineIdx.to_s} wasn\'t replaced!" if m  
-                      end
+                      opt = l.match(/\$OPTION\((.*)\)/)
+                      raise "Error: Key $$(#{m[1]}) in #{File.basename(filename)}, line #{tmpLineIdx.to_s} wasn\'t replaced!" if m
+                      puts "Info: Key $OPTION(#{opt[1]}) in #{File.basename(filename)}, line #{tmpLineIdx.to_s} wasn\'t replaced!" if opt  
                       fout.write(l)
                       set = false
                     end
@@ -66,15 +77,18 @@ module BConv
               elsif line.match(/\$\$\(#{key}\)/)
                 wroteLine = findAndReplace(key, line, fout, "", "")
                 break
+              elsif line.match(/\$OPTION\(#{key}\)/)
+                wroteLine = findAndReplace(key, line, fout, "", "")
+                break
               end
             end
             
             if wroteLine == false
               if set == true
                 m = line.match(/\$\$\((.*)\)/)
-                if m
-                  puts "Info: Key $$(#{m[1]}) in #{File.basename(templatefilename)}, line #{lineIdx.to_s} wasn\'t replaced!"
-                end
+                opt = line.match(/\$OPTION\((.*)\)/)
+                raise "Error: Key $$(#{m[1]}) in #{File.basename(templatefilename)}, line #{lineIdx.to_s} wasn\'t replaced!" if m
+                puts "Info: Key $OPTION(#{opt[1]}) in #{File.basename(templatefilename)}, line #{lineIdx.to_s} wasn\'t replaced!" if opt
                 fout.write(line)
               end
               set = true
@@ -89,16 +103,19 @@ module BConv
         puts e.back_trace if @debugMode == true
         abort
       end
+      return 0
     end
   
     def findAndReplace(key, line, fout, prefix, postfix)
       wroteLine = false
       found = line.scan(/(.*)\$\$\(#{key}\)(.*)/)
-    
+      foundOpt = line.scan(/(.*)\$OPTION\(#{key}\)(.*)/)
+      
+      found = foundOpt if (found.length==0 && foundOpt.length!=0)
+      
       if found.length == 1
         pre = found[0][0]
         post = found[0][1]
-
         if @map[key].kind_of?(Array)
           @map[key].each do |val|
             line = prefix + pre + val.to_s + post + postfix + "\n"
@@ -114,6 +131,10 @@ module BConv
         line.gsub!(/\$\$\(#{key}\)/, @map[key].to_s)
         fout.write(line)
         wroteLine = true
+      elsif line.include?("/\$OPTION\(#{key}\)/") && found.length == 0
+        line.gsub!(/\$OPTION\(#{key}\)/, @map[key].to_s)
+        fout.write(line)
+        wroteLine = true
       end
       return wroteLine
     end

data/lib/File_ext.rb

@@ -5,7 +5,7 @@
 class File
   
   def self.isAbsolute?(filename) 
-    File.expand_path(filename) == filename
+    return File.expand_path(filename) == filename
   end
   
 end

data/lib/Filter.rb

@@ -8,29 +8,17 @@ module BConv
   
   class Filter
     
-    def self.hashFilter(keySearched, doFilter, hash)
+    def self.hashFilter(keySearched, forFiltering, hash)      
+      forFilteringArr = forFiltering[1..-2].split(",").map {|elm| elm.strip}
       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"
+        if key == keySearched.split("EXCLUDE_")[1]
+          forFilteringArr.each do |elm|
+            value.each do |val|
+              if val.include?(elm)
+                value.delete(val)
+              end
+            end
           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

data/lib/PathAdapt.rb

@@ -10,13 +10,15 @@ module BConv
     SLASH = "/"
     COLON = ":"
     
-    def self.adapt_path(outputFilePath, bhash, cfgFleFromCmdLne)
+    def self.adapt_path(outputFilePath, bhash, cfgFleFromCmdLne, debugMode)
       diffPathLevels, diffPathLevelsDown = 0, 0
       dir, diffUp = "", ""
       diffArr = []
       
-      splitOutputFile = File.expand_path(File.dirname(outputFilePath),File.dirname(cfgFleFromCmdLne)).split("/")
-      splitProjMeta   = bhash['BAKE_PROJECTDIR'][0].split("/")
+      begin
+      splitOutputFile = File.expand_path(File.dirname(outputFilePath),File.dirname(cfgFleFromCmdLne)).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
   
       if splitOutputFile.length > splitProjMeta.length
         diffPathLevels = splitOutputFile.length-splitProjMeta.length
@@ -73,6 +75,11 @@ module BConv
           end
         end
       end
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace.inspect if debugMode == true
+        exit(1)
+      end
       return directories
     end
       

data/lib/Util.rb

@@ -11,7 +11,8 @@ class Util
       outputfilename = file
     else
       outputfilename = File.dirname(configFile) + "/" + file
-    end    
+    end
+    return outputfilename    
   end
   
   def self.strToArray(key, map)

data/lib/Version.rb

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

data/lib/bakeConverter.rb

@@ -20,7 +20,8 @@ def main
   projToConvert = ""
   cfgFleFromCmdLne = ""
   setMock = false
-  debugMode = false  
+  debugMode = false
+  mapConverted = 0
  
   begin
   args = ARGV.select.each_with_index{|str, i| i.even? && str[0] == "-"}
@@ -36,7 +37,7 @@ def main
   end
 
   if ARGV.length == 1 && ARGV[0] != "--help" && ARGV[0] != "-h" && ARGV[0] != "--show_doc" && ARGV[0] != "--version" && ARGV[0] != "-v" && ARGV[0] != "--show_license" && ARGV[0] != "--mock"
-    puts "Error: Too less arguments! (try --help)"
+    #puts "Error: Too less arguments! (try --help)"
     puts "Config file is missing!" if opts[0] == nil
     exit(-1)
   elsif ARGV.length == 0 || (ARGV.length == 1 && ARGV[0] == "--mock")
@@ -76,7 +77,6 @@ def main
     when "--debug"
       debugMode = true
     when "--show_doc"
-      #Launchy.open(File.expand_path("../doc/doc.html", File.dirname(__FILE__)))
       Launchy.open("http://esrlabs.github.io/bakeConv/")
       exit(0)
     when "--show_license"
@@ -93,9 +93,9 @@ def main
     end
   end
    
-  rescue => e
+  rescue Exception => e
   puts "Error in arguments!"
-  puts e.to_s if debug_mode == true
+  puts e.backtrace if debugMode == true
   exit(-1)
   end
 
@@ -108,11 +108,10 @@ def main
   cp = BConv::ConfigParser.new(configFile, projToConvert, debugMode)
   
   puts "Reading config..."
-  mappings = cp.readConfig
+  status, mappings = cp.readConfig
   
   abort "Error: Config file is empty OR the requested project(s) is commented out!" if mappings.length == 0
   puts "Converting #{mappings.length} projects..."
-  
   idxCnt = 0
   
   mappings.each do |map|
@@ -126,22 +125,30 @@ def main
     bhash = bake.getHash(bakeLines)
     if bhash != nil
       map.each do |k,v|
-        if (k == "GMOCK_FILTER" && v == "true") || k == "DEPENDENCIES_FILTER" 
+        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)
     end
-    bhash_adapted = BConv::PathAdapt.adapt_path(map['OutputFileName'], bhash, cfgFleFromCmdLne)
     
     if bhash_adapted != nil
-      bhash_adapted.each {|k,v| map[k] = v unless (map.has_key?k && k!="DEPENDENCIES_FILTER")}
+      bhash_adapted.each {|k,v| map[k] = v unless (map.has_key?k)}
       conv = BConv::Converter.new(map, configFile, debugMode)
       puts "Convert..."
-      conv.convert
+      status = conv.convert
+      mapConverted = mapConverted + 1 if status == 0
     end
   end
   
-  puts "Done"
+  puts "Done: Converted #{mapConverted} from #{mappings.length} projects."
+  
+  if (mapConverted == mappings.length) && (mapConverted != 0)
+    return exit(0)
+  else
+    return exit(1)
+  end
+  
 end
 
 #-------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bakeConv
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Frauke Blossey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy