boxgrinder-build 0.9.3 → 0.9.4

data/spec/plugins/delivery/sftp/sftp-plugin-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-build/plugins/delivery/sftp/sftp-plugin'
 
 module BoxGrinder

data/spec/plugins/os/centos/centos-plugin-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-build/plugins/os/centos/centos-plugin'
 require 'hashery/opencascade'
 

data/spec/plugins/os/fedora/fedora-plugin-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-build/plugins/os/fedora/fedora-plugin'
 require 'hashery/opencascade'
 

data/spec/plugins/os/rhel/rhel-plugin-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-build/plugins/os/rhel/rhel-plugin'
 require 'hashery/opencascade'
 

data/spec/plugins/os/rpm-based/kickstart-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-build/plugins/os/rpm-based/kickstart'
 require 'hashery/opencascade'
 
@@ -32,6 +33,8 @@ module BoxGrinder
     def prepare_kickstart(repos = {})
       @config = mock('Config')
       @appliance_config = mock('ApplianceConfig')
+      @dir = mock('Some directory')
+      @dir.stub!(:tmp).and_return('baloney')
 
       @appliance_config.stub!(:path).and_return(OpenCascade.new({:build => 'build/path'}))
       @appliance_config.stub!(:name).and_return('full')
@@ -39,8 +42,9 @@ module BoxGrinder
       @appliance_config.stub!(:release).and_return(0)
       @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '11', :password => 'boxgrinder'}))
       @appliance_config.stub!(:packages).and_return(["gcc-c++", "wget"])
+      @appliance_config.stub!(:repos).and_return(repos)
 
-      @kickstart = Kickstart.new(@config, @appliance_config, repos, OpenCascade.new(:base => 'a/base/dir'))
+      @kickstart = Kickstart.new(@config, @appliance_config, @dir, OpenCascade.new(:base => 'a/base/dir'))
     end
 
     describe ".build_definition" do

data/spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin'
 require 'hashery/opencascade'
 
@@ -242,14 +243,15 @@ module BoxGrinder
       it "should execute additional steps for Fedora 15" do
         @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '15'}))
         @appliance_config.should_receive(:default_repos).and_return(true)
-        @plugin.should_receive(:add_repos).with({})
+        @plugin.should_receive(:add_repos).ordered.with({})
 
         do_build do |guestfs, guestfs_helper|
-          @plugin.should_receive(:disable_biosdevname).with(guestfs)
-          @plugin.should_receive(:change_runlevel).with(guestfs)
-          @plugin.should_receive(:disable_netfs).with(guestfs)
-          @plugin.should_receive(:link_mtab).with(guestfs)
-          @plugin.should_receive(:recreate_rpm_database).with(guestfs, guestfs_helper)
+          @plugin.should_receive(:disable_biosdevname).ordered.with(guestfs)
+          @plugin.should_receive(:change_runlevel).ordered.with(guestfs)
+          @plugin.should_receive(:disable_netfs).ordered.with(guestfs)
+          @plugin.should_receive(:link_mtab).ordered.with(guestfs)
+          @plugin.should_receive(:recreate_rpm_database).ordered.with(guestfs, guestfs_helper)
+          @plugin.should_receive(:execute_post).ordered.with(guestfs_helper)
         end
 
         @plugin.build_with_appliance_creator('jeos.appl')
@@ -296,7 +298,7 @@ module BoxGrinder
     end
 
     describe ".cleanup_after_appliance_creator" do
-      it "should cleanup after appliance creator (surprisngly!)" do
+      it "should cleanup after appliance creator (surprisingly!)" do
         Process.should_receive(:kill).with("TERM", 12345)
         Process.should_receive(:wait).with(12345)
 

data/spec/plugins/os/rpm-based/rpm-dependency-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-build/plugins/os/rpm-based/rpm-dependency-validator'
 require 'hashery/opencascade'
 

data/spec/plugins/os/sl/sl-plugin-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-build/plugins/os/sl/sl-plugin'
+require 'rspec'
 require 'hashery/opencascade'
 
 module BoxGrinder

data/spec/plugins/platform/ec2/ec2-plugin-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-build/plugins/platform/ec2/ec2-plugin'
 require 'boxgrinder-core/helpers/log-helper'
 require 'hashery/opencascade'

data/spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin'
 require 'hashery/opencascade'
 

data/spec/plugins/platform/vmware/vmware-plugin-spec.rb

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'rspec'
 require 'boxgrinder-build/plugins/platform/vmware/vmware-plugin'
 require 'hashery/opencascade'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 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 
@@ -35,7 +35,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: aws
+  name: aws-sdk
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -49,7 +49,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: amazon-ec2
+  name: net-sftp
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,7 +63,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: net-sftp
+  name: net-ssh
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,7 +77,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: progressbar
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +91,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: progressbar
+  name: rest-client
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -104,20 +104,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id007
 description: A tool for creating appliances from simple plain text files for various virtual environments.
 email: info@boxgrinder.org
 executables: 
@@ -132,12 +118,15 @@ extra_rdoc_files:
 - lib/boxgrinder-build.rb
 - lib/boxgrinder-build/appliance.rb
 - lib/boxgrinder-build/helpers/augeas-helper.rb
+- lib/boxgrinder-build/helpers/aws-helper.rb
+- lib/boxgrinder-build/helpers/ec2-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/qemu.wrapper
+- lib/boxgrinder-build/helpers/s3-helper.rb
 - lib/boxgrinder-build/managers/plugin-manager.rb
 - lib/boxgrinder-build/plugins/base-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb
@@ -200,12 +189,15 @@ files:
 - lib/boxgrinder-build.rb
 - lib/boxgrinder-build/appliance.rb
 - lib/boxgrinder-build/helpers/augeas-helper.rb
+- lib/boxgrinder-build/helpers/aws-helper.rb
+- lib/boxgrinder-build/helpers/ec2-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/qemu.wrapper
+- lib/boxgrinder-build/helpers/s3-helper.rb
 - lib/boxgrinder-build/managers/plugin-manager.rb
 - lib/boxgrinder-build/plugins/base-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb
@@ -240,11 +232,13 @@ files:
 - rubygem-boxgrinder-build.spec
 - spec/appliance-spec.rb
 - spec/helpers/augeas-helper-spec.rb
+- spec/helpers/ec2-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/helpers/s3-helper-spec.rb
 - spec/managers/plugin-manager-spec.rb
 - spec/plugins/base-plugin-spec.rb
 - spec/plugins/delivery/ebs/ebs-plugin-spec.rb