mystro-common 0.1.7 → 0.1.8

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.1.7:
+* fix lingering error with Account.list change
+* merge v0.1.6
+* merge release v0.1.2
+* new DSL framework
+* ruby version file
+* changelog rake tasks
+
 ## v0.1.6:
 
 ## v0.1.5:

data/Rakefile

@@ -49,13 +49,3 @@ desc "show current changes (changelog output from HEAD to most recent tag)"
 task :current do
   changelog("HEAD",true)
 end
-
-task :test do
-  require "mystro-common"
-  require "awesome_print"
-  %w{simple medium complex}.each do |n|
-    file = "test/#{n}.rb"
-    puts "processing: #{n} #{file}"
-    Mystro::Template.load(file)
-  end
-end

data/lib/mystro/common/version.rb

@@ -3,7 +3,7 @@ module Mystro
     module Version
       MAJOR = 0
       MINOR = 1
-      TINY  = 7
+      TINY  = 8
       TAG   = nil
       STRING = [MAJOR, MINOR, TINY, TAG].compact.join(".")
     end

data/lib/mystro/dsl/template.rb

@@ -1,8 +1,281 @@
 module Mystro
   module DSL
-    class Template < Base
-      has_many :balancers, named: true
-      has_many :computes, named: true
+    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
     end
   end
 end

data/lib/mystro-common.rb

@@ -58,12 +58,10 @@ end
 require "mystro/config"
 require "mystro/account"
 require "mystro/log"
-
-require "mystro/dsl"
+require "mystro/dsl/template"
 require "mystro/plugin"
 require "mystro/connect"
 require "mystro/userdata"
-require "mystro/template"
 
 Mystro::Config.instance
 Mystro::Account.read

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mystro-common
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -131,25 +131,14 @@ files:
 - lib/mystro/connect/compute.rb
 - lib/mystro/connect/dns.rb
 - lib/mystro/connect/environment.rb
-- lib/mystro/dsl.rb
-- lib/mystro/dsl/balancer.rb
-- lib/mystro/dsl/balancer/health.rb
-- lib/mystro/dsl/balancer/listener.rb
-- lib/mystro/dsl/balancer/sticky.rb
-- lib/mystro/dsl/compute.rb
 - lib/mystro/dsl/template.rb
-- lib/mystro/dsl/template_file.rb
 - lib/mystro/ext/fog/balancer.rb
 - lib/mystro/job.rb
 - lib/mystro/log.rb
 - lib/mystro/model.rb
 - lib/mystro/plugin.rb
-- lib/mystro/template.rb
 - lib/mystro/userdata.rb
 - mystro-common.gemspec
-- test/complex.rb
-- test/medium.rb
-- test/simple.rb
 homepage: http://github.com/mystro
 licenses: []
 post_install_message: 
@@ -174,7 +163,4 @@ rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: common functionality for Mystro
-test_files:
-- test/complex.rb
-- test/medium.rb
-- test/simple.rb
+test_files: []

data/lib/mystro/dsl/balancer/health.rb

@@ -1,11 +0,0 @@
-module Mystro
-  module DSL
-    class Health < Mystro::DSL::Base
-      attribute :target, value: "HTTP:80/"
-      attribute :interval, value: 30
-      attribute :timer, value: 5
-      attribute :healthy, value: 2
-      attribute :unhealthy, value: 10
-    end
-  end
-end

data/lib/mystro/dsl/balancer/listener.rb

@@ -1,9 +0,0 @@
-module Mystro
-  module DSL
-      class Listener < Mystro::DSL::Base
-        attribute :from, value: "http:80"
-        attribute :to, value: "http:80"
-        attribute :cert
-      end
-  end
-end

data/lib/mystro/dsl/balancer/sticky.rb

@@ -1,8 +0,0 @@
-module Mystro
-  module DSL
-      class Sticky < Mystro::DSL::Base
-        attribute :type
-        attribute :arg
-      end
-  end
-end

data/lib/mystro/dsl/balancer.rb

@@ -1,10 +0,0 @@
-module Mystro
-  module DSL
-    class Balancer < Base
-      attribute :primary, type: :boolean, value: false
-      has_one :sticky
-      has_one :health
-      has_many :listeners
-    end
-  end
-end

data/lib/mystro/dsl/compute.rb

@@ -1,17 +0,0 @@
-module Mystro
-  module DSL
-    class Compute < Base
-      attribute :primary, type: :boolean, value: false
-      attribute :num, value: 1
-      attribute :image
-      attribute :flavor
-      attribute :keypair
-      attribute :userdata, value: "default"
-
-      attribute :roles, type: :array
-      attribute :groups, type: :array
-
-      references :balancer
-    end
-  end
-end

data/lib/mystro/dsl/template_file.rb

@@ -1,7 +0,0 @@
-module Mystro
-  module DSL
-    class TemplateFile < Base
-      has_one :template
-    end
-  end
-end

data/lib/mystro/dsl.rb

@@ -1,145 +0,0 @@
-require "active_support/all"
-
-module Mystro
-  module DSL
-    class Base
-      attr_reader :data
-
-      def initialize
-        @data = Marshal.load(Marshal.dump(self.class.attrs))
-      end
-
-      def method_missing(method, *args, &block)
-        m = method.to_sym
-        raise "unknown attribute #{method}: #{@data.inspect}" unless @data[m]
-        o = @data[m]
-
-        if o[:type] == :array
-          #puts "setting #{m} << #{args.first}"
-          o[:value] << args.first
-        elsif o[:type] == :child
-          #puts "setting child #{m} << #{o[:klass]}"
-          k = o[:klass].constantize
-          obj = k.new
-          obj.instance_eval &block
-          if o[:many]
-            if o[:named]
-              o[:value] ||= {}
-              o[:value][args.first.to_sym] = obj.to_hash
-            else
-              o[:value] << obj.to_hash
-            end
-          else
-            raise "setting more than one #{method}: previous: #{o[:value].inspect}" if o[:value]
-            o[:value] = obj.to_hash
-          end
-        else
-          #puts "setting #{m} = #{args.first}"
-          o[:value] = args.first
-        end
-      end
-
-      def validate!
-        if @data[:block]
-          block.call(self)
-        end
-      rescue => e
-        raise "validation failed: #{e.message} at #{e.backtrace.first}"
-      end
-
-      def to_hash
-        @hash ||= begin
-          validate!
-          out = {}
-          @data.each do |k, v|
-            out[k] = v[:value]
-          end
-          out
-        end
-      end
-
-      #def to_mash
-      #  Hashie::Mash.new(to_hash)
-      #end
-
-      class << self
-        @attrs = {}
-        attr_accessor :attrs
-
-        def attribute(name, options={}, &block)
-          n = name.to_sym
-          o = {
-              value: nil,
-              type: :string,
-              klass: nil
-          }.merge(options)
-          #puts "ATTR: #{name} - #{o.inspect}"
-
-          if o[:type] == :array
-            n = name.to_s.singularize.to_sym
-            o[:value] = [] unless o[:value]
-          else
-            if o[:type] == :child
-              if o[:many]
-                if o[:named]
-                  o[:value] = {} unless o[:value]
-                else
-                  o[:value] = [] unless o[:value]
-                end
-              else
-                o[:value] = nil
-              end
-            end
-
-          end
-
-          o[:block] = block if block_given?
-
-          @attrs ||= {}
-          @attrs[n] = o
-        end
-
-        def has_one(name, options={})
-          o = {
-              klass: find_class(name),
-              type: :child,
-              many: false,
-              named: false,
-              value: nil
-          }.merge(options)
-          attribute(name, o)
-        end
-
-        def has_many(names, options={})
-          singular = names.to_s.singularize
-          o = {
-              klass: find_class(singular),
-              type: :child,
-              many: true,
-              named: false,
-              value: nil
-          }.merge(options)
-          attribute(singular, o)
-        end
-
-        def references(name, options={})
-          attribute(name, options)
-        end
-
-        def find_class(name)
-          c = "Mystro::DSL::#{name.capitalize}"
-          #puts "FINDCLASS: #{name} #{c}"
-          c
-        rescue => e
-          raise "could not find class: #{c}: #{e.message} at #{e.backtrace.first}"
-        end
-      end
-    end
-  end
-end
-
-dir = "#{File.dirname(__FILE__)}/dsl"
-Dir[File.join("#{dir}/**", "*.rb")].each do |file|
-  #puts "loading: #{file}"
-  require "#{file.gsub(/\.rb/, '')}"
-end

data/lib/mystro/template.rb

@@ -1,50 +0,0 @@
-module Mystro
-  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
-          d = File.read(template_file)
-          t = Mystro::DSL::TemplateFile.new
-          t.instance_eval(d, "TemplateFile(#{template_file})")
-          t.to_hash
-        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
-  end
-end

data/test/complex.rb

@@ -1,74 +0,0 @@
-template do
-  balancer :frontend do
-    primary true
-    listener do
-      from "https:443"
-      to "http:80"
-      cert "arn:aws:iam::595408174370:server-certificate/2013inqlabs.com"
-    end
-    listener do
-      from "http:80"
-      to "http:80"
-    end
-    health do
-      target "HTTP:80/"
-    end
-  end
-
-  balancer :backend do
-    listener do
-      from "http:8080"
-      to "http:8080"
-    end
-    health do
-      target "HTTP:8080/INQReaderServer/rest/AjaxConfig/config"
-    end
-  end
-
-  balancer :image do
-    listener do
-      from "http:80"
-      to "http:80"
-    end
-    health do
-      target "HTTP:80/getImages?url=http%3A%2F%2Fwww.bbc.co.uk%2Fnews%2Fworld-us-canada-21638727"
-      interval 120
-      timer 60
-      unhealthy 3
-      healthy 10
-    end
-  end
-
-  compute :backend do
-    num 3
-    role :backend
-    flavor "m1.xlarge"
-    userdata "chef"
-    image "ami-3236ad5b" # 0.6.2.1
-    group "backend"
-    keypair "live"
-    balancer :backend
-  end
-
-  compute :frontend do
-    num 3
-    role :frontend
-    flavor "m1.medium"
-    userdata "chef"
-    image "ami-0145d268"
-    group "frontend"
-    keypair "live"
-    balancer :frontend
-  end
-
-  compute :image do
-    num 5
-    role :image
-    balancer :image
-    userdata "chef"
-    flavor "m1.large"
-    image "ami-ac8f13c5"
-    group "frontend"
-    keypair "live"
-  end
-end

data/test/medium.rb

@@ -1,78 +0,0 @@
-template do
-  balancer :frontend do
-    primary true
-    listener do
-      from :https, 443
-      to :http, 80
-      cert "arn:aws:iam::595408174370:server-certificate/2013inqlabs.com"
-    end
-    listener do
-      from :http, 80
-      to :http, 80
-    end
-    health do
-      target "HTTP:80/"
-    end
-  end
-
-  balancer :backend do
-    listener do
-      from :http, 8080
-      to :http, 8080
-    end
-    health do
-      target "HTTP:8080/INQReaderServer/rest/AjaxConfig/config"
-    end
-  end
-
-  balancer :image do
-    listener do
-      from :http, 80
-      to :http, 80
-    end
-    listener do
-      from :http, 8080
-      to :http, 8080
-    end
-    health do
-      target "HTTP:80/getImages?url=http%3A%2F%2Fwww.bbc.co.uk%2Fnews%2Fworld-us-canada-21638727"
-      interval 120
-      timer 60
-      unhealthy 3
-      healthy 10
-    end
-  end
-
-  compute :image do
-  num 2
-    role :app
-    balancer :image
-    userdata "chef"
-    flavor "m1.large"
-    image "ami-ac8f13c5"
-    group "frontend"
-    keypair "stage"
-  end
-
-  compute :backend do
-    num 2
-    role :backend
-    balancer :backend
-    flavor "m1.xlarge"
-    userdata "chef"
-    image "ami-3236ad5b" # 0.6.2.1
-    group "backend"
-    keypair "stage"
-  end
-
-  compute :frontend do
-    num 2
-    role :frontend
-    balancer :frontend
-    flavor "m1.large"
-    userdata "chef"
-    image "ami-0145d268"
-    group "frontend"
-    keypair "stage"
-  end
-end

data/test/simple.rb

@@ -1,31 +0,0 @@
-template do
-  compute :backend do
-    num 1
-    role :backend
-    flavor "m1.xlarge"
-    userdata "chef"
-    image "ami-3236ad5b" # 0.6.2.1
-    group "backend"
-    keypair "dev"
-  end
-
-  compute :frontend do
-    num 1
-    role :frontend
-    flavor "m1.large"
-    userdata "chef"
-    image "ami-0145d268"
-    group "frontend"
-    keypair "dev"
-  end
-
-  compute :image do
-    num 1
-    role :image
-    userdata "chef"
-    flavor "m1.large"
-    image "ami-ac8f13c5"
-    group "frontend"
-    keypair "dev"
-  end
-end