vzlimit 0.0.1 → 0.0.2

data/History.txt

@@ -1,7 +1,12 @@
 === 0.0.1 2010-01-30
 
-* Initial release
-* Listing/configuriong resources
-  * Memory Limits (privvmpages)
-  * Disk limits
-* ATTENTION: May only work on x86 and x86_64 hardware yet!
+* 1 major enhancement:
+  * Initial release
+
+=== 0.0.2 2010-02-02
+
+* Fixed bug that hard limit is ignored
+* Changed 'limit' command to 'set'
+* Changed param '--memory' and '-m' to '--ram' and '-r'
+* Fixed bug when calling 'vzlimit' without any parameters
+* Added help page

data/Manifest.txt

@@ -1,5 +1,6 @@
 History.txt
 Manifest.txt
+PostInstall.txt
 README.rdoc
 Rakefile
 bin/vzlimit
@@ -15,3 +16,4 @@ test/test_vzlimit.rb
 test/test_vzlimit_cli.rb
 vzlimit.gemspec
 website/index.html
+website/index.html$

data/PostInstall.txt

@@ -0,0 +1,7 @@
+
+For more information on vzlimit, see http://vzlimit.rubyforge.org
+
+NOTE: Change this information in PostInstall.txt 
+You can also delete it if you don't want it.
+
+

data/README.rdoc

@@ -1,10 +1,10 @@
 = vzlimit
 
-* http://vzlimit.rubyforge.org/
+* http://github.com/#{github_username}/#{project_name}
 
 == DESCRIPTION:
 
-vzlimit simplifies the resource management of the virtualization system 'OpenVZ'. It allows to list all the configured limits as well as changing them in human readable/writable units.
+FIX (describe your package)
 
 == FEATURES/PROBLEMS:
 
@@ -12,14 +12,37 @@ vzlimit simplifies the resource management of the virtualization system 'OpenVZ'
 
 == SYNOPSIS:
 
-  vzlimit list
+  FIX (code sample of usage)
 
 == REQUIREMENTS:
 
-* highline
-* rubyforge
-* hirb
+* FIX (list of requirements)
 
 == INSTALL:
 
-* sudo gem install vzlimit
+* FIX (sudo gem install, anything else)
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2010 Remo Fritzsche
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -12,9 +12,10 @@ Hoe.plugin :website
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'vzlimit' do
   self.developer 'Remo Fritzsche', 'dev@remofritzsche.com'
-  #self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  self.rubyforge_name       = 'vzlimit' # TODO this is default value
+  self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
+  self.rubyforge_name       = self.name # TODO this is default value
   self.extra_deps         = [['highline','>= 1.5.1'], ['rubyforge','>= 2.0.3'], ['hirb', '>= 0.2.9']]
+
 end
 
 require 'newgem/tasks'

data/config/website.yml

@@ -1,2 +1,2 @@
 host: remofritzsche@vzlimit.rubyforge.org
-remote_dir: /var/www/gforge-projects/vzlimit
+remote_dir: /var/www/gforge-projects/vzlimit

data/lib/vzlimit/cli.rb

@@ -14,7 +14,7 @@ module Vzlimit
       
       begin
         # Check action argument
-        if !@arguments[0] ||! ACTIONS.include?(@arguments[0].to_sym)
+				if !@arguments[0] || (!ACTIONS.include?(@arguments[0].to_sym) &&! @arguments[0] =~ /^-.*/)
           usage
         end
         
@@ -24,8 +24,18 @@ module Vzlimit
         end
         
         # limit
-        if @arguments[0].to_sym == :limit
-          limit
+        if @arguments[0].to_sym == :set
+          set
+        end
+
+				# help
+				if @arguments[0] == '-h' || @arguments[0] == '--help'
+					help
+				end
+
+				# version
+        if @arguments[0] == '-v' || @arguments[0] == '--version'
+          version
         end
       rescue
         @h.say $!
@@ -96,9 +106,9 @@ module Vzlimit
       
     end
 
-    def limit
+    def set
       @arguments.shift
-      usage = 'Usage: vzlimit limit vpsid [options]'
+      usage = 'Usage: vzlimit set vpsid [options]'
       raise usage unless @arguments[0]
       
       vpsid = @arguments.shift
@@ -106,20 +116,20 @@ module Vzlimit
       disk = nil
       
       while (arg = @arguments.shift) do
-        if ['-m', '--memory'].include? arg
+        if ['-r', '--ram'].include? arg
           memory = @arguments.shift
           
           if !(memory =~ /^[-+]?[0-9]*\.?[0-9]+:[-+]?[0-9]*\.?[0-9]+$/)
-            raise "Usage: vzlimit limit vpsid #{arg} soft:hard"
+            raise "Usage: vzlimit set vpsid #{arg} soft:hard"
           end
         elsif ['-d', '--diskspace'].include? arg
           disk = @arguments.shift
           
           if !(disk =~ /^\d+:\d+$/)
-            raise "Usage: vzlimit limit vpsid #{arg} soft:hard"
+            raise "Usage: vzlimit set vpsid #{arg} soft:hard"
           end
         else
-          raise "Argument #{arg} not valid for action limit."
+          raise "Argument #{arg} not valid for action 'set'."
         end
       end
       
@@ -145,7 +155,7 @@ module Vzlimit
       
       # Convert MB limits to mempages
       soft = (soft_mb.to_f * 1024 / 4).to_i
-      hard = (soft_mb.to_f * 1024 / 4).to_i
+      hard = (hard_mb.to_f * 1024 / 4).to_i
       
       # Execute command 
       execute "vzctl set #{vpsid} --privvmpages #{soft}:#{hard} --save"
@@ -168,7 +178,7 @@ module Vzlimit
       
       # Convert MB limits to 1K-block
       soft = (soft_mb.to_f * 1024).to_i
-      hard = (soft_mb.to_f * 1024).to_i
+      hard = (hard_mb.to_f * 1024).to_i
       
       # Execute command 
       execute "vzctl set #{vpsid} --diskspace #{soft}:#{hard} --save"
@@ -196,6 +206,20 @@ module Vzlimit
     
     def usage
       @h.say "Usage: vzlimit action [params...]"
+      exit
     end
+
+		def version
+			@h.say "vzlimit version #{VERSION}"
+		end
+
+    def help
+			@h.say "vzlimit list | set <veid>"
+			@h.say "vzlimit set <veid>"
+   		@h.say "\t[--ram, -r <soft-limit-in-mb>:<hard-limit-in-mb>]"
+   		@h.say "\t[--diskspace, -d <soft-limit-in-mb>:<hard-limit-in-mb>]"
+			@h.say "vzlimit --help, -h"
+			@h.say "vzlimit --version, -v"
+		end
   end
-end
+end

data/lib/vzlimit.rb

@@ -4,6 +4,6 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'rubygems'
 
 module Vzlimit
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
-end
+end

data/website/index.html

@@ -10,6 +10,14 @@
 	</head>
 	<body>
 		<h1>vzlimit</h1>
-		<p>Website comming soon.</p>
+		<p>A convenience way of managing OpenVZ container resource limits.</p>
+
+		<h2>Commands</h2>
+		<h3>List resource limits</h3>
+		<p><code>vzlimit list</code></p>
+		<h3>Set ram limit</h3>
+		<p><code>vzlimit set <i>vpsid</i> --ram, -r <i>soft(MB)</i>:<i>hard(MB)</i></code></p>
+		<h3>Set diskspace limit</h3>
+                <p><code>vzlimit set <i>vpsid</i> --diskspace, -d <i>soft(MB)</i>:<i>hard(MB)</i></code></p>
 	</body>
 </html>

data/website/index.html$

@@ -0,0 +1,17 @@
+<html>
+	<head>
+		<title>vzlimit - managing OpenVZ limits with comfort</title>
+		<style type="text/css">
+			body
+			{
+				font-family:	Georgia;
+			}
+		</style>
+	</head>
+	<body>
+		<h1>vzlimit</h1>
+		<p>A relaxed way of managing resources/limits for OpenVZ.</p>
+		<h2>Commands</h2>
+		<h3>List all 
+	</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vzlimit
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Remo Fritzsche
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 +01:00
+date: 2010-02-01 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,7 +72,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.5.0
     version: 
-description: vzlimit simplifies the resource management of the virtualization system 'OpenVZ'. It allows to list all the configured limits as well as changing them in human readable/writable units.
+description: FIX (describe your package)
 email: 
 - dev@remofritzsche.com
 executables: 
@@ -82,9 +82,11 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
+- PostInstall.txt
 files: 
 - History.txt
 - Manifest.txt
+- PostInstall.txt
 - README.rdoc
 - Rakefile
 - bin/vzlimit
@@ -100,11 +102,12 @@ files:
 - test/test_vzlimit_cli.rb
 - vzlimit.gemspec
 - website/index.html
+- website/index.html$
 has_rdoc: true
-homepage: http://vzlimit.rubyforge.org/
+homepage: http://github.com/#{github_username}/#{project_name}
 licenses: []
 
-post_install_message: 
+post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
 - README.rdoc
@@ -128,7 +131,7 @@ rubyforge_project: vzlimit
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: vzlimit simplifies the resource management of the virtualization system 'OpenVZ'
+summary: FIX (describe your package)
 test_files: 
 - test/test_helper.rb
 - test/test_vzlimit.rb