lxc-ruby 0.2.2 → 0.2.3

data/README.md

@@ -85,10 +85,21 @@ c.stop   # => {:state => 'STOPPED', :pid => -1}
 c.freeze
 c.unfreeze
 
+# Destroy container
+c.destroy # => true
+```
+
+Container metrics:
+
+```ruby
 # Get container memory usage (in bytes)
 c.memory_usage
 c.memory_limit
 
+# Get container cpu shares and usage (in seconds)
+c.cpu_shares # => 1024
+c.cpu_usage  # => 4312.08
+
 # Get running processes
 c.processes 
 # => 
@@ -98,9 +109,6 @@ c.processes
 #   "memory"=>"0.1",
 #   "command"=>"/sbin/init",
 #   "args"=>""}]
-
-# Destroy container
-c.destroy # => true
 ```
 
 To create a new container:

data/lib/lxc/container.rb

@@ -54,14 +54,14 @@ module LXC
     # Start container
     # @return [Hash] container status hash
     def start
-      LXC.run('start', '-d', '-n', name)
+      run('start', '-d')
       status
     end
 
     # Stop container
     # @return [Hash] container status hash
     def stop
-      LXC.run('stop', '-n', name)
+      run('stop')
       status
     end
 
@@ -75,14 +75,14 @@ module LXC
     # Freeze container
     # @return [Hash] container status hash
     def freeze
-      LXC.run('freeze', '-n', name)
+      run('freeze')
       status
     end
 
     # Unfreeze container
     # @return [Hash] container status hash
     def unfreeze
-      LXC.run('unfreeze', '-n', name)
+      run('unfreeze')
       status
     end
 
@@ -92,26 +92,42 @@ module LXC
       if !LXC::Shell.valid_state?(state)
         raise ArgumentError, "Invalid container state: #{state}"
       end
-      LXC.run('wait', '-n', name, '-s', state)
+
+      run('wait', '-s', state)
     end
 
     # Get container memory usage in bytes
     # @return [Integer]
     def memory_usage
-      LXC.run('cgroup', '-n', name, 'memory.usage_in_bytes').strip.to_i
+      run('cgroup', 'memory.usage_in_bytes').strip.to_i
     end
 
     # Get container memory limit in bytes
     # @return [Integer]
     def memory_limit
-      LXC.run('cgroup', '-n', name, 'memory.limit_in_bytes').strip.to_i
+      run('cgroup', 'memory.limit_in_bytes').strip.to_i
+    end
+
+    # Get container cpu shares
+    # @return [Integer]
+    def cpu_shares
+      result = run('cgroup', "cpu.shares").strip
+      result.empty? ? nil : result.to_i
+    end
+
+    # Get container cpu usage in seconds
+    # @return [Float]
+    def cpu_usage
+      result = run('cgroup', "cpuacct.usage").strip
+      result.empty? ? nil : Float('%.4f' % (result.to_i / 1E9))
     end
 
     # Get container processes
     # @return [Array] list of all processes
     def processes
       raise ContainerError, "Container is not running" if !running?
-      str = LXC.run('ps', '-n', name, '--', '-eo pid,user,%cpu,%mem,args').strip
+
+      str = run('ps', '--', '-eo pid,user,%cpu,%mem,args').strip
       lines = str.split("\n") ; lines.delete_at(0)
       lines.map { |l| parse_process_line(l) }
     end
@@ -121,6 +137,7 @@ module LXC
     # @return [Boolean]
     def create(path)
       raise ContainerError, "Container already exists." if exists?
+
       if path.is_a?(Hash)
         args = "-n #{name}"
 
@@ -186,21 +203,27 @@ module LXC
     #
     def destroy(force=false)
       raise ContainerError, "Container does not exist." unless exists?
+
       if running?
         if force
           # This will force stop and destroy container automatically
-          LXC.run('destroy', '-n', '-f', name)
+          run('destroy', '-f')
         else
           raise ContainerError, "Container is running. Stop it first or use force=true"
         end
       else
-        LXC.run('destroy', '-n', name)
+        run('destroy')
       end  
+
       !exists?
     end
 
     private
 
+    def run(command, *args)
+      LXC.run(command, "-n", name, *args)
+    end
+
     def parse_process_line(line)
       chunks = line.split(' ')
       chunks.delete_at(0)

data/lib/lxc/version.rb

@@ -1,3 +1,3 @@
 module LXC
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/container_spec.rb

@@ -120,4 +120,65 @@ describe LXC::Container do
       end
     end
   end
+
+  describe '#cpu_shares' do
+    context 'when container is running' do
+      before do
+        stub_lxc("cgroup", "-n", "app", "cpu.shares") { "1024\n" }
+      end
+
+      it 'returns cpu shares value' do
+        subject.cpu_shares.should eq 1024
+      end
+    end
+
+    context 'when container is stopped' do
+      before do
+        stub_lxc("cgroup", "-n", "app", "cpu.shares") { "\n" }
+      end
+
+      it 'returns nil' do
+        subject.cpu_shares.should be_nil
+      end
+    end
+  end
+
+  describe '#cpu_usage' do
+    context 'when container is running' do
+      before do
+        stub_lxc("cgroup", "-n", "app", "cpuacct.usage") { "4239081939568\n" }
+      end
+
+      it 'returns usage in seconds' do
+        subject.cpu_usage.should eq 4239.0819
+      end
+    end
+
+    context 'when container is stopped' do
+      before do
+        stub_lxc("cgroup", "-n", "app", "cpuacct.usage") { "\n" }
+      end
+
+      it 'returns nil' do
+        subject.cpu_usage.should be_nil
+      end
+    end
+  end
+
+  describe '#run' do
+    let(:subject) do
+      class Kontainer < LXC::Container
+        def info
+          run('info')
+        end
+      end
+
+      Kontainer.new('app')
+    end
+
+    it 'executes a command with container name' do
+      stub_lxc("info", "-n", "app") { "info" }
+      subject.info.should eq "info"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lxc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,15 +102,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2803095474129589431
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2803095474129589431
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper to LXC
@@ -125,4 +131,3 @@ test_files:
 - spec/fixtures/lxc-version.txt
 - spec/lxc_spec.rb
 - spec/spec_helper.rb
-has_rdoc: