boxgrinder-core 0.3.4 → 0.3.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.3.5
+
+* [BGBUILD-273] Move to RSpec2
+* [BGBUILD-275] default_repos setting is not included in schema and is not documented
+
 v0.3.4
 
 * Version bump.

data/Manifest

@@ -1,29 +0,0 @@
-CHANGELOG
-LICENSE
-Manifest
-README
-Rakefile
-boxgrinder-core.gemspec
-lib/boxgrinder-core.rb
-lib/boxgrinder-core/appliance-parser.rb
-lib/boxgrinder-core/appliance-validator.rb
-lib/boxgrinder-core/errors.rb
-lib/boxgrinder-core/helpers/appliance-config-helper.rb
-lib/boxgrinder-core/helpers/appliance-definition-helper.rb
-lib/boxgrinder-core/helpers/appliance-transformation-helper.rb
-lib/boxgrinder-core/helpers/exec-helper.rb
-lib/boxgrinder-core/helpers/log-helper.rb
-lib/boxgrinder-core/models/appliance-config.rb
-lib/boxgrinder-core/models/config.rb
-lib/boxgrinder-core/models/task.rb
-lib/boxgrinder-core/schemas/appliance_schema_0.8.0.yaml
-lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml
-rubygem-boxgrinder-core.spec
-spec/appliance-parser-spec.rb
-spec/appliance-validator-spec.rb
-spec/helpers/appliance-config-helper-spec.rb
-spec/helpers/appliance-definition-helper-spec.rb
-spec/helpers/appliance-transformation-helper-spec.rb
-spec/helpers/exec-helper-spec.rb
-spec/helpers/log-helper-spec.rb
-spec/models/config-spec.

data/Rakefile

@@ -17,12 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
-
-begin
-  require 'rake/dsl'
-rescue LoadError
-end
-
+require 'rspec/core/rake_task'
 require 'echoe'
 
 Echoe.new("boxgrinder-core") do |p|
@@ -35,16 +30,16 @@ Echoe.new("boxgrinder-core") do |p|
   p.runtime_dependencies << 'open4 >=1.0.0' unless RUBY_PLATFORM =~ /java/
 end
 
-Spec::Rake::SpecTask.new('spec') do |t|
+RSpec::Core::RakeTask.new('spec') do |t|
   t.rcov = false
-  t.spec_files = FileList["spec/**/*-spec.rb"]
-  t.spec_opts = ['--colour', '--format', 'specdoc', '-b']
+  t.pattern = "spec/**/*-spec.rb"
+  t.rspec_opts = ['--colour', '--format', 'doc', '-b']
   t.verbose = true
 end
 
-Spec::Rake::SpecTask.new('spec:coverage') do |t|
-  t.spec_files = FileList["spec/**/*-spec.rb"]
-  t.spec_opts = ['--colour', '--format', 'html:pkg/rspec_report.html', '-b']
+RSpec::Core::RakeTask.new('spec:coverage') do |t|
+  t.pattern = "spec/**/*-spec.rb"
+  t.rspec_opts = ['--colour', '--format', 'html', '--out', 'pkg/rspec_report.html', '-b']
   t.rcov = true
   t.rcov_opts = ['--exclude', 'spec,teamcity/*,/usr/lib/ruby/,.gem/ruby,/boxgrinder-build/,/gems/']
   t.verbose = true

data/boxgrinder-core.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-08-17}
   s.description = %q{Core library for BoxGrinder}
   s.email = %q{info@boxgrinder.org}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/appliance-parser.rb", "lib/boxgrinder-core/appliance-validator.rb", "lib/boxgrinder-core/errors.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-definition-helper.rb", "lib/boxgrinder-core/helpers/appliance-transformation-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/schemas/appliance_schema_0.8.0.yaml", "lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml"]

data/lib/boxgrinder-core/models/appliance-config.rb

@@ -41,6 +41,8 @@ module BoxGrinder
       @hardware.network = 'NAT'
       @hardware.partitions = {"/" => {'size' => 1}}
 
+      @default_repos = true
+
       @post = {}
 
       @packages = []

