jvmargs 0.0.6 → 0.0.7

data/lib/jvmargs/args.rb

@@ -96,22 +96,7 @@ module JVMArgs
     end
 
     def heap_size(size)
-      if (size =~ /([0-9]+)%/)
-        percent = $1.to_i * 0.01
-        if percent > 1
-          raise ArgumentError, "heap_size percentage must be less than 100%, you provided #{$1}%"
-        elsif percent < 0.01
-          raise ArgumentError, "heap_size percentage must be between 100% - 1%, you provided #{$1}%"
-        end
-        system_ram = JVMArgs::Util.get_system_ram_m.sub(/M/,'').to_i
-        size_ram = "#{(system_ram * percent).to_i}M"
-      else
-        begin
-          size_ram = JVMArgs::Util.convert_to_m(size)
-        rescue ArgumentError
-           raise ArgumentError, "heap_size percentage must be a percentage or a fixed size in KiloBytes(K), MegaBytes (M), or Gigabytes(G)"
-        end 
-      end
+      size_ram = JVMArgs::Util.parse_ram_size_to_m(size)
       @args[:nonstandard]["Xmx"] = JVMArgs::NonStandard.new("-Xmx#{size_ram}")
       @args[:nonstandard]["Xms"] = JVMArgs::NonStandard.new("-Xms#{size_ram}")
     end

data/lib/jvmargs/nonstandard.rb

@@ -4,11 +4,12 @@ module JVMArgs
     
     def initialize(arg)
       stripped = arg.sub(/^-/, '')
-      stripped =~ /(X[a-z]+)([0-9]+[a-zA-Z])?/
-      @key = $1
+      stripped =~ /(X[a-z]+:?)([0-9]+[a-zA-Z])?/
       if $2.nil?
-        @value =  true
+        @key = $1 
+        @value = stripped[@key.length..-1] # could be an empty string
       else
+        @key = $1
         @value = JVMArgs::Util.convert_to_m($2)
         # value is a kilobyte value < 1 MB after conversion
         if @value == "0M"
@@ -18,11 +19,7 @@ module JVMArgs
     end
     
     def to_s
-      if @value == true
-        "-#{@key}"
-      else
-        "-#{@key}#{@value}"
-      end
+      "-#{@key}#{@value}"
     end
   end
 end

data/lib/jvmargs/util.rb

@@ -39,5 +39,25 @@ module JVMArgs
       [$1.to_i, $2.upcase]
     end
     
+    # Accepts a 'size' value such as 70% or 5G and converts this to
+    # the size in M.
+    def self.parse_ram_size_to_m(size)
+      if (size =~ /([0-9]+)%/)
+        percent = $1.to_i * 0.01
+        if percent > 1
+          raise ArgumentError, "heap_size percentage must be less than 100%, you provided #{$1}%"
+        elsif percent < 0.01
+          raise ArgumentError, "heap_size percentage must be between 100% - 1%, you provided #{$1}%"
+        end
+        system_ram = JVMArgs::Util.get_system_ram_m.sub(/M/,'').to_i
+        size_ram = "#{(system_ram * percent).to_i}M"
+      else
+        begin
+          size_ram = JVMArgs::Util.convert_to_m(size)
+        rescue ArgumentError
+           raise ArgumentError, "heap_size percentage must be a percentage or a fixed size in KiloBytes(K), MegaBytes (M), or Gigabytes(G)"
+        end 
+      end      
+    end
   end
 end

data/lib/jvmargs/version.rb

@@ -1,4 +1,4 @@
 module JVMArgs
   # The gem version
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jvmargs
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -115,6 +115,6 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: jvmargs-0.0.6
+summary: jvmargs-0.0.7
 test_files: []
 has_rdoc: