lxc-ruby 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b048cb271bb43ee64cf3759aa1916899b9c85e5
-  data.tar.gz: c91c3b7c6e0998b64eccf7e81f033781d997ff51
+  metadata.gz: 3278c0b50a89c969fa21e9c1151fc614e325eff8
+  data.tar.gz: 38d8b3efd06f23d2dfd04fa8e770b16b779f8ab8
 SHA512:
-  metadata.gz: fc5eddbca427353c4f33dbcab6f559949dddd2472239488badebc54eae7d8ed831462832ba7e7b67ec8230fc8e7841094d549d418a55814448d05fd08ed16217
-  data.tar.gz: de0f0ad1dea5a915b1ceddc781aaf488e1b19194ef4143e6604bb7d5c901cf67231c8355415a791e91245f4d12ad945a833ba34a019fe9cf07f9e286a696fca1
+  metadata.gz: 5a61cb7a870e39a69b08e177e9eefafce41d61c8f682488655f558f501e47736fa5a2b8dc8b9e5b45aadfa74205eaefa94185a7f805fbf9d1026ff8ad160034c
+  data.tar.gz: b7d2a8468de82b3b79e237beb57000bc5346e091b716b94079192f0c430afa52d304cea74b1592d9b9adc113bf97b1111fc53e34ca011fdea43c1b9b86f1bd7f

data/.travis.yml

@@ -3,6 +3,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - 2.0.0
-  - rbx-18mode
-  - rbx-19mode
+  - 2.0.0

data/README.md

@@ -1,16 +1,19 @@
-# LXC Ruby Wrapper [![Build Status](https://secure.travis-ci.org/sosedoff/lxc-ruby.png?branch=master)](http://travis-ci.org/sosedoff/lxc-ruby)
+# lxc-ruby
 
-Ruby library to integrate with [Linux Containers](http://lxc.sourceforge.net/) CLI tools
+Ruby wrapper for [Linux Containers](http://lxc.sourceforge.net/) tools.
+
+[![Build Status](https://secure.travis-ci.org/sosedoff/lxc-ruby.png?branch=master)](http://travis-ci.org/sosedoff/lxc-ruby)
 
 ## Requirements
 
 Supported LXC versions:
 
 - 0.7.5
-- 0.8.0  
+- 0.8.0
+- 0.9.0
 
 For testing purposes you can use [Vagrant](http://vagrantup.com/) with [VirtualBox](https://www.virtualbox.org/). 
-Most of the functionality was tested on 64-bit Ubuntu 11.10 and 12.04. Recommended version is 12.04. 
+Most of the functionality was tested on 64-bit Ubuntu 12.04.
 Additional boxes could be found [here](http://www.vagrantbox.es/).
 
 ## Installation
@@ -131,7 +134,10 @@ LXC.use_sudo = true
 
 **Using lxc-setcap**
 
-If you want to make container usable by non-root users, run lxc-setcap as root, and some capabilities will be set so that normal users will be able to use the container utils. This is not done by default, though, and you have to explicitly allow it.
+If you want to make container usable by non-root users, run lxc-setcap as root, 
+and some capabilities will be set so that normal users will be able to use the 
+container utils. This is not done by default, though, and you have to 
+explicitly allow it.
 
 ## Testing
 
@@ -145,8 +151,19 @@ rake test
 
 Copyright (c) 2012-2013 Dan Sosedoff.
 
-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.
+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/lib/lxc.rb

@@ -53,9 +53,18 @@ module LXC
   # @param [String] select containers that match string
   # @return [Array] array of LXC::Containers
   def self.containers(filter=nil)
-    names = LXC.run('ls').split("\n").uniq
+    names = LXC.run("ls").split("\n").uniq
 
-    names.delete_if { |v| !v.include?(filter) } if filter.kind_of?(String)
+    if filter
+      names = names.select do |name|
+        if filter.kind_of?(Regexp)
+          name =~ filter ? true : false
+        elsif filter.kind_of?(String)
+          name.include?(filter)
+        end
+      end
+    end
+    
     names.map { |name| LXC::Container.new(name) }
   end
 

data/lib/lxc/container.rb

@@ -172,8 +172,11 @@ module LXC
         LXC.run('create', args)
         exists?
       else
-        raise ArgumentError, "File #{path} does not exist." unless File.exists?(path)
-        LXC.run('create', '-f', path)
+        unless File.exists?(path)
+          raise ArgumentError, "File #{path} does not exist."
+        end
+
+        LXC.run("create", "-n", name, "-f", path)
         exists?
       end
     end

data/lib/lxc/shell.rb

@@ -88,6 +88,11 @@ module LXC
       cmd << "#{command_name} #{args.join(' ')}".strip
       cmd << " | #{yield}" if block_given?
 
+      # Debug if LXC_DEBUG env is set
+      if ENV["LXC_DEBUG"]
+        puts "Executing: #{cmd}"
+      end
+
       child = POSIX::Spawn::Child.new(cmd.strip)
       child.out
     end

data/lib/lxc/version.rb

@@ -1,3 +1,3 @@
 module LXC
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/container_spec.rb

@@ -42,6 +42,34 @@ describe LXC::Container do
     end
   end
 
+  describe "#create" do
+    context "when container already exists" do
+      before do
+        stub_lxc("ls") { "app" }
+      end
+
+      it "raises error" do
+        expect { subject.create("path") }.
+          to raise_error LXC::ContainerError, "Container already exists."
+      end
+    end
+
+    it "raises error if config path does not exist" do
+      stub_lxc("ls") { "" }
+
+      expect { subject.create("foobar") }.
+        to raise_error ArgumentError, "File foobar does not exist."
+    end
+
+    it "creates a new container" do
+      stub_lxc("ls") { "" }
+      stub_lxc("create", "-n", "app", "-f", "/tmp") { "" }
+      stub_lxc("ls") { "app" }
+
+      expect(subject.create("/tmp")).to eq true
+    end
+  end
+
   describe '#destroy' do
     it 'raises error if container does not exist' do
       stub_lxc('ls') { "app2" }

data/spec/lxc_spec.rb

@@ -70,8 +70,8 @@ describe LXC do
     end
   end
 
-  describe '.containers' do
-    it 'returns all available containers' do
+  describe ".containers" do
+    it "returns all available containers" do
       stub_lxc('ls') { "vm0\nvm1\nvm0" }
     
       list = LXC.containers
@@ -81,12 +81,23 @@ describe LXC do
       expect(list.first.name).to eq('vm0')
     end
 
-    context 'with argument' do
-      it 'returns containers filtered by name' do
-        stub_lxc('ls') { "vm0\nvm1\nfoo\n"}
+    context "with string filter" do
+      before do
+        stub_lxc("ls") { "vm0\nvm1\nfoo\n"}
+      end
+
+      it "returns matched containers" do
+        expect(LXC.containers("vm").size).to eq 2
+      end
+    end
+
+    context "with regexp filter" do
+      before do
+        stub_lxc("ls") { "vm0\nvm1\nfoo\n"}
+      end
 
-        list = LXC.containers("vm")
-        expect(list.size).to eq(2)
+      it "returns matched container" do
+        expect(LXC.containers(/vm/).size).to eq 2
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lxc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper to LXC
@@ -134,4 +134,3 @@ test_files:
 - spec/lxc_spec.rb
 - spec/spec_helper.rb
 - spec/status_spec.rb
-has_rdoc: