rig 0.3.6 → 0.3.7

data/Gemfile

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rig.gemspec
 gemspec
 
+gem 'fog'
 gem 'chef', '~> 0.10.8'
 gem 'net-ssh', '~> 2.1.4'

data/conf/templates/solo.yml

@@ -4,6 +4,14 @@
     :count: 1
     :flavor: c1.medium
     :balance: true
+    #[{"PolicyNames"=>[], "Listener"=>{"InstancePort"=>80, "SSLCertificateId"=>nil, "Protocol"=>"HTTP", "LoadBalancerPort"=>80, "InstanceProtocol"=>"HTTP"}}]
+    #{"ListenerDescriptions"=>[{"PolicyNames"=>[], "Listener"=>{"InstancePort"=>80, "SSLCertificateId"=>nil, "Protocol"=>"HTTP", "LoadBalancerPort"=>80, "InstanceProtocol"=>"HTTP"}}]}
+    :listeners:
+      - :from: HTTP:80
+        :to: HTTP:80
+      - :from: HTTPS:443
+        :to: HTTP:80
+        :cert: inqlabs.com
     :primary: true
 :groups:
 - default

data/lib/rig/command/balancer/list.rb

@@ -8,8 +8,13 @@ module Rig
           list = Rig::Model::Balancer.all
           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}"
+              puts "  - #{inst}"
             end
           end
         end

data/lib/rig/model/balancer.rb

@@ -1,3 +1,6 @@
+require 'fog/aws/models/elb/listeners'
+require 'fog/aws/models/elb/load_balancers'
+require 'awesome_print'
 
 module Rig
   module Model
@@ -7,12 +10,18 @@ module Rig
           Rig::Connection.balancer.load_balancers.all
         end
 
-        def new(name)
-          Rig::Connection.balancer.load_balancers.new({ :id => name })
+        def new(name, listeners=[])
+          listeners.map! do |listener|
+            ld = new_listener_description(listener)
+            ap ld
+            ld
+          end
+          ap listeners
+          Rig::Connection.balancer.load_balancers.new({ :id => name, "ListenerDescriptions" => listeners })
         end
 
-        def create(name)
-          b = self.new(name)
+        def create(name, listeners=[])
+          b = self.new(name, listeners)
           b.save if b
           puts ".. created: #{name}"
           b
@@ -23,17 +32,41 @@ module Rig
         end
 
         def find_by_environment(name)
-          self.all.select {|e| e.id =~ /^#{name}/}
+          self.all.select { |e| e.id =~ /^#{name}/ }
         end
 
         def destroy(list)
           list = [*list]
-          lbs = list.map {|e| e.kind_of?(String) ? self.find(e) : e}
+          lbs  = list.map { |e| e.kind_of?(String) ? self.find(e) : e }
           lbs.each do |lb|
             puts ".. destroying: #{lb.id}"
             lb.destroy if lb
           end
         end
+
+        private
+
+        def new_listener_description(listener)
+          desc                     = { }
+          (from_proto, from_port)  = listener[:from].split(/:/)
+          (to_proto, to_port)      = listener[:to].split(/:/)
+          sslcert                  = listener[:cert] || nil
+          policy_names             = listener[:policy_names] || []
+
+          new_listener = Fog::AWS::ELB::Listener.new(
+              :policy_names      => policy_names,
+              :instance_port     => to_port,
+              :instance_protocol => to_proto,
+              :lb_port           => from_port,
+              :protocol          => from_proto,
+              :ssl_id            => sslcert
+          )
+
+          {
+              'Listener' => new_listener.to_params,
+              'PolicyNames' => new_listener.policy_names
+          }
+        end
       end
     end
   end

data/lib/rig/model/environment.rb

@@ -118,7 +118,7 @@ module Rig
 
             if tmpl[:balance]
               puts "creating balancer"
-              balancer = Rig::Model::Balancer.create("#{name}-#{role}")
+              balancer = Rig::Model::Balancer.create("#{name}-#{role}", tmpl[:listeners])
               balancer.register_instances(setinstances.collect { |e| e.id })
               balancer.save
 
@@ -138,14 +138,15 @@ module Rig
                 puts ".. primary: #{name}.env.#@zone #{balancer.attributes[:dns_name]}"
                 Rig::Model::Dns.create("#{name}.env.#@zone", balancer.attributes[:dns_name])
               end
+            else
+              #TODO: handle no balancer, but primary - point to server instance
+              #if tmpl[:primary]
+              #  puts ".. primary #{name}.env.#@zone #{}"
+              #end
             end
           end
         end
 
-        #print "waiting"
-        #@servers.first.wait_for { print "."; attributes[:public_ip_address] }
-        #puts
-
         # if we've got a chef config, use it
         if Rig.config.chef
           puts "creating chef environment"

data/lib/rig/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rig
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Shawn Catanzarite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-30 00:00:00 Z
+date: 2012-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clamp