boxgrinder-core 0.1.5 → 0.2.0

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

@@ -50,7 +50,7 @@ module BoxGrinder
     it "should change log level" do
       FileUtils.should_receive(:mkdir_p).once.with("log")
 
-      @helper = LogHelper.new( :threshold => "debug" )
+      @helper = LogHelper.new( :level => "debug" )
 
       stdout_log  = @helper.instance_variable_get(:@stdout_log)
       file_log    = @helper.instance_variable_get(:@file_log)
@@ -62,7 +62,7 @@ module BoxGrinder
     it "should change log level" do
       FileUtils.should_receive(:mkdir_p).once.with("log")
 
-      @helper = LogHelper.new( :thrshold => "doesntexists" )
+      @helper = LogHelper.new( :level => "doesntexists" )
 
       stdout_log  = @helper.instance_variable_get(:@stdout_log)
       file_log    = @helper.instance_variable_get(:@file_log)

data/spec/models/config-spec.rb

@@ -0,0 +1,56 @@
+#
+# 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 'boxgrinder-core/models/config'
+
+module BoxGrinder
+  describe Config do
+    it "should not load options from file if it doesn't exists" do
+      ENV['BG_CONFIG_FILE'] = "doesntexists"
+
+      config = Config.new
+      config.force.should == false
+    end
+
+    it "should load empty config file" do
+      ENV['BG_CONFIG_FILE'] = "#{File.dirname(__FILE__)}/../rspec/src/config/empty"
+
+      config = Config.new
+      config.force.should == false
+      config.log_level.should == :info
+    end
+
+    it "should load config file" do
+      ENV['BG_CONFIG_FILE'] = "#{File.dirname(__FILE__)}/../rspec/src/config/valid"
+
+      config = Config.new
+      config.force.should == true
+      config.log_level.should == 'trace'
+      config.dir.build.should == 'build'
+      config.dir.root.should == 'root/dir'
+    end
+
+    it "should merge platform" do
+      ENV['BG_CONFIG_FILE'] = "doesntexists"
+
+      config = Config.new.merge(:platform => :ec2)
+
+      config.platform.should == :ec2
+    end
+  end
+end

data/spec/rspec/src/appliances/ephemeral-repo.appl

@@ -9,9 +9,8 @@ hardware:
     "/":
       size: 1
 packages:
-  includes:
-    - gcc-c++
-    - wget
+  - gcc-c++
+  - wget
 repos:
   - name: "cirras"
     baseurl: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"

data/spec/rspec/src/appliances/full.appl

@@ -11,9 +11,8 @@ hardware:
     "/home":
       size: 3
 packages:
-  includes:
-    - gcc-c++
-    - wget
+  - gcc-c++
+  - wget
 repos:
   - name: "cirras"
     baseurl: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"

data/spec/rspec/src/appliances/invalid_yaml.appl

@@ -0,0 +1 @@
+!!

data/spec/rspec/src/appliances/repo.appl

@@ -9,9 +9,8 @@ hardware:
     "/":
       size: 1
 packages:
-  includes:
-    - gcc-c++
-    - wget
+  - gcc-c++
+  - wget
 repos:
   - name: "cirras"
     baseurl: "http://repo.boxgrinder.org/packages/#OS_NAME#/#OS_VERSION#/RPMS/#ARCH#"

data/spec/rspec/src/config/valid

@@ -0,0 +1,4 @@
+force: true
+log_level: trace
+dir:
+  root: root/dir

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +01:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,6 @@ extra_rdoc_files:
 - LICENSE
 - README
 - lib/boxgrinder-core.rb
-- lib/boxgrinder-core/defaults.rb
 - lib/boxgrinder-core/helpers/appliance-config-helper.rb
 - lib/boxgrinder-core/helpers/appliance-helper.rb
 - lib/boxgrinder-core/helpers/exec-helper.rb
@@ -79,7 +78,6 @@ files:
 - Rakefile
 - boxgrinder-core.gemspec
 - lib/boxgrinder-core.rb
-- lib/boxgrinder-core/defaults.rb
 - lib/boxgrinder-core/helpers/appliance-config-helper.rb
 - lib/boxgrinder-core/helpers/appliance-helper.rb
 - lib/boxgrinder-core/helpers/exec-helper.rb
@@ -94,12 +92,16 @@ files:
 - spec/helpers/appliance-helper-spec.rb
 - spec/helpers/exec-helper-spec.rb
 - spec/helpers/log-helper-spec.rb
+- spec/models/config-spec.rb
 - spec/rspec/ls/one
 - spec/rspec/ls/two
 - spec/rspec/rspec-config-helper.rb
 - spec/rspec/src/appliances/ephemeral-repo.appl
 - spec/rspec/src/appliances/full.appl
+- spec/rspec/src/appliances/invalid_yaml.appl
 - spec/rspec/src/appliances/repo.appl
+- spec/rspec/src/config/empty
+- spec/rspec/src/config/valid
 - spec/validators/appliance-config-validator-spec.rb
 has_rdoc: true
 homepage: http://www.jboss.org/boxgrinder

data/lib/boxgrinder-core/defaults.rb

@@ -1,58 +0,0 @@
-#
-# 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.
-
-module BoxGrinder
-  # here are global variables
-  SUPPORTED_ARCHES        = ["i386", "x86_64"]
-
-  APPLIANCE_DEFAULTS      = {
-      :os       => {
-          :password => "boxgrinder"
-      },
-      :hardware => {
-          :partitions => {"/" => { 'size' => 1 }},
-          :memory     => 256,
-          :network    => "NAT",
-          :cpus       => 1
-      }
-  }
-
-  SUPPORTED_DESKTOP_TYPES = ["gnome"]
-
-  DEFAULT_LOCATION        = {
-      :log => 'log/boxgrinder.log'
-  }
-
-  DEFAULT_HELP_TEXT       = {
-      :general => "See documentation: http://community.jboss.org/docs/DOC-14358."
-  }
-
-  DEFAULT_PROJECT_CONFIG  = {
-      :name           => 'BoxGrinder',
-      :version        => '1.0.0',
-      :release        => 'SNAPSHOT',
-      :dir_build      => 'build',
-      #:topdir            => "#{self.} build/topdir",
-      :dir_src_cache  => '/var/cache/boxgrinder/sources-cache',
-      :dir_rpms_cache => '/var/cache/boxgrinder/rpms-cache',
-      :dir_specs      => 'specs',
-      :dir_appliances => 'appliances',
-      :dir_src        => 'src',
-      :dir_kickstarts => 'kickstarts'
-  }
-end