bakeConv 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a564dfac3eb6816f428188a0ab0b3674be29d392
-  data.tar.gz: fe91e06eb189d0399d00f7cbad600b3374a0d4ba
+  metadata.gz: 639d6ef31d173fc0127249318e67e142d2219482
+  data.tar.gz: d589a78f7eb5284a04aef9af05fbb43407fbc9f1
 SHA512:
-  metadata.gz: 50d3805099bb35d0095317ef413611f13002309950759e412db711948ccbe2c2a55209ceb23382687a2f815b868c6132a53cba713540a03445521ad378b41717
-  data.tar.gz: 53ecea82597d2200b8cd72ca90f6d9a014229d08d64585c82249d5cff185558e673edc6c8fedf66a0c4c16294305e50875ae9e077e7dacc9246cc540f087262e
+  metadata.gz: 51a1bb0cce8b76e32e3487358761037a9743d758b5a6254c4782cc738cbe0f88a9185af87a8f1f04e846ce88beb3d9341c6ad981921371ed0ab28a7986739636
+  data.tar.gz: be2cf880163d53549c9bfb9ca9a88cb6547e45ba93ad2368152f83947d875ce9a0a32dd450ef09d7f3fd6a37ec4faa529994031de40b770ced2a207d62695d2a

data/lib/Bake.rb

@@ -6,12 +6,8 @@ require_relative 'Converter'
 
 module BConv
 
-  # class ParserException < Exception
-  # end
-
   class Bake
-    
-    #enums
+
     START_INFO = 1
     END_INFO = 2
     BEFORE_INFO = 3

data/lib/ConfigParser.rb

@@ -14,59 +14,54 @@ module BConv
     
     def readConfig
       begin
+        mapping = []
+        mappings = []
+        bracket = false
+        i=0
+        j=0
+        
         File.open(@filename) do |l|
-          mappings = []
-          mapForProj = {} 
-          while(line = l.gets) != nil
-            mapping = {}
-            ar = []
-            setEndLabel = false
-            if line.match(/^Mapping/)
+           while(line = l.gets) != nil  
+            if line.include?("{")
+              mapping.push({})
+              i = i+1
+              mapping[i] = mapping[i-1].clone
+              bracket = true
               lineNumber = l.lineno
-              while(line = l.gets) != nil
-                line.gsub!('\\','/')
-                ar = line.split("=")
-                
-                if (ar.length == 2)
-                  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,"")
+            elsif line.include?("}")
+              if bracket == true
+                if @projToConvert != "" && @projToConvert != mapping[i]['Proj2Convert']
+                  #do nothing and continue
+                elsif @projToConvert != "" && @projToConvert == mapping[i]['Proj2Convert']
+                  mappings.push({})
+                  mappings[j] = mapping[i].clone
+                  break
+                else
+                  mappings.push({})
+                  mappings[j] = mapping[i].clone
                 end
                 
-                if line.match(/^}$/)
-                  raise "Error: Workspace parameter from Mapping in line #{lineNumber} is missing!" if mapping.has_key?('Workspace') == false
-                  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: 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
+                if mappings.length != 0
+                  mappings[j].each do |key,value|
+                    raise "Error: Workspace parameter from Mapping in line #{lineNumber} is missing!" if mappings[j].has_key?('Workspace') == false
+                    raise "Error: MainProj parameter from Mapping in line #{lineNumber} is missing!" if mappings[j].has_key?('MainProj') == false
+                    raise "Error: BuildConfig parameter from Mapping in line #{lineNumber} is missing!" if mappings[j].has_key?('BuildConfig') == false
+                    raise "Error: Proj2Convert parameter from Mapping in line #{lineNumber} is missing!" if mappings[j].has_key?('Proj2Convert') == false
+                    raise "Error: OutputFile parameter from Mapping in line #{lineNumber} is missing!" if mappings[j].has_key?('OutputFile') == false
+                    raise "Error: TemplateFile parameter from Mapping in line #{lineNumber} is missing!" if mappings[j].has_key?('TemplateFile') == false
                   end
-                  setEndLabel = true
-                  break
-                  
-                elsif line.include?("Mapping")
-                  raise "Error: end label } from Mapping in line #{lineNumber} is missing!"
+                  j = j+1
                 end
               end
-              raise "Error: end label } from Mapping in line #{lineNumber} is missing!" if setEndLabel == false
-            elsif line.match(/^( *)Workspace/)
-              lineNumber = l.lineno
-              raise "Error: Mapping keyword in front of line #{lineNumber} is missing?"
+              mapping.delete_at(i)
+              i = i-1
+              bracket = false
+            else
+              getKeyValuePairs(line,mapping[i],lineNumber)
             end
           end
-          return 0, mappings
         end
+        return 0, mappings
       rescue Exception => e
         puts e.message
         puts e.back_trace if @debugMode == true
@@ -74,9 +69,27 @@ module BConv
       end
     end
     
+    def getKeyValuePairs(line,hash,lineNumber)
+      arr = []
+      line.gsub!('\\','/')
+      arr = line.split("=")
+      
+      if (arr.length == 2)
+        if arr[0].strip[0] != "#"
+          comPos = arr[1].index("#")
+          arr[1] = arr[1][0..comPos-1] if comPos != nil
+          hash.store(arr[0].strip,arr[1].strip)
+          raise "Error: Parameter in #{File.basename(@filename)} from Mapping in line #{lineNumber} is missing!" if arr[0].strip == ""
+        end
+      elsif arr[1] == ""
+        hash.store(arr[0].strip,"")
+      end
+      return hash
+    end
+    
   end
   
-end    
+end
 
 
 

data/lib/Converter.rb

@@ -39,9 +39,7 @@ module BConv
                 if preAndPostfix.length == 1
                   prefix = preAndPostfix[0][0]
                   postfix = preAndPostfix[0][1]
-                end
-                #need some cosmetics!
-                if preAndPostfixOpt.length == 1
+                elsif preAndPostfixOpt.length == 1
                   prefix = preAndPostfixOpt[0][0]
                   postfix = preAndPostfixOpt[0][1]
                 end

data/lib/Version.rb

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

data/lib/bakeConverter.rb

@@ -63,10 +63,10 @@ def main
     when "--mock"
       setMock = true
     when "--version"
-      puts "bakeConverter #{BConv::Version.number}"
+      puts "bakeConv #{BConv::Version.number}"
       exit(0)
     when "-v"
-      puts "bakeConverter #{BConv::Version.number}"
+      puts "bakeConv #{BConv::Version.number}"
       exit(0)
     when "--help"
       BConv::Help.printHelp
@@ -94,7 +94,6 @@ def main
   end
    
   rescue Exception => e
-  puts "Error in arguments!"
   puts e.backtrace if debugMode == true
   exit(-1)
   end

data/license.txt

@@ -1,4 +1,4 @@
-bakeConverter License:
+bakeConv License:
 
 Copyright (c) 2015 E.S.R. Labs AG
 

metadata

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