rig 0.6.3 → 0.6.4

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v0.6.3:
+* minor bug fixes
+* clean up 'server tags' command, need to look at the rest
+* add support for setting balancer 'stickiness' policy
+* smarter DNS removal for environments and servers
+* fix bug with userdata in template dsl
+* add dns to template dsl
+* clean up code around waiting for environment servers to be ready (possibly still needs work)
+* started changing dsl classes to use a more standardized approach
+
 ## v0.6.2:
 * add csshx support, just generates and runs the csshx command line to connect to all instances of an environment
 

data/conf/plugins/mongo.rb

@@ -23,43 +23,20 @@ module Rig
           parameter "[PASS]", "password of user to add to database"
 
           def execute
-            db = Rig::Connection.database
-            db.create_database(name, user, pass) unless test?
+            Rig::Plugin::Mongo.create_database(name, user, pass) unless test?
           end
         end
         subcommand "destroy", "destroy a database" do
           parameter "NAME", "name of the database"
 
           def execute
-            db = Rig::Connection.database
-            db.destroy_database(name) unless test?
+            Rig::Plugin::Mongo.destroy_database(name) unless test?
           end
         end
         self.default_subcommand = "list"
       end
 
       class << self
-        #def initialize(opts)
-        #  @options = {
-        #      :host => "localhost",
-        #      :port => 27017,
-        #      :user => nil,
-        #      :pass => nil,
-        #      :admin_user => nil,
-        #      :admin_pass => nil
-        #  }.merge(opts)
-        #  connect
-        #end
-
-        ## accessors
-        #def user; @options[:user]; end
-        #def host; @options[:host]; end
-        #def port; @options[:port]; end
-        #def pass; @options[:pass]; end
-        #def password; @options[:pass]; end
-        #def admin_user; @options[:admin_user]; end
-        #def admin_pass; @options[:admin_pass]; end
-        #def admin_password; @options[:admin_pass]; end
 
         def connect
           @options ||= config_for self
@@ -101,35 +78,4 @@ module Rig
     end
   end
 
-  module Command
-    module Mongo
-      class Main < Clamp::Command
-        subcommand "list", "list all databases" do
-          def execute
-            list = Rig::Plugin::Mongo.all.sort
-            print_table(%w{Database Size}, list)
-          end
-        end
-        subcommand "create", "create a database" do
-          parameter "NAME", "name of the database"
-          parameter "[USER]", "user to add to database"
-          parameter "[PASS]", "password of user to add to database"
-
-          def execute
-            db = Rig::Connection.database
-            db.create_database(name, user, pass) unless test?
-          end
-        end
-        subcommand "destroy", "destroy a database" do
-          parameter "NAME", "name of the database"
-
-          def execute
-            db = Rig::Connection.database
-            db.destroy_database(name) unless test?
-          end
-        end
-        self.default_subcommand = "list"
-      end
-    end
-  end
-end
+end

data/lib/rig/model/environment.rb

@@ -114,16 +114,25 @@ module Rig
               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
+
+            if b.sticky
+              Rig::Log.info ".. setting stickiness policy"
+              policy_name = 'RigLBStickinessPolicy'
+              type = b.sticky_type
+              expires_or_cookie = b.sticky_arg
+              case type.to_sym
+                when :app, :application
+                  Rig::Connection.balancer.create_app_cookie_stickiness_policy("#@name-#{b.name}", policy_name, expires_or_cookie)
+                when :lb, :load_balancer
+                  Rig::Connection.balancer.create_lb_cookie_stickiness_policy("#@name-#{b.name}", policy_name, expires_or_cookie)
+                else
+                  raise "unknown sticky type #{type}"
+              end
+            end
           end
         end
 
-        server_count = @servers.count
-        Rig::Log.info "waiting "
-        begin
-          sleep 1
-          reload
-          Rig::Log.info " . #{server_count} != #{@servers.count} : dns=#{@servers.select{|e| e.dns_name.nil? }.count == 0}"
-        end while server_count != @servers.count && @servers.select{|e| e.dns_name.nil? }.count == 0
+        wait_for_dns
 
         Rig::Log.info "associating servers' DNS"
         @dnsdelayed.each do |h|
@@ -188,8 +197,19 @@ module Rig
         @protected
       end
 
+      def servers_without_dns
+        @servers.select{|e| e.dns_name.nil? }.count
+      end
+
       private
 
+      def wait_for_dns
+        while servers_without_dns > 0
+          sleep 2
+          reload
+        end
+      end
+
       def load_config
         @region  = @options[:region] ||
             Rig.account[:region] ||

data/lib/rig/template.rb

@@ -101,12 +101,15 @@ module Rig
       def name
         @attrs[:name]
       end
+
       def roles
         @attrs[:roles]
       end
+
       def groups
         @attrs[:groups]
       end
+
       def dnsnames
         @attrs[:dnsnames]
       end
@@ -154,12 +157,13 @@ module Rig
     end
 
     class Balancer
-      attr_reader :name, :sticky_type, :sticky_arg
+      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)
@@ -176,9 +180,13 @@ module Rig
         @listeners.map { |e| e.spec }
       end
 
-      def sticky(type, expires_or_cookie)
-        @sticky_type = type
-        @sticky_arg = expires_or_cookie
+      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
 

data/lib/rig/version.rb

@@ -3,7 +3,7 @@ unless defined?(Rig::Version)
     module Version
       MAJOR = 0
       MINOR = 6
-      TINY  = 3
+      TINY  = 4
       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.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cloud provisioning tool built on ruby fog