boxgrinder-core 0.3.0 → 0.3.1

data/spec/helpers/appliance-definition-helper-spec.rb

@@ -16,54 +16,47 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-core/helpers/appliance-definition-helper'
+require 'boxgrinder-core/appliance-parser'
 
 module BoxGrinder
   describe ApplianceDefinitionHelper do
 
-    before(:each) do
+    def prepare_helper
       @helper = ApplianceDefinitionHelper.new(:log => LogHelper.new(:level => :trace, :type => :stdout))
     end
 
+    before(:each) do
+      prepare_helper
+    end
+
     describe ".read_definitions" do
       it "should read definition from files with different extensions" do
         appliance_config = ApplianceConfig.new
-
         ['appl', 'yml', 'yaml'].each do |ext|
-          @helper = ApplianceDefinitionHelper.new(:log => Logger.new('/dev/null'))
+          prepare_helper
+          @helper.appliance_parser.should_receive(:load_schemas)
           File.should_receive(:exists?).with("file.#{ext}").and_return(true)
-          @helper.should_receive(:read_yaml_file).with("file.#{ext}").and_return(appliance_config)
+          @helper.appliance_parser.should_receive(:parse_definition).with("file.#{ext}").and_return(appliance_config)
           @helper.read_definitions("file.#{ext}")
-
           configs = @helper.appliance_configs
-          configs.should == [appliance_config]
-        end
-      end
 
-      it "should read YAML definition from files with different content types" do
-        appliance_config = ApplianceConfig.new
+          puts configs.size
 
-        ['application/x-yaml', 'text/yaml'].each do |type|
-          @helper = ApplianceDefinitionHelper.new(:log => Logger.new('/dev/null'))
-          File.should_receive(:exists?).with("file").and_return(true)
-          @helper.should_receive(:read_yaml_file).with("file").and_return(appliance_config)
-          @helper.read_definitions("file", type)
-
-          configs = @helper.appliance_configs
           configs.should == [appliance_config]
-          configs.first.should == appliance_config
         end
       end
 
-      it "should read XML definition from files with different content types" do
+      it "should read YAML definition from files with different content types" do
         appliance_config = ApplianceConfig.new
 
-        ['application/xml', 'text/xml', 'application/x-xml'].each do |type|
-          @helper = ApplianceDefinitionHelper.new(:log => Logger.new('/dev/null'))
+        ['application/x-yaml', 'text/yaml'].each do |type|
+          prepare_helper
+          @helper.appliance_parser.should_receive(:load_schemas)
           File.should_receive(:exists?).with("file").and_return(true)
-          @helper.should_receive(:read_xml_file).with("file").and_return(appliance_config)
+          @helper.appliance_parser.should_receive(:parse_definition).with("file").and_return(appliance_config)
           @helper.read_definitions("file", type)
-
           configs = @helper.appliance_configs
           configs.should == [appliance_config]
           configs.first.should == appliance_config
@@ -71,6 +64,8 @@ module BoxGrinder
       end
 
       it "should read definition from two files" do
+        @helper.appliance_parser.should_receive(:load_schemas).twice
+
         appliance_a = ApplianceConfig.new
         appliance_a.name = 'a'
         appliance_a.appliances << "b"
@@ -81,8 +76,8 @@ module BoxGrinder
         File.should_receive(:exists?).ordered.with('a.appl').and_return(true)
         File.should_receive(:exists?).ordered.with('./b.appl').and_return(true)
 
-        @helper.should_receive(:read_yaml_file).ordered.with('a.appl').and_return(appliance_a)
-        @helper.should_receive(:read_yaml_file).ordered.with('./b.appl').and_return(appliance_b)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('a.appl').and_return(appliance_a)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('./b.appl').and_return(appliance_b)
 
         @helper.read_definitions("a.appl")
 
@@ -92,6 +87,8 @@ module BoxGrinder
       end
 
       it "should read definitions from a tree file structure" do
+        @helper.appliance_parser.should_receive(:load_schemas).exactly(5).times
+
         appliance_a = ApplianceConfig.new
         appliance_a.name = 'a'
         appliance_a.appliances << "b1"
@@ -117,11 +114,11 @@ module BoxGrinder
         File.should_receive(:exists?).ordered.with('./b1.appl').and_return(true)
         File.should_receive(:exists?).ordered.with('./c1.appl').and_return(true)
 
-        @helper.should_receive(:read_yaml_file).ordered.with('a.appl').and_return(appliance_a)
-        @helper.should_receive(:read_yaml_file).ordered.with('./b2.appl').and_return(appliance_b2)
-        @helper.should_receive(:read_yaml_file).ordered.with('./c2.appl').and_return(appliance_c2)
-        @helper.should_receive(:read_yaml_file).ordered.with('./b1.appl').and_return(appliance_b1)
-        @helper.should_receive(:read_yaml_file).ordered.with('./c1.appl').and_return(appliance_c1)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('a.appl').and_return(appliance_a)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('./b2.appl').and_return(appliance_b2)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('./c2.appl').and_return(appliance_c2)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('./b1.appl').and_return(appliance_b1)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('./c1.appl').and_return(appliance_c1)
 
         @helper.read_definitions("a.appl")
 
@@ -132,6 +129,8 @@ module BoxGrinder
 
       # https://issues.jboss.org/browse/BGBUILD-60
       it "should read definitions from a tree file structure based on same appliance" do
+        @helper.appliance_parser.should_receive(:load_schemas).exactly(4).times
+
         appliance_a = ApplianceConfig.new
         appliance_a.name = 'a'
         appliance_a.appliances << "b1"
@@ -153,11 +152,11 @@ module BoxGrinder
         File.should_receive(:exists?).ordered.with('./c.appl').and_return(true)
         File.should_receive(:exists?).ordered.with('./b1.appl').and_return(true)
 
-        @helper.should_receive(:read_yaml_file).ordered.with('a.appl').and_return(appliance_a)
-        @helper.should_receive(:read_yaml_file).ordered.with('./b2.appl').and_return(appliance_b2)
-        @helper.should_receive(:read_yaml_file).ordered.with('./c.appl').and_return(appliance_c)
-        @helper.should_receive(:read_yaml_file).ordered.with('./b1.appl').and_return(appliance_b1)
-        @helper.should_not_receive(:read_yaml_file).ordered.with('./c.appl').and_return(appliance_c)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('a.appl').and_return(appliance_a)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('./b2.appl').and_return(appliance_b2)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('./c.appl').and_return(appliance_c)
+        @helper.appliance_parser.should_receive(:parse_definition).ordered.with('./b1.appl').and_return(appliance_b1)
+        @helper.appliance_parser.should_not_receive(:parse_definition).ordered.with('./c.appl')
 
         @helper.read_definitions("a.appl")
 
@@ -167,7 +166,7 @@ module BoxGrinder
       end
 
       it "should read YAML content instead of loading a file" do
-        yaml = "name: abc\nos:\n  name: fedora\n  version: 13\npackages:\n  - @core\nhardware:\n  partitions:\n    \"/\":\n      size: 6"
+        yaml = "name: abc\nos:\n  name: fedora\n  version: '13'\npackages:\n  - @core\nhardware:\n  partitions:\n    \"/\":\n      size: 6"
         appliance = @helper.read_definitions(yaml).last
 
         appliance.name.should == 'abc'
@@ -175,21 +174,16 @@ module BoxGrinder
         appliance.hardware.partitions['/']['size'].should == 6
       end
 
-      it "should read invalid YAML content" do
-        lambda { @helper.read_definitions("@$FEWYERTH") }.should raise_error(RuntimeError, 'Provided definition is not a Hash.')
+      it "should read invalid YAML content" do #ApplianceValidationError: :
+        lambda { @helper.read_definitions("@$FEWYERTH") }.should raise_error(ApplianceValidationError, "The appliance definition was invalid according to schema 0.9.0. See log for details.")
       end
 
       it "should catch exception if YAML parsing raises it" do
-        lambda { @helper.read_definitions("!!") }.should raise_error(RuntimeError, 'Provided definition could not be read.')
+        lambda { @helper.read_definitions("!!") }.should raise_error(ApplianceValidationError, "The appliance definition was invalid according to schema 0.9.0. See log for details.")
       end
 
       it "should catch exception if YAML file parsing raises it" do
-        lambda { @helper.read_definitions("#{File.dirname(__FILE__)}/../rspec/src/appliances/invalid-yaml.appl") }.should raise_error(RuntimeError, /File '(.*)' could not be read./)
-      end
-
-      it "should raise because xml files aren't supported yet" do
-        File.should_receive(:exists?).with("file.xml").and_return(true)
-        lambda { @helper.read_definitions("file.xml") }.should raise_error(RuntimeError, "Reading XML files is not supported right now. File 'file.xml' could not be read.")
+        lambda { @helper.read_definitions("#{File.dirname(__FILE__)}/../rspec/src/appliances/invalid-yaml.appl") }.should raise_error(ApplianceValidationError, "The appliance definition was invalid according to schema 0.9.0. See log for details.")
       end
 
       it "should raise because of unsupported file format" do
@@ -197,9 +191,18 @@ module BoxGrinder
         lambda { @helper.read_definitions("file.xmdfl") }.should raise_error(RuntimeError, "Unsupported file format for appliance definition file.")
       end
 
+      #Do more extensive tests in the parser/validator itself
+      it "should allow legacy package inclusion styles" do #@helper.appliance_validator.should_receive(:load_specification_files).
+        #@helper = ApplianceDefinitionHelper.new(:log => LogHelper.new(:level => :trace, :type => :stdout))
+        @helper.read_definitions("#{File.dirname(__FILE__)}/../rspec/src/appliances/legacy.appl")
+        @helper.appliance_configs.last.packages.should == ['squid', 'boxgrinder-rest']
+      end
+
       # https://issues.jboss.org/browse/BGBUILD-150
       context "cyclical dependency" do
         it "should stop reading appliances when appliance was already read" do
+          @helper.appliance_parser.should_receive(:load_schemas).twice
+
           appliance_a = ApplianceConfig.new
           appliance_a.name = 'a'
           appliance_a.appliances << "b"
@@ -213,45 +216,19 @@ module BoxGrinder
           File.should_receive(:exists?).with('./b.appl').and_return(true)
           File.should_not_receive(:exists?).ordered.with('./a.appl')
 
-          @helper.should_receive(:read_yaml_file).ordered.with('a.appl').and_return(appliance_a)
-          @helper.should_receive(:read_yaml_file).ordered.with('./b.appl').and_return(appliance_b)
-          @helper.should_not_receive(:read_yaml_file).ordered.with('./a.appl')
+          @helper.appliance_parser.should_receive(:parse_definition).ordered.with('a.appl').and_return(appliance_a)
+          @helper.appliance_parser.should_receive(:parse_definition).ordered.with('./b.appl').and_return(appliance_b)
+          @helper.appliance_parser.should_not_receive(:parse_definition).ordered.with('./a.appl')
 
           @helper.read_definitions("a.appl")
         end
       end
     end
 
-    describe "read_yaml_file" do
-      it "should read default_repos and set to false" do
-        YAML.should_receive(:load_file).with('default_repos_false.appl').and_return({'default_repos'=>false})
-        @helper.read_yaml_file('default_repos_false.appl').default_repos.should == false
-      end
-
-      it "should read default_repos and set to true" do
-        YAML.should_receive(:load_file).with('default_repos_true.appl').and_return({'default_repos'=>true})
-        @helper.read_yaml_file('default_repos_true.appl').default_repos.should == true
-      end
-
-      it "should read default_repos but not set it" do
-        YAML.should_receive(:load_file).with('default_repos_empty.appl').and_return({})
-        @helper.read_yaml_file('default_repos_empty.appl').default_repos.should == nil
-      end
-
-      it "should read default_repos and raise" do
-        YAML.should_receive(:load_file).with('default_repos_bad.appl').and_return({'default_repos'=>'something'})
-
-        lambda {
-          @helper.read_yaml_file("default_repos_bad.appl")
-        }.should raise_error(RuntimeError, 'default_repos should be set to true or false')
-      end
-    end
-
     describe ".parse_yaml" do
       context "partitions" do
         it "should add default partition when no partitions are specified" do
           appliance_config = @helper.parse_yaml({})
-
           appliance_config.hardware.partitions.size.should == 1
           appliance_config.hardware.partitions['/'].should == {'size' => 1}
         end
@@ -264,11 +241,6 @@ module BoxGrinder
           appliance_config.hardware.partitions['/home'].should == {'size' => 1}
         end
 
-        it "should allow legacy package inclusion style" do
-          appliance = @helper.read_yaml_file("#{File.dirname(__FILE__)}/../rspec/src/appliances/legacy.appl")
-          appliance.packages.should == ['squid','boxgrinder-rest']
-        end
-
       end
     end
   end

data/spec/helpers/appliance-transformation-helper-spec.rb

