scud 0.5.0 → 0.6.0

data/bin/scud

@@ -6,7 +6,7 @@ require 'scud'
 include GLI::App
 
 program_desc <<DESC
-create and terminate VMs in the cloud and bootstrap your favourite CM tool (puppet, chef etc)
+create and bootstrap cloud instances with ease, your way.
 DESC
 
 config_file 'scud/config.yaml'

data/lib/scud.rb

@@ -2,9 +2,8 @@ require 'scud/version'
 require 'scud/provider'
 require 'scud/provisioner/capistrano'
 
-# Add requires for other files you add to your project here, so
-# you just need to require this one file in your bin file
-
+# external deps
+#
 require 'pp'
 require 'fog'
 require 'table_print'

data/lib/scud/provisioner/capistrano.rb

@@ -4,22 +4,30 @@ require 'capistrano/cli'
 module Scud
   module Provisioner
     module Capistrano
-      extend self
 
-      def bootstrap(opts={})
+      def self.bootstrap(opts={})
         config = ::Capistrano::Configuration.new
         config.logger.level = ::Capistrano::Logger::TRACE
-        config.load "#{ENV['HOME']}/scud/bootstrap.rb"
+        bootstrapname = find_bootstrap(opts[:bootstrapname])
+        unless bootstrapname
+          puts "No provisioning tasks found - #{opts[:bootstrapname]}"
+          exit 1
+        end
+        config.load bootstrapname
 
         config.default_run_options[:pty] = true
 
-        #TODO: find better way of parsing options to cap tasks
-        #
         ENV['HOSTS'] = opts[:dns_name]
 
         puts "\nbootstrapping #{ENV['HOSTS']}....."
         config.bootstrap
       end
+
+      private
+
+      def self.find_bootstrap(name)
+        Gem.find_files('**/*.rb').select { |path| path =~ /#{name}\/bootstrap.rb/ }.first
+      end
     end
   end
 end

data/lib/scud/ui/bootstrap_command.rb

@@ -1,6 +1,6 @@
 desc 'bootstrap an instance'
 long_desc '''
-This will run all of the capistrano tasks declared in $HOME/scud/bootstrap.rb
+This will run all of the capistrano tasks declared in $HOME/scud/*/bootstrap.rb
 '''
 command :bootstrap do |c|
 
@@ -8,6 +8,11 @@ command :bootstrap do |c|
   c.long_desc     'What is the name of the instance you wish to bootstrap - eg: ec2-54-253-9-16.ap-southeast-2.compute.amazonaws.com'
   c.flag          :dns_name
 
+  c.desc          'name of the bootstrap task to run'
+  c.long_desc     'What bootstrap task to run - eg: puppetclient, standalone, lamp etc'
+  c.default_value 'basic'
+  c.flag          :bootstrapname
+
   c.desc            'EC2 region'
   c.long_desc       'Which EC2 region ?'
   c.default_value   'ap-southeast-2'

data/lib/scud/ui/create_command.rb

@@ -26,6 +26,7 @@ command :create do |c|
 
   c.desc            'instance name'
   c.long_desc       'Friendly name to display in AWS console'
+  c.default_value   (0...8).map{(65+rand(26)).chr}.join
   c.flag            :name
 
   c.desc            'bootstrap host'
@@ -33,11 +34,16 @@ command :create do |c|
   c.default_value   true
   c.switch          :bootstrap
 
+  c.desc            'name of the bootstrap task to run'
+  c.long_desc       'What bootstrap task to run - eg: puppetclient, standalone, lamp etc'
+  c.default_value   'basic'
+  c.flag            :bootstrapname
+
   c.action do |global_options, options, args|
     opts=global_options.merge(options)
     server = Scud::Provider::EC2.create(opts)
     if opts[:bootstrap]
-      server.wait_for { print '.'; openport?(server.public_ip_address, 22) }
+      server.wait_for(60) { print '.'; openport?(server.public_ip_address, 22) }
       Scud::Provisioner::Capistrano.bootstrap(opts.merge(:dns_name => server.dns_name))
       puts "#{server.dns_name} has been bootstrapped."
     else

data/lib/scud/version.rb

@@ -1,3 +1,3 @@
 module Scud
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/scud.gemspec

@@ -6,7 +6,7 @@ spec = Gem::Specification.new do |s|
   s.version = Scud::VERSION
   s.author = 'Mick Pollard'
   s.email = 'aussielunix@gmail.com'
-  s.homepage = 'http://aussie.lunix.com.au'
+  s.homepage = 'http://aussielunix.github.io/scud/'
   s.platform = Gem::Platform::RUBY
   s.summary = 'scud is for creating, terminating and bootstrapping VMs (cloud instances).'
 # Add your other files here if you make them

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scud
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -148,7 +148,7 @@ files:
 - ext/tasks/puppet.rb
 - ext/bootstrap.rb
 - scud.rdoc
-homepage: http://aussie.lunix.com.au
+homepage: http://aussielunix.github.io/scud/
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3751677803402973259
+      hash: -3999055534572787464
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3751677803402973259
+      hash: -3999055534572787464
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23