blimpy 0.3.4 → 0.3.5

data/lib/blimpy/box.rb

@@ -1,6 +1,7 @@
 require 'blimpy/helpers/state'
 require 'blimpy/livery'
 require 'blimpy/keys'
+require 'blimpy/securitygroups'
 require 'blimpy/boxes'
 
 module Blimpy
@@ -8,7 +9,7 @@ module Blimpy
     include Blimpy::Helpers::State
 
     attr_reader :allowed_regions, :region
-    attr_accessor :image_id, :flavor, :group
+    attr_accessor :image_id, :flavor, :group, :ports
     attr_accessor :name, :tags, :fleet_id, :username, :livery
 
 
@@ -33,6 +34,7 @@ module Blimpy
       @group = nil
       @name = 'Unnamed Box'
       @tags = {}
+      @ports = []
       @server = server
       @fleet_id = 0
       @ssh_connected = false

data/lib/blimpy/boxes/aws.rb

@@ -46,10 +46,12 @@ module Blimpy::Boxes
       tags = @tags.merge({:Name => @name, :CreatedBy => 'Blimpy', :BlimpyFleetId => @fleet_id})
 
       Blimpy::Keys.import_key(fog)
+      generated_group = Blimpy::SecurityGroups.ensure_group(fog, @ports + [22])
+      groups = [@group, generated_group].compact
       fog.servers.create(:image_id => @image_id,
                          :flavor_id => @flavor,
                          :key_name => Blimpy::Keys.key_name,
-                         :groups => [@group],
+                         :groups => groups,
                          :tags => tags)
     end
   end

data/lib/blimpy/cli.rb

@@ -116,7 +116,7 @@ module Blimpy
 Blimpy.fleet do |fleet|
   fleet.add(:aws) do |ship|
     ship.name = 'Excelsior'
-    ship.group = 'default'
+    ship.ports = [22, 8080]
   end
 end
 """)

data/lib/blimpy/securitygroups.rb

@@ -0,0 +1,37 @@
+require 'set'
+require 'zlib'
+
+module Blimpy
+  module SecurityGroups
+    def self.group_id(ports)
+      if ports.nil? or ports.empty?
+        return nil
+      end
+
+      ports = Set.new(ports)
+      # Lolwut, #hash is inconsistent between ruby processes
+      "Blimpy-#{Zlib.crc32(ports.inspect)}"
+    end
+
+    def self.ensure_group(fog, ports)
+      name = group_id(ports)
+      ports = Set.new(ports)
+
+      exists = fog.security_groups.get(name)
+
+      if exists.nil?
+        create_group(fog, ports)
+      end
+      name
+    end
+
+    def self.create_group(fog, ports)
+      name = group_id(ports)
+      group = fog.security_groups.create(:name => name,
+                                         :description => "Custom Blimpy security group for #{ports.to_a}")
+      ports.each do |port|
+        group.authorize_port_range(port .. port)
+      end
+    end
+  end
+end

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/blimpy/securitygroups_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'blimpy/securitygroups'
+
+describe Blimpy::SecurityGroups do
+    let(:fog) { mock('Fog object') }
+    let(:ports) { [22, 8080] }
+
+  describe '#group_id' do
+    it 'should return nil for an empty port Array' do
+      subject.group_id([]).should be_nil
+    end
+
+    context 'with a known ID' do
+      let(:known_id) { 3548764514 }
+
+      it 'should generate the right string for [1, 2]' do
+        subject.group_id([1, 2]).should == "Blimpy-#{known_id}"
+      end
+
+      it 'should generate the identical string for [1, 2, 1]' do
+        subject.group_id([1, 2, 1]).should == "Blimpy-#{known_id}"
+      end
+    end
+  end
+
+  describe '#ensure_group' do
+    context 'for a group that exists' do
+      it 'should bail and not try to create the group' do
+        fog.stub_chain(:security_groups, :get).and_return(true)
+        subject.should_receive(:create_group).never
+        subject.should_receive(:group_id).and_return('fake-id')
+        name = subject.ensure_group(fog, ports)
+        name.should == 'fake-id'
+      end
+    end
+
+    context "for a group that doesn't exist" do
+      it 'should create the group' do
+        fog.stub_chain(:security_groups, :get).and_return(nil)
+        subject.should_receive(:create_group).once
+        subject.ensure_group(fog, ports)
+      end
+    end
+  end
+
+  describe '#create_group' do
+    let(:group) { mock('Fog SecurityGroup') }
+    it 'should authorize the port ranges for every port' do
+      fog.stub_chain(:security_groups, :create).and_return(group)
+      group.should_receive(:authorize_port_range).with(22..22)
+      group.should_receive(:authorize_port_range).with(8080..8080)
+      subject.create_group(fog, ports)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &13269540 !ruby/object:Gem::Requirement
+  requirement: &7711400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13269540
+  version_requirements: *7711400
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &13269100 !ruby/object:Gem::Requirement
+  requirement: &7710980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13269100
+  version_requirements: *7710980
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &13268640 !ruby/object:Gem::Requirement
+  requirement: &7710540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13268640
+  version_requirements: *7710540
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -79,6 +79,7 @@ files:
 - lib/blimpy/helpers/state.rb
 - lib/blimpy/keys.rb
 - lib/blimpy/livery.rb
+- lib/blimpy/securitygroups.rb
 - lib/blimpy/version.rb
 - spec/blimpy/box_spec.rb
 - spec/blimpy/boxes/aws_spec.rb
@@ -88,6 +89,7 @@ files:
 - spec/blimpy/helpers/state_spec.rb
 - spec/blimpy/keys_spec.rb
 - spec/blimpy/livery_spec.rb
+- spec/blimpy/securitygroups_spec.rb
 - spec/blimpy_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/rtyler/blimpy
@@ -132,5 +134,6 @@ test_files:
 - spec/blimpy/helpers/state_spec.rb
 - spec/blimpy/keys_spec.rb
 - spec/blimpy/livery_spec.rb
+- spec/blimpy/securitygroups_spec.rb
 - spec/blimpy_spec.rb
 - spec/spec_helper.rb