delphivm 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7d2acce55cf3d45e6bd0cf88af6fd8b2812f743
-  data.tar.gz: 7bfdafdb4536e2a71c6f3953086cd2d741a56d59
+  metadata.gz: ffd80d6a4e910ba6228a8d7f2101eb982d039ba8
+  data.tar.gz: e6b73cff009b43f837757fca00c3e233013325c4
 SHA512:
-  metadata.gz: 021bc9cf2dc28520b3789f2b93bce4c860011dc8b12c3ada9bdc8b6afb5bd0c0aa90b77db726597f06e2dc7f2e32109eebd005decae5ed4d16b599c2de89c043
-  data.tar.gz: 364539e676ccdd015a8ddbd65039983dea5860c5956066f8c7be87b0e36c0f65d85905a26b19e6bc58e4e6b34c37d1a34633f13c105d75607f486581e23f02c6
+  metadata.gz: 8ef751a83859061335a15cf5eeea484b728fd039e97847fa68fc0e4110e744cf26e5934a04836349d8433f0faac440c3784d47e7384ad2b5e0a988bfcc272f40
+  data.tar.gz: fd41c76496a2f477846a299cc286ddf90c3c8985a7dff742d00c9e54b7caac997a3adede2b932e4479a237c7ab01db6e562ee1b52d97f69a619fa5fa7093dfda

data/Gemfile

@@ -6,7 +6,7 @@ gem "version_info"
 gem "rubyzip", :require => "zip/zip"
 gem "ruby-progressbar"
 gem "nokogiri"
-
+gem "dnote"
 group :development do
   gem "ocra"
 end

data/Gemfile.lock

@@ -1,34 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    colorize (0.5.8)
-    coveralls (0.6.3)
-      colorize
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    mime-types (1.21)
-    multi_json (1.7.2)
-    nokogiri (1.5.9)
+    dnote (1.7.1)
     nokogiri (1.5.9-x86-mingw32)
