boxgrinder-core 0.3.13 → 0.3.14

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.3.14
+
+* [BGBUILD-373] Remove hashery dependency
+
 v0.3.13
 
 * [BGBUILD-364] Validate length of appliance name

data/Manifest

@@ -6,6 +6,8 @@ Rakefile
 lib/boxgrinder-core.rb
 lib/boxgrinder-core/appliance-parser.rb
 lib/boxgrinder-core/appliance-validator.rb
+lib/boxgrinder-core/astruct.rb
+lib/boxgrinder-core/astruct_mixin.rb
 lib/boxgrinder-core/compat/color.rb
 lib/boxgrinder-core/compat/yaml19.rb
 lib/boxgrinder-core/errors.rb

data/Rakefile

@@ -26,7 +26,7 @@ Echoe.new("boxgrinder-core") do |p|
   p.summary = "Core library for BoxGrinder"
   p.url = "http://boxgrinder.org"
   p.email = "info@boxgrinder.org"
-  p.runtime_dependencies = ['hashery >=1.3.0', 'kwalify >=0.7.2', 'term-ansicolor >=1.0.0']
+  p.runtime_dependencies = ['kwalify >=0.7.2', 'term-ansicolor >=1.0.0']
   p.runtime_dependencies << 'open4 >=1.0.0' unless RUBY_PLATFORM =~ /java/
 end
 

data/boxgrinder-core.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "boxgrinder-core"
-  s.version = "0.3.13"
+  s.version = "0.3.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = "2012-08-22"
+  s.date = "2012-09-04"
   s.description = "Core library for BoxGrinder"
   s.email = "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/compat/color.rb", "lib/boxgrinder-core/compat/yaml19.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", "lib/boxgrinder-core/schemas/appliance_schema_0.9.6.yaml"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/appliance-parser.rb", "lib/boxgrinder-core/appliance-validator.rb", "lib/boxgrinder-core/compat/color.rb", "lib/boxgrinder-core/compat/yaml19.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", "lib/boxgrinder-core/schemas/appliance_schema_0.9.6.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/appliance-config-spec.rb", "spec/models/config-spec.rb", "spec/rcov_helper.rb", "spec/rspec/ls/one", "spec/rspec/ls/two", "spec/rspec/src/appliances/0.8.x.appl", "spec/rspec/src/appliances/0.9.x-invalid.appl", "spec/rspec/src/appliances/0.9.x.appl", "spec/rspec/src/appliances/comments.appl", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/invalid-yaml.appl", "spec/rspec/src/appliances/legacy.appl", "spec/rspec/src/appliances/repo.appl", "spec/rspec/src/config/empty", "spec/rspec/src/config/valid", "spec/spec_helper.rb", "boxgrinder-core.gemspec"]
+  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/astruct.rb", "lib/boxgrinder-core/astruct_mixin.rb", "lib/boxgrinder-core/compat/color.rb", "lib/boxgrinder-core/compat/yaml19.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", "lib/boxgrinder-core/schemas/appliance_schema_0.9.6.yaml"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/appliance-parser.rb", "lib/boxgrinder-core/appliance-validator.rb", "lib/boxgrinder-core/astruct.rb", "lib/boxgrinder-core/astruct_mixin.rb", "lib/boxgrinder-core/compat/color.rb", "lib/boxgrinder-core/compat/yaml19.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", "lib/boxgrinder-core/schemas/appliance_schema_0.9.6.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/appliance-config-spec.rb", "spec/models/config-spec.rb", "spec/rcov_helper.rb", "spec/rspec/ls/one", "spec/rspec/ls/two", "spec/rspec/src/appliances/0.8.x.appl", "spec/rspec/src/appliances/0.9.x-invalid.appl", "spec/rspec/src/appliances/0.9.x.appl", "spec/rspec/src/appliances/comments.appl", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/invalid-yaml.appl", "spec/rspec/src/appliances/legacy.appl", "spec/rspec/src/appliances/repo.appl", "spec/rspec/src/config/empty", "spec/rspec/src/config/valid", "spec/spec_helper.rb", "boxgrinder-core.gemspec"]
   s.homepage = "http://boxgrinder.org"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-core", "--main", "README"]
   s.require_paths = ["lib"]
@@ -22,18 +22,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hashery>, [">= 1.3.0"])
       s.add_runtime_dependency(%q<kwalify>, [">= 0.7.2"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<open4>, [">= 1.0.0"])
     else
-      s.add_dependency(%q<hashery>, [">= 1.3.0"])
       s.add_dependency(%q<kwalify>, [">= 0.7.2"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.0"])
       s.add_dependency(%q<open4>, [">= 1.0.0"])
     end
   else
-    s.add_dependency(%q<hashery>, [">= 1.3.0"])
     s.add_dependency(%q<kwalify>, [">= 0.7.2"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.0"])
     s.add_dependency(%q<open4>, [">= 1.0.0"])

data/lib/boxgrinder-core/astruct.rb

@@ -0,0 +1,16 @@
+require 'boxgrinder-core/astruct_mixin'
+
+module BoxGrinder
+
+  class AStruct < Hash
+
+    include AStructMixin
+
+    def initialize(hash=nil, cascade_for_nils=true)
+      cascade_for_nils! if cascade_for_nils
+      hash.each { |k,v| self[k]=v } if hash
+    end
+
+  end
+
+end

data/lib/boxgrinder-core/astruct_mixin.rb

@@ -0,0 +1,59 @@
+module BoxGrinder
+
+  module AStructMixin
+
+    def cascade_for_nils!
+      @cascade_for_nils = true
+      self
+    end
+
+    def key?(key)
+      super( key ) || super( key.to_sym ) || super( key.to_s )
+    end
+
+    def [](key)
+      r = [key, key.to_sym, key.to_s].find { |fk| !super(fk).nil? }
+      transform_entry( key, super(r) )
+    end
+
+    def method_missing(sym, *args, &blk)
+      type = sym.to_s[-1,1]
+      name = sym.to_s.gsub(/[=!?]$/, '').to_sym
+      case type
+      when '='
+        self[name] = args.first
+      when '!'
+        __send__(name, *args, &blk)
+      when '?'
+        self[name]
+      else
+        if key?(name)
+          self[name]
+        elsif @cascade_for_nils
+          self[name] = AStruct.new.cascade_for_nils!
+          self[name]
+        else
+          nil
+        end
+      end
+    end
+
+    def transform_entry(for_key, entry)
+      case(entry)
+        when AStructMixin
+          entry
+        when Hash
+          entry.extend(AStructMixin)
+        when Array
+          entry.map!{|i| transform_entry(for_key, i)}
+        else
+          entry
+      end
+    end
+
+    def inspect
+       "AStruct<#{super.to_s}>"
+    end
+  end
+
+end

data/lib/boxgrinder-core/helpers/exec-helper.rb

@@ -78,7 +78,7 @@ module BoxGrinder
         # to get reliable status for processes both on MRI and JRuby
         #
         # http://jira.codehaus.org/browse/JRUBY-5673
-        status = OpenCascade.new(:exitstatus => 0)
+        status = AStruct.new(:exitstatus => 0)
         
         fakepid, status = Process.waitpid2(pid) if process_alive?(pid)
 

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

@@ -17,7 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
-require 'hashery/opencascade'
+require 'boxgrinder-core/astruct'
 
 module BoxGrinder
   class ApplianceConfig
@@ -28,14 +28,14 @@ module BoxGrinder
 
       @default_repos = true
 
-      @os = OpenCascade.new
+      @os = AStruct.new
 
       @os.name = nil
       @os.version = nil
       @os.password = nil
       @os.pae = true
 
-      @hardware = OpenCascade.new
+      @hardware = AStruct.new
 
       @hardware.cpus = 1
       @hardware.memory = 256
@@ -106,7 +106,7 @@ module BoxGrinder
     end
 
     def initialize_paths
-      @path = OpenCascade.new
+      @path = AStruct.new
 
       @path.os = "#{@os.name}/#{@os.version}"
       @path.version = "#{@version}.#{@release}"

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

@@ -17,12 +17,12 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
-require 'hashery/opencascade'
+require 'boxgrinder-core/astruct'
 require 'yaml'
 require 'etc'
 
 module BoxGrinder
-  class Config < OpenCascade
+  class Config < AStruct
     def initialize(values = {})
       super({})
 
@@ -90,4 +90,4 @@ module BoxGrinder
       end
     end
   end
-end
+end

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

@@ -15,7 +15,7 @@ mapping:
   "release":
     type: int
   "os":
-    class: OpenCascade
+    class: AStruct
     type: map
     mapping:
       "name":
@@ -28,7 +28,7 @@ mapping:
       "password":
         type: str
   "hardware":
-    class: OpenCascade
+    class: AStruct
     type: map
     name: Hardware
     mapping:

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

@@ -15,7 +15,7 @@ mapping:
   "release":
     type: int
   "os":
-    class: OpenCascade
+    class: AStruct
     type: map
     mapping:
       "name":
@@ -28,7 +28,7 @@ mapping:
       "password":
         type: str  
   "hardware":
-    class: OpenCascade
+    class: AStruct
     type: map
     name: Hardware
     mapping:

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

@@ -15,7 +15,7 @@ mapping:
   "release":
     type: int
   "os":
-    class: OpenCascade
+    class: AStruct
     type: map
     mapping:
       "name":
@@ -28,7 +28,7 @@ mapping:
       "password":
         type: str
   "hardware":
-    class: OpenCascade
+    class: AStruct
     type: map
     name: Hardware
     mapping:

data/rubygem-boxgrinder-core.spec

@@ -11,7 +11,7 @@
 
 Summary:     Core library for BoxGrinder
 Name:        rubygem-%{gem_name}
-Version:     0.3.13
+Version:     0.3.14
 Release:     1%{?dist}
 Group:       Development/Languages
 License:     LGPLv3+
@@ -20,13 +20,11 @@ Source0:     http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
 Requires: ruby(abi) = %{rubyabi}
 Requires: rubygem(open4)
-Requires: rubygem(hashery)
 Requires: rubygem(kwalify)
 Requires: rubygem(term-ansicolor)
 
 BuildRequires: rubygem(rake)
 BuildRequires: rubygem(open4)
-BuildRequires: rubygem(hashery)
 BuildRequires: rubygem(echoe)
 BuildRequires: rubygem(kwalify)
 BuildRequires: rubygems-devel
@@ -89,6 +87,10 @@ popd
 %{gem_docdir}
 
 %changelog
+* Tue Sep 4 2012 Marc Savy <msavy@redhat.com> - 0.3.14
+- Upstream release: 0.3.14
+- [BGBUILD-373] Remove hashery dependency
+
 * Mon Jun 18 2012 Marc Savy <msavy@redhat.com> - 0.3.13
 - Upstream release: 0.3.13
 - [BGBUILD-364] Validate length of appliance name

data/spec/appliance-validator-spec.rb

@@ -17,7 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-core/appliance-validator'
-require 'hashery/opencascade'
+require 'boxgrinder-core/astruct'
 
 module BoxGrinder
   describe ApplianceValidator do
@@ -32,21 +32,21 @@ module BoxGrinder
       context "repository" do
         it "should generate error when no baseurl or mirrorlist is specified for repository" do
           a = []
-          @validator.validate_hook({}, OpenCascade.new(:name => 'Repository'), '/', a)
+          @validator.validate_hook({}, AStruct.new(:name => 'Repository'), '/', a)
           a.size.should == 1
           a.first.message.should == 'Please specify either a baseurl or a mirrorlist.'
         end
 
         it "should generate error when both baseurl and mirrorlist are specified for repository" do
           a = []
-          @validator.validate_hook({'baseurl' => 'abc', 'mirrorlist' => 'def'}, OpenCascade.new(:name => 'Repository'), '/', a)
+          @validator.validate_hook({'baseurl' => 'abc', 'mirrorlist' => 'def'}, AStruct.new(:name => 'Repository'), '/', a)
           a.size.should == 1
           a.first.message.should == 'Please specify either a baseurl or a mirrorlist.'
         end
 
         it "should pass if baseurl or mirrorlist is specified for repository" do
           a = []
-          @validator.validate_hook({'baseurl' => 'abc'}, OpenCascade.new(:name => 'Repository'), '/', a)
+          @validator.validate_hook({'baseurl' => 'abc'}, AStruct.new(:name => 'Repository'), '/', a)
           a.size.should == 0
         end
       end
@@ -54,14 +54,14 @@ module BoxGrinder
       context "hardware" do
         it "should allow only multiplicity of 64 for memory" do
           a = []
-          @validator.validate_hook({'memory' => 235}, OpenCascade.new(:name => 'Hardware'), '/', a)
+          @validator.validate_hook({'memory' => 235}, AStruct.new(:name => 'Hardware'), '/', a)
           a.size.should == 1
           a.first.message.should == "Specified memory amount: 235 is invalid. The value must be a multiple of 64."
         end
 
         it "should pass if the memory is 256" do
           a = []
-          @validator.validate_hook({'memory' => 256}, OpenCascade.new(:name => 'Hardware'), '/', a)
+          @validator.validate_hook({'memory' => 256}, AStruct.new(:name => 'Hardware'), '/', a)
           a.size.should == 0
         end
       end

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

@@ -40,7 +40,7 @@ module BoxGrinder
         @stdout.should_receive(:each)
         @stderr.should_receive(:each)
         Process.should_receive(:getpgid)
-        Process.should_receive(:waitpid2).with(1234).and_return([1234, OpenCascade.new(:exitstatus => 1)])
+        Process.should_receive(:waitpid2).with(1234).and_return([1234, AStruct.new(:exitstatus => 1)])
 
         @o4.should_receive(:send).with(:popen4, 'exitstatus').and_return([@pid, @stdin, @stdout, @stderr])
 
@@ -51,7 +51,7 @@ module BoxGrinder
         @stdout.should_receive(:each)
         @stderr.should_receive(:each)
         Process.should_receive(:getpgid)
-        Process.should_receive(:waitpid2).with(1234).and_return([1234, OpenCascade.new(:exitstatus => 1)])
+        Process.should_receive(:waitpid2).with(1234).and_return([1234, AStruct.new(:exitstatus => 1)])
 
         @o4.should_receive(:send).with(:popen4, 'exitstatus').and_return([@pid, @stdin, @stdout, @stderr])
 
@@ -63,7 +63,7 @@ module BoxGrinder
       @stdout.should_receive(:each)
       @stderr.should_receive(:each)
       Process.should_receive(:getpgid)
-      Process.should_receive(:waitpid2).with(1234).and_return([1234, OpenCascade.new(:exitstatus => 0)])
+      Process.should_receive(:waitpid2).with(1234).and_return([1234, AStruct.new(:exitstatus => 0)])
 
       @o4.should_receive(:send).with(:popen4, 'abc').and_return([@pid, @stdin, @stdout, @stderr])
 
@@ -85,7 +85,7 @@ module BoxGrinder
       @stdout.should_receive(:each)
       @stderr.should_receive(:each)
       Process.should_receive(:getpgid)
-      Process.should_receive(:waitpid2).with(1234).and_return([1234, OpenCascade.new(:exitstatus => 0)])
+      Process.should_receive(:waitpid2).with(1234).and_return([1234, AStruct.new(:exitstatus => 0)])
 
       @helper = ExecHelper.new(:log => log)
       @o4.should_receive(:send).with(:popen4, "ala ma kota i jest fajnie").and_return([@pid, @stdin, @stdout, @stderr])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxgrinder-core
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashery
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: kwalify
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +70,8 @@ extra_rdoc_files:
 - lib/boxgrinder-core.rb
 - lib/boxgrinder-core/appliance-parser.rb
 - lib/boxgrinder-core/appliance-validator.rb
+- lib/boxgrinder-core/astruct.rb
+- lib/boxgrinder-core/astruct_mixin.rb
 - lib/boxgrinder-core/compat/color.rb
 - lib/boxgrinder-core/compat/yaml19.rb
 - lib/boxgrinder-core/errors.rb
@@ -109,6 +95,8 @@ files:
 - lib/boxgrinder-core.rb
 - lib/boxgrinder-core/appliance-parser.rb
 - lib/boxgrinder-core/appliance-validator.rb
+- lib/boxgrinder-core/astruct.rb
+- lib/boxgrinder-core/astruct_mixin.rb
 - lib/boxgrinder-core/compat/color.rb
 - lib/boxgrinder-core/compat/yaml19.rb
 - lib/boxgrinder-core/errors.rb