mystro-common 0.1.11 → 0.2.0

data/lib/mystro/dsl/template.rb

@@ -1,281 +1,15 @@
-module Mystro
-  module DSL
-    module Template
-      class << self
-        def load(name_or_file)
-          @templates    ||= {}
-          template_name = nil
-          template_file = nil
-          if File.exists?(name_or_file)
-            template_name = File.basename(name_or_file).gsub(/\.rb$/, "").to_sym
-            template_file = name_or_file
-          elsif File.exists?("#{dir}/#{name_or_file}.rb")
-            template_name = name.to_sym
-            template_file = "#{dir}/#{name}.rb"
-          end
-          raise "could not load template #{template_name} (#{template_file})" unless template_file && File.file?(template_file)
-          #raise "template already loaded #{template_name}" if @templates[template_name]
-          @templates[template_name] ||= begin
-            t = Mystro::DSL::Template::DSL.new(template_name)
-            t.instance_eval(File.read(template_file), "Template(#{template_file})")
-            @templates[template_name] = t
-          end
-        end
-
-        def load_yaml_file(path)
-          file = File.expand_path(path)
-          raise "Configuration not found: #{path} (#{file})" unless File.exists?(file)
-          yaml = YAML.load_file(file)
-          yaml = yaml[yaml.keys.first] if yaml.keys.count == 1
-
-          yaml
-        end
-
-        def list
-          Dir["#{dir}/*"].inject({}) do |h, e|
-            f           = e.gsub("#{dir}/", "")
-            f           = File.basename(f, ".yml")
-            h[f.to_sym] = e
-            h
-          end
-        end
-
-        private
-        def dir
-          "#{Mystro.directory}/templates"
-        end
-      end
-
-      class DSL
-        attr_reader :balancers, :servers
-
-        def initialize(name)
-          @name      = name.to_sym
-          @balancers = []
-          @servers   = []
-        end
-
-        def template(&block)
-          instance_eval &block
-        end
-
-        def balancer(name, &block)
-          balancer = Balancer.new(name)
-          balancer.instance_eval &block
-          @balancers << balancer
-        end
-
-        def server(name, &block)
-          server = Server.new(name)
-          server.instance_eval &block
-          @servers << server
-        end
-      end
-
-      class Base
-        def attr(name, value=nil)
-          @attrs[name] = value unless value.nil?
-          @attrs[name]
-        end
-
-        def list_attr(name, value=nil)
-          @attrs[name] ||= []
-          unless value.nil?
-            if value.kind_of?(Array)
-              @attrs[name] += value
-            else
-              @attrs[name] << value
-            end
-          end
-          @attrs[name]
-        end
-      end
-
-      class Server < Base
-        def initialize(name)
-          @attrs = {
-              :name     => name.to_sym,
-              :roles    => [],
-              :groups   => [],
-              :count    => 1,
-              :image    => nil,
-              :flavor   => nil,
-              :keypair  => nil,
-              :userdata => "default",
-              :dnsnames => [],
-          }
-        end
-
-        def name
-          @attrs[:name]
-        end
-
-        def roles
-          @attrs[:roles]
-        end
-
-        def groups
-          @attrs[:groups]
-        end
-
-        def dnsnames
-          @attrs[:dnsnames]
-        end
-
-        def role(r)
-          list_attr(:roles, r)
-        end
-
-        def count(c=nil)
-          attr(:count, c)
-        end
-
-        def image(i=nil)
-          attr(:image, i)
-        end
-
-        def flavor(f=nil)
-          attr(:flavor, f)
-        end
-
-        def group(g)
-          list_attr(:groups, g)
-        end
-
-        def keypair(k=nil)
-          attr(:keypair, k)
-        end
-
-        def userdata(u=nil)
-          attr(:userdata, u)
-        end
-
-        def balancer(b=nil, &block)
-          if block_given?
-            raise "balancer block must specify name" unless b
-            Mystro::DSL::Template::DSL.balancer(b, &block)
-          end
-          attr(:balancer, b)
-        end
-
-        def dns(name)
-          n = name.gsub(Mystro.get_config(:dns_zone), "")
-          list_attr(:dnsnames, n)
-        end
-      end
-
-      class Balancer
-        attr_reader :name, :sticky, :primary, :sticky_type, :sticky_arg
-
-        def initialize(name)
-          @listeners = []
-          @name      = name.to_sym
-          @primary   = false
-          @sticky    = false
-        end
-
-        def primary(enable = nil)
-          enable.nil? ? @primary : @primary = enable
-        end
-
-        def listener(&block)
-          listener = Listener.new
-          listener.instance_eval &block
-          @listeners << listener
-        end
-
-        def health(&block)
-          healthcheck = HealthCheck.new
-          healthcheck.instance_eval &block
-          @healthcheck = healthcheck
-        end
-
-        def listeners
-          @listeners.map { |e| e.spec }
-        end
-
-        def sticky(type=nil, expires_or_cookie=nil)
-          if type && expires_or_cookie
-            @sticky      = true
-            @sticky_type = type
-            @sticky_arg  = expires_or_cookie
-          end
-          @sticky
-        end
-      end
-
-      class Listener
-        def initialize
-          @from_proto = nil
-          @from_port  = nil
-          @to_proto   = nil
-          @to_port    = nil
-          @cert       = nil
-        end
-
-        def from(proto, port)
-          @from_proto = proto
-          @from_port  = port
-        end
-
-        def to(proto, port)
-          @to_proto = proto
-          @to_port  = port
-        end
-
-        def cert(cert)
-          @cert = cert
-        end
-
-        def spec
-          {
-              :from => "#@from_proto:#@from_port",
-              :to   => "#@to_proto:#@to_port",
-              :cert => @cert,
-          }
-        end
-      end
-
-      class HealthCheck
-        def initialize
-          @healthy   = 10
-          @unhealthy = 2
-          @interval  = 30
-          @target    = nil
-          @timeout   = 5
-        end
-
-        def healthy(v)
-          @healthy = v
-        end
-
-        def unhealthy(v)
-          @unhealthy = v
-        end
-
-        def interval(v)
-          @interval = v
-        end
-
-        def target(v)
-          @target = v
-        end
-
-        def timeout(v)
-          @timeout = v
-        end
-
-        def spec
-          raise "target not specified for health check" unless @target
-          {
-              healthy: @healthy,
-              unhealthy: @unhealthy,
-              interval: @interval,
-              target: @target,
-              timeout: @timeout,
-          }
-        end
-      end
+class Mystro::Dsl::Template < Mystro::Dsl::Base
+  has_many :computes, named: true
+  has_many :balancers, named: true
+
+  def actions
+    out = []
+    @data[:compute] && @data[:compute].each do |c|
+      out += c.actions
+    end
+    @data[:balancer] && @data[:balancer].each do |b|
+      out += b.actions
     end
+    out
   end
 end

data/lib/mystro/dsl/template_file.rb

@@ -0,0 +1,18 @@
+class Mystro::Dsl::TemplateFile < Mystro::Dsl::Base
+  has_one :template
+  def actions
+    @data[:template].actions
+  end
+
+  def compute(name)
+    n = name.to_sym
+    dsl = computes.detect {|e| e[:name] == n}
+    raise "no template entry for compute #{n}" unless dsl
+    act = dsl.actions.first
+    act.to_model
+  end
+
+  def computes
+    @data[:template] && @data[:template][:compute]
+  end
+end

data/lib/mystro/dsl/volume.rb

@@ -0,0 +1,8 @@
+class Mystro::Dsl::Volume < Mystro::Dsl::Base
+  attribute :name
+  attribute :device
+  attribute :size
+  attribute :dot
+  attribute :snapshot
+  attribute :virtual
+end

data/lib/mystro/dsl.rb

@@ -0,0 +1,40 @@
+require 'damsel/data'
+
+module Mystro
+  module Dsl
+    class Base < Damsel::Data
+
+    end
+
+    class << self
+      def get(name)
+        n = name.to_sym
+        raise "no template named #{name}" unless @templates[n]
+        @templates[n]
+      end
+
+      def load(file)
+        @templates ||= {}
+        file = File.expand_path(file)
+        name = File.basename(file).gsub(/\.rb$/, "").to_sym
+        raise "file: '#{file}' does not exist" unless File.exist?(file)
+        @templates[name] ||= begin
+          t = Mystro::Dsl::TemplateFile.new(file)
+          t.instance_eval(File.read(file), "#{file}:[TemplateFile]")
+          t
+        end
+      end
+
+      def actions(name)
+        tf = get(name)
+        t = tf[:template]
+        t.actions
+      end
+    end
+  end
+end
+
+Dir["#{File.dirname(__FILE__)}/dsl/*rb"].each do |file|
+  #puts "dsl: #{file}"
+  require "#{file.gsub(/\.rb/, '')}"
+end

data/lib/mystro/organization.rb

@@ -0,0 +1,83 @@
+require 'mystro/cloud'
+
+module Mystro
+  class Organization
+    class << self
+      attr_reader :selected
+
+      def [](name)
+        get(name)
+      end
+
+      def get(name)
+        @list[name]
+      end
+
+      def read
+        dir = Mystro.directory
+        @list = {}
+
+        Dir["#{dir}/organizations/*.y*ml"].each do |file|
+          name = file.gsub(/#{dir}\/organizations\//, "").gsub(/\.(\w+?)$/, "")
+          Mystro::Log.debug "loading organization '#{name}' '#{file}'"
+          @list[name] = self.new(name, file)
+        end
+
+        @selected = default
+      end
+
+      def default
+        return ENV['MYSTRO_ORGANIZATION'] if ENV['MYSTRO_ORGANIZATION']
+        return Mystro.config.default_organization if Mystro.config.default_organization?
+        return "default" if @list.keys.include?("default")
+        @list.keys.first
+      end
+
+      def select(name)
+        @selected = name
+      end
+    end
+
+    attr_reader :data
+    attr_reader :file
+    attr_reader :name
+
+    def initialize(name, file)
+      cfg = Mystro.config.to_hash
+      organization = File.exists?(file) ? YAML.load_file(file) : {}
+      @name = name
+      @file = file
+      @data = Hashie::Mash.new(cfg.deep_merge(organization))
+      @data.name = name
+    end
+
+    def to_hash
+      @data.to_hash
+    end
+
+    def compute
+      @compute ||= connect(:compute)
+    end
+
+    def balancer
+      @balancer ||= connect(:balancer)
+    end
+
+    def record
+      @dns ||= connect(:record)
+    end
+
+    protected
+
+    def connect(type)
+      raise "#{type} not configured: see mystro/config.yml or mystro/organization/#{@name}.yml" unless @data[type]
+      raise "#{type} provider not configured: see mystro/config.yml or mystro/organization/#{@name}.yml" unless @data[type].provider!.name
+      return false if @data[type].disabled? && @data[type].disabled == true
+      options = @data[type].provider.to_hash.symbolize_keys
+      config = @data[type].config.to_hash.symbolize_keys if @data[type].config
+      pn = options.delete(:name)
+      raise "provider not set" unless pn
+      Mystro::Cloud.new(pn, type, {options: options, config: config})
+    end
+  end
+end

data/lib/mystro/plugin.rb

@@ -24,7 +24,8 @@ module Mystro
       end
 
       def load(plugins={ })
-        plugins.each do |plugin, data|
+        list = plugins.reject {|k, v| k == 'disabled'}
+        list.each do |plugin, data|
           begin
             f = "#{Mystro.directory}/plugins/#{plugin}"
             Mystro::Log.debug "loading plugin: #{plugin} #{f}"
@@ -37,7 +38,7 @@ module Mystro
 
       def disabled?(name)
         Mystro::Log.debug "disabled? #{name}"
-        Mystro.config.disabled && Mystro.config.disabled[name]
+        Mystro.config.plugins && Mystro.config.plugins.disabled && Mystro.config.plugins.disabled[name]
       end
 
       def register(key, opts={})
@@ -95,7 +96,7 @@ module Mystro
 
       def config_for(klass)
         name = klass.name.split('::').last.downcase.to_sym
-        return Mystro.account.plugins[name] if Mystro.account.plugins && Mystro.account.plugins[name]
+        return Mystro.organization.plugins[name] if Mystro.organization.plugins && Mystro.organization.plugins[name]
         { }
       end
 

data/lib/mystro/provider.rb

@@ -0,0 +1,40 @@
+module Mystro
+  class Provider
+    class << self
+      def [](name)
+        get(name)
+      end
+
+      def get(name)
+        @list ||= {}
+        @list[name]
+      end
+
+      def read
+        dir   = Mystro.directory
+        @list ||= { }
+
+        Dir["#{dir}/providers/*.y*ml"].each do |file|
+          name = file.gsub(/#{dir}\/providers\//, "").gsub(/\.(\w+?)$/, "")
+          Mystro::Log.debug "loading provider '#{name}' '#{file}'"
+          @list[name] = self.new(name, file)
+        end
+      end
+    end
+
+    attr_reader :data
+    attr_reader :file
+    attr_reader :name
+
+    def initialize(name, file)
+      yaml = File.exists?(file) ? YAML.load_file(file) : { }
+      @name   = name
+      @file   = file
+      @data   = Hashie::Mash.new(yaml)
+    end
+
+    def to_hash
+      @data.to_hash.symbolize_keys
+    end
+  end
+end

data/lib/mystro/userdata.rb

@@ -22,7 +22,7 @@ module Mystro
             :roles        => roles,
             :environment  => environment,
             :nickname     => name,
-            :account      => "unknown",
+            :organization      => "unknown",
             :zone         => "unknown.local",
             :dependencies => [],
             :gems         => [],

data/lib/mystro-common.rb

@@ -1,8 +1,6 @@
-require "mystro/common/version"
-require "fog"
-require "mystro/ext/fog/balancer"
-require "hashie/mash"
-require "active_support/all"
+require 'mystro/common/version'
+require 'hashie/mash'
+require 'active_support/all'
 
 module Mystro
   class << self
@@ -10,58 +8,61 @@ module Mystro
       Mystro::Config.instance.data
     end
 
-    def account
-      raise "mystro account unset! default account ('#{config.default_account}') doesn't exist?" unless current_account
-      current_account.data
+    def organization
+      raise "mystro organization unset! default organization ('#{config.default_organization}') doesn't exist?" unless current_organization
+      current_organization.data
     end
 
-    def current_account
-      Mystro::Account.get(selected)
+    def current_organization
+      Mystro::Organization.get(selected)
     end
 
     def directory
       @dir ||= begin
-        d = "~/.mystro"
-        if ENV["MYSTRO_CONFIG"]
-          d = ENV["MYSTRO_CONFIG"]
-        elsif File.exists?("./config/mystro")
-          d = "./config/mystro"
-        elsif File.exists?("./.mystro")
-          d = "./.mystro"
+        d = '~/.mystro'
+        if ENV['MYSTRO_CONFIG']
+          d = ENV['MYSTRO_CONFIG']
+        elsif File.exists?('./config/mystro')
+          d = './config/mystro'
+        elsif File.exists?('./.mystro')
+          d = './.mystro'
         end
         File.expand_path(d)
       end
     end
 
     def selected
-      Mystro::Account.selected
+      Mystro::Organization.selected
     end
 
     def compute
-      current_account.compute
+      current_organization.compute
     end
 
-    def dns
-      current_account.dns
+    def record
+      current_organization.record
     end
 
     def balancer
-      current_account.balancer
+      current_organization.balancer
     end
 
     def environment
-      current_account.environment
+      current_organization.environment
     end
   end
 end
 
-require "mystro/config"
-require "mystro/account"
-require "mystro/log"
-require "mystro/dsl/template"
-require "mystro/plugin"
-require "mystro/connect"
-require "mystro/userdata"
+require 'mystro/config'
+require 'mystro/log'
+require 'mystro/cloud'
+require 'mystro/provider'
+require 'mystro/organization'
+require 'mystro/dsl/oldtemplate'
+require 'mystro/plugin'
+require 'mystro/userdata'
+require 'mystro/dsl'
 
 Mystro::Config.instance
-Mystro::Account.read
+Mystro::Provider.read
+Mystro::Organization.read

data/mystro-common.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "fog", "~> 1.12.1"        # talk to cloud
+  gem.add_dependency "fog", "~> 1.15.0"        # talk to cloud
   gem.add_dependency "yell", "~> 1.2.0"        # logging
   gem.add_dependency "hashie"                  # better data objects
   gem.add_dependency "activesupport", "3.2.14" # active support
   gem.add_dependency "ipaddress"               # ip address library
   gem.add_dependency "erubis"                  # userdata templates
+  gem.add_dependency "damsel", "~> 0.1.0"      # dsl
 end

data/spec/cloud/aws/balancer_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+describe Mystro::Cloud::Aws::Balancer, :aws do
+  def cloud
+    @cloud ||= connect('aws', 'balancer')
+  end
+  def config
+    @config ||= load_config('aws', 'balancer')
+  end
+  it_behaves_like 'cloud balancer'
+end

data/spec/cloud/aws/compute_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+describe Mystro::Cloud::Aws::Compute, :aws do
+  def cloud
+    @cloud ||= connect('aws', 'compute')
+  end
+  def config
+    @config ||= load_config('aws', 'compute')
+  end
+  it_behaves_like 'cloud compute'
+end

data/spec/cloud/aws/record_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+describe Mystro::Cloud::Aws::Record, :aws do
+  def cloud
+    @cloud ||= connect('aws', 'record')
+  end
+  def config
+    @config ||= load_config('aws', 'record')
+  end
+  it_behaves_like 'cloud record'
+end

data/spec/cloud/dynect/record_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+describe Mystro::Cloud::Dynect::Record, :dynect do
+  def cloud
+    @cloud ||= connect('dynect', 'record')
+  end
+  def config
+    @config ||= load_config('dynect', 'record')
+  end
+  it_behaves_like 'cloud record'
+end