bakeConv 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccaf42df2dd2839f2b59740ac7709eb6002326f0
-  data.tar.gz: bea04047131fca20b5fe52d41e1fc6b96972b016
+  metadata.gz: 77a23202d00aacf618f97272a61931f882fa737f
+  data.tar.gz: 8e4fc77e651741768e88d69a666b77edee2e1917
 SHA512:
-  metadata.gz: 0c1d6e7bce4bc0087356ec68c66601beafb89f4eba369fafd532dcb7c7c2b5882cc4be5a1843eb73b07ebf817349093fa1981fce0e0e365447499f173f08206a
-  data.tar.gz: 2670d654360ed1456282c7d8632dba4e90ee896a4aeeab40d1ad341f2e5779c145d497c64e1e4168199322b5de274995be280138cf88522a395d9392f132cd80
+  metadata.gz: 0aa01576efe2c7b8ffb74d35eaf7b1e6410d2cf912f55de0006da535d64cf4b308b14a17f395c9785b892c3a14a3dad72a95bfd888bb49a6b8a043975a5a961e
+  data.tar.gz: b8fa9751fac12a72ab778cdde8d168dac74a99df26cab54ecc8a93bfa4456101a9b822e436cf681f489b949ab4e6328ef40f699efecab3f2ba53db70ccc57acb

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

@@ -64,7 +64,7 @@ module BConv
         return 0, mappings
       rescue Exception => e
         puts e.message
-        puts e.back_trace if @debugMode == true
+        #puts e.back_trace if @debugMode == true
         abort
       end
     end

data/lib/Converter.rb

@@ -15,8 +15,12 @@ module BConv
     end
     
     def convert
-      outputfilename = Util.makeAbsolute(@map['OutputFile'], @configFile)
-      templatefilename = Util.makeAbsolute(@map['TemplateFile'], @configFile)
+      pwd = @map['Workspace'][1..-2]
+      
+      #outputfilename = Util.makeAbsolute(@map['OutputFile'], @configFile)
+      outputfilename = Util.makeAbsolute(@map['OutputFile'], pwd)
+      #templatefilename = Util.makeAbsolute(@map['TemplateFile'], @configFile)
+      templatefilename = Util.makeAbsolute(@map['TemplateFile'], pwd)
 
       lineIdx = 0
       tmpLineIdx = 0
@@ -44,7 +48,8 @@ module BConv
                   postfix = preAndPostfixOpt[0][1]
                 end
                 
-                filename = Util.makeAbsolute(@map[key], @configFile)
+                #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,13 +10,14 @@ module BConv
     SLASH = "/"
     COLON = ":"
     
-    def self.adapt_path(outputFilePath, bhash, cfgFleFromCmdLne, debugMode)
+    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(cfgFleFromCmdLne)).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

@@ -6,11 +6,11 @@ require_relative 'File_ext'
 
 class Util
   
-  def self.makeAbsolute(file, configFile)
+  def self.makeAbsolute(file, pwd)
     if File.isAbsolute?(file)
       outputfilename = file
     else
-      outputfilename = File.dirname(configFile) + "/" + file
+      outputfilename = File.join(pwd,file)
     end
     return outputfilename    
   end

data/lib/Version.rb

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

data/lib/bakeConverter.rb

@@ -112,7 +112,7 @@ def main
   puts "Reading config..."
   status, mappings = cp.readConfig
   
-  abort "Error: Config file is empty OR the requested project(s) is commented out!" if mappings.length == 0
+  abort "Error: Config file is empty OR the requested project(s) is commented out OR the project doesn't exist!" if mappings.length == 0
   puts "Converting #{mappings.length} projects..."
   idxCnt = 0
   
@@ -131,7 +131,8 @@ def main
           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, 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.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Frauke Blossey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy