blimpy 0.3.0 → 0.3.1

data/features/cli/provision.feature

@@ -0,0 +1,31 @@
+Feature: Run provisioning against running VMs
+  In order to update the currently running VMs with new code/etc
+  As a blimpy user
+  I should be able to incrementally send updates to VMs and have the
+  provisioning code run again
+
+  Background: Ensure a simple Blimpfile
+    Given I have the Blimpfile:
+      """
+      Blimpy.fleet do |fleet|
+        fleet.add(:aws) do |blimp|
+          blimp.name = 'provision-blimp'
+        end
+      end
+      """
+
+  Scenario: No arguments and no VMs
+    When I run `blimpy provision`
+    Then the exit status should be 1
+    And the output should contain:
+      """
+      No Blimps running!
+      """
+
+  Scenario: Naming a blimp without running Blimps
+    When I run `blimpy provision provision-blimp`
+    Then the exit status should be 1
+    And the output should contain:
+      """
+      Could not find a blimp named "provision-blimp"
+      """

data/features/cli/{list.feature → status.feature}

@@ -1,11 +1,11 @@
-Feature: List running VMs
+Feature: Show running VMs
 
   Scenario: With no running VMs
     Given I have the Blimpfile:
       """
       # Empty!
       """
-    When I run `blimpy list`
+    When I run `blimpy status`
     Then the exit status should be 0
     And the output should contain:
       """
@@ -14,6 +14,6 @@ Feature: List running VMs
 
   Scenario: With a running VM
     Given I have a single VM running
-    When I run `blimpy list`
+    When I run `blimpy status`
     Then the exit status should be 0
     And the output should list the VM

data/lib/blimpy/box.rb

@@ -153,12 +153,15 @@ module Blimpy
     def bootstrap_livery
       tarball = nil
       if livery == :cwd
-        tarball = Blimpy::Livery.tarball_directory(Dir.pwd)
-        scp_file(tarball)
-        # HAXX
-        basename = File.basename(tarball)
+        dir_name = File.basename(Dir.pwd)
+        run_command('rsync', '-av',
+                    '--exclude=.git',
+                    '--exclude=.svn',
+                    '--exclude=.blimpy.d',
+                    '.',
+                    "#{username}@#{dns_name}:#{dir_name}/")
         puts 'Bootstrapping the livery'
-        ssh_into("tar -zxf #{basename} && cd #{File.basename(tarball, '.tar.gz')} && sudo ./bootstrap.sh")
+        ssh_into("cd #{dir_name} && sudo ./bootstrap.sh")
       end
     end
 
@@ -170,7 +173,6 @@ module Blimpy
       # after sshd(8) comes online
       @exec_commands = false
 
-      print "..waiting for sshd on #{@name} to come online"
       until @ssh_connected
         # Run the `true` command and exit
         @ssh_connected = ssh_into('-q', 'true')

data/lib/blimpy/cli.rb

@@ -22,7 +22,6 @@ module Blimpy
         engine
       end
 
-
       def box_by_name(name)
         engine = load_engine
         box = nil
@@ -41,11 +40,22 @@ module Blimpy
 
         engine.fleet.ships.each do |ship|
           next unless ship.name == name
-          ship.server = Blimpy::Box.fog_server_for_instance(id, data)
+          ship.server = ship.class.fog_server_for_instance(id, data)
           box = ship
         end
         box
       end
+
+      def current_blimps
+        blimps = Dir["#{Dir.pwd}/.blimpy.d/*.blimp"]
+        return false if blimps.empty?
+
+        data = []
+        blimps.each do |blimp|
+          data << [blimp, YAML.load_file(blimp)]
+        end
+        data
+      end
     end
 
     desc 'start', 'Start up a fleet of blimps'
@@ -63,17 +73,16 @@ module Blimpy
       engine.fleet.start
     end
 
-    desc 'list', 'List running blimps'
-    def list
+    desc 'status', 'Show running blimps'
+    def status
       ensure_blimpfile
-      blimps = Dir["#{Dir.pwd}/.blimpy.d/*.blimp"]
-      if blimps.empty?
+      blimps = current_blimps
+      unless blimps
         puts 'No currently running VMs'
         exit 0
       end
 
-      blimps.each do |blimp|
-        data = YAML.load_file(blimp)
+      blimps.each do |blimp, data|
         instance_id = File.basename(blimp)
         instance_id = instance_id.split('.blimp').first
         puts "#{data['name']} (#{instance_id}) is: online at #{data['dns']}"
@@ -138,12 +147,26 @@ end
     desc 'provision BLIMP_NAME', 'Run the livery again'
     def provision(name=nil)
       ensure_blimpfile
-      box = box_by_name(name)
-      if box.nil?
-        puts "Could not find a blimp named \"#{name}\""
-        exit 1
+      unless name.nil?
+        box = box_by_name(name)
+        if box.nil?
+          puts "Could not find a blimp named \"#{name}\""
+          exit 1
+        end
+        box.bootstrap
+      else
+        blimps = current_blimps
+        unless blimps
+          puts "No Blimps running!"
+          exit 1
+        end
+
+        blimps.each do |blimp, data|
+          next unless data['name']
+          box = box_by_name(data['name'])
+          box.bootstrap
+        end
       end
-      box.bootstrap
     end
   end
 end

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/blimpy/box_spec.rb

@@ -110,8 +110,9 @@ describe Blimpy::Box do
 
         it 'should tarball up the current directory' do
           Dir.should_receive(:pwd).and_return('mock-pwd')
-          Blimpy::Livery.should_receive(:tarball_directory).with('mock-pwd').and_return('mock-pwd.tar.gz')
-          subject.should_receive(:scp_file).with('mock-pwd.tar.gz')
+          subject.should_receive(:run_command) do |*args|
+            args.first.should == 'rsync'
+          end
           subject.should_receive(:ssh_into)
           subject.bootstrap_livery
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &20178020 !ruby/object:Gem::Requirement
+  requirement: &9308320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20178020
+  version_requirements: *9308320
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &20177600 !ruby/object:Gem::Requirement
+  requirement: &9307780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20177600
+  version_requirements: *9307780
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &20177180 !ruby/object:Gem::Requirement
+  requirement: &9307240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20177180
+  version_requirements: *9307240
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -60,10 +60,11 @@ files:
 - bin/blimpy
 - blimpy.gemspec
 - features/cli/init.feature
-- features/cli/list.feature
+- features/cli/provision.feature
 - features/cli/scp.feature
 - features/cli/ssh.feature
 - features/cli/start.feature
+- features/cli/status.feature
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb
@@ -115,10 +116,11 @@ specification_version: 3
 summary: Ruby + CLOUD = Blimpy
 test_files:
 - features/cli/init.feature
-- features/cli/list.feature
+- features/cli/provision.feature
 - features/cli/scp.feature
 - features/cli/ssh.feature
 - features/cli/start.feature
+- features/cli/status.feature
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb