ironfan 3.1.7 → 3.2.2

data/lib/ironfan/server_slice.rb

@@ -5,32 +5,26 @@ module Ironfan
   # The idea is we want to be able to smoothly roll up settings
   #
   #
-  class ServerSlice < Ironfan::DslObject
-    attr_reader :name, :servers, :cluster
+  class ServerSlice < Ironfan::DslBuilderCollection
+    attr_accessor :name
+    attr_accessor :cluster
 
     def initialize cluster, servers
+      @item_type = Ironfan::Server
+      @key_method = :name
       super()
-      @name    = "#{cluster.name} slice"
-      @cluster = cluster
-      @servers = servers
+      self.name    = "#{cluster.name} slice"
+      self.cluster = cluster
+      receive!(servers)
     end
 
-    #
-    # Enumerable
-    #
-    include Enumerable
-    def each(&block)
-      @servers.each(&block)
-    end
-    def length
-      @servers.length
-    end
-    def empty?
-      length == 0
+    def servers
+      @clxn.values
     end
+
     [:select, :find_all, :reject, :detect, :find, :drop_while].each do |method|
       define_method(method) do |*args, &block|
-        ServerSlice.new cluster, @servers.send(method, *args, &block)
+        ServerSlice.new cluster, servers.send(method, *args, &block)
       end
     end
     # true if slice contains a server with the given fullname (if arg is a
@@ -197,7 +191,7 @@ module Ironfan
           hsh["State"] = "not running"
         end
         hsh['Volumes'] = []
-        svr.composite_volumes.each do |name, vol|
+        svr.volumes.each_pair do |name, vol|
           if    vol.ephemeral_device? then next
           elsif vol.volume_id         then hsh['Volumes'] << vol.volume_id
           elsif vol.create_at_launch? then hsh['Volumes'] << vol.snapshot_id

data/lib/ironfan/volume.rb

@@ -2,33 +2,31 @@ module Ironfan
   #
   # Internal or external storage
   #
-  class Volume < Ironfan::DslObject
-    attr_reader   :parent
+  class Volume < Ironfan::DslBuilder
+    field :parent, String
     attr_accessor :fog_volume
-    has_keys(
-      :name,
-      # mountable volume attributes
-      :device, :mount_point, :mount_options, :fstype, :mount_dump, :mount_pass,
-      :mountable, :formattable, :resizable, :in_raid,
-      # cloud volume attributes
-      :attachable, :create_at_launch, :volume_id, :snapshot_id, :size, :keep, :availability_zone,
-      # arbitrary tags
-      :tags
-      )
-
-    VOLUME_DEFAULTS = {
-      :fstype          => 'xfs',
-      :mount_options    => 'defaults,nouuid,noatime',
-      :keep             => true,
-      :attachable       => :ebs,
-      :create_at_launch => false,
-      #
-      :mountable        => true,
-      :resizable        => false,
-      :formattable      => false,
-      :in_raid          => false,
-    }
-    def self.defaults(hsh) VOLUME_DEFAULTS.merge(hsh) ; end
+
+    # mountable volume attributes
+    magic :device, String
+    magic :mount_point, String
+    magic :mount_options, String, :default => 'defaults,nouuid,noatime'
+    magic :fstype, String, :default => 'xfs'
+    magic :mount_dump, String
+    magic :mount_pass, String
+    magic :mountable, Whatever, :default => true
+    magic :formattable, Whatever, :default => false
+    magic :resizable, Whatever, :default => false
+    magic :in_raid, Whatever, :default => false
+    # cloud volume attributes
+    magic :attachable, Whatever, :default => :ebs
+    magic :create_at_launch, Whatever, :default => false
+    magic :volume_id, String
+    magic :snapshot_id, String
+    magic :size, String
+    magic :keep, Whatever, :default => true
+    magic :availability_zone, String
+    # arbitrary tags
+    magic :tags, Hash, :default => {}
 
     # Snapshot for snapshot_name method.
     # Set your own by adding
@@ -52,18 +50,14 @@ module Ironfan
     #     :tags => {}, :keep => true )
     #
     def initialize attrs={}
-      @parent = attrs.delete(:parent)
+      parent = attrs.delete(:owner)
       super(attrs)
-      @settings[:tags] ||= {}
     end
 
     # human-readable description for logging messages and such
     def desc
-      "#{name} on #{parent.fullname} (#{volume_id} @ #{device})"
-    end
-
-    def defaults
-      self.configure(VOLUME_DEFAULTS)
+      container = parent.name rescue nil
+      "#{name} on #{container} (#{volume_id} @ #{device})"
     end
 
     def ephemeral_device?
@@ -94,11 +88,11 @@ module Ironfan
       in_cloud? && fog_volume.server_id.present?
     end
 
-    def reverse_merge!(other_hsh)
-      super(other_hsh)
-      self.tags.reverse_merge!(other_hsh.tags) if other_hsh.respond_to?(:tags) && other_hsh.tags.present?
-      self
-    end
+#     def reverse_merge!(other_hsh)
+#       super(other_hsh)
+#       self.tags.reverse_merge!(other_hsh.tags) if other_hsh.respond_to?(:tags) && other_hsh.tags.present?
+#       self
+#     end
 
     # An array of hashes with dorky-looking keys, just like Fog wants it.
     def block_device_mapping
@@ -128,31 +122,25 @@ module Ironfan
   # * http://stu.mp/2009/12/disk-io-and-throughput-benchmarks-on-amazons-ec2.html
   #
   class RaidGroup < Volume
-    has_keys(
-      :sub_volumes,     # volumes that comprise this raid group
-      :level,           # RAID level (http://en.wikipedia.org/wiki/RAID#Standard_levels)
-      :chunk,           # Raid chunk size (https://raid.wiki.kernel.org/articles/r/a/i/RAID_setup_cbb2.html)
-      :read_ahead,      # read-ahead buffer
-      )
+    # volumes that comprise this raid group
+    magic :sub_volumes, Array, :default => []
+    # RAID level (http://en.wikipedia.org/wiki/RAID#Standard_levels)
+    magic :level, String
+    # Raid chunk size (https://raid.wiki.kernel.org/articles/r/a/i/RAID_setup_cbb2.html)
+    magic :chunk, String
+    # read-ahead buffer
+    magic :read_ahead, String
+
+    # Overrides of Volume field defaults
+    magic :attachable, Whatever, :default => false
+    magic :formattable, Whatever, :default => true
+    magic :mount_options, String, :default => 'defaults,nobootwait,noatime,nouuid,comment=ironfan'
 
     def desc
       "#{name} on #{parent.fullname} (#{volume_id} @ #{device} from #{sub_volumes.join(',')})"
     end
 
-    def defaults()
-      super
-      fstype            'xfs'
-      mount_options     "defaults,nobootwait,noatime,nouuid,comment=ironfan"
-      attachable        false
-      create_at_launch  false
-      #
-      mountable         true
-      resizable         false
-      formattable       true
-      #
-      in_raid           false
-      #
-      sub_volumes       []
-    end
+#     attr_reader   :parent
+    attr_accessor :fog_volume
   end
 end

data/lib/ironfan.rb

@@ -5,11 +5,12 @@ require 'gorillib/metaprogramming/class_attribute'
 require 'gorillib/hash/reverse_merge'
 require 'gorillib/object/blank'
 require 'gorillib/hash/compact'
+require 'gorillib/builder'
 require 'set'
 
-require 'ironfan/dsl_object'
-require 'ironfan/cloud'
+require 'ironfan/dsl_builder'
 require 'ironfan/security_group'
+require 'ironfan/cloud'
 require 'ironfan/compute'           # base class for machine attributes
 require 'ironfan/facet'             # similar machines within a cluster
 require 'ironfan/cluster'           # group of machines with a common mission
@@ -70,8 +71,8 @@ module Ironfan
   #
   def self.cluster(name, attrs={}, &block)
     name = name.to_sym
-    cl = ( self.clusters[name] ||= Ironfan::Cluster.new(name, attrs) )
-    cl.configure(&block)
+    cl = ( self.clusters[name] ||= Ironfan::Cluster.new(name) )
+    cl.receive!(attrs, &block)
     cl
   end
 

metadata

@@ -1,124 +1,148 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ironfan
-version: !ruby/object:Gem::Version
-  version: 3.1.7
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 3.2.2
 platform: ruby
-authors:
+authors: 
 - Infochimps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: chef
-  requirement: &70201801398780 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70201801398780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: fog
-  requirement: &70201801398300 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+      - !ruby/object:Gem::Version 
+        version: "1.2"
   type: :runtime
   prerelease: false
-  version_requirements: *70201801398300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: formatador
-  requirement: &70201801397280 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
+      - !ruby/object:Gem::Version 
+        version: "0.2"
   type: :runtime
   prerelease: false
-  version_requirements: *70201801397280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: gorillib
-  requirement: &70201801396800 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
+      - !ruby/object:Gem::Version 
+        version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70201801396800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &70201801396320 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.1'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.1"
   type: :development
   prerelease: false
-  version_requirements: *70201801396320
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70201801395840 !ruby/object:Gem::Requirement
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.6'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70201801395840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70201801395360 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
+      - !ruby/object:Gem::Version 
+        version: "2.8"
   type: :development
   prerelease: false
-  version_requirements: *70201801395360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &70201801394880 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.6'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.7"
   type: :development
   prerelease: false
-  version_requirements: *70201801394880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: redcarpet
-  requirement: &70201801394400 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.1"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: oj
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.2"
+  type: :development
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: json
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70201801394400
-description: Ironfan allows you to orchestrate not just systems but clusters of machines.
-  It includes a powerful layer on top of knife and a collection of cloud cookbooks.
+  version_requirements: *id011
+description: Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.
 email: coders@infochimps.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.md
 - README.md
-files:
+files: 
 - .gitignore
 - .rspec
 - .yardopts
@@ -164,7 +188,7 @@ files:
 - lib/ironfan/compute.rb
 - lib/ironfan/deprecated.rb
 - lib/ironfan/discovery.rb
-- lib/ironfan/dsl_object.rb
+- lib/ironfan/dsl_builder.rb
 - lib/ironfan/facet.rb
 - lib/ironfan/fog_layer.rb
 - lib/ironfan/private_key.rb
@@ -173,37 +197,6 @@ files:
 - lib/ironfan/server.rb
 - lib/ironfan/server_slice.rb
 - lib/ironfan/volume.rb
-- notes/Backup of ec2-pricing_and_capacity.numbers
-- notes/Home.md
-- notes/INSTALL-cloud_setup.md
-- notes/INSTALL.md
-- notes/Ironfan-Roadmap.md
-- notes/advanced-superpowers.md
-- notes/aws_servers.jpg
-- notes/aws_user_key.png
-- notes/cookbook-versioning.md
-- notes/core_concepts.md
-- notes/declaring_volumes.md
-- notes/design_notes-aspect_oriented_devops.md
-- notes/design_notes-ci_testing.md
-- notes/design_notes-cookbook_event_ordering.md
-- notes/design_notes-meta_discovery.md
-- notes/ec2-pricing_and_capacity.md
-- notes/ec2-pricing_and_capacity.numbers
-- notes/homebase-layout.txt
-- notes/knife-cluster-commands.md
-- notes/named-cloud-objects.md
-- notes/opscode_org_key.png
-- notes/opscode_user_key.png
-- notes/philosophy.md
-- notes/rake_tasks.md
-- notes/renamed-recipes.txt
-- notes/silverware.md
-- notes/style_guide.md
-- notes/tips_and_troubleshooting.md
-- notes/version-3_2.md
-- notes/walkthrough-hadoop.md
-- notes/walkthrough-web.md
 - spec/ironfan/cluster_spec.rb
 - spec/ironfan/facet_spec.rb
 - spec/ironfan/server_slice_spec.rb
@@ -214,40 +207,41 @@ files:
 - spec/test_config.rb
 - tasks/chef_config.rake
 homepage: http://infochimps.com/labs
-licenses:
+licenses: 
 - apachev2
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 1629322618717092090
+      segments: 
       - 0
-      hash: 2550767254429275141
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Ironfan allows you to orchestrate not just systems but clusters of machines.
-  It includes a powerful layer on top of knife and a collection of cloud cookbooks.
-test_files:
+summary: Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.
+test_files: 
+- spec/ironfan_spec.rb
+- spec/spec_helper/dummy_chef.rb
 - spec/ironfan/cluster_spec.rb
-- spec/ironfan/facet_spec.rb
 - spec/ironfan/server_slice_spec.rb
 - spec/ironfan/server_spec.rb
-- spec/ironfan_spec.rb
-- spec/spec_helper/dummy_chef.rb
+- spec/ironfan/facet_spec.rb
 - spec/spec_helper.rb
 - spec/test_config.rb

data/lib/ironfan/dsl_object.rb

@@ -1,124 +0,0 @@
-Mash.class_eval do
-  def reverse_merge!(other_hash)
-    # stupid mash doesn't take a block arg, which breaks the implementation of
-    # reverse_merge!
-    other_hash.each_pair do |key, value|
-      key = convert_key(key)
-      regular_writer(key, convert_value(value)) unless has_key?(key)
-    end
-    self
-  end
-  def to_mash
-    self.dup
-  end unless method_defined?(:to_mash)
-end
-
-Hash.class_eval do
-  def to_mash
-    Mash.new(self)
-  end unless method_defined?(:to_mash)
-end
-
-module Ironfan
-  #
-  # Provides magic methods, defined with has_keys
-  #
-  # @example
-  #   class Mom < Ironfan::DslObject
-  #     has_keys(:college, :combat_boots, :fat, :so_fat)
-  #   end
-  #
-  #   class Person
-  #     def momma &block
-  #       @momma ||= Mom.new
-  #       @momma.configure(&block) if block
-  #     end
-  #   end
-  #
-  #   yo = Person.new
-  #   yo.mamma.combat_boots :wears
-  #   yo.momma do
-  #     fat    true
-  #     so_fat 'When she sits around the house, she sits *AROUND* the house'
-  #   end
-  #
-  class DslObject
-    class_attribute :keys
-    self.keys = []
-
-    def initialize(attrs={}, &block)
-      @settings = Mash.new
-      configure(attrs, &block)
-    end
-
-    #
-    # Defines DSL attributes
-    #
-    # @param [Array(String)] key_names DSL attribute names
-    #
-    # @example
-    #   class Mom < Ironfan::DslObject
-    #     has_keys(:fat, :so_fat)
-    #   end
-    #   yer_mom = Mom.new
-    #   yer_mom.fat :quite
-    #
-    def self.has_keys(*key_names)
-      key_names.map!(&:to_sym)
-      self.keys += key_names
-      self.keys.uniq!
-      key_names.each do |key|
-        next if method_defined?(key)
-        define_method(key){|*args| set(key, *args) }
-      end
-    end
-
-    #
-    # Sets the DSL attribute, unless the given value is nil.
-    #
-    def set(key, val=nil)
-      @settings[key.to_s] = val unless val.nil?
-      @settings[key.to_s]
-    end
-
-    def to_hash
-      @settings.to_hash
-    end
-
-    def to_mash
-      @settings.dup
-    end
-
-    def to_s
-      "<#{self.class} #{to_hash.inspect}>"
-    end
-
-    def reverse_merge!(hsh)
-      @settings.reverse_merge!(hsh.to_hash)
-    end
-
-    def configure(hsh={}, &block)
-      @settings.merge!(hsh.to_hash)
-      instance_eval(&block) if block
-      self
-    end
-
-    # delegate to the knife ui presenter
-    def ui()      Ironfan.ui ; end
-    # delegate to the knife ui presenter
-    def self.ui() Ironfan.ui ; end
-
-    def step(desc, *style)
-      ui.info("  #{"%-15s" % (name.to_s+":")}\t#{ui.color(desc.to_s, *style)}")
-    end
-
-    # helper method for bombing out of a script
-    def die(*args) Ironfan.die(*args) ; end
-
-    # helper method for turning exceptions into warnings
-    def safely(*args, &block) Ironfan.safely(*args, &block) ; end
-
-    # helper method for debugging only
-    def dump(*args) args.each{|arg| Chef::Log.debug( arg.inspect ) } end
-  end
-end