rig 0.6.5 → 0.6.6

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.6.5:
+* get stickiness code working properly, have to add policy to balancer and associate with listener
+
 ## v0.6.4:
 * add support for setting stickiness policy with DSL 'sticky' method on balancers
 * clean up waiting for dns on environment create/save

data/lib/rig/command/balancer.rb

@@ -9,21 +9,18 @@ module Rig
       subcommand "list", "list load balancers" do
         def execute
           list = Rig::Model::Balancer.all
+          rows = []
           list.each do |lb|
-            puts lb.id
-            puts "- listeners"
-            lb.listeners.each do |l|
-              puts "  - #{l.protocol}:#{l.lb_port} => #{l.instance_protocol}:#{l.instance_port}"
-            end
-            puts "- instances"
-            lb.instances.each do |inst|
-              puts "  - #{inst}"
-            end
-            puts "- zones"
-            lb.availability_zones.each do |z|
-              puts "  - #{z}"
-            end
+            listeners = lb.listeners.map { |l| "#{l.protocol}:#{l.lb_port} => #{l.instance_protocol}:#{l.instance_port}" }.join("\n")
+            instances = lb.instances.join("\n")
+            zones     = lb.availability_zones.join("\n")
+            rows << [lb.id,
+                     listeners,
+                     instances,
+                     zones]
           end
+
+          print_table(%w{Name Listeners Instances Zones}, rows)
         end
       end
 

data/lib/rig/command/environment.rb

@@ -11,9 +11,8 @@ module Rig
         parameter "TEMPLATE", "the template to use (solo, multi, etc)", :default => "solo"
 
         def execute
-          #connection = Rig::Connection.compute
-          env = Rig::Model::Environment.create(name, template.to_sym)
-          #ap env.servers
+          Rig::Model::Environment.create(name, template.to_sym)
+          Rig::Log.info "environment created"
         end
       end
 

data/lib/rig/command/server.rb

@@ -1,5 +1,4 @@
 require 'rig'
-require 'awesome_print'
 
 module Rig
   module Command
@@ -20,7 +19,7 @@ module Rig
 
         def execute
           # figure out if there are others of this role, if there are add a number to name to distinguish.
-          n    = "#{name}1.#{environment}.env"
+          n    = "#{name}1.#{environment}.#{Rig.get_config[:dns_subdomain]}"
           chef = Rig.config[:chef] ? true : false
 
           unless flavor

data/lib/rig/model/dns.rb

@@ -52,7 +52,7 @@ module Rig
 
         def remove_environment(name)
           zone = zone(Rig.get_config(:dns_zone))
-          list = zone.records.all.select {|e| e.attributes[:name] =~ /\.#{name}\.env/ }
+          list = zone.records.all.select {|e| e.attributes[:name] =~ /\.#{name}\.#{Rig.get_config[:dns_subdomain]}/ }
           list.each do |e|
             Rig::Log.info "record: #{e.attributes[:name]}"
             destroy(e.attributes[:name])

data/lib/rig/model/environment.rb

@@ -65,7 +65,7 @@ module Rig
         @template.servers.each do |s|
           Rig::Log.debug "server[#{s.count}]= #{s.inspect}"
           1.upto(s.count) do |i|
-            n = "#{s.name}#{i}.#@name.env"
+            n = "#{s.name}#{i}.#@name.#{Rig.get_config[:dns_subdomain]}"
             Rig::Log.debug "  name= #{n}"
             userdata = s.userdata || Rig.get_config(:userdata)
             o = {
@@ -111,8 +111,8 @@ module Rig
             @balancers << balancer
 
             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)
+              Rig::Log.info ".. primary: #{name}.#{Rig.get_config[:dns_subdomain]}.#@zone #{balancer.attributes[:dns_name]}"
+              Rig::Model::Dns.create("#{name}.#{Rig.get_config[:dns_subdomain]}.#@zone", balancer.attributes[:dns_name], :ttl => 30)
             end
           end
         end
@@ -123,17 +123,9 @@ module Rig
           if set[b.name]
             if b.sticky
               Rig::Log.info "#@name-#{b.name}: setting stickiness policy"
-              policy_name = 'RigLBStickinessPolicy'
               type = b.sticky_type
-              expires_or_cookie = b.sticky_arg
-              case type.to_sym
-                when :app, :application
-                  ap Rig::Connection.balancer.create_app_cookie_stickiness_policy("#@name-#{b.name}", policy_name, expires_or_cookie)
-                when :lb, :load_balancer
-                  ap Rig::Connection.balancer.create_lb_cookie_stickiness_policy("#@name-#{b.name}", policy_name, expires_or_cookie)
-                else
-                  raise "unknown sticky type #{type}"
-              end
+              expires = b.sticky_arg
+              Rig::Model::Balancer.sticky(b.name, type, expires, 443, "AWSConsolePolicy-1")
             end
           end
         end
@@ -176,11 +168,11 @@ module Rig
         roles = @servers.collect { |s| s.tags['Role'] }.compact
         roles.each do |r|
           Rig::Log.info "removing role balancer dns (#{r})"
-          Rig::Model::Dns.destroy("#{r}.#{name}.env.#{Rig.get_config(:dns_zone)}")
+          Rig::Model::Dns.destroy("#{r}.#{name}.#{Rig.get_config[:dns_subdomain]}.#{Rig.get_config(:dns_zone)}")
         end
 
         Rig::Log.info "removing primary dns"
-        Rig::Model::Dns.destroy("#{name}.env.#{Rig.get_config(:dns_zone)}")
+        Rig::Model::Dns.destroy("#{name}.#{Rig.get_config[:dns_subdomain]}.#{Rig.get_config(:dns_zone)}")
 
         Rig::Log.info "destroying servers"
         Rig::Model::Instance.destroy(@servers)

data/lib/rig/model/instance.rb

@@ -39,6 +39,8 @@ module Rig
         end
 
         def create(opts, tags={})
+          #Rig::Log.debug "instance create #{opts.inspect}"
+          #Rig::Log.debug "instance create #{tags.inspect}"
           fog = Rig::Connection.compute
           server = fog.servers.create(opts)
           fog.create_tags(server.id, tags) if tags.count > 0

data/lib/rig/model/userdata.rb

@@ -1,5 +1,4 @@
 require 'erubis'
-require 'awesome_print'
 
 module Rig
   module Model

data/lib/rig/plugin.rb

@@ -6,9 +6,12 @@ module Rig
         @hooks.select { |e| e[:event] == event }.each do |plugin|
           klass = plugin[:class]
           block = plugin[:block]
-
-          Rig::Log.debug "calling #{klass} :: #{event}"
-          block.call(args.dup)
+          begin
+            Rig::Log.debug "calling #{klass} :: #{event}"
+            block.call(args.dup)
+          rescue => e
+            Rig::Log.error "failed to run event #{event} for #{klass}"
+          end
         end
       end
 

data/lib/rig/template.rb

@@ -5,13 +5,13 @@ module Rig
         @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
+        #raise "template already loaded #{template_name}" if @templates[template_name]
+        @templates[template_name] ||= begin
+          t = Rig::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)

data/lib/rig/version.rb

@@ -3,7 +3,7 @@ unless defined?(Rig::Version)
     module Version
       MAJOR = 0
       MINOR = 6
-      TINY  = 5
+      TINY  = 6
       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.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp