hosties 1.0.0 → 1.1.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ddfeda2e90489df21afb44cb70c5560fd24b12
-  data.tar.gz: 7307934a3183c4fcb74d1a4fe3e4c6401ecf7ba0
+  metadata.gz: b67e9ef6e1d2d98eaf6c3e5dc570e2b478e12708
+  data.tar.gz: d3fa2796ecfee0d21f0091c6ca6d1518961d281f
 SHA512:
-  metadata.gz: e8c90640a12836827bc7c0df71a7496389833b5fafcfb495b35355efc650215032ae6e39b8b10870c40b9e36c9f62ed45025347f1d8d051175fe50c04813b7d4
-  data.tar.gz: e17ba1f3cb0e4bfa34740edf9491124a97ef467cdd993dd4e478e257cfcf4d556dcdc2e34270962239b05a3114e604a6a8c45d59635bf4e532d55ed743360c1b
+  metadata.gz: c3b2df43b6b47519ad39ef1c339c60b94e0ad27f2d1b7941c4686e7cbaed8166735aa03ac4fa1c8b9a3fae126a41935e041030a669f6ab1c1410eb3d0d5ee326
+  data.tar.gz: 86b140c14683a0b37cf754158920181856cd4fb0bc85f560806e37166b13246a0da667a2db1c965a0c1bb44574a601163ab7d8c2ae3cec5aea9bce4e11879e51

data/lib/hosties.rb

@@ -1,5 +1,6 @@
 require 'hosties/definitions'
 require 'hosties/reification'
+require 'hosties/easydata'
 
 # A library to provide easily readable environment definitions.
 module Hosties

data/lib/hosties/{Definitions.rb → definitions.rb}

@@ -37,6 +37,8 @@ class HasAttributes
   end
 
   alias_method :have_attribute, :have_attributes
+  alias_method :has_attribute, :have_attribute
+  alias_method :has_attributes, :have_attributes
 
   # Helpful method to define constraints
   def where(name)
@@ -71,6 +73,8 @@ class HostRequirement < HasAttributes
   end
 
   alias_method :have_service, :have_services
+  alias_method :has_service, :have_service
+  alias_method :has_services, :have_services
 
   def finished
     Hosties::HostDefinitions[@type] = self

data/lib/hosties/easydata.rb

@@ -0,0 +1,40 @@
+###############################################################
+# Provide a more convenient data structure to work with once  #
+# environment declarations have been read.                    #
+###############################################################
+class DataWrapper
+  def metaclass
+    class << self
+      self
+    end
+  end
+end
+
+module Hosties
+  module EasyData
+    def self.fromHost(hash)
+      result = DataWrapper.new
+      hash.each do |k, v|
+        result.metaclass.send(:define_method, k) do v end
+      end
+      result
+    end
+    def self.fromEnv(hash)
+      result = DataWrapper.new
+      hash.each do |k, v|
+        result.metaclass.send(:define_method, k) do v end
+      end
+      # Add a hosts_by_type method
+      result.metaclass.send(:define_method, :hosts_by_type) do |type|
+        self.hosts.find_all do |host|
+          host.type == type
+        end
+      end
+      # Add an each_host method
+      result.metaclass.send(:define_method, :each_host) do |&block|
+        yield self.hosts
+      end
+      result
+    end
+  end
+end

data/lib/hosties/{Reification.rb → reification.rb}

@@ -64,8 +64,8 @@ class HostBuilder < UsesAttributes
     @definition.services.each do |svc|
       raise ArgumentError, "Missing service #{svc}" if @service_ports[svc].nil?
     end
-    # TODO: More clever data repackaging
-    super.merge({ :hostname => @hostname }).merge(@service_ports)
+    # TODO: Declare these reserved names
+    super.merge({ :hostname => @hostname, :type => @type }).merge(@service_ports)
   end
 end
 
@@ -75,7 +75,7 @@ class EnvironmentBuilder < UsesAttributes
     if Hosties::EnvironmentDefinitions[type].nil? then
       raise ArgumentError, "Unrecognized environment type"
     end
-    @hosts = {} # host type => array of hosts' data
+    @hosts = [] 
     @type = type
     @definition = Hosties::EnvironmentDefinitions[@type]
     super(@definition) # Creates attribute code
@@ -86,8 +86,7 @@ class EnvironmentBuilder < UsesAttributes
         begin
           builder = HostBuilder.new(host_type, hostname)
           builder.instance_eval(&block)
-          if @hosts[host_type].nil? then @hosts[host_type] = [] end
-          @hosts[host_type] << builder.finish
+          @hosts << Hosties::EasyData.fromHost(builder.finish)
         rescue ArgumentError => ex
           #puts "Problem declaring host: #{ex}"
           raise ex
@@ -99,19 +98,11 @@ class EnvironmentBuilder < UsesAttributes
   def finish
     # Verify all of the required hosts were set
     @definition.hosts.each do |host_type| 
-      raise ArgumentError, "Missing #{host_type} host" unless @hosts.include? host_type
-    end
-    retval = super.merge({ :hosts => @hosts })
-    Hosties::Environments[@type] << retval
-    # Add ourselves into the grouped listing if necessary
-    attr = @definition.grouping
-    unless attr.nil? then # TODO: This is really ugly
-      if Hosties::GroupedEnvironments[@type].nil? then
-        Hosties::GroupedEnvironments[@type] = Hash.new{|h,k| h[k] = []}
+      unless @hosts.detect { |host| host.type == host_type } then
+        raise ArgumentError, "Missing #{host_type} host" 
       end
-      Hosties::GroupedEnvironments[@type][retval[attr]] << retval
     end
-    retval
+    super.merge({ :hosts => @hosts })
   end
 end
 
@@ -120,6 +111,16 @@ def environment_for(type, &block)
     builder = EnvironmentBuilder.new(type)
     builder.instance_eval(&block)
     data = builder.finish
+    nice_version = Hosties::EasyData.fromEnv(data)
+    Hosties::Environments[type] << nice_version
+    definition = Hosties::EnvironmentDefinitions[type]
+    # Add into the grouped listing if necessary
+    unless definition.grouping.nil? then 
+      if Hosties::GroupedEnvironments[type].nil? then
+        Hosties::GroupedEnvironments[type] = Hash.new{|h,k| h[k] = []}
+      end
+      Hosties::GroupedEnvironments[type][data[definition.grouping]] << nice_version
+    end
   rescue ArgumentError => ex
     puts "Problem declaring environment: #{ex}"
     raise ex

data/spec/easydata_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Hosties::EasyData do
+  it 'should turn host declarations into something awesome' do
+    host_type :easydata_one do
+      have_service :http
+      have_attribute :attr_one
+    end
+    builder = HostBuilder.new(:easydata_one, "localhost")
+    builder.http 80
+    builder.attr_one "One!"
+    result = Hosties::EasyData.fromHost(builder.finish)
+    expect(result.http).to eq(80)
+    expect(result.attr_one).to eq("One!")
+    expect(result.hostname).to eq("localhost")
+    expect(result.type).to eq(:easydata_one)
+  end
+
+  it 'should turn environment declarations into something awesome too' do
+    host_type :easydata_two do end
+    host_type :easydata_three do end
+    environment_type :easydata_one do
+      need :easydata_two, :easydata_three
+      have_attribute :environment
+      where(:environment).can_be :dev, :testing
+    end
+    builder = EnvironmentBuilder.new :easydata_one
+    builder.easydata_two "0.0.0.0" do end
+    builder.easydata_three "1.1.1.1" do end
+    builder.environment :dev
+    result = Hosties::EasyData.fromEnv(builder.finish)
+    expect(result.environment).to eq(:dev)
+    type_two_hosts = result.hosts_by_type(:easydata_two)
+    expect(type_two_hosts.size).to eq(1)
+    host = type_two_hosts.first
+    expect(host.hostname).to eq("0.0.0.0")
+  end
+end

data/spec/hosties_spec.rb

@@ -5,7 +5,7 @@ describe Hosties do
     host_type :special_host do
     end
     instance = HostBuilder.new(:special_host, "0.0.0.0")
-    expect(instance.finish).to eq({ :hostname => "0.0.0.0"})
+    expect(instance.finish).to eq({ :hostname => "0.0.0.0", :type => :special_host})
   end
 
   it 'catches missing services' do
@@ -81,12 +81,12 @@ describe Hosties do
     end
     expect(Hosties::Environments[:typical_product].nil?).to eq(false)
     data = Hosties::Environments[:typical_product].first
-    expect(data[:environment]).to eq(:qa)
-    expect(data[:hosts][:monitoring].size).to eq(2) # Two monitoring hosts
-    expect(data[:hosts][:service_host].size).to eq(1)
-    service_host = data[:hosts][:service_host].first
-    expect(service_host[:service_port]).to eq(1234)
-    expect(service_host[:uuid]).to eq("81E3C1D4-C040-4D59-A56F-4273384D576B")
+    expect(data.environment).to eq(:qa)
+    expect(data.hosts_by_type(:monitoring).size).to eq(2) # Two monitoring hosts
+    expect(data.hosts_by_type(:service_host).size).to eq(1)
+    service_host = data.hosts_by_type(:service_host).first
+    expect(service_host.service_port).to eq(1234)
+    expect(service_host.uuid).to eq("81E3C1D4-C040-4D59-A56F-4273384D576B")
   end
 
   it 'can group environments by attribute' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hosties
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.alpha
 platform: ruby
 authors:
 - Ron Dahlgren
@@ -32,10 +32,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hosties/Definitions.rb
-- lib/hosties/Reification.rb
+- lib/hosties/definitions.rb
+- lib/hosties/easydata.rb
+- lib/hosties/reification.rb
 - lib/hosties.rb
 - spec/definitions_spec.rb
+- spec/easydata_spec.rb
 - spec/hosties_spec.rb
 - spec/reification_spec.rb
 - spec/spec_helper.rb
@@ -54,9 +56,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -65,6 +67,7 @@ specification_version: 4
 summary: Easy environment description
 test_files:
 - spec/definitions_spec.rb
+- spec/easydata_spec.rb
 - spec/hosties_spec.rb
 - spec/reification_spec.rb
 - spec/spec_helper.rb