rig 0.5.2 → 0.6.0

data/Rakefile

@@ -1,2 +1,37 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+task :changelog do
+  command="git --no-pager log --format='%an::::%h::::%s'"
+
+  list = `git tag`
+  last = nil
+
+  puts "# Changelog"
+  puts
+
+  list.lines.reverse_each do |t|
+    tag = t.chomp
+
+    if last
+      check = { }
+      out   = []
+      log   = `#{command} #{last}...#{tag}`
+      log.lines.each do |line|
+        (who, hash, msg) = line.split('::::')
+        unless check[msg]
+          unless msg =~ /^Merge branch/ || msg =~ /^(v|version|changes for|preparing|ready for release|ready to release|bump version)*\s*(v|version)*\d+\.\d+\.\d+/
+            out << "#{msg.gsub(" *", "\n*")}"
+            check[msg] = hash
+          end
+        end
+      end
+      puts "## #{last}:"
+      out.each { |e| puts e }
+      #puts log
+      puts
+    end
+
+    last = tag
+  end
+end

data/conf/plugins/scout.rb

@@ -55,6 +55,8 @@ module Rig
           configure
           server = ::Scout::Server.first(:name => name)
           ::Scout::Server.delete(server.id) if server
+        rescue => e
+          Rig::Log.error "#{self.class} : #{e.message} at #{e.backtrace.first}"
         end
 
         def environment_destroy(name)

data/conf/templates/multi.rb

@@ -0,0 +1,51 @@
+
+template do
+  balancer :web do
+    primary true
+    listener do
+      from :https, 443
+      to :http, 80
+      cert 'arn:aws:iam::101010101010:server-certificate/domain.com'
+    end
+    listener do
+      from :http, 80
+      to :http, 80
+    end
+  end
+
+  balancer :app do
+    listener do
+      from :https, 443
+      to :http, 80
+      cert 'arn:aws:iam::101010101010:server-certificate/domain.com'
+    end
+  end
+
+  server :app do
+    count 3
+    flavor "c1.large"
+    balancer :app
+    role "app"
+  end
+
+  server :app do
+    count 2
+    flavor "c1.large"
+    balancer :app
+    role "app"
+    role "scheduler"
+  end
+
+  server :web do
+    count 3
+    flavor "c1.large"
+    balancer :web
+    role "web"
+  end
+
+  server :cache do
+    count 1
+    flavor "m1.large"
+    role "cache"
+  end
+end

data/conf/templates/solo.rb

@@ -0,0 +1,21 @@
+
+template do
+  balancer :app do
+    primary true
+    listener do
+      from :https, 443
+      to :http, 80
+      cert 'arn:aws:iam::101010101010:server-certificate/domain.com'
+    end
+  end
+
+  server :app do
+    count 1
+    role :app
+    flavor "c1.medium"
+    userdata "chef"
+    balancer :app
+    group 'app-server'
+    group 'db-inqcloud-dev'
+  end
+end

data/conf/userdata/chef/userdata.sh.erb

@@ -27,14 +27,14 @@ gem install <%= gem %> --no-ri --no-rdoc
 
 cat <<FACTS > /etc/facts.yml
 rig_name: <%= @name %>
-rig_role: <%= @role %>
+rig_roles: <%= @roles.join(",") %>
 rig_environment: <%= @environment %>
 FACTS
 
 cat <<JSON > /etc/chef/bootstrap.json
 {
     "run_list": [
-        "role[<%= @role %>]"
+        <%= @roles.map {|e| "\"role[#{e}]\""}.join(",") %>
     ]
 }
 JSON

data/lib/rig.rb

@@ -4,6 +4,7 @@ require 'fog'
 require 'rig/version'
 require 'rig/config'
 require 'rig/account'
+require 'rig/template'
 require 'rig/log'
 require 'rig/plugin'
 require 'rig/model'

data/lib/rig/capistrano.rb

@@ -12,7 +12,7 @@ module Rig
       env     = ENV['ENVIRONMENT'] || Rig.config[:environment]
       role    = ENV['ROLE'] || Rig.config[:role]
       servers = Rig::Model::Environment.find(env).servers
-      list    = role == 'all' ? servers : servers.select { |s| s.tags['Role'] == role }
+      list    = role == 'all' ? servers : servers.select { |s| (s.tags['Roles']||"").split(",").include?(role) }
 
       raise "Rig could not find any servers matching environment=#{env} and role=#{role}" unless list && list.count > 0
       list.each do |s|

data/lib/rig/command.rb

@@ -17,15 +17,24 @@ module Rig
 
       subcommand "userdata", "test userdata" do
         parameter "NAME", "name of server"
-        parameter "ROLE", "role of server"
         parameter "ENVIRONMENT", "environment of server"
+        parameter "ROLE ...", "role of server"
 
         def execute
-          userdata = Rig::Model::Userdata.create(name, role, environment)
+          userdata = Rig::Model::Userdata.create(name, role_list, environment)
           puts "USERDATA:\n#{userdata}"
         end
       end
 
+      subcommand "template", "test template" do
+        parameter "NAME", "name of template"
+
+        def execute
+          t = Rig::Template.load(name)
+          ap t
+        end
+      end
+
       subcommand "init", "initialize configuration directory" do
         option %w{-f --force}, :flag, "force creation of files", :default => false
         option %w{-d --directory}, "DIRECTORY", "configuration directory", :default => "~/.rig"
@@ -40,8 +49,8 @@ module Rig
 
             accounts/default.yml
 
-            templates/solo.yml
-            templates/multi.yml
+            templates/solo.rb
+            templates/multi.rb
 
             userdata/default/userdata.sh.erb
             userdata/default/userdata.yml

data/lib/rig/command/abstract.rb

@@ -27,7 +27,7 @@ module Rig
           r = []
           r << server.tags['Name']
           r << server.tags['Environment']
-          r << server.tags['Role']
+          r << (server.tags['Roles']||server.tags["Role"])
           r << (server.tags['Protected'] ? 'true' : '')
           r << server.public_ip_address.to_s
           if detailed

data/lib/rig/command/environment.rb

@@ -37,7 +37,7 @@ module Rig
             rows = []
             envs.each do |e|
               env   = Rig::Model::Environment.find(e)
-              zones = env.servers.collect { |e| e.availability_zone }
+              zones = env.servers.collect { |e| e.availability_zone }.uniq.join(",")
               rows << [env.name, env.template, env.region, env.servers.count, env.balancers.count, env.protected?, zones]
             end
             print_table(%w{Name Template Region Servers# Balancers# Protected? AZs}, rows)

data/lib/rig/config.rb

@@ -52,7 +52,7 @@ module Rig
     end
 
     def get_template(name)
-      Rig::Model::Template.load(name)
+      Rig::Template.load(name)
     end
 
   end

data/lib/rig/model/environment.rb

@@ -49,99 +49,81 @@ module Rig
 
         }.merge(opts)
 
-        @name          = name
+        @name      = name
+        @template  = Rig.get_template(template) unless template.nil?
         @template_name = template
-        @servers       = []
-        @balancers     = []
+        @servers   = []
+        @balancers = []
       end
 
       def save
         puts "creating instances"
-
-        #@template      = TEMPLATES[@template_name]
-        @template = Rig.get_template(@template_name)
-        raise "unknown template #{template}" unless @template
         load_config
+        set = { }
+
+        @template.servers.each do |s|
+          1.upto(s.count) do |i|
+            n = "#{s.name}#{i}.#@name.env"
+            o = {
+                :image_id  => s.image || @image,
+                :flavor_id => s.flavor || @flavor,
+                :key_name  => s.keypair || @keypair,
+                :groups    => s.groups || @groups,
+                :user_data => Rig::Model::Userdata.create(n, s.roles, @name)
+            }
+
+            # throw this error, because Fog and AWS don't care if you don't set a keypair
+            # but you won't be able to easily connect to it
+            raise "No key_name (keypair) set." unless o[:key_name]
+
+            Rig::Log.debug "creating instance: name:#{n} environment:#@name roles:#{s.roles.inspect}"
+            instance = Rig::Model::Instance.create(o, 'Name' => n, 'Environment' => name, 'Roles' => s.roles.join(","))
+            set[s.balancer] ||= []
+            set[s.balancer] << instance if s.balancer
+            @servers << instance
+          end
+        end
 
-        @template[:instances].each do |inst|
-          setinstances = []
-          inst.each do |role, tmpl|
-            count = tmpl[:count] || 1
-            count.times do |i|
-              n    = "#{role}#{i+1}.#{name}.env"
-              chef = Rig.config[:chef] ? true : false
-
-              o = {
-                  :image_id  => tmpl[:image] || @image,
-                  :flavor_id => tmpl[:flavor] || @flavor,
-                  :key_name  => tmpl[:keypair] || @keypair,
-                  :groups    => tmpl[:groups] || @template[:groups] || @groups,
-                  :user_data => Rig::Model::Userdata.create(n, role, name, :chef => chef)
-              }
-
-              # throw this error, because Fog and AWS don't care if you don't set a keypair
-              # but you won't be able to easily connect to it
-              raise "No key_name (keypair) set." unless o[:key_name]
-
-              server = Rig::Model::Instance.create(o, 'Name' => n, 'Environment' => name, 'Role' => role)
-              @servers << server
-              setinstances << server
-            end
+        @template.balancers.each do |b|
+          if set[b.name]
+            zones    = set[b.name].collect { |e| e.availability_zone }
+            balancer = Rig::Model::Balancer.create("#@name-#{b.name}", b.listeners, zones)
+            balancer.register_instances(set[b.name].collect { |e| e.id })
+            balancer.save
+
+            @balancers << balancer
 
-            if tmpl[:balance]
-              puts "creating balancer"
-              zones = setinstances.collect {|e| e.availability_zone }
-              balancer = Rig::Model::Balancer.create("#{name}-#{role}", tmpl[:listeners], zones)
-              balancer.register_instances(setinstances.collect { |e| e.id })
-              balancer.save
-
-              @balancers << balancer
-
-              # set primary dns for environment (<name>.env.inqlabs.com)
-              # to point to this load balancer
-              if tmpl[:primary]
-                puts ".. primary: #{name}.env.#@zone #{balancer.attributes[:dns_name]}"
-                Rig::Model::Dns.create("#{name}.env.#@zone", balancer.attributes[:dns_name], :ttl => 30)
-              end
-            else
-              #TODO: need to support balancer: false, primary: true = point to server instance
-              #if tmpl[:primary]
-              #  puts ".. primary #{name}.env.#@zone #{}"
-              #end
+            if b.primary
+              Rig::Log.info ".. primary: #{name}.env.#@zone #{balancer.attributes[:dns_name]}"
+              Rig::Model::Dns.create("#{name}.env.#@zone", balancer.attributes[:dns_name], :ttl => 30)
             end
           end
         end
 
-        # if we've got a chef config, use it
-        #if Rig.config[:chef]
-        #  puts "creating chef environment"
-        #  Rig::Chef.environment_create(name)
-        #end
-
-        # all of this crap to be absolutely sure that the instance has an ip and dns
-        puts "sleeping 3"
+        Rig::Log.info "sleeping 3 seconds"
         sleep 3
         reload
 
-        puts "associating servers' DNS"
+
+        Rig::Log.info "associating servers' DNS"
         @servers.each do |server|
           record = "#{server.tags['Name']}.#{Rig.get_config(:dns_zone)}"
           dns    = server.attributes[:dns_name]
           ip     = server.attributes[:public_ip_address]
 
-          puts ".. #{record} dns=#{dns} ip=#{ip}"
+          Rig::Log.info ".. #{record} dns=#{dns} ip=#{ip}"
           if dns
             Rig::Model::Dns.create(record, dns)
           else
-            puts "server #{server.id} doesn't have public_ip_address"
+            Rig::Log.info "server #{server.id} doesn't have public_ip_address"
           end
         end
 
         Rig::Plugin.run "environment:create", self
       rescue => e
-        puts "error creating environment:\n#{e.message} at #{e.backtrace.join("\n")}"
+        Rig::Log.error "error creating environment:\n#{e.message} at #{e.backtrace.join("\n")}"
         destroy
-        raise "error creating environment: #{e.message} at #{e.backtrace.first}"
+        Rig::Log.error "error creating environment: #{e.message} at #{e.backtrace.first}"
       end
 
       def destroy
@@ -176,7 +158,7 @@ module Rig
       def reload
         find_servers
         find_balancers
-        @protected = @servers.any? {|s| s.tags["Protected"] == "true" }
+        @protected = @servers.any? { |s| s.tags["Protected"] == "true" }
       end
 
       def protected?
@@ -201,7 +183,7 @@ module Rig
         @keypair = @options[:keypair] ||
             Rig.account[:keypair] ||
             nil
-        @groups = @options[:groups] ||
+        @groups  = @options[:groups] ||
             Rig.account[:groups] ||
             nil
       end

data/lib/rig/model/userdata.rb

@@ -5,14 +5,14 @@ module Rig
   module Model
     class Userdata
       class << self
-        def create(name, role, environment, opts={ })
+        def create(name, roles, environment, opts={ })
           package = Rig.get_config(:userdata)
           directory = "#{Rig::Config.dir}/userdata/#{package}"
           config = YAML.load_file("#{directory}/userdata.yml")
 
           data = {
               :name         => name,
-              :role         => role,
+              :roles        => roles,
               :environment  => environment,
               :zone         => Rig.get_config(:dns_zone),
               :dependencies => [],

data/lib/rig/template.rb

@@ -0,0 +1,170 @@
+module Rig
+  module Template
+    class << self
+      def load(name)
+        @templates    ||= { }
+        template_name = name.to_sym
+        template_file = "#{dir}/#{name}.rb"
+
+        raise "could not load template #{template_name} (#{template_file})" unless File.file?(template_file)
+        raise "template already loaded #{template_name}" if @templates[template_name]
+
+        t = Rig::Template::DSL.new(template_name)
+        t.instance_eval(File.read(template_file), "Template(#{template_file})")
+        @templates[template_name] = t
+      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
+        "#{Rig::Config.dir}/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 Server
+      attr_reader :name, :roles, :groups
+
+      def initialize(name)
+        @name     = name.to_sym
+        @roles    = []
+        @groups   = []
+        @count    = 1
+        @image    = nil
+        @flavor   = nil
+        @keypair  = nil
+        @userdata = "default"
+      end
+
+      def role(r)
+        @roles << r
+      end
+
+      def count(c=nil)
+        c.nil? ? @count : @count = c
+      end
+
+      def image(i=nil)
+        i.nil? ? @image : @image = i
+      end
+
+      def flavor(f=nil)
+        f.nil? ? @flavor : @flavor = f
+      end
+
+      def group(g)
+        @groups << g
+      end
+
+      def keypair(k=nil)
+        k.nil? ? @keypair : @keypair = k
+      end
+
+      def userdata(u=nil)
+        u.nil? ? @userdata : @userdata = u.to_sym
+      end
+
+      def balancer(b=nil)
+        b.nil? ? @balancer : @balancer = b.to_sym
+      end
+    end
+
+    class Balancer
+      attr_reader :name
+
+      def initialize(name)
+        @listeners = []
+        @name      = name.to_sym
+        @primary   = 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 listeners
+        @listeners.map {|e| e.spec}
+      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
+  end
+end

data/lib/rig/version.rb

@@ -2,8 +2,8 @@ unless defined?(Rig::Version)
   module Rig
     module Version
       MAJOR = 0
-      MINOR = 5
-      TINY  = 2
+      MINOR = 6
+      TINY  = 0
       STRING = [MAJOR, MINOR, TINY].join('.')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rig
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -128,8 +128,8 @@ files:
 - conf/plugins/mongo.rb
 - conf/plugins/mysql.rb
 - conf/plugins/scout.rb
-- conf/templates/multi.yml
-- conf/templates/solo.yml
+- conf/templates/multi.rb
+- conf/templates/solo.rb
 - conf/userdata/chef/userdata.sh.erb
 - conf/userdata/chef/userdata.yml
 - conf/userdata/chef/validation.pem
@@ -158,9 +158,9 @@ files:
 - lib/rig/model/dns.rb
 - lib/rig/model/environment.rb
 - lib/rig/model/instance.rb
-- lib/rig/model/template.rb
 - lib/rig/model/userdata.rb
 - lib/rig/plugin.rb
+- lib/rig/template.rb
 - lib/rig/version.rb
 - rig.gemspec
 homepage: https://github.com/shawncatz/rig

data/conf/templates/multi.yml

@@ -1,26 +0,0 @@
----
-:instances:
-- :memcache:
-    :count: 1
-    :flavor: m1.large
-  :appserver:
-    :count: 3
-    :flavor: c1.large
-    :balance: true
-    :listeners:
-      - :from: HTTP:80
-        :to: HTTP:80
-      - :from: HTTPS:443
-        :to: HTTP:80
-        :cert: arn:cert:name
-  :webserver:
-    :count: 3
-    :flavor: c1.large
-    :balance: true
-    :listeners:
-      - :from: HTTP:80
-        :to: HTTP:80
-      - :from: HTTPS:443
-        :to: HTTP:80
-        :cert: arn:cert:name
-    :primary: true

data/conf/templates/solo.yml

@@ -1,13 +0,0 @@
----
-:instances:
-- :appserver:
-    :count: 1
-    :flavor: c1.medium
-    :balance: true
-    :primary: true
-    :listeners:
-      - :from: HTTP:80
-        :to: HTTP:80
-      - :from: HTTPS:443
-        :to: HTTP:80
-        :cert: arn:cert:name

data/lib/rig/model/template.rb

@@ -1,34 +0,0 @@
-module Rig
-  module Model
-    class Template
-      class << self
-        def load(name)
-          self.load_yaml_file("#{dir}/#{name}.yml")
-        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
-          "#{Rig::Config.dir}/templates"
-        end
-      end
-    end
-  end
-end