delphivm 0.8.1 → 0.9.0

data/lib/build_target.rb

@@ -0,0 +1,84 @@
+class BuildTarget < Thor
+	attr_accessor :idetag
+	attr_accessor :config
+	 
+	INCL_BUILD = /(_|\/|\A)build(_|\/|\Z)/ # REX for recognize a build subpath
+	
+	include Thor::Actions
+	
+	def self.inherited(klass)
+		klass.source_root(ROOT)
+		klass.publish
+	end
+
+	def method_missing(name, *args, &block)
+		if name.to_s.match(/(\w+)_path$/)
+			convert_to_path $1
+		else
+			super
+		end
+	end
+
+protected
+	def self.depends(*task_names)
+		@depends ||=[]
+		@depends.push(*task_names)
+		@depends
+	end
+	
+	def clear_products
+		@products = [] 
+	end
+		
+	def catch_products
+		@catch_products = true
+		yield
+	ensure
+		@catch_products = false
+	end
+
+	def catch_product(*prods)
+		@products.push(*prods)
+		yield *prods unless @catch_products
+	end
+	
+	def do_clean(idetag, cfg)
+		catch_products do
+			do_make(idetag, cfg)
+		end
+		@products.each do |p| 
+			remove_file(p) 
+		end
+	end
+	
+	def do_make(idetag, cfg)
+	end
+
+	def do_build(idetag, cfg)
+		invoke :clean
+		invoke :make
+	end
+
+	def self.publish    
+		[:clean, :make, :build].each do |mth|
+			desc "#{mth}", "#{mth} #{self.namespace} products"
+			method_option :params,  type: :hash, aliases: '-p', default: {:Config => 'Debug'}, desc: "more MSBuild params. See MSBuild help"
+			define_method mth do
+				msbuild_params = options[:params]
+				IDEServices.ideused.each do |idetag|          
+					self.idetag = idetag
+					self.config = msbuild_params
+					self.clear_products
+					self.class.depends.each { |task| self.invoke "#{task}:#{mth}" }
+					send("do_#{mth}", idetag, msbuild_params)
+				end
+			end
+		end
+	end
+
+	def convert_to_path(under_scored='')
+		buildpath_as_str = (Pathname('out') + self.idetag + self.config[:Config]).to_s    
+		ROOT + under_scored.to_s.split('_').join('/').gsub(INCL_BUILD, '\1' + buildpath_as_str + '\2')
+	end
+	
+end

data/lib/delphivm.rb

@@ -1,137 +1,77 @@
-#!/usr/bin/env ruby
-
-require 'thor'
-require 'pathname'
-
-Delphivm = Thor
-class Delphivm
-  ROOT = ::Pathname.getwd
-end
-
-require 'zip/zip'
-
-require 'open3'
-require 'nokogiri'
-
-require 'win32/registry.rb'
-
-require 'version_info'
-require 'open-uri'
-require 'net/http'
-require 'ruby-progressbar'
-
-require 'extensions'
-require 'delphivm/version'
-require 'delphivm/ide_services'
-require 'delphivm/dsl'
-
-require 'delphivm/runner'
-
-if Delphivm::ROOT == Pathname(__FILE__).dirname.parent
-  TARGET = Object.const_get('Delphivm')
-else
-  VersionInfo.file_format = :text
-  target = Module.new
-  target.module_exec do
-    include VersionInfo
-    self.VERSION.file_name = Delphivm::ROOT + 'VERSION'
-  end
-  Object.const_set(Delphivm::ROOT.basename.to_s.snake_case.camelize, target)
-  target.freeze
-  VersionInfo.install_tasks(:target => target)
-
-  TARGET = Object.const_get(target.name)
-end
-
-module Thor::Util #:nodoc:
-  SEARCH_ROOT = File.dirname(__FILE__)
-  # redefine to search tasks only for this app
-  def self.globs_for(path)
-    ["#{SEARCH_ROOT}/dvm/*.thor", "#{Delphivm::ROOT}/dvm/*.thor"]
-  end
-end
-
-class BuildTarget < Thor
-  attr_accessor :idetag
-  attr_accessor :config
-   
-  INCL_BUILD = /(_|\/|\A)build(_|\/|\Z)/ # REX for recognize a build subpath
-  
-  include Thor::Actions
-  
-  def self.inherited(klass)
-    klass.source_root(ROOT)
-    klass.publish
-  end
-
-  def method_missing(name, *args, &block)
-    if name.to_s.match(/(\w+)_path$/)
-      convert_to_path $1
-    else
-      super
-    end
-  end
-
-protected
-  def self.depends(*task_names)
-    @depends ||=[]
-    @depends.push(*task_names)
-    @depends
-  end
-  
-  def clear_products
-    @products = [] 
-  end
-    
-  def catch_products
-    @catch_products = true
-    yield
-  ensure
-    @catch_products = false
-  end
-
-  def catch_product(*prods)
-    @products.push(*prods)
-    yield *prods unless @catch_products
-  end
-  
-  def do_clean(idetag, cfg)
-    catch_products do
-      do_make(idetag, cfg)
-    end
-    @products.each do |p| 
-      remove_file(p) 
-    end
-  end
-  
-  def do_make(idetag, cfg)
-  end
-
-  def do_build(idetag, cfg)
-    invoke :clean
-    invoke :make
-  end
-
-  def self.publish    
-    [:clean, :make, :build].each do |mth|
-      desc "#{mth}", "#{mth} #{self.namespace} products"
-      method_option :params,  type: :hash, aliases: '-p', default: {:Config => 'Debug'}, desc: "more MSBuild params. See MSBuild help"
-      define_method mth do
-        msbuild_params = options[:params]
-        IDEServices.ideused.each do |idetag|          
-          self.idetag = idetag
-          self.config = msbuild_params
-          self.clear_products
-          self.class.depends.each { |task| self.invoke "#{task}:#{mth}" }
-          send("do_#{mth}", idetag, msbuild_params)
-        end
-      end
-    end
-  end
-
-  def convert_to_path(under_scored='')
-    buildpath_as_str = (Pathname('out') + self.idetag + self.config[:Config]).to_s    
-    ROOT + under_scored.to_s.split('_').join('/').gsub(INCL_BUILD, '\1' + buildpath_as_str + '\2')
-  end
-  
-end
+#!/usr/bin/env ruby
+
+require 'thor'
+require 'pathname'
+
+require 'zip/zip'
+
+require 'open3'
+require 'nokogiri'
+
+require 'win32/registry.rb'
+
+require 'version_info'
+require 'open-uri'
+require 'net/http'
+require 'ruby-progressbar'
+
+require 'extensions'
+
+require 'build_target'
+
+Delphivm = Thor # sure, we are hacking Thor !
+
+class Delphivm
+  include(VersionInfo)
+
+  ROOT = ::Pathname.getwd
+  GEM_ROOT = Pathname(__FILE__).dirname.parent
+  EXE_NAME = File.basename($0, '.rb')
+
+ 	PATH_TO_VENDOR = ROOT + 'vendor'
+  PATH_TO_VENDOR_CACHE = PATH_TO_VENDOR + 'cache'
+  PATH_TO_VENDOR_IMPORTS = PATH_TO_VENDOR + 'imports'
+  DVM_IMPORTS_FILE = PATH_TO_VENDOR + 'imports.dvm'
+  
+  module Util #:nodoc:
+    # redefine Thor to search tasks only for this app
+    def self.globs_for(path)
+      ["#{GEM_ROOT}/lib/dvm/**/*.thor", "#{Delphivm::ROOT}/dvm/**/*.thor"]
+    end
+  end
+
+  class Gen < Thor
+    namespace :gen
+    # used only as thor namesapce for generators
+    # defined here because we need ensure class Gen exist when generator tasks are loaded
+    desc "echo", "prueba de echo"
+    def echo
+    end
+  end
+
+private
+  def self.create_app_module
+    @app_module = ::Module.new do
+      include VersionInfo
+      self.VERSION.file_name = ROOT + 'VERSION'
+    end
+    Object.const_set(ROOT.basename.to_s.snake_case.camelize, @app_module)
+    @app_module.freeze # force to fix then module name
+  end  
+
+  def self.app_module
+    return @app_module if @app_module
+    if ROOT.basename.to_s.casecmp(EXE_NAME) == 0
+      @app_module = Delphivm
+    else
+      create_app_module
+    end
+    VersionInfo.install_tasks(:target => @app_module)
+    @app_module
+  end
+public
+  APPMODULE = self.app_module
+end
+
+# Runner must be loaded after Delphivm setup, i.e., after Thor is hacked 
+require 'delphivm/runner'

data/lib/delphivm/generator.rb