@@ -0,0 +1,51 @@
+#
+# Copyright 2010 Red Hat, Inc.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'rubygems'
+require 'boxgrinder-core/helpers/appliance-transformation-helper'
+
+module BoxGrinder
+  describe ApplianceTransformationHelper do
+    before(:each) do
+
+      @log = LogHelper.new(:level => :trace, :type => :stdout)
+      @helper = ApplianceTransformationHelper.new('0.9.0', :log => @log)
+    end
+
+    describe ".transform" do
+      it "should not transform to the same version" do
+        @log.should_not_receive(:debug) # hacky, but does the trick
+        @helper.transform('definition', '0.9.0').should == 'definition'
+      end
+
+      it "should transform with one pass" do
+        @helper.should_receive(:to_0_9_0).with('definition').and_return('new-def')
+        @helper.transform('definition', '0.8.0').should == 'new-def'
+      end
+    end
+
+    describe ".to_0_9_0" do
+      it "should remove excludes section" do
+        appl = "name: test-appl\nos:\n  name: fedora\n  version: 15\npackages:\n  includes:\n    - @base\n    - emacs\n  excludes:\n    - this-does-nothing"
+        out = @helper.to_0_9_0(YAML.load(appl))
+        out['packages'].should == ["@base", "emacs"]
+        out['excludes'].should == nil
+      end
+    end
+  end
+end

data/spec/helpers/exec-helper-spec.rb

@@ -16,36 +16,59 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-core/helpers/exec-helper'
 
 module BoxGrinder
   describe ExecHelper do
     before(:each) do
       @helper = ExecHelper.new(:log => Logger.new('/dev/null'))
+      @o4 = (RUBY_PLATFORM =~ /java/ ? IO : Open4)
+
+      @pid = 1234
+      @stdin = mock('STDIN')
+      @stdout = mock('STDOUT')
+      @stderr = mock('STDERR')
     end
 
     it "should fail when command doesn't exists" do
-      Open4.should_receive(:popen4).with('thisdoesntexists').and_raise('abc')
-
+      @o4.should_receive(:send).with(:popen4, 'thisdoesntexists').and_raise('abc')
       proc { @helper.execute("thisdoesntexists") }.should raise_error("An error occurred while executing command: 'thisdoesntexists', abc")
     end
 
-    it "should fail when command exit status != 0" do
-      open4 = mock(Open4)
-      open4.stub!(:exitstatus).and_return(1)
+    if RUBY_PLATFORM =~ /java/
+      it "should fail when command exit status != 0 and is on MRI" do
+        @stdout.should_receive(:each)
+        @stderr.should_receive(:each)
+        Process.should_receive(:getpgid)
+        Process.should_receive(:waitpid2).with(1234).and_return([1234, OpenCascade.new(:exitstatus => 1)])
+
+        @o4.should_receive(:send).with(:popen4, 'exitstatus').and_return([@pid, @stdin, @stdout, @stderr])
 
-      Open4.should_receive(:popen4).with('abc').and_return(open4)
+        lambda { @helper.execute("exitstatus") }.should_not raise_error("An error occurred while executing command: 'exitstatus', process exited with wrong exit status: 1")
+      end
+    else
+      it "should fail when command exit status != 0 and is on MRI" do
+        @stdout.should_receive(:each)
+        @stderr.should_receive(:each)
+        Process.should_receive(:getpgid)
+        Process.should_receive(:waitpid2).with(1234).and_return([1234, OpenCascade.new(:exitstatus => 1)])
 
-      proc { @helper.execute("abc") }.should raise_error("An error occurred while executing command: 'abc', process exited with wrong exit status: 1")
+        @o4.should_receive(:send).with(:popen4, 'exitstatus').and_return([@pid, @stdin, @stdout, @stderr])
+
+        lambda { @helper.execute("exitstatus") }.should raise_error("An error occurred while executing command: 'exitstatus', process exited with wrong exit status: 1")
+      end
     end
 
     it "should execute the command" do
-      open4 = mock(Open4)
-      open4.stub!(:exitstatus).and_return(0)
+      @stdout.should_receive(:each)
+      @stderr.should_receive(:each)
+      Process.should_receive(:getpgid)
+      Process.should_receive(:waitpid2).with(1234).and_return([1234, OpenCascade.new(:exitstatus => 0)])
 
-      Open4.should_receive(:popen4).with('abc').and_return(open4)
+      @o4.should_receive(:send).with(:popen4, 'abc').and_return([@pid, @stdin, @stdout, @stderr])
 
-      proc { @helper.execute("abc") }.should_not raise_error
+      lambda { @helper.execute("abc") }.should_not raise_error
     end
 
     it "should execute the command and return output" do
@@ -60,8 +83,13 @@ module BoxGrinder
       log = mock('Logger')
       log.should_receive(:debug).with("Executing command: 'ala ma <REDACTED> i jest fajnie'")
 
+      @stdout.should_receive(:each)
+      @stderr.should_receive(:each)
+      Process.should_receive(:getpgid)
+      Process.should_receive(:waitpid2).with(1234).and_return([1234, OpenCascade.new(:exitstatus => 0)])
+
       @helper = ExecHelper.new(:log => log)
-      Open4.should_receive(:popen4).and_return(OpenStruct.new(:exitstatus => 0))
+      @o4.should_receive(:send).with(:popen4, "ala ma kota i jest fajnie").and_return([@pid, @stdin, @stdout, @stderr])
 
       @helper.execute("ala ma kota i jest fajnie", :redacted => ['kota'])
     end

data/spec/helpers/log-helper-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-core/helpers/log-helper'
 
 module BoxGrinder

data/spec/models/config-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-core/models/config'
 
 module BoxGrinder
@@ -53,4 +54,4 @@ module BoxGrinder
       config.platform.should == :ec2
     end
   end
-end
+end

data/spec/rspec/src/appliances/0.8.x.appl

@@ -0,0 +1,38 @@
+name: 0.8.x test appliance
+summary: appliance to test 0.8.x schema 
+version: 0
+release: 0
+os:
+  name: fedora
+  version: 15
+  password: boxgrinder-ftw
+hardware:
+  cpus: 4
+  memory: 2048
+  partitions:
+    "/":
+      size: 4
+      type: ext4
+appliances:
+  - _include
+packages:
+  includes: 
+    - @base
+    - emacs
+    - mc
+  excludes:
+    - this-does-nothing
+repos:
+  - name: boxgrinder-ci-repo
+    baseurl: http://repo.ci.boxgrinder.org/fedora/15/RPMS/
+    ephemeral: true
+  - name: test
+    baseurl: "http://example.com/repo/#BASE_ARCH#/"
+variables:
+  my_var: "bg rocks!"
+  something: "other"
+post:
+  base:
+    - "/bin/echo 'Hello, World!' > hello-world"
+  vmware:
+    - "/bin/echo 'Hello, World!' > hello-world-vmware" 

data/spec/rspec/src/appliances/0.9.x-invalid.appl

@@ -0,0 +1,40 @@
+name: ""
+summary: ""
+version: -1
+release: -2
+hardware:
+  cpus: 0
+  memory: 0
+  partitions:
+    "/":
+      size: 0
+    "/home":
+      size: -1
+      type: ABC123 #no such type 
+appliances:
+  - /cannot/do/this
+  - #wrong
+  - "" #wrong
+  - " "#technically ok
+  - this$is%fine£though
+packages:
+  - this-is-fine
+  - good/bad/u g l y
+  - $%^&*dontlet$$£this%£"$work
+  - #blank is bad
+  - "" #empty string is invalid too
+  - " "#no spaces allowed
+repos:
+  - name: "" # wrong and missing baseurl/mirrorlist
+  - name: " "# no spaces and missing baseurl/mirrorlist
+  - name: "blah" # repo has baseurl AND mirrorlist which is wrong
+    baseurl: sftp://example.com #no sftp support
+    mirrorlist: http:// this is not ok .\/\/ #invalid uri
+post:
+  base:
+    - #wrong
+    - "" #wrong
+    - " " #wrong
+    - "this>is<fine >> << $() || && == ++ --"
+  fred: #ok
+    - "shred" #ok

data/spec/rspec/src/appliances/0.9.x.appl

@@ -0,0 +1,36 @@
+name: 0.9.x test appliance
+summary: appliance to test 0.9.x schema 
+version: 0
+release: 0
+os:
+  name: fedora
+  version: 15
+  password: boxgrinder-ftw
+hardware:
+  cpus:  4
+  memory: 2048
+  partitions:
+    "/":
+      size: 4
+      type: ext4
+appliances:
+  - _include
+packages:
+  - squid
+  - rubygem-boxgrinder-build
+repos:
+  - name: boxgrinder-ci-repo
+    baseurl: http://repo.ci.boxgrinder.org/fedora/15/RPMS/
+    ephemeral: true
+  - name: test
+    baseurl: "http://example.com/repo/#BASE_ARCH#/"
+  - name: mirrorlist
+    mirrorlist: "http://example.com/"
+variables:
+  my_var: "bg rocks!"
+  something: "other"
+post:
+  base:
+    - "/bin/echo 'Hello, World!' > hello-world"
+  vmware:
+    - "/bin/echo 'Hello, World!' > hello-world-vmware"