data/lib/boxgrinder-core/schemas/appliance_schema_0.8.0.yaml

@@ -63,6 +63,9 @@ mapping:
             pattern: /^[\w\-+.@#\s]+$/ #fedora packaging standard http://bit.ly/h0JN9u (plus a few more, disallow symbols) 
             length: { min: 1 }
       "excludes": *pkg
+  "default_repos":
+    type: bool
+    default: true
   "repos":
     type: seq
     sequence:

data/lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml

@@ -59,6 +59,9 @@ mapping:
       - type: str # Now allowing spaces due to group labels (these map to real groups with no spaces, but confuses users) https://issues.jboss.org/browse/BGBUILD-220
         pattern: /^[\w\-+.@#\s]+$/ #fedora packaging standard http://bit.ly/h0JN9u (plus a few more, disallow symbols) 
         length: { min: 1 }
+  "default_repos":
+    type: bool
+    default: true
   "repos":
     type: seq
     sequence:

data/rubygem-boxgrinder-core.spec

@@ -5,13 +5,12 @@
 
 Summary: Core library for BoxGrinder
 Name: rubygem-%{gemname}
-Version: 0.3.4
+Version: 0.3.5
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
 URL: http://boxgrinder.org/
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: ruby(abi) = %{rubyabi}
 Requires: rubygem(open4)
@@ -19,11 +18,12 @@ Requires: rubygem(hashery)
 Requires: rubygem(kwalify)
 
 BuildRequires: rubygem(rake)
-BuildRequires: rubygem(rspec)
 BuildRequires: rubygem(open4)
 BuildRequires: rubygem(hashery)
 BuildRequires: rubygem(echoe)
 BuildRequires: rubygem(kwalify)
+# Use rspec-core until rspec are migrated to RSpec 2.x
+BuildRequires: rubygem(rspec-core)
 
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
@@ -76,6 +76,11 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Wed Jul 13 2011 Marek Goldmann <mgoldman@redhat.com> - 0.3.5-1
+- Upstream release: 0.3.5
+- [BGBUILD-273] Move to RSpec2
+- [BGBUILD-275] default_repos setting is not included in schema and is not documented
+
 * Tue Jun 28 2011 Marc Savy <msavy@redhat.com> - 0.3.4-1
 - Upstream release: 0.3.4
 

data/spec/appliance-parser-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-core/appliance-parser'
 require 'boxgrinder-core/helpers/log-helper'
 

data/spec/appliance-validator-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-core/appliance-validator'
 require 'hashery/opencascade'
 

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

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-core/helpers/appliance-config-helper'
 require 'boxgrinder-core/models/appliance-config'
 

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

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-core/helpers/appliance-definition-helper'
 require 'boxgrinder-core/appliance-parser'
 
@@ -161,9 +162,8 @@ module BoxGrinder
 
         @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.once.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")
 
@@ -179,6 +179,17 @@ module BoxGrinder
         appliance.name.should == 'abc'
         appliance.os.version.should == '13'
         appliance.hardware.partitions['/']['size'].should == 6
+        appliance.default_repos.should == true
+      end
+
+      it "should read YAML content instead of loading a file with default repos disabled" do
+        yaml = "name: abc\nos:\n  name: fedora\n  version: '13'\npackages:\n  - @core\nhardware:\n  partitions:\n    \"/\":\n      size: 6\ndefault_repos: false"
+        appliance = @helper.read_definitions(yaml).last
+
+        appliance.name.should == 'abc'
+        appliance.os.version.should == '13'
+        appliance.hardware.partitions['/']['size'].should == 6
+        appliance.default_repos.should == false
       end
 
       it "should read invalid YAML content" do #ApplianceValidationError: :

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

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-core/helpers/appliance-transformation-helper'
 
 module BoxGrinder

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

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-core/helpers/exec-helper'
 
 module BoxGrinder

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

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-core/helpers/log-helper'
 
 module BoxGrinder

data/spec/models/config-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-core/models/config'
 
 module BoxGrinder

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +02:00
+date: 2011-08-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency