blimpy 0.6.2 → 0.6.3

data/README.md

@@ -4,7 +4,7 @@
 ![Excelsior!](http://strongspace.com/rtyler/public/excelsior.png)
 
 
-### About
+## About
 
 Blimpy is a tool to help developers spin up and utilize machines "in the
 cloud."
@@ -30,18 +30,10 @@ Once machines are online, they're easy to access by name with:
 Then once you're finished working with the machines a simple `blimpy destroy`
 will terminate the machines.
 
----
-
-(Inspired by [Vagrant](http://vagrantup.com))
-
-Notes and other bits are being stored in [this public Evernote
-notebook](https://www.evernote.com/pub/agentdero/blimpy).
-
-The current concept/design document is captured in [this
-note](https://www.evernote.com/pub/agentdero/blimpy#b=58a228bb-8910-4cd1-a7f5-995d775b81a2&n=06def701-7e25-425b-81d4-5811e7987c7e)
 
+---
 
-### The Blimpfile
+## The Blimpfile
 
 Here's an example Blimpfile:
 
@@ -59,6 +51,14 @@ Here's an example Blimpfile:
     end
 ```
 
+### Supported Clouds
+
+Currently Blimpy supports creating machines on:
+
+ * [Amazon Web Services](https://github.com/rtyler/blimpy/wiki/AWS) - using the `:aws` argument passed into `fleet.add`
+ * [OpenStack](https://github.com/rtyler/blimpy/wiki/OpenStack) - using the `:openstack` argument passed into `fleet.add`
+
+---
 
 ### What is Livery?
 

data/lib/blimpy/securitygroups.rb

@@ -8,19 +8,21 @@ module Blimpy
         return nil
       end
 
-      ports = Set.new(ports)
+      unless ports.is_a? Set
+        ports = Set.new(ports)
+      end
+
       # 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)
+        name = create_group(fog, ports)
       end
       name
     end
@@ -29,9 +31,15 @@ module Blimpy
       name = group_id(ports)
       group = fog.security_groups.create(:name => name,
                                          :description => "Custom Blimpy security group for #{ports.to_a}")
+
+      unless ports.is_a? Set
+        ports = Set.new(ports)
+      end
+
       ports.each do |port|
         group.authorize_port_range(port .. port)
       end
+      name
     end
   end
 end

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/blimpy/securitygroups_spec.rb

@@ -3,7 +3,11 @@ require 'blimpy/securitygroups'
 
 describe Blimpy::SecurityGroups do
     let(:fog) { mock('Fog object') }
-    let(:ports) { [22, 8080] }
+    # Due to the implementation of the group_id method, [22,8140] can trigger
+    # a failure case that is not triggered by [22,8080].
+    # Zlib.crc32(Set.new(Set.new([22,8140])).inspect) != Zlib.crc32(Set.new([22,8140]).inspect), at least in ruby 1.8.7
+    let(:ports) { [22, 8140 ] }
+    let(:expected_group_name) { subject.group_id(ports) }
 
   describe '#group_id' do
     it 'should return nil for an empty port Array' do
@@ -28,17 +32,22 @@ describe Blimpy::SecurityGroups 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'
+        name.should == expected_group_name
       end
     end
 
     context "for a group that doesn't exist" do
+      let(:sec_groups) { mock('Fog Security Groups object') }
+      let(:group) { mock('Fog SecurityGroup') }
+
       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)
+        fog.stub(:security_groups).and_return(sec_groups)
+        sec_groups.should_receive(:get).with(expected_group_name).and_return(nil)
+        sec_groups.should_receive(:create).and_return(group)
+        group.stub(:authorize_port_range)
+        name = subject.ensure_group(fog, ports)
+        name.should == expected_group_name
       end
     end
   end
@@ -48,7 +57,7 @@ describe Blimpy::SecurityGroups do
     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)
+      group.should_receive(:authorize_port_range).with(8140..8140)
       subject.create_group(fog, ports)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000Z
+date: 2012-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &21221380 !ruby/object:Gem::Requirement
+  requirement: &22676120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21221380
+  version_requirements: *22676120
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &21220960 !ruby/object:Gem::Requirement
+  requirement: &22675680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21220960
+  version_requirements: *22675680
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &21220520 !ruby/object:Gem::Requirement
+  requirement: &22675240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21220520
+  version_requirements: *22675240
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1797117388119190917
+      hash: 3825155761784382810
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1797117388119190917
+      hash: 3825155761784382810
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10