rake-delphi 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fac8338f63859adafff7ad6681916eada8c35b5
-  data.tar.gz: 08d7384ceae2e954237f3260d52e3c5d01289c28
+  metadata.gz: 85268a1c9740bd8216fad6d4693c671089f0d226
+  data.tar.gz: d33a4a9546706b44ab6f8d70b686bee4847a1ec9
 SHA512:
-  metadata.gz: 7eb163f1d211c08f314fd66c8e8b2ef02feefd7a9fe1be6dfdb92748deee25c6ee04b3126178fcdf21ba04eb093908dee0f6180de07985a498af048fe76cbbff
-  data.tar.gz: 2f0c7ee26b2dbb4031d499a2b79f1acec268afee6fe2d16f20980f226fbe095f2205c3ff82a59192088c602a73385558fb015e063e08ebb9dbc0403457c2f067
+  metadata.gz: dc648d2523347f3c35665a6fb9d5b4dd9beb41463aeb6ccc2af821b593307ab23b818ea5dff8e71a54acaad16bd53af28cefa40821002690214f071894a9b14d
+  data.tar.gz: 31bf56b4d73b599ff79ce2dde19ecd80de6150ab8bebc17d5a4ab17f0492fac32b671a80a30dbfb003e4c422de61a9ebea6cd5bf6602c7764a8e4e0b54e30003

data/Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rake-delphi.gemspec
 gemspec
-gem 'rake', '~> 10.0.4'
-gem 'minitest', '~> 4.3'
-gem 'xml-simple'
-gem 'rubyzip', '~> 0.9.9'
-gem 'inifile'
-gem 'apktools', :group => :development

data/Gemfile.lock

@@ -1,7 +1,11 @@
 PATH
   remote: .
   specs:
-    rake-delphi (0.0.29)
+    rake-delphi (0.0.30)
+      bundler (~> 1.3)
+      inifile
+      rake (~> 10.0.4)
+      xml-simple
 
 GEM
   remote: https://rubygems.org/
@@ -19,10 +23,6 @@ PLATFORMS
 
 DEPENDENCIES
   apktools
-  bundler (~> 1.3)
-  inifile
   minitest (~> 4.3)
-  rake (~> 10.0.4)
   rake-delphi!
   rubyzip (~> 0.9.9)
-  xml-simple

data/lib/rake/common/libstask.rb

@@ -11,6 +11,7 @@ module Rake
         def initialize(name, app)
             super
             @original_dir = ENV['RAKE_DIR'] || Rake.original_dir
+            @libs = []
         end
 
         def self.define(name, app)

data/lib/rake/delphi/dcc32.rb

@@ -318,7 +318,10 @@ module Rake
                             # on Windows there is some limit on command line parameters length
                             # so we just append path parameters to config file
                             File.open(cfg, 'a+') do |f|
-                                paths.each do |p|
+                                lpaths = paths
+                                Logger.trace(Logger::TRACE, 'Implicit and included paths:')
+                                Logger.trace(Logger::TRACE, lpaths)
+                                lpaths.each do |p|
                                     f.write(p + "\n")
                                 end
                             end

data/lib/rake/delphi/project.rb

@@ -18,7 +18,7 @@ module Rake
             super
             initvars
             @dcc = application.define_task(Dcc32Task, shortname + ':dcc32')
-            @libs = LibsTask.define(name + ':all-delphi-libs', application)
+            @libs = LibsTask.define(shortname + ':all-delphi-libs', application)
             @post = application.define_task(PAClientTask, @dcc.shortname + ':post')
             @level = 1
             enhance([@libs, @dcc, @post])

data/lib/rake/delphi/projectinfo.rb

@@ -25,7 +25,7 @@ module Rake
         end
 
         def method_missing(name, *args, &block)
-            @info[name]
+            @info[name].gsub('"', '""') if @info[name]
         end
     end
 

data/lib/rake/delphi/resources.rb

@@ -63,8 +63,10 @@ module Rake
         def method_missing(name, *args, &block)
             if args.empty? && @extra[name]
                 @extra[name]
-            elsif
-                @source.name
+            elsif @source
+              @source.name
+            else
+              raise 'No key :%s' % name.to_s
             end
         end
     end

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.29'
+    VERSION = '0.0.30'
   end
 end

data/lib/rake/helpers/gemversion.rb

@@ -37,6 +37,16 @@ module Gem
             self.class.new segments.join('.')
         end
 
+        ##
+        # The build number
+        def build_num
+            segments = self.segments.dup
+            segments.pop while segments.any? { |s| String === s }
+            segments.pop while segments.size > 4
+
+            segments.size == 4 ? segments[-1] : nil
+        end
+
         ##
         # Returns release only part
         # (e.g. 1.2.3.4 -> 3, 1.2.3 -> 2)
@@ -48,6 +58,22 @@ module Gem
             segments[-1]
         end
 
+        def major
+            segments = self.segments.dup
+            segments.pop while segments.any? { |s| String === s }
+            segments.pop while segments.size > 1
+
+            segments[-1]
+        end
+
+        def minor
+            segments = self.segments.dup
+            segments.pop while segments.any? { |s| String === s }
+            segments.pop while segments.size > 2
+
+            segments.size == 2 ? segments[-1] : nil
+        end
+
         def comma
             segments.dup.join(',')
         end

data/lib/rake/helpers/unittest.rb

@@ -9,7 +9,7 @@ if defined? MiniTest::Unit::TestCase && Test::Unit::TestCase < MiniTest::Unit::T
             class TestCase
                 def name
                     __name__
-                end
+                end unless instance_methods.include?(:name)
             end
         end
     end

data/rake-delphi.gemspec

@@ -28,10 +28,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_runtime_dependency "bundler", "~> 1.3"
+  spec.add_runtime_dependency "rake", "~> 10.0.4"
+  spec.add_runtime_dependency "xml-simple"
+  spec.add_runtime_dependency "inifile"
+  # Ruby 2.2 have no `test-unit` gem in stdlib
+  if (Gem::Version.new(RUBY_VERSION) <=> Gem::Version.new('2.2')) >= 0
+    spec.add_development_dependency "test-unit"
+  end
   spec.add_development_dependency "minitest", "~> 4.3"
-  spec.add_development_dependency "rake", "~> 10.0.4"
-  spec.add_development_dependency "xml-simple"
   spec.add_development_dependency "rubyzip", "~> 0.9.9"
   spec.add_development_dependency "apktools"
 end

data/test/test-delphi.rb

@@ -16,7 +16,7 @@ module DelphiTests
 
 class TestDelphi < TestVerInfo
 private
-    def _test_compile_and_output(prepare_args, output)
+    def _test_prepare(prepare_args)
         args = [:altercfg, :usecfg, :defines, :debuginfo, :debug, :includepaths]
         # reinitialize arguments (even absent ones)
         args.each do |arg|
@@ -39,7 +39,10 @@ private
         prepare_args[:dcu] = dcu_dir_rel.unix2dos_separator
 
         prepare_task.invoke(useresources, prepare_args)
+    end
 
+    def _test_compile_and_output(prepare_args, output)
+        _test_prepare(prepare_args)
         # reenable tasks (!!! after invoking 'test:prepare')
         task = ::Rake::Task['test:compile']
         task.reenable_chain
@@ -66,6 +69,13 @@ public
         require PROJECT_PATH + '/Rakefile.rb'
     end
 
+    def test_all_delphi_libs_task_name
+        namespace :test_name do
+            Rake.application.define_task(Rake::Delphi::Project, :'project:delphi')
+        end
+        assert_equal 'test_name:project:delphi:all-delphi-libs', ::Rake::Task['test_name:project:delphi:all-delphi-libs'].name
+    end
+
     def test_compile
         _test_compile_and_output({},
             'testproject works')

data/test/test-gemversion.rb

@@ -32,6 +32,17 @@ public
         assert_equal '1,2,3,4', Gem::VersionImproved.new('1.2.3.4').comma
     end
 
+    def test_build_num
+        @version = Gem::VersionImproved.new('1.2.3.4')
+        assert_equal 4, @version.build_num
+
+        @version = Gem::VersionImproved.new('1.2.3')
+        assert_equal nil, @version.build_num
+
+        @version = Gem::VersionImproved.new('1.2')
+        assert_equal nil, @version.build_num
+    end
+
     def test_release_num
         @version = Gem::VersionImproved.new('1.2.3.4')
         assert_equal 3, @version.release_num
@@ -73,4 +84,32 @@ public
         @version = Gem::VersionImproved.new('1.x')
         assert_equal '2', @version.build.version
     end
+
+    def test_major
+        @version = Gem::VersionImproved.new('1.2.3.4')
+        assert_equal 1, @version.major
+
+        @version = Gem::VersionImproved.new('5.2.3')
+        assert_equal 5, @version.major
+
+        @version = Gem::VersionImproved.new('3.2')
+        assert_equal 3, @version.major
+
+        @version = Gem::VersionImproved.new('4')
+        assert_equal 4, @version.major
+    end
+
+    def test_minor
+        @version = Gem::VersionImproved.new('1.2.3.4')
+        assert_equal 2, @version.minor
+
+        @version = Gem::VersionImproved.new('5.4.3')
+        assert_equal 4, @version.minor
+
+        @version = Gem::VersionImproved.new('3.1')
+        assert_equal 1, @version.minor
+
+        @version = Gem::VersionImproved.new('4')
+        assert_equal nil, @version.minor
+    end
 end

data/test/test-libstask.rb

@@ -28,6 +28,13 @@ public
         end
         # already invoked
         assert_not_equal(nil, task2.libs)
+        # not empty
+        assert_not_equal([], task2.libs)
+    end
+
+    def test_libs_relative_not_executed
+        task2 = Rake::Delphi::LibsTask.define('libs task not executed', Rake.application)
+        assert_equal [], task2.libs
     end
 
     def test_libs_relative

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Alexey Shumkin
@@ -17,7 +17,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,47 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
-  type: :development
+        version: 10.0.4
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 10.0.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 10.0.4
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-simple
+  name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement