blimpy 0.3.6 → 0.3.7

data/lib/blimpy/box.rb

@@ -167,15 +167,32 @@ module Blimpy
 
     def bootstrap_livery
       if livery == :cwd
+        unpack_command = 'true'
         dir_name = File.basename(Dir.pwd)
-        run_command('rsync', '-avL',
-                    '--exclude=.git',
-                    '--exclude=.svn',
-                    '--exclude=.blimpy.d',
-                    '.',
-                    "#{username}@#{dns_name}:#{dir_name}/")
+
+        if can_rsync?
+          unpack_command = "cd #{dir_name}"
+          run_command('rsync', '-avL',
+                      '--exclude=.git',
+                      '--exclude=.svn',
+                      '--exclude=.blimpy.d',
+                      '.',
+                      "#{username}@#{dns_name}:#{dir_name}/")
+        else
+          puts "Remote host has no rsync(1), falling back to copying a full tarball over"
+          tarball = Blimpy::Livery.tarball_directory(Dir.pwd)
+          scp_file(tarball)
+          # HAXX
+          basename = File.basename(tarball)
+          unpack_command = "tar -zxf #{basename} && cd #{dir_name}"
+        end
+
         puts 'Bootstrapping the livery'
-        ssh_into("cd #{dir_name} && sudo ./bootstrap.sh")
+        run_sudo = 'sudo'
+        if username == 'root'
+          run_sudo = ''
+        end
+        ssh_into("#{unpack_command} && #{run_sudo} ./bootstrap.sh")
       end
     end
 
@@ -206,6 +223,11 @@ module Blimpy
       raise NotImplementedError, '#fog should be implemented by cloud-specific subclasses'
     end
 
+    def can_rsync?
+      @can_rsync ||= ssh_into('-q', 'which rsync > /dev/null')
+    end
+
+
     private
 
     def create_host

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/spec/blimpy/box_spec.rb

@@ -148,6 +148,7 @@ describe Blimpy::Box do
       context 'with a livery of :cwd' do
         before :each do
           subject.livery = :cwd
+          subject.stub(:can_rsync?).and_return(true)
         end
 
         it 'should tarball up the current directory' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000Z
+date: 2012-07-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &14091140 !ruby/object:Gem::Requirement
+  requirement: &7560740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14091140
+  version_requirements: *7560740
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &14090460 !ruby/object:Gem::Requirement
+  requirement: &7559940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14090460
+  version_requirements: *7559940
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &14089460 !ruby/object:Gem::Requirement
+  requirement: &7559080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14089460
+  version_requirements: *7559080
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3393293475964109853
+      hash: -306445518054353312
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3393293475964109853
+      hash: -306445518054353312
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10