rake-delphi 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eca8384876329fb4725a0a2dfe448daeee168868
-  data.tar.gz: 05a2efd6373a367c07998bdb8e78e48fb1fc26cb
+  metadata.gz: 6c119e5e4ece30a32ff3711de76435085b2537a5
+  data.tar.gz: e5637e98253cd6c1a19f5d4ea0618c81beb4f501
 SHA512:
-  metadata.gz: 8a7f1a1943b60d27d5f653108f757c54fb257f1b100dea5800d823be5d0f73df7316700c244e25826b889bba4bc9d772f8855adc94ca4e212d5620876fe029c0
-  data.tar.gz: 045a1be7b49a0ba772d95866aaf4db51b2c04912968f28bf0147b97dc03166ab3e0cb6e87f06514d5abaf3bf3d0dd953ae422e1035619497ee82aec84882452f
+  metadata.gz: b4cd5c00f5acd60e9ca67e94fe2af7ac18ccb5e49a9c5f9b391f2a33a7836d8b0f39d77d68c35f6caf89986d732145902e269a51c1a9fd972eae3b8a3c44f97b
+  data.tar.gz: 1e6222bc2efdf3b4dbbba47658764860f221c3c26922320eb1607ab1c3b5fd24edb0b253302f53c213f4d86ac464449b35eb4bc7ad684ecea2ad4aa229f04b30

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake-delphi (0.0.32)
+    rake-delphi (0.0.33)
       bundler (~> 1.3)
       inifile
       rake (~> 10.0.4)

data/lib/rake/delphi/android/sdk.rb

@@ -19,9 +19,6 @@ module Rake
           :zipalign => 'SDKZipAlignPath',
           :jdk_path => 'JDKJarsignerPath'
         }
-        REG_KEYS = {::Win32::Registry::HKEY_CURRENT_USER => 'HKCU',
-          ::Win32::Registry::HKEY_LOCAL_MACHINE => 'HKLM'}
-
         PROPERTIES.keys.each do |prop|
           attr_accessor prop
         end
@@ -34,11 +31,14 @@ module Rake
         def read_default_config
           begin
             require 'win32/registry'
+            @reg_keys = {::Win32::Registry::HKEY_CURRENT_USER => 'HKCU',
+              ::Win32::Registry::HKEY_LOCAL_MACHINE => 'HKLM'}
+
             [::Win32::Registry::HKEY_CURRENT_USER, \
                 ::Win32::Registry::HKEY_LOCAL_MACHINE].each do |regRoot|
               begin
                 key = 'Default_Android'
-                Logger.trace(Logger::DEBUG, "Finding #{REG_KEYS[regRoot]}\\#{@platform_SDKs}\\#{key}")
+                Logger.trace(Logger::DEBUG, "Finding #{@reg_keys[regRoot]}\\#{@platform_SDKs}\\#{key}")
                 regRoot.open(@platform_SDKs) do |reg|
                     reg_typ, reg_val = reg.read(key)
                   Logger.trace(Logger::DEBUG, "Found '#{reg_val}'")
@@ -61,14 +61,13 @@ module Rake
           return unless default_android
           reg_default = @platform_SDKs + '\\' + default_android
           begin
-            require 'win32/registry'
             PROPERTIES.each do |prop, reg_key|
               next unless reg_key
               # current user values have precedence over local machine
               [::Win32::Registry::HKEY_CURRENT_USER, \
                  ::Win32::Registry::HKEY_LOCAL_MACHINE].each do |regRoot|
                 begin
-                  Logger.trace(Logger::DEBUG, "Finding '#{reg_key}' for '#{prop}' in '#{REG_KEYS[regRoot]}\\#{reg_default}'")
+                  Logger.trace(Logger::DEBUG, "Finding '#{reg_key}' for '#{prop}' in '#{@reg_keys[regRoot]}\\#{reg_default}'")
                   regRoot.open(reg_default) do |reg|
                     reg_typ, reg_val = reg.read(reg_key)
                     Logger.trace(Logger::DEBUG, "Value=#{reg_val}")

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.32'
+    VERSION = '0.0.33'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Alexey Shumkin