conan 0.4.3 → 0.4.4

data/lib/conan/cloud/aws/provision.rb

@@ -246,12 +246,32 @@ module AWS
       if lb.nil?
         puts "Creating Elastic Load Balancer #{elb_name}"
       
-        lb = elb.load_balancers.create(:id => elb_name, :availability_zones => zones)
-      
-        #need to do listeners but for now stick with the default
+        listeners = [];
+        
+        if new_conf[:listeners].nil?
+          list = Fog::AWS[:elb].listeners.new()
+          listeners << { 'Listener' => list.to_params, 'PolicyNames' => [] }
+        else 
+          new_conf[:listeners].each do |listener|
+            listener = listener.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+            list = Fog::AWS[:elb].listeners.new(listener)
+            listeners << { 'Listener' => list.to_params, 'PolicyNames' => [] }
+          end
+        end
       
+        lb = elb.load_balancers.create(:id => elb_name, :availability_zones => zones, 'ListenerDescriptions' => listeners)
+
         compute = Fog::Compute.new(:provider => :aws, :region => region)
 
+        new_conf[:ingress_for].each do |ingress|
+          ingress = ingress.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo} 
+          port = ingress.delete(:port)
+          sg_name = ec2_name_tag(ingress[:group_name]) 
+          sg = compute.security_groups.get(sg_name)
+          lbsgparams = {:group_name => lb.source_group['GroupName'], :user_id => lb.source_group['OwnerAlias']}
+          sg.authorize_ip_permission(Range.new(port.to_i,port.to_i),lbsgparams)
+        end unless new_conf[:ingress_for].nil?
+
         inst_servers = new_conf[:servers].map { |s| ec2_name_tag(s) } unless new_conf[:servers].nil?
 
         list_stage_servers(region).each do |server|

data/lib/conan/cloud/aws/security_group.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
-require 'fog/aws/models/compute/security_group'
+# require 'fog/aws/models/compute/security_group'
 
 module Fog
   module Compute
     class AWS
-      class SecurityGroup
+      class SecurityGroup < Fog::Model
         def authorize_ip_permission(port_range, options = {})
           requires :name
 

data/lib/conan/deployment/deploy.rb

@@ -44,7 +44,7 @@ namespace :deploy do
     maintenance.start
     update_code
     migrate
-    symlink
+    create_symlink
     restart
     maintenance.stop
   end

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,59 +1,73 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: conan
-version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 4
+  version: 0.4.4
 platform: ruby
-authors:
+authors: 
 - Paul Battley
 - Stuart Eccles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-27 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70333738810960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70333738810960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: &70333738810280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70333738810280
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: &70333738803340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 11
+        - 2
+        version: 2.11.2
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: fog
   prerelease: false
-  version_requirements: *70333738803340
-description: Set up a project to enable the provision of infrastructure through AWS
-  and the configuration of servers using Chef via Capistrano.
-email:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+description: Set up a project to enable the provision of infrastructure through AWS and the configuration of servers using Chef via Capistrano.
+email: 
 - stuart@madebymany.co.uk
-executables:
+executables: 
 - conan
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - bin/conan
 - lib/conan/capistrano.rb
 - lib/conan/cloud/aws/autoscale.rb
@@ -92,28 +106,35 @@ files:
 - lib/conan/template/deploy/chef/solo.rb
 - lib/conan/version.rb
 - README.md
+has_rdoc: true
 homepage: http://github.com/madebymany/conan
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Conan The Deployer
 test_files: []
+