@@ -0,0 +1,123 @@
+class Delphivm
+
+	module Generator
+		TEMPLATE_ROOT = GEM_ROOT + Pathname('templates/delphi')
+
+		def self.included(base) #:nodoc:
+			base.send :include, Thor::Actions
+			base.add_runtime_options!
+			base.extend ClassMethods
+		end
+
+		module ClassMethods
+			def subtemplate
+				@subtemplate
+			end
+
+			def subtemplate=(value)
+				@subtemplate = value
+			end
+			
+			def get_app_name
+				@app_name = output_folder.basename.to_s.camelize
+			end
+
+			def desc(*msg)
+				if msg.size==1
+					command = name.split(':')[-1].downcase
+					args = self.arguments.map {|arg| arg.usage }.join(' ')
+					# # hide from  thor standard list
+					group(' ')
+					Gen.register(self, command, command + ' ' + args, *msg)
+				end
+				super *msg
+			end
+
+			def template_subfolder
+				subpath = (subtemplate.to_s.empty? ? '' : '/' + subtemplate.to_s)
+				@template_subfolder = self.name.split('::')[-1].snake_case + subpath + '.tt'
+			end
+
+			def output_folder
+				@output_folder ||= ROOT
+			end
+
+			def output_folder=(value)
+				@output_folder = Pathname(value.to_s)
+			end
+
+			def source_root
+				TEMPLATE_ROOT + self.template_subfolder
+			end
+		end
+		 
+		def method_missing(name, *args, &block)
+			binding_params.has_key?(name) ? binding_params[name] : super
+		end
+
+		def do_folder_template(folder)
+			empty_directory folder
+		end
+
+		def do_file_template(source, target)
+			template(source, target.dirname + target.basename('.tt'))
+			rescue Exception => e
+			say "task #{self.class.namespace} proccessing template #{source}", :red
+			say "ERROR: #{e.message}", :red
+			say "avaiable params:\n", :red
+			print_table(binding_params.inject({}){|r,p| r[":#{p[0]} => "] = p[1];r}.to_a)
+			raise ""
+		end
+
+		def skip_template_item?(item, directory)
+			if directory && item.to_s =~ /@(.+)/
+				($1 != binding_params[:idever])
+			else
+				false
+			end
+		end
+
+		def do_execute
+			self.class.source_root.glob('**/*') do |f|
+				source = f.relative_path_from(self.class.source_root)
+				target = self.class.output_folder + source
+			
+				next if skip_template_item?(source, f.directory?)
+						
+				target = Pathname(target.to_s.gsub('@','') % binding_params)
+				if f.directory?
+					do_folder_template target
+				else
+					do_file_template(source, target)
+				end
+			end
+		end
+
+		def binding_params
+				return @binding_params if @binding_params
+				@binding_params = {app_name: self.class.get_app_name}
+				options.each do |k, v|
+					@binding_params[k.to_sym] = v
+				end
+				self.class.arguments.each do |arg|
+					@binding_params[arg.name.to_sym] = self.send(arg.name)
+				end
+				@binding_params	
+		end
+
+		def do_invoke(*names, &block)
+			propagate_thor_runtime_options(*names)
+			klass = names[0]
+			klass.output_folder = self.class.output_folder
+			invoke(*names, &block)
+		end
+
+		def propagate_thor_runtime_options(*names)
+			names[2] ||= {} # ensure we have options hash
+			%w(force pretend quiet skip).each do |rt_opt|
+				names[2][rt_opt] = options[rt_opt] if options.has_key?(rt_opt)
+			end
+		end
+	end
+
+end

data/lib/delphivm/ide_services.rb

@@ -21,7 +21,8 @@ class	Delphivm
 			'D100' => {regkey: 'Software\Borland\BDS\4.0', name: '2006', desc: 'Borland Developer Stuido 4.0'},
 			'D150' => {regkey: 'Software\Embarcadero\BDS\8.0', name: 'XE', desc: 'Embarcadero RAD Stuido XE'},
 			'D160' => {regkey: 'Software\Embarcadero\BDS\9.0', name: 'XE2', desc: 'Embarcadero RAD Stuido XE2'},
-			'D170' => {regkey: 'Software\Embarcadero\BDS\10.0', name: 'XE3', desc: 'Embarcadero RAD Stuido XE3'}
+      'D170' => {regkey: 'Software\Embarcadero\BDS\10.0', name: 'XE3', desc: 'Embarcadero RAD Stuido XE3'},
+      'D180' => {regkey: 'Software\Embarcadero\BDS\11.0', name: 'XE4', desc: 'Embarcadero RAD Stuido XE4'}
     }
 
     def self.idelist
@@ -30,6 +31,10 @@ class	Delphivm
       result.sort.reverse
     end
     
+		def self.default_ide
+			self.idelist.first
+		end
+		
     def self.ideused
 			#TODO ensure we return only ides listed at IDEInfos
 		  ROOT.glob("{src,samples}/**/*.{#{GROUP_FILE_EXT.join(',')}}").map {|f| f.dirname.basename.to_s.split('-')[0]}.uniq.sort
@@ -44,7 +49,7 @@ class	Delphivm
 			new_path = ide_paths(ide_tag.upcase).map{ |p| p + 'bin' }.first
 			path.unshift new_path
 			path = path.join(';')
-			self.winpath= path
+			self.winpath = path
 			return new_path
 		end
 		
@@ -59,7 +64,7 @@ class	Delphivm
     end
       
     def set_env
-      ENV["PATH"] =  '$(BDSCOMMONDIR)\bpl;' + ENV["PATH"]
+      ENV["PATH"] = '$(BDSCOMMONDIR)\bpl;' + ENV["PATH"]
       ENV["PATH"] = self['RootDir'] + 'bin;' + ENV["PATH"]
       ENV["BDSPROJECTGROUPDIR"] = workdir.win
       ENV["IDEVERSION"] = idever