boxgrinder-core 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,4 +1,8 @@
 
+v0.1.3
+
+* [BGBUILD-98] Use hashery gem
+
 v0.1.2
 
 * [BGBUILD-87] Set default filesystem to ext4 for Fedora 13+

data/Manifest

@@ -1,32 +0,0 @@
-CHANGELOG
-LICENSE
-Manifest
-README
-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
-lib/boxgrinder-core/helpers/log-helper.rb
-lib/boxgrinder-core/helpers/queue-helper.rb
-lib/boxgrinder-core/models/appliance-config.rb
-lib/boxgrinder-core/models/config.rb
-lib/boxgrinder-core/models/task.rb
-lib/boxgrinder-core/validators/appliance-config-validator.rb
-lib/boxgrinder-core/validators/errors.rb
-lib/openhash/openhash.rb
-rubygem-boxgrinder-core.spec
-spec/helpers/appliance-config-helper-spec.rb
-spec/helpers/appliance-helper-spec.rb
-spec/helpers/exec-helper-spec.rb
-spec/helpers/log-helper-spec.rb
-spec/helpers/queue-helper-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/repo.appl
-spec/validators/appliance-config-validator-spec.rb

data/Rakefile

@@ -19,6 +19,7 @@
 require 'rubygems'
 require 'spec/rake/spectask'
 require 'echoe'
+require 'rbconfig'
 
 Echoe.new("boxgrinder-core") do |p|
   p.project     = "BoxGrinder"
@@ -26,7 +27,7 @@ Echoe.new("boxgrinder-core") do |p|
   p.summary     = "Core library for BoxGrinder"
   p.url         = "http://www.jboss.org/boxgrinder"
   p.email       = "info@boxgrinder.org"
-  p.runtime_dependencies = ['open4 >=1.0.0']
+  p.runtime_dependencies = ['open4 >=1.0.0', 'hashery >=1.3.0']
 end
 
 desc "Run all tests"
@@ -46,32 +47,23 @@ Spec::Rake::SpecTask.new('spec:coverage') do |t|
   t.verbose = true
 end
 
-topdir = "#{Dir.pwd}/pkg/rpmbuild"
-directory "#{topdir}/SOURCES"
-
-task 'gem:copy' => [:clean, :manifest, :gem, 'rpm:topdir'] do
-  Dir["**/pkg/*.gem"].each { |gem| FileUtils.cp(gem, "#{topdir}/SOURCES", :verbose => true) }
-end
-
-task 'rpm:topdir' do
-  FileUtils.mkdir_p(["#{topdir}/SOURCES", "#{topdir}/RPMS", "#{topdir}/BUILD", "#{topdir}/SPECS", "#{topdir}/SRPMS"], :verbose => true)
-end
-
 desc "Create RPM"
-task 'rpm' => ['gem:copy'] do
+task :rpm, :target, :version, :arch, :needs => ['clean', 'gem'] do |t, args|
+  target  = args[:target] || 'fedora'
+  version = args[:version] || 'rawhide'
+  arch    = args[:arch] || RbConfig::CONFIG['host_cpu']
+
   Dir["**/rubygem-*.spec"].each do |spec|
-    `rpmbuild --define '_topdir #{topdir}' -ba #{spec}`
+    `mock -v -r #{target}-#{version}-#{arch} --buildsrpm --sources pkg/*.gem --spec #{spec} --resultdir pkg/`
+    exit 1 unless $? == 0
+    `mock -v -r #{target}-#{version}-#{arch} --rebuild pkg/*.rpm --resultdir pkg/`
     exit 1 unless $? == 0
   end
 end
 
 desc "Install RPM"
-task 'rpm:install' => ['rpm'] do
-  puts "sudo yum -y remove rubygem-boxgrinder-core"
+task 'rpm:install' => [:rpm] do
   system "sudo yum -y remove rubygem-boxgrinder-core"
+  system "sudo yum -y localinstall --nogpgcheck pkg/*.rpm"
   exit 1 unless $? == 0
-
-  puts "sudo yum -y --nogpgcheck localinstall #{topdir}/RPMS/noarch/*.rpm"
-  system "sudo yum -y --nogpgcheck localinstall #{topdir}/RPMS/noarch/*.rpm"
-  exit 1 unless $? == 0
-end
+end

data/boxgrinder-core.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-11-11}
+  s.date = %q{2010-11-23}
   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/defaults.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb", "lib/openhash/openhash.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "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", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb", "lib/openhash/openhash.rb", "rubygem-boxgrinder-core.spec", "spec/helpers/appliance-config-helper-spec.rb", "spec/helpers/appliance-helper-spec.rb", "spec/helpers/exec-helper-spec.rb", "spec/helpers/log-helper-spec.rb", "spec/helpers/queue-helper-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/repo.appl", "spec/validators/appliance-config-validator-spec.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "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", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "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", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb", "rubygem-boxgrinder-core.spec", "spec/helpers/appliance-config-helper-spec.rb", "spec/helpers/appliance-helper-spec.rb", "spec/helpers/exec-helper-spec.rb", "spec/helpers/log-helper-spec.rb", "spec/helpers/queue-helper-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/repo.appl", "spec/validators/appliance-config-validator-spec.rb"]
   s.homepage = %q{http://www.jboss.org/boxgrinder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-core", "--main", "README"]
   s.require_paths = ["lib"]
@@ -24,10 +24,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<open4>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<hashery>, [">= 1.3.0"])
     else
       s.add_dependency(%q<open4>, [">= 1.0.0"])
+      s.add_dependency(%q<hashery>, [">= 1.3.0"])
     end
   else
     s.add_dependency(%q<open4>, [">= 1.0.0"])
+    s.add_dependency(%q<hashery>, [">= 1.3.0"])
   end
 end

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

@@ -16,8 +16,9 @@
 # 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/defaults'
-require 'openhash/openhash'
+require 'hashery/opencascade'
 
 module BoxGrinder
   class ApplianceConfig
@@ -27,13 +28,13 @@ module BoxGrinder
 
       @variables = {}
 
-      @os = OpenHash.new
+      @os = OpenCascade.new
 
       @os.name      = nil
       @os.version   = nil
       @os.password  = nil
 
-      @hardware = OpenHash.new
+      @hardware = OpenCascade.new
 
       @hardware.cpus      = APPLIANCE_DEFAULTS[:hardware][:cpus]
       @hardware.memory    = APPLIANCE_DEFAULTS[:hardware][:memory]
@@ -41,7 +42,7 @@ module BoxGrinder
 
       @post = {}
 
-      @packages = OpenHash.new
+      @packages = OpenCascade.new
       @packages.includes = []
       @packages.excludes = []
 
@@ -81,7 +82,7 @@ module BoxGrinder
     end
 
     def initialize_paths
-      @path = OpenHash.new
+      @path = OpenCascade.new
 
       @path.os        = "#{@os.name}/#{@os.version}"
       @path.main      = "#{@hardware.arch}/#{@path.os}"

data/rubygem-boxgrinder-core.spec

@@ -5,20 +5,22 @@
 
 Summary: Core library for BoxGrinder
 Name: rubygem-%{gemname}
-Version: 0.1.2
-Release: 1%{?dist}
+Version: 0.1.3
+Release: 3%{?dist}
 Group: Development/Languages
 License: LGPLv3+
 URL: http://www.jboss.org/boxgrinder
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: ruby(abi) = %{rubyabi}
-Requires: rubygems >= 1.2
-Requires: ruby >= 0
-Requires: rubygem(open4) >= 1.0.0
-BuildRequires: rubygems >= 1.2
-BuildRequires: ruby >= 0
+Requires: rubygem(open4)
+Requires: rubygem(hashery)
+
+BuildRequires: rubygem(rake)
+BuildRequires: rubygem(rspec)
+BuildRequires: rubygem(open4)
+BuildRequires: rubygem(hashery)
+BuildRequires: rubygem(echoe)
 
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
@@ -35,24 +37,22 @@ Requires:%{name} = %{version}-%{release}
 Documentation for %{name}
 
 %prep
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            --force --rdoc %{SOURCE0}
 
 %build
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force --rdoc %{SOURCE0}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
 
 %check
-pushd %{buildroot}/%{geminstdir}
+pushd .%{geminstdir}
 rake spec
-rm -rf log
 popd
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-, root, root, -)
 %dir %{geminstdir}
@@ -73,6 +73,19 @@ rm -rf %{buildroot}
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Wed Nov 17 2010  <mgoldman@redhat.com> - 0.1.3-3
+- Added: BuildRequires: rubygem(echoe)
+- Changed the way Gem is installed and tests are exeuted
+
+* Mon Nov 15 2010  <mgoldman@redhat.com> - 0.1.3-2
+- Removing unecessary Requires: rubygems
+
+* Mon Nov 15 2010  <mgoldman@redhat.com> - 0.1.3-1
+- Removed BuildRoot tag
+- Adjusted Requires and BuildRequires
+- Different approach for testing
+- [BGBUILD-98] Use hashery gem
+
 * Tue Nov 09 2010  <mgoldman@redhat.com> - 0.1.2-1
 - [BGBUILD-87] Set default filesystem to ext4 for Fedora 13+
 - [BGBUILD-65] Allow to specify own repos overriding default repos provided for selected OS

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +01:00
+date: 2010-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,22 @@ dependencies:
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hashery
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :runtime
+  version_requirements: *id002
 description: Core library for BoxGrinder
 email: info@boxgrinder.org
 executables: []
@@ -56,7 +72,6 @@ extra_rdoc_files:
 - lib/boxgrinder-core/models/task.rb
 - lib/boxgrinder-core/validators/appliance-config-validator.rb
 - lib/boxgrinder-core/validators/errors.rb
-- lib/openhash/openhash.rb
 files: 
 - CHANGELOG
 - LICENSE
@@ -76,7 +91,6 @@ files:
 - lib/boxgrinder-core/models/task.rb
 - lib/boxgrinder-core/validators/appliance-config-validator.rb
 - lib/boxgrinder-core/validators/errors.rb
-- lib/openhash/openhash.rb
 - rubygem-boxgrinder-core.spec
 - spec/helpers/appliance-config-helper-spec.rb
 - spec/helpers/appliance-helper-spec.rb

data/lib/openhash/openhash.rb

@@ -1,92 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2005 Thomas Sawyer
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-class OpenHash < Hash
-
-  # New OpenHash.
-  def initialize(data={})
-    super()
-    merge!(data)
-  end
-
-  #
-  def <<(x)
-    case x
-      when Hash
-        update(x)
-      when Array
-        x.each_slice(2) do |(k, v)|
-          self[k] = v
-        end
-    end
-  end
-
-  #
-  def respond_to?(name)
-    key?(name.to_sym) || super(name)
-  end
-
-  #
-  def to_h
-    dup
-  end
-
-  #
-  def to_hash
-    dup
-  end
-
-  #
-  def inspect
-    super
-  end
-
-  # Omit specific Hash methods from slot protection.
-  def omit!(*methods)
-    methods.reject!{ |x| x.to_s =~ /^__/ }
-    (
-    class << self;
-      self;
-    end).class_eval{ private *methods }
-  end
-
-  # Route get and set calls.
-  def method_missing(s, *a, &b)
-    type = s.to_s[-1, 1]
-    name = s.to_s.sub(/[!?=]$/, '')
-    key = name.to_sym
-    case type
-      when '='
-        self[key] = a[0]
-      #when '!'
-      # self[s] = OpenHash.new
-      when '?'
-        key?(key)
-      else
-        if key?(key)
-          self[key]
-        else
-          nil # super(s, *a, &b)
-        end
-    end
-  end
-end