bakeConv 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52b4f2a1ff3c69ac8093291b4d8ace6342b5f011
-  data.tar.gz: 969558efc184b693f78d5ce6e301909ab92d6c5d
+  metadata.gz: 54c74fa0b572d947cfc10c64e2cb9bdde2b65cdb
+  data.tar.gz: 2063ac52ef08aded42b620c16bd2c41fddc110ca
 SHA512:
-  metadata.gz: e786e52fdad316208fbdd8d93acf5f685bd9b938e3fb5069c4e41e82e3592bb0c46ec1d17b6f191e5e5f033a6c144039643a67ec006cb94b74cd251fbd28b1b0
-  data.tar.gz: 211d6aac9f67465dd75b8cc47307cefbd8fcd9cb7fcbd30a58e769e458b52cf117ca59fd504f9d64aaf99b93d95d80757ba39cd76c4446169a3e52caa768287a
+  metadata.gz: 97f2d4efcdec98c419a6d3e43c0a67efee0dd795713ee7d6d02dcfe2d091155a494741d7e38fb9584eef4e7a4afb681ae31a1037b503bfdb8c9a54ee833c7d89
+  data.tar.gz: 3785de4d0adc21601ee3accf9b844b4cd03e31d8e769c0416f83c51ba316c91515023732a4c9385d5b86d94cfe702b9cc772fa9c475f64652f2cff05c952fa42

data/lib/Bake.rb

@@ -17,10 +17,11 @@ module BConv
     BEFORE_INFO = 3
     VAR = 4
   
-    def initialize(map, setMock, configFile)
+    def initialize(map, setMock, configFile, debugMode)
       @map = map
       @setMock = setMock
       @configFile = configFile
+      @debugMode = debugMode
     end
     
     def run
@@ -39,11 +40,10 @@ module BConv
       
       rescue Exception => e
         puts e.message
-        puts e.back_trace    #for debug mode
+        puts e.back_trace if @debugMode == true
         abort
-      end  
-      
-      abort "Error while trying to call bake!" unless $?.success?
+      end
+            
       return bakeLines
     end
     
@@ -67,20 +67,10 @@ module BConv
             value = []
             key = line.strip
             b_hash.store(key,value)
-            
-            # if key != "BAKE_INCLUDES" && key != "BAKE_SOURCES" && key != "BAKE_DEFINES"
-              # state = Bake::START_INFO           
-            # else
-              state = VAR
-            #end
+            state = VAR
           end
-        #elsif line.start_with?("") && !line.match("START_INFO") && !line.match("END_INFO")
-        #  puts "Error: Nothing else than START_INFO and END_INFO starting without blanks!"
         else
           if line.match("START_INFO") && line[0] != " "
-            # if state != Bake::BEFORE_INFO
-              # abort "Error!" 
-            # end
             state = Bake::START_INFO
           elsif line.match("END_INFO")
             state = Bake::END_INFO
@@ -91,14 +81,7 @@ module BConv
       if state != Bake::END_INFO
         puts "Error: There is a problem with END_INFO. No output file could be generated!"
         return nil
-       #raise ParseException.new("END_INFO missing") 
       end
-       
-     # begin
-       # ...
-     # rescue ParseException
-       # exit(-1)
-     # end
         
       return b_hash
     end

data/lib/ConfigParser.rb

@@ -6,9 +6,10 @@ module BConv
 
   class ConfigParser
     
-    def initialize(filename, projToConvert)
+    def initialize(filename, projToConvert, debugMode)
       @filename = filename
       @projToConvert = projToConvert
+      @debugMode = debugMode
     end
     
     def readConfig
@@ -73,7 +74,7 @@ module BConv
         end
       rescue Exception => e
         puts e.message
-        #puts e.back_trace    #for debug mode
+        puts e.back_trace if @debugMode == true
         abort
       end
     end

data/lib/Converter.rb

@@ -8,9 +8,10 @@ module BConv
  
   class Converter
   
-    def initialize(map, configFile)
+    def initialize(map, configFile, debugMode)
       @configFile = configFile
       @map = map
+      @debugMode = debugMode
     end
     
     def convert
@@ -85,7 +86,7 @@ module BConv
       raise "Error: Template file #{File.basename(templatefilename)} is empty!" if File.zero?(templatefilename)
       rescue Exception => e
         puts e.message
-        puts e.backtrace
+        puts e.back_trace if @debugMode == true
         abort
       end
     end

data/lib/Help.rb

@@ -13,7 +13,8 @@ module BConv
       puts "-v, --version                      Print version."
       puts "-h, --help                         Print this help."
       puts "--show_doc                         Open documentation."
-      puts "--show_license                     Print the license." 
+      puts "--show_license                     Print the license."
+      puts "--debug                            Print debug output."
       
     end
     

data/lib/PathAdapt.rb

@@ -10,12 +10,12 @@ module BConv
     SLASH = "/"
     COLON = ":"
     
-    def self.adapt_path(outputFilePath, bhash)
+    def self.adapt_path(outputFilePath, bhash, cfgFleFromCmdLne)
       diffPathLevels, diffPathLevelsDown = 0, 0
       dir, diffUp = "", ""
       diffArr = []
       
-      splitOutputFile = File.expand_path(File.dirname(outputFilePath)).split("/")
+      splitOutputFile = File.expand_path(File.dirname(outputFilePath),File.dirname(cfgFleFromCmdLne)).split("/")
       splitProjMeta   = bhash['BAKE_PROJECTDIR'][0].split("/")
   
       if splitOutputFile.length > splitProjMeta.length

data/lib/Version.rb

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

data/lib/bakeConverter.rb

@@ -18,7 +18,9 @@ def main
   #-------------------------------------------------------
   converterConfigFile = ""
   projToConvert = ""
-  setMock = false  
+  cfgFleFromCmdLne = ""
+  setMock = false
+  debugMode = false  
  
   begin
   args = ARGV.select.each_with_index{|str, i| i.even? && str[0] == "-"}
@@ -45,7 +47,8 @@ def main
   Hash[(args.zip opts)].each do |k,v|
     case k
     when "-f"
-      converterConfigFile = v
+      cfgFleFromCmdLne = v
+      converterConfigFile = File.expand_path(v)
       abort "Error: Config file is missing!" if converterConfigFile == nil
     when "--file"
       converterConfigFile = v
@@ -70,6 +73,8 @@ def main
     when "-h"
       BConv::Help.printHelp
       exit(0)
+    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/")
@@ -90,16 +95,17 @@ def main
    
   rescue => e
   puts "Error in arguments!"
-  #puts e.to_s    #for debug mode
+  puts e.to_s if debug_mode == true
   exit(-1)
   end
 
-  configFile = converterConfigFile.gsub('\\','/')   
+  configFile = converterConfigFile.gsub('\\','/')  
+  cfgFleFromCmdLne = cfgFleFromCmdLne.gsub('\\','/') 
  
   #-------------------------------------------------------
   # Starting converting process:
   #-------------------------------------------------------
-  cp = BConv::ConfigParser.new(configFile, projToConvert)
+  cp = BConv::ConfigParser.new(configFile, projToConvert, debugMode)
   
   puts "Reading config..."
   mappings = cp.readConfig
@@ -113,9 +119,10 @@ def main
     idxCnt += 1
     puts "Convert #{idxCnt} from #{mappings.length}: #{map['Proj2Convert']} (#{map['BuildConfig']})"
     puts "Call Bake..."
-    bake = BConv::Bake.new(map, setMock, configFile)
+    bake = BConv::Bake.new(map, setMock, configFile, debugMode)
     bakeLines = bake.run
-    #puts bakeLines
+    puts bakeLines if debugMode == true
+    abort "Error while trying to call bake!" unless $?.success?
     bhash = bake.getHash(bakeLines)
     if bhash != nil
       map.each do |k,v|
@@ -124,11 +131,11 @@ def main
         end
       end
     end
-    bhash_adapted = BConv::PathAdapt.adapt_path(map['OutputFileName'], bhash)
+    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")}
-      conv = BConv::Converter.new(map, configFile)
+      conv = BConv::Converter.new(map, configFile, debugMode)
       puts "Convert..."
       conv.convert
     end

metadata

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