-    ocra (1.3.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    ocra (1.3.1)
     ruby-progressbar (1.0.2)
     rubyzip (0.9.9)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    thor (0.18.0)
+    thor (0.18.1)
     version_info (1.7.6)
 
 PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  coveralls
+  dnote
   nokogiri
   ocra
   ruby-progressbar

data/bin/delphivm

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
 
 begin
   $LOAD_PATH.unshift File.join(File.dirname($0), '..', 'lib')
@@ -27,3 +26,4 @@ rescue Exception => e
   puts e.backtrace.join("\n") if defined? ::BACKTRACE
   exit 1
 end
+exit 0

data/lib/delphivm.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
 
 require 'thor'
 require 'pathname'
@@ -26,7 +25,7 @@ require 'delphivm/version'
 require 'delphivm/ide_services'
 require 'delphivm/dsl'
 
-require 'thor/runner'
+require 'delphivm/runner'
 
 if Delphivm::ROOT == Pathname(__FILE__).dirname.parent
   TARGET = Object.const_get('Delphivm')
@@ -116,17 +115,15 @@ protected
   def self.publish    
     [:clean, :make, :build].each do |mth|
       desc "#{mth}", "#{mth} #{self.namespace} products"
-      method_option :config,  type: :array, aliases: '-c', default: 'Debug', desc: "use IDE config(s): Debug, Release, etc"
+      method_option :params,  type: :hash, aliases: '-p', default: {:Config => 'Debug'}, desc: "more MSBuild params. See MSBuild help"
       define_method mth do
-        IDEServices.ideused.each do |idetag|
-          configs = [options[:config]].flatten
-          configs.each do |cfg|
-            self.idetag = idetag
-            self.config = cfg
-            self.clear_products
-            self.class.depends.each { |task| self.invoke "#{task}:#{mth}" }
-            send("do_#{mth}", idetag, cfg)
-          end
+        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
@@ -138,27 +135,3 @@ protected
   end
   
 end
-
-class Delphivm
-  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'
-
-  class Runner
-    # remove some tasks not needed
-    remove_task :install, :installed, :uninstall, :update
-
-    # default version and banner outputs THOR, so redefine it
-    def self.banner(task, all = false, subcommand = false)
-      "#{Delphivm::EXE_NAME} " + task.formatted_usage(self, all, subcommand)
-    end    
-
-    desc "version", "Show #{Delphivm::EXE_NAME} version"
-    def version
-      say "#{Delphivm::VERSION}"
-    end
-  end
-end

data/lib/delphivm/dsl.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+
 class Delphivm
 
   module DSL
@@ -42,19 +42,15 @@ class Delphivm
       full_url = source_uri + '/' + file_name
       to_here = dowonlad_root_path + file_name
       pb = nil
-      puts "Downloading: #{full_url}"
+      puts "\nDownloading: #{full_url}"
       start = lambda do |length, hint=''| 
-        pb = ProgressBar.new("#{file_name}", length);	
-        pb.instance_variable_set "@title_width", file_name.length + 2
-        pb.format =  "\s\s%-s #{hint} %3d%% %s %s"
-        pb.clear
-        pb.send :show
+        pb = ProgressBar.create(:title => "#{hint}", :format => "%t %E %w");
       end
 
-      progress = lambda {|s| pb.set(s)}
+      progress = lambda {|s| pb.progress = s; pb.refresh}
 
       if Pathname(to_here).exist?
-        start.call(0, "(cached)")
+        start.call(0, "(cached) ")
       else
         begin
           content = open(full_url, "rb", content_length_proc: start, progress_proc: progress).read
@@ -74,15 +70,12 @@ class Delphivm
 
     def unzip(file, destination)
       Zip::ZipFile.open(file) do |zip_file|
-        pb = ProgressBar.new("", zip_file.size)
-        pb.format =  "\s\s\s\sextracting: %3d%% %s file: %-34s"
-        pb.format_arguments = [:percentage, :bar, :title]
+        pb = ProgressBar.create(:total =>  zip_file.size, :format => "extracting %c/%C %B %t")
         zip_file.each do |f|
           f_path = destination + f.name
           next if Pathname(f_path).directory?
           f_path.dirname.mkpath
-          pb.instance_variable_set "@title", "#{f_path.basename}"
-          pb.inc
+          pb.title = "#{f_path.basename}"
           Pathname(f_path).delete if File.exist?(f_path)
           zip_file.extract(f, f_path) 
         end

data/lib/delphivm/ide_services.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'fiddle'
 require 'fiddle/import'
 
@@ -69,8 +67,8 @@ class	Delphivm
 
     def start
       set_env
-      Process.detach(spawn "#{self['App']}", "-r#{prj_slug}")
-      say "started bds -r#{prj_slug}"
+      Process.detach(spawn "#{self['App']}", "-rDelphiVM\\#{prj_slug}")
+      say "started bds -rDelphiVM\\#{prj_slug}"
     end
     
     def prj_slug
@@ -82,18 +80,20 @@ class	Delphivm
 			ide_number > 140			
 		end
 		
-    def msbuild(config, target)
+    def msbuild(target, config)
       set_env
-      self.class.winshell(out_filter: ->(line){line =~ /(error)/}) do |i|
-        Pathname.glob(workdir + "{src,samples}/#{idever}**/*.{#{GROUP_FILE_EXT.join(',')}}") do |f|
+      self.class.winshell(out_filter: ->(line){line =~/\b(warning|error)\b/i}) do |i|
+			  Pathname.glob(workdir + "{src,samples,test}/#{idever}**/*.{#{GROUP_FILE_EXT.join(',')}}") do |f|
           f_to_show = f.relative_path_from(workdir)
-          say "#{target} (#{config}) #{f_to_show.win} ...."
           # paths can contains spaces so we need use quotes
 					if supports_msbuild?(idever)
+						msbuild_prms = config.inject([]) {|prms, item| prms << '/p:' + item.join('=')}.join(' ')
+	          say "[#{idever}] msbuild /t:#{target} #{msbuild_prms} #{f_to_show.win} ...."
           	i.puts %Q["#{self['RootDir'] + 'bin\rsvars.bat'}"]
-          	i.puts %Q[msbuild /nologo /t:#{target} /p:Config=#{config} "#{f.win}"]
+          	i.puts %Q[msbuild /nologo /consoleloggerparameters:v=quiet /filelogger /flp:v=detailed /t:#{target} #{msbuild_prms} "#{f.win}"]
 					else						
-          	i.puts %Q[bds -b "#{f.win}"]
+            say "[#{idever}] bds -b #{f_to_show.win} ...."
+	        	i.puts %Q[bds -b "#{f.win}"]
 					end
         end  
       end    

data/lib/delphivm/runner.rb

@@ -0,0 +1,25 @@
+require 'thor/runner'
+
+class Delphivm
+	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'
+
+	class Runner
+		# remove some tasks not needed
+		remove_task :install, :installed, :uninstall, :update
+
+		# default version and banner outputs THOR, so redefine it
+		def self.banner(task, all = false, subcommand = false)
+			"#{Delphivm::EXE_NAME} " + task.formatted_usage(self, all, subcommand)
+		end    
+
+		desc "version", "Show #{Delphivm::EXE_NAME} version"
+		def version
+			say "#{Delphivm::VERSION}"
+		end
+	end
+end

data/lib/delphivm/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 class Delphivm
-  VERSION = "0.7.7"
+  VERSION = "0.8.0"
   include(VersionInfo)
   self.VERSION.file_name = __FILE__
 end

data/lib/dvm/project.thor

@@ -1,12 +1,9 @@
-# encoding: UTF-8
-
-	
+	
 class Project < BuildTarget
 
 	SHIP_FILE = "#{TARGET}-#{TARGET.VERSION.tag}"
 
 	desc  "clean", "clean #{SHIP_FILE} products", :for => :clean
-	
 	desc  "make", "make #{SHIP_FILE} products", :for => :make
 	desc  "build", "build #{SHIP_FILE} products", :for => :build
 
@@ -14,7 +11,6 @@ class Project < BuildTarget
 	method_option :config,  type: :array, aliases: '-c', default: '', desc: "use IDE config(s): Debug, Release, etc"
 	def ship
 		get_idevers.each do |idever|
-			#ide = IDEServices.new(idever, ROOT)
 			configs = [options[:config]].flatten
 			configs.each do |cfg|
 				build_ship(idever, cfg)
@@ -26,17 +22,17 @@ protected
 
 	def do_clean(idetag, cfg)
 		ide = IDEServices.new(idetag, ROOT)
-		ide.msbuild(cfg, 'Clean')
+		ide.msbuild('Clean', cfg)
 	end
 
 	def do_make(idetag, cfg)
 		ide = IDEServices.new(idetag, ROOT)
-		ide.msbuild(cfg, 'Make')
+		ide.msbuild('Make', cfg)
 	end
 
 	def do_build(idetag, cfg)
 		ide = IDEServices.new(idetag, ROOT)
-		ide.msbuild(cfg, 'Build')
+		ide.msbuild('Build', cfg)
 	end
 
 private
@@ -56,7 +52,7 @@ private
 		groups = [
 			["output", ROOT + 'out' + idever + config, Pathname('.')],
 			["source", ROOT + 'src', Pathname('src') + SHIP_FILE],
-			["sample", ROOT + 'samples', Pathname('samples') + SHIP_FILE],
+			["samples", ROOT + 'samples', Pathname('samples') + SHIP_FILE],
 			["documentation", ROOT + 'doc', Pathname('doc') + SHIP_FILE]
 		]
 		puts "Ship file " + zip_fname.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delphivm
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Jorge L. Cangas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - lib/delphivm.rb
 - lib/delphivm/dsl.rb
 - lib/delphivm/ide_services.rb
+- lib/delphivm/runner.rb
 - lib/delphivm/version.rb
 - lib/dvm/ide.thor
 - lib/dvm/project.thor