boxgrinder-build 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.8.1
+
+* [BGBUILD-141] Long delay after "Preparing guestfs" message when creating new image
+* [BGBUILD-150] Cyclical inclusion dependencies in appliance definition files are not detected/handled
+* [BGBUILD-165] Use version in dependencies in gem and in RPM only where necessary
+
 v0.8.0
 
 * [BGBUILD-138] enablerepo path is not escaped when calling repoquery

data/Manifest

@@ -1,31 +0,0 @@
-CHANGELOG
-LICENSE
-Manifest
-README
-Rakefile
-bin/boxgrinder
-boxgrinder-build.gemspec
-lib/boxgrinder-build.rb
-lib/boxgrinder-build/appliance.rb
-lib/boxgrinder-build/helpers/appliance-customize-helper.rb
-lib/boxgrinder-build/helpers/augeas-helper.rb
-lib/boxgrinder-build/helpers/guestfs-helper.rb
-lib/boxgrinder-build/helpers/image-helper.rb
-lib/boxgrinder-build/helpers/linux-helper.rb
-lib/boxgrinder-build/helpers/package-helper.rb
-lib/boxgrinder-build/helpers/plugin-helper.rb
-lib/boxgrinder-build/helpers/thor-helper.rb
-lib/boxgrinder-build/managers/plugin-manager.rb
-lib/boxgrinder-build/plugins/base-plugin.rb
-rubygem-boxgrinder-build.spec
-spec/Rakefile
-spec/appliance-spec.rb
-spec/helpers/appliance-customize-helper-spec.rb
-spec/helpers/augeas-helper-spec.rb
-spec/helpers/guestfs-helper-spec.rb
-spec/helpers/image-helper-spec.rb
-spec/helpers/linux-helper-spec.rb
-spec/helpers/package-helper-spec.rb
-spec/helpers/plugin-helper-spec.rb
-spec/managers/plugin-manager-spec.rb
-spec/plugins/base-plugin-spec.rb

data/README

@@ -1,7 +1,7 @@
 Project home page
 
-    http://www.jboss.org/boxgrinder
+    http://boxgrinder.org/
 
 Project documentation
 
-    http://community.jboss.org/docs/DOC-14358
+    http://boxgrinder.org/tutorials/

data/Rakefile

@@ -26,7 +26,7 @@ Echoe.new("boxgrinder-build") do |p|
   p.summary     = "A tool for creating appliances from simple plain text files for various virtual environments."
   p.url         = "http://www.jboss.org/boxgrinder"
   p.email       = "info@boxgrinder.org"
-  p.runtime_dependencies = ["thor >=0.13", "boxgrinder-core ~>0.2.0"]
+  p.runtime_dependencies = ["thor >=0.13", "boxgrinder-core ~>0.2.1"]
 end
 
 desc "Run all tests"

data/bin/boxgrinder

@@ -25,7 +25,7 @@ require 'boxgrinder-build/helpers/thor-helper'
 #$stderr.reopen($stdout)
 
 if Process.uid != 0
-  puts "This program must be executed with root privileges. Try 'sudo boxgrinder-build'"
+  puts "This program must be executed with root privileges. Try 'sudo boxgrinder'"
   abort
 end
 
@@ -41,10 +41,13 @@ module BoxGrinder
     method_option :force, :type => :boolean, :default => false, :aliases => '-f', :desc => "Force image creation - removes all previous builds for selected appliance. Default: false."
     method_option :debug, :type => :boolean, :default => false, :desc => "Prints debug information while building. Default: false."
     method_option :trace, :type => :boolean, :default => false, :desc => "Prints trace information while building. Default: false."
+    method_option :backtrace, :type => :boolean, :default => false, :aliases => '-b', :desc => "Prints full backtrace if errors occur whilst building. Default: true if -debug or -trace, else false."
 
     def build(appliance_definition_file)
       log_level = :debug if options.debug?
       log_level = :trace if options.trace?
+      #TODO want to be able to compare log levels like Logger::LVL_X<=>Logger::LVL_Y (as with inbuilt logger CONST values)
+      backtrace = options.backtrace || !log_level.nil?
 
       config = Config.new(options.merge(:platform => options.platform.to_sym, :delivery => options.delivery.to_sym))
       config.merge!(:log_level => log_level) unless log_level.nil?
@@ -59,7 +62,12 @@ module BoxGrinder
       begin
         Appliance.new(appliance_definition_file, config, :log => log).create
       rescue Exception => e
-        log.fatal e
+          if backtrace
+            log.fatal e
+          else #demote backtrace to debug so that it is in file log only
+            log.fatal e.message
+            log.debug e.backtrace.join($/)
+          end  
       end
     end
 
@@ -117,5 +125,4 @@ begin
   BoxGrinder::App.start
 rescue Thor::Error => e
   puts e.message
-end
-
+end

data/boxgrinder-build.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-02-22}
   s.default_executable = %q{boxgrinder}
   s.description = %q{A tool for creating appliances from simple plain text files for various virtual environments.}
   s.email = %q{info@boxgrinder.org}
@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, [">= 0.13"])
-      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.2.0"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.2.1"])
     else
       s.add_dependency(%q<thor>, [">= 0.13"])
-      s.add_dependency(%q<boxgrinder-core>, ["~> 0.2.0"])
+      s.add_dependency(%q<boxgrinder-core>, ["~> 0.2.1"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.13"])
-    s.add_dependency(%q<boxgrinder-core>, ["~> 0.2.0"])
+    s.add_dependency(%q<boxgrinder-core>, ["~> 0.2.1"])
   end
 end

data/lib/boxgrinder-build/appliance.rb

@@ -21,7 +21,7 @@ require 'hashery/opencascade'
 require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-core/models/appliance-config'
 require 'boxgrinder-core/models/config'
-require 'boxgrinder-core/helpers/appliance-helper'
+require 'boxgrinder-core/helpers/appliance-definition-helper'
 require 'boxgrinder-core/helpers/appliance-config-helper'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'boxgrinder-build/managers/plugin-manager'
@@ -38,7 +38,11 @@ module BoxGrinder
     def read_definition
       begin
         # first try to read as appliance definition file
-        appliance_configs, appliance_config = ApplianceHelper.new(:log => @log).read_definitions(@appliance_definition)
+        appliance_helper = ApplianceDefinitionHelper.new(:log => @log)
+        appliance_helper.read_definitions(@appliance_definition)
+
+        appliance_configs = appliance_helper.appliance_configs
+        appliance_config = appliance_configs.first
       rescue
         # then try to read OS plugin specific format
         PluginManager.instance.plugins[:os].each_value do |info|

data/lib/boxgrinder-build/helpers/guestfs-helper.rb

@@ -19,9 +19,8 @@
 require 'boxgrinder-build/helpers/augeas-helper'
 require 'boxgrinder-core/helpers/log-helper'
 require 'guestfs'
-require 'open-uri'
-require 'timeout'
 require 'rbconfig'
+require 'resolv'
 
 module BoxGrinder
   class SilencerProxy
@@ -94,10 +93,8 @@ module BoxGrinder
       @log.trace "Checking if HW virtualization is available..."
 
       begin
-        Timeout::timeout(2) { open('http://169.254.169.254/1.0/meta-data/local-ipv4') }
-
-        ec2 = true
-      rescue Exception
+        ec2 = Resolv.getname("169.254.169.254").include?(".ec2.internal")
+      rescue Resolv::ResolvError
         ec2 = false
       end
 

data/lib/boxgrinder-build/helpers/thor-helper.rb

@@ -73,8 +73,11 @@ module BoxGrinder
         shell.say "BoxGrinder Build:"
         shell.say "  A tool for building VM images from simple definition files."
         shell.say
+        shell.say "Homepage:"
+        shell.say "  http://boxgrinder.org/"
+        shell.say
         shell.say "Documentation:"
-        shell.say "  http://community.jboss.org/docs/DOC-14358"
+        shell.say "  http://boxgrinder.org/tutorials/"
         shell.say
       end
     end

data/lib/boxgrinder-build/plugins/base-plugin.rb

@@ -171,9 +171,6 @@ module BoxGrinder
     # This reads the plugin config from file
     def read_plugin_config
       return if @config[:plugins].nil? or @config[:plugins][@plugin_info[:name].to_s].nil?
-
-      @log.debug "Reading configuration for #{@plugin_info[:full_name]} plugin."
-
       @plugin_config = @config[:plugins][@plugin_info[:name].to_s]
     end
 

data/rubygem-boxgrinder-build.spec

@@ -5,24 +5,26 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.8.0
+Version: 0.8.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
-URL: http://www.jboss.org/boxgrinder
+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(thor)
-Requires: rubygem(boxgrinder-core) >= 0.2.0
+Requires: rubygem(boxgrinder-core) >= 0.2.1
+Requires: rubygem(boxgrinder-core) < 0.3.0
 Requires: ruby-libguestfs
 Requires: parted
 Requires: e2fsprogs
 
 BuildRequires: rubygem(rake)
 BuildRequires: rubygem(rspec)
-BuildRequires: rubygem(boxgrinder-core) >= 0.2.0
+BuildRequires: rubygem(boxgrinder-core) >= 0.2.1
+BuildRequires: rubygem(boxgrinder-core) < 0.3.0
 BuildRequires: rubygem(echoe)
 BuildRequires: ruby-libguestfs
 
@@ -86,6 +88,12 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Tue Feb 16 2011  <mgoldman@redhat.com> - 0.8.1-1
+- Upstream release: 0.8.1
+- [BGBUILD-141] Long delay after "Preparing guestfs" message when creating new image
+- [BGBUILD-150] Cyclical inclusion dependencies in appliance definition files are not detected/handled
+- [BGBUILD-165] Use version in dependencies in gem and in RPM only where necessary
+
 * Tue Jan 04 2011  <mgoldman@redhat.com> - 0.8.0-1
 - Upstream release: 0.8.0
 - Added BuildRoot tag to build for EPEL 5

data/spec/appliance-spec.rb

@@ -120,10 +120,11 @@ module BoxGrinder
 
         appliance_config = ApplianceConfig.new
 
-        appliance_helper = mock(ApplianceHelper)
-        appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl").and_return([{}, appliance_config])
+        appliance_helper = mock(ApplianceDefinitionHelper)
+        appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl")
+        appliance_helper.should_receive(:appliance_configs).and_return([appliance_config])
 
-        ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
+        ApplianceDefinitionHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
 
         appliance_config_helper = mock(ApplianceConfigHelper)
 
@@ -133,7 +134,7 @@ module BoxGrinder
 
         appliance_config_helper.should_receive(:merge).with(appliance_config).and_return(appliance_config)
 
-        ApplianceConfigHelper.should_receive(:new).with({}).and_return(appliance_config_helper)
+        ApplianceConfigHelper.should_receive(:new).with([appliance_config]).and_return(appliance_config_helper)
 
         @appliance.read_definition
       end
@@ -143,7 +144,7 @@ module BoxGrinder
 
         appliance_config = ApplianceConfig.new
 
-        appliance_helper = mock(ApplianceHelper)
+        appliance_helper = mock(ApplianceDefinitionHelper)
         appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks").and_raise("Unknown format")
 
         clazz = mock('PluginClass')
@@ -159,7 +160,7 @@ module BoxGrinder
 
         PluginManager.should_receive(:instance).and_return(plugin_manager)
 
-        ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
+        ApplianceDefinitionHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
 
         appliance_config_helper = mock(ApplianceConfigHelper)
 
@@ -177,7 +178,7 @@ module BoxGrinder
       it "should read definition with kickstart appliance definition file and fail because there was no plugin able to read .ks" do
         prepare_appliance({}, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
 
-        appliance_helper = mock(ApplianceHelper)
+        appliance_helper = mock(ApplianceDefinitionHelper)
         appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks").and_raise("Unknown format")
 
         plugin_manager = mock(PluginManager)
@@ -186,7 +187,7 @@ module BoxGrinder
 
         PluginManager.should_receive(:instance).and_return(plugin_manager)
 
-        ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
+        ApplianceDefinitionHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
 
         lambda {
           @appliance.read_definition

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

@@ -265,25 +265,19 @@ module BoxGrinder
 
     describe ".hw_virtualization_available?" do
       it "should return true if HW acceleration is available" do
-        @helper.should_receive(:open).with('http://169.254.169.254/1.0/meta-data/local-ipv4').and_raise("blah")
+        Resolv.should_receive(:getname).with("169.254.169.254").and_return("blah")
         @helper.should_receive(:`).with('cat /proc/cpuinfo | grep flags | grep vmx | wc -l').and_return("2")
         @helper.hw_virtualization_available?.should == true
       end
 
       it "should return false if no vmx flag is present" do
-        @helper.should_receive(:open).with('http://169.254.169.254/1.0/meta-data/local-ipv4').and_raise("blah")
+        Resolv.should_receive(:getname).with("169.254.169.254").and_return("blah")
         @helper.should_receive(:`).with('cat /proc/cpuinfo | grep flags | grep vmx | wc -l').and_return("0")
         @helper.hw_virtualization_available?.should == false
       end
 
       it "should return false if we're on EC2" do
-        @helper.should_receive(:open).with('http://169.254.169.254/1.0/meta-data/local-ipv4').and_return("IP")
-        @helper.hw_virtualization_available?.should == false
-      end
-
-      it "should return false if timeout exception is thrown" do
-        @helper.should_receive(:open).with('http://169.254.169.254/1.0/meta-data/local-ipv4').and_raise(Timeout::Error.new('something'))
-        @helper.should_receive(:`).with('cat /proc/cpuinfo | grep flags | grep vmx | wc -l').and_return("0")
+        Resolv.should_receive(:getname).with("169.254.169.254").and_return("instance-data.ec2.internal")
         @helper.hw_virtualization_available?.should == false
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-02-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 1
+        version: 0.2.1
   type: :runtime
   version_requirements: *id002
 description: A tool for creating appliances from simple plain text files for various virtual environments.