blimpy 0.3.7 → 0.3.8

data/lib/blimpy/box.rb

@@ -159,41 +159,51 @@ module Blimpy
                   '-l', username, dns_name, *args)
     end
 
-    def scp_file(filename)
+    def scp_file(filename, directory='')
       filename = File.expand_path(filename)
       run_command('scp', '-o', 'StrictHostKeyChecking=no',
-                  filename, "#{username}@#{dns_name}:", *ARGV[3..-1])
+                  filename, "#{username}@#{dns_name}:#{directory}", *ARGV[3..-1])
     end
 
     def bootstrap_livery
+      script = File.expand_path(File.dirname(__FILE__) + "/../../scripts/#{livery}.sh")
+
       if livery == :cwd
-        unpack_command = 'true'
-        dir_name = File.basename(Dir.pwd)
-
-        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
+        script = File.join(Dir.pwd, '/bootstrap.sh')
+      end
 
-        puts 'Bootstrapping the livery'
-        run_sudo = 'sudo'
-        if username == 'root'
-          run_sudo = ''
-        end
-        ssh_into("#{unpack_command} && #{run_sudo} ./bootstrap.sh")
+      unless File.exists?(script)
+        puts "Could not find `#{script}` which is needed to kick-start the machine"
+        return
+      end
+
+      unpack_command = 'true'
+      dir_name = File.basename(Dir.pwd)
+
+      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)
+        ssh_into("tar -zxf #{basename} && cd #{dir_name}")
+      end
+
+      puts 'Bootstrapping the livery'
+      run_sudo = 'sudo'
+      if username == 'root'
+        run_sudo = ''
       end
+      scp_file(script, dir_name)
+      ssh_into("cd #{dir_name} && #{run_sudo} ./#{File.basename(script)}")
     end
 
     def wait_for_sshd

data/lib/blimpy/version.rb

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

data/scripts/freebsd_puppet.sh

@@ -0,0 +1,21 @@
+#!/bin/sh -x
+
+which pkg > /dev/null
+
+if [ $? -ne 0 ]; then
+  echo "pkgng is not installed!"
+  ftp -V ftp://anonymous:ec2@ftp.freebsd.org/pub/FreeBSD/ports/amd64/packages-9-stable/Latest/pkg.tbz
+  pkg_add ./pkg.tbz
+
+  echo "PACKAGESITE : http://pkgbeta.freebsd.org/freebsd-9-amd64/latest/" > /usr/local/etc/pkg.conf
+
+  pkg update -q
+  # Update pkgng itself
+  pkg install -y pkg
+  # Install rsync(1) so we don't have to fall back to tar(1)+scp(1) ever again
+  pkg install -y rsync
+  # Install puppet so we can get that up and running
+  pkg install -y puppet
+fi
+
+puppet apply --modulepath=./modules --verbose manifests/site.pp

data/scripts/linux_puppet.sh

@@ -0,0 +1,19 @@
+#!/bin/sh -x
+
+export PATH=/var/lib/gems/1.8/bin:$PATH
+
+which puppet
+
+if [ $? -ne 0 ]; then
+    apt-get update
+
+    apt-get install -y ruby1.8 \
+                    ruby1.8-dev \
+                    libopenssl-ruby1.8 \
+                    rubygems
+
+    gem install puppet --no-ri --no-rdoc
+fi
+
+
+puppet apply --verbose --modulepath=./modules manifests/site.pp

data/spec/blimpy/box_spec.rb

@@ -141,25 +141,6 @@ describe Blimpy::Box do
           result.should be_instance_of Blimpy::Boxes::AWS
         end
       end
-
-    end
-
-    describe '#bootstrap_livery' 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
-          Dir.should_receive(:pwd).and_return('mock-pwd')
-          subject.should_receive(:run_command) do |*args|
-            args.first.should == 'rsync'
-          end
-          subject.should_receive(:ssh_into)
-          subject.bootstrap_livery
-        end
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000Z
+date: 2012-07-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &7560740 !ruby/object:Gem::Requirement
+  requirement: &13551560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7560740
+  version_requirements: *13551560
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &7559940 !ruby/object:Gem::Requirement
+  requirement: &13550720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7559940
+  version_requirements: *13550720
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &7559080 !ruby/object:Gem::Requirement
+  requirement: &13549340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7559080
+  version_requirements: *13549340
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -81,6 +81,8 @@ files:
 - lib/blimpy/livery.rb
 - lib/blimpy/securitygroups.rb
 - lib/blimpy/version.rb
+- scripts/freebsd_puppet.sh
+- scripts/linux_puppet.sh
 - spec/blimpy/box_spec.rb
 - spec/blimpy/boxes/aws_spec.rb
 - spec/blimpy/boxes/openstack_spec.rb
@@ -106,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -306445518054353312
+      hash: -3611461695599472567
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -306445518054353312
+      hash: -3611461695599472567
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10