blimpy 0.1.0 → 0.2.0

data/blimpy.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'fog'
   gem.add_dependency 'thor'
+  gem.add_dependency 'minitar'
 end

data/features/cli/scp.feature

@@ -0,0 +1,37 @@
+Feature: SCP a file into a named VM
+  In order to easily copy files from my local host to the named VM
+  As a Blimpy user
+  I should be able to run `blimpy scp <name> <file> [dest]`
+
+  Scenario: SCPing with an invalid blimp name
+    Given I have the Blimpfile:
+      """
+      Blimpy.fleet do |f|
+        f.add do |host|
+          host.name = 'Cucumber Host'
+        end
+      end
+      """
+    And I have a file named "hello.txt"
+    When I run `blimpy scp Gherkins hello.txt`
+    Then the exit status should be 1
+    And the output should contain:
+      """
+      Could not find a blimp named "Gherkins"
+      """
+
+  # This test is in the same boat that the complimentary test in ssh.feature is
+  # in.
+  @slow @destroy @wip
+  Scenario: SCPing a valid file
+    Given I have the Blimpfile:
+      """
+      Blimpy.fleet do |f|
+        f.add do |host|
+          host.name = 'Cucumber Host'
+        end
+      end
+      """
+    And I have a file named "hello.txt"
+    When I run `blimpy scp "Cucumber Host" hello.txt`
+    Then the exit status should be 0

data/features/cli/ssh.feature

@@ -16,7 +16,7 @@ Feature: SSH into a named VM
     Then the exit status should be 1
     And the output should contain:
       """
-      Could not find blimp named "Gherkins"
+      Could not find a blimp named "Gherkins"
       """
 
 

data/features/step_definitions/cli_steps.rb

@@ -26,6 +26,12 @@ Given /^I have a single VM running$/ do
   end
 end
 
+Given /^I have a file named "([^"]*)"$/ do |filename|
+  File.open(filename, 'w') do |fd|
+    fd.write("I am #{filename}\n")
+  end
+end
+
 When /^I ssh into the machine$/ do
   step %{I run `blimpy start`}
   step %{I run `blimpy ssh "Cucumber Host" -o StrictHostKeyChecking=no` interactively}

data/lib/blimpy/box.rb

@@ -1,4 +1,5 @@
 require 'blimpy/helpers/state'
+require 'blimpy/livery'
 require 'blimpy/keys'
 
 module Blimpy
@@ -37,6 +38,8 @@ module Blimpy
       @tags = {}
       @server = server
       @fleet_id = 0
+      @ssh_connected = false
+      @exec_commands = true
     end
 
     def region=(newRegion)
@@ -65,6 +68,14 @@ module Blimpy
       write_state_file
     end
 
+    def bootstrap
+      @exec_commands = false
+      unless livery.nil?
+        wait_for_sshd
+        bootstrap_livery
+      end
+    end
+
     def stop
       unless @server.nil?
         @server.stop
@@ -91,7 +102,6 @@ module Blimpy
       end
     end
 
-
     def state_file
       if @server.nil?
         raise Exception, "I can't make a state file without a @server!"
@@ -120,19 +130,62 @@ module Blimpy
       'no name'
     end
 
-    def ssh_into
+    def run_command(*args)
+      if @exec_commands
+        ::Kernel.exec(*args)
+      else
+        ::Kernel.system(*args)
+      end
+    end
+
+    def ssh_into(*args)
+      # Support using #ssh_into within our own code as well to pass arguments
+      # to the ssh(1) binary
+      args = args || ARGV[2 .. -1]
+      run_command('ssh', '-o', 'StrictHostKeyChecking=no',
+                  '-l', username, dns_name, *args)
+    end
+
+    def scp_file(filename)
+      filename = File.expand_path(filename)
+      run_command('scp', '-o', 'StrictHostKeyChecking=no',
+                  filename, "#{username}@#{dns_name}:", *ARGV[3..-1])
+    end
+
+    def bootstrap_livery
+      tarball = nil
+      if livery == :cwd
+        tarball = Blimpy::Livery.tarball_directory(Dir.pwd)
+        scp_file(tarball)
+        # HAXX
+        basename = File.basename(tarball)
+        puts 'Bootstrapping the livery'
+        ssh_into("tar -zxf #{basename} && cd #{File.basename(tarball, '.tar.gz')} && sudo ./bootstrap.sh")
+      end
+    end
+
+    def wait_for_sshd
+      return if @ssh_connected
       start = Time.now.to_i
-      print "..making sure #{@name} is online"
-      begin
-        TCPSocket.new(dns_name, 22)
-      rescue Errno::ECONNREFUSED
-        if (Time.now.to_i - start) < 30
-          print '.'
-          retry
+      use_exec = @exec_commands
+      # Even if we are supposed to use #exec here, we wait to disable it until
+      # 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')
+
+        unless @ssh_connected
+          if (Time.now.to_i - start) < 30
+            print '.'
+            sleep 1
+          end
         end
       end
       puts
-      ::Kernel.exec('ssh', '-l', username, dns_name, *ARGV[2..-1])
+      @exec_commands = use_exec
     end
 
     private

data/lib/blimpy/cli.rb

@@ -15,6 +15,17 @@ module Blimpy
           exit 1
         end
       end
+
+      def box_by_name(name)
+        fleet = Blimpy::Fleet.new
+        box = nil
+        fleet.members.each do |instance_id, data|
+          box_name = data['name']
+          next unless box_name == name
+          box = Blimpy::Box.from_instance_id(instance_id, data)
+        end
+        box
+      end
     end
 
     desc 'start', 'Start up a fleet of blimps'
@@ -84,19 +95,25 @@ end
     desc 'ssh BLIMP_NAME', 'Log into a running blimp'
     def ssh(name, *args)
       ensure_blimpfile
-      fleet = Blimpy::Fleet.new
-      box = nil
-      fleet.members.each do |instance_id, data|
-        box_name = data['name']
-        next unless box_name == name
-        box  = Blimpy::Box.from_instance_id(instance_id, data)
-      end
+      box = box_by_name(name)
       if box.nil?
-        puts "Could not find blimp named \"#{name}\""
+        puts "Could not find a blimp named \"#{name}\""
         exit 1
       end
-
+      box.wait_for_sshd
       box.ssh_into
     end
+
+    desc 'scp BLIMP_NAME FILE_NAME', 'Securely copy FILE_NAME into the blimp'
+    def scp(name, filename, *args)
+      ensure_blimpfile
+      box = box_by_name(name)
+      if box.nil?
+        puts "Could not find a blimp named \"#{name}\""
+        exit 1
+      end
+      box.wait_for_sshd
+      box.scp_file(filename)
+    end
   end
 end

data/lib/blimpy/fleet.rb

@@ -69,6 +69,7 @@ module Blimpy
         host.wait_for_state('running') { print '.' }
         print ".. online at: #{host.dns_name}"
         host.online!
+        host.bootstrap
         puts
       end
 

data/lib/blimpy/livery.rb

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'zlib'
+require 'archive/tar/minitar'
+
+module Blimpy
+  class Livery
+    def self.tarball_directory(directory)
+      if directory.nil? || !(File.directory? directory)
+        raise ArgumentError, "The argument '#{directory}' doesn't appear to be a directory"
+      end
+
+      directory = File.expand_path(directory)
+      short_name = File.basename(directory)
+
+      tarball = nil
+      Dir.chdir(File.expand_path(directory  + '/../')) do
+        tarball = self.gzip_for_directory(short_name, '/tmp') do |tgz|
+          Archive::Tar::Minitar.pack(short_name, tgz)
+        end
+      end
+      tarball
+    end
+
+    private
+
+    def self.gzip_for_directory(directory, root)
+      filename = File.join(root, "#{directory}.tar.gz")
+      yield Zlib::GzipWriter.new(File.open(filename, 'wb'))
+      filename
+    end
+
+  end
+end

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/blimpy/box_spec.rb

@@ -147,5 +147,21 @@ describe Blimpy::Box do
       end
 
     end
+
+    describe '#bootstrap_livery' do
+      context 'with a livery of :cwd' do
+        before :each do
+          subject.livery = :cwd
+        end
+
+        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(:ssh_into)
+          subject.bootstrap_livery
+        end
+      end
+    end
   end
 end

data/spec/blimpy/livery_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'blimpy/livery'
+
+describe Blimpy::Livery do
+  context 'class methods' do
+    describe '#tarball_directory' do
+      subject { Blimpy::Livery } # No instantiating!
+      it 'should raise an exception if the directory doesn\'t exist' do
+        expect {
+          subject.tarball_directory(nil)
+        }.to raise_error(ArgumentError)
+
+        expect {
+          subject.tarball_directory('/tmp/never-gonna-give-you-up.lolz')
+        }.to raise_error(ArgumentError)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000Z
+date: 2012-04-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &6754760 !ruby/object:Gem::Requirement
+  requirement: &6248380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6754760
+  version_requirements: *6248380
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &6754100 !ruby/object:Gem::Requirement
+  requirement: &6247840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6754100
+  version_requirements: *6247840
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: &6247360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *6247360
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -50,6 +61,7 @@ files:
 - blimpy.gemspec
 - features/cli/init.feature
 - features/cli/list.feature
+- features/cli/scp.feature
 - features/cli/ssh.feature
 - features/cli/start.feature
 - features/step_definitions/cli_steps.rb
@@ -62,12 +74,14 @@ files:
 - lib/blimpy/fleet.rb
 - lib/blimpy/helpers/state.rb
 - lib/blimpy/keys.rb
+- lib/blimpy/livery.rb
 - lib/blimpy/version.rb
 - spec/blimpy/box_spec.rb
 - spec/blimpy/engine_spec.rb
 - spec/blimpy/fleet_spec.rb
 - spec/blimpy/helpers/state_spec.rb
 - spec/blimpy/keys_spec.rb
+- spec/blimpy/livery_spec.rb
 - spec/blimpy_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/rtyler/blimpy
@@ -97,6 +111,7 @@ summary: Ruby + CLOUD = Blimpy
 test_files:
 - features/cli/init.feature
 - features/cli/list.feature
+- features/cli/scp.feature
 - features/cli/ssh.feature
 - features/cli/start.feature
 - features/step_definitions/cli_steps.rb
@@ -107,5 +122,6 @@ test_files:
 - spec/blimpy/fleet_spec.rb
 - spec/blimpy/helpers/state_spec.rb
 - spec/blimpy/keys_spec.rb
+- spec/blimpy/livery_spec.rb
 - spec/blimpy_spec.rb
 - spec/spec_helper.rb