madeira 0.0.1 → 0.2.0

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/bin/madeira

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'gli'
+require 'madeira'
+
+include GLI::App
+
+program_desc <<DESC
+create and terminate VMs in the cloud and bootstrap your favourite CM tool (puppet, chef etc)
+DESC
+
+config_file 'madeira/config.yaml'
+
+commands_from('madeira/ui')
+
+on_error do |exception|
+  # Error logic here
+  # return false to skip default error handling
+  true
+end
+
+exit run(ARGV)

data/ext/bootstrap.rb

@@ -0,0 +1,19 @@
+#FIXME: find better way of setting the paths to the required tasks
+#
+require "#{ENV['HOME']}/madeira/tasks/apt"
+require "#{ENV['HOME']}/madeira/tasks/puppet"
+
+
+set :user, 'ubuntu'
+set :ssh_options, { :forward_agent => true }
+
+#FIXME: how to get madeira ask for sudo password ?
+set :use_sudo, true
+
+ssh_options[:keys] = "~/.ssh/ec2/aws-sydney.pem"
+
+
+task :bootstrap do
+  aptupgrade
+  puppet_client
+end

data/ext/tasks/apt.rb

@@ -0,0 +1,32 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  desc <<-DESC
+    noninteractive apt-get upgrade.
+
+    This task will complete an 'apt-get update' and then an 'apt-get upgrade'
+
+    *WARNING* the following flags are passed to 'apt-get upgrade'
+
+      * DEBIAN_FRONTEND=noninteractive
+      * --yes
+
+    Options:
+
+      HOSTFILTER='fqdn'     # fqdn of host to upgrade
+      ROLES='web'           # group of hosts to upgrade
+      FORCE=true            # add --allow-unauthenticated for unsigned packages
+
+    Examples:
+
+      cap node:aptupgrade HOSTS='foo.example.com'
+      cap node:aptupgrade HOSTFILTER='foo.example.com' FORCE=true
+
+  DESC
+  task :aptupgrade  do
+    run "#{sudo} apt-get update -yq"
+    if ENV['FORCE']
+      run "#{sudo} DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes --allow-unauthenticated"
+    else
+      run "#{sudo} DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes --quiet"
+    end
+  end
+end

data/ext/tasks/puppet.rb

@@ -0,0 +1,32 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  desc 'bootstrap puppet client.'
+  task :puppet_client do
+    #puts "Bootstrapping new Puppet client".green
+    # clean the slate
+    run "#{sudo} aptitude purge -y ~npuppet libaugeas-ruby ~nrubygems"
+    run "#{sudo} rm -rf /etc/puppet"
+    #   
+    # add puppetlabs apt repos
+    filename = "/etc/apt/sources.list.d/puppetlabs.list"
+    run "echo 'deb http://apt.puppetlabs.com/ precise main' | #{sudo} tee #{filename}"
+    run "#{sudo} apt-key adv --keyserver keyserver.ubuntu.com --recv 4BD6EC30"
+    run "#{sudo} apt-get -yq update"
+    #   
+    run "#{sudo} apt-get install -yq ruby ruby1.8 rubygems libaugeas-ruby git"
+    run "#{sudo} apt-get install -yq puppet=2.7.20-1puppetlabs1 puppet-common=2.7.20-1puppetlabs1"
+
+    # Prep puppet.conf so the first Puppet run works.
+        puppet_dot_conf = <<-END.gsub(/^ {8}/, '')
+       [main]
+          logdir=/var/log/puppet
+          vardir=/var/lib/puppet
+          ssldir=/var/lib/puppet/ssl
+          rundir=/var/run/puppet
+          factpath=$vardir/lib/facter
+          templatedir=$confdir/templates
+          pluginsync=true
+        END
+    put puppet_dot_conf, "/tmp/puppet.conf.new"
+    run "#{sudo} cp /tmp/puppet.conf.new /etc/puppet/puppet.conf"
+  end
+end

data/lib/madeira.rb

@@ -1,2 +1,10 @@
-require 'madeira/provisioner'
-require 'madeira/tasks'
+require 'madeira/version'
+require 'madeira/provider'
+require 'madeira/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
+
+require 'pp'
+require 'fog'
+require 'table_print'

data/lib/madeira/provider.rb

@@ -0,0 +1 @@
+require 'madeira/provider/ec2'

data/lib/madeira/provider/ec2.rb

@@ -0,0 +1,62 @@
+module Madeira
+  module Provider
+    module EC2
+      extend self
+
+      # use fog to talk to AWS/ec2
+      #
+      def create(options={})
+        # check all required fog creds are supplied
+        #TODO: #validate_creds(options)
+
+        # connect to ec2
+        #
+        connect(options)
+
+        # create an instance
+        #
+        server = @fog.servers.create(
+          :image_id   => options[:ami],
+          :flavor_id  => options[:size],
+          :key_name   => options[:keypair],
+          :groups     => options[:security],
+          :tags       => { 'Name' => options[:name] }
+        )
+
+        # print progress as dots whilst waiting for it to get online
+        #
+        server.wait_for { print "."; ready? }
+        puts
+        tp server, :id, {:dns_name => {:width => 65}}, :public_ip_address, :private_ip_address, :tags, :flavor_id, :key_name, :security_group_ids
+        server.dns_name
+      end
+
+
+      # terminate an instance
+      # 
+      def terminate(options)
+        # connect to ec2
+        #
+        connect(options)
+
+        instances = @fog.servers.all
+        instance = instances.select {|i| i.dns_name == options[:dns_name] }
+        instance[0].destroy
+      end
+
+      private
+
+      # create connection to AWS
+      # returns @fog object.
+      #
+      def connect(options={})
+        @fog ||= Fog::Compute.new(
+          :provider               => 'aws',
+          :region                 => options[:region],
+          :aws_access_key_id      => options[:aws_access_key_id],
+          :aws_secret_access_key  => options[:aws_secret_access_key]
+        )
+      end
+    end
+  end
+end

data/lib/madeira/provisioner/capistrano.rb

@@ -0,0 +1,25 @@
+require 'capistrano'
+require 'capistrano/cli'
+
+module Madeira
+  module Provisioner
+    module Capistrano
+      extend self
+
+      def bootstrap(opts={})
+        config = ::Capistrano::Configuration.new
+        config.logger.level = ::Capistrano::Logger::TRACE
+        config.load "#{ENV['HOME']}/madeira/bootstrap.rb"
+
+        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
+    end
+  end
+end

data/lib/madeira/ui/bootstrap_command.rb

@@ -0,0 +1,20 @@
+desc 'bootstrap an instance'
+long_desc '''
+This will run all of the capistrano tasks declared in $HOME/madeira/bootstrap.rb
+'''
+command :bootstrap do |c|
+
+  c.desc          'dns_name of instance to bootstrap'
+  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            'EC2 region'
+  c.long_desc       'Which EC2 region ?'
+  c.default_value   'ap-southeast-2'
+  c.flag            :region
+
+  c.action do |global_options, options, args|
+    opts=global_options.merge(options)
+    Madeira::Provisioner::Capistrano.bootstrap(opts)
+  end
+end

data/lib/madeira/ui/create_command.rb

@@ -0,0 +1,48 @@
+desc 'create a new instance'
+command :create do |c|
+
+  c.desc            'ami id to use'
+  c.default_value   'ami-fb8611c1'
+  c.flag            :ami
+
+  c.desc            'keypair to use'
+  c.long_desc       'What keypair to use for connecting to this instance ?'
+  c.default_value   'general'
+  c.flag            :keypair
+
+  c.desc            'security group to apply'
+  c.long_desc       'What securoty group to add to this instance. Currently only one is supported.'
+  c.default_value   'default'
+  c.flag            :security
+
+  c.desc            'size of instance'
+  c.default_value   't1.micro'
+  c.flag            :size
+
+  c.desc            'EC2 region'
+  c.long_desc       'Which EC2 region do you want to bring up an instance in ?'
+  c.default_value   'ap-southeast-2'
+  c.flag            :region
+
+  c.desc            'instance name'
+  c.long_desc       'Friendly name to display in AWS console'
+  c.flag            :name
+
+  c.desc            'bootstrap host'
+  c.long_desc       'whether to bootstrap new instance or not.'
+  c.default_value   true
+  c.switch          :bootstrap
+
+  c.action do |global_options, options, args|
+    opts=global_options.merge(options)
+    dns_name = Madeira::Provider::EC2.create(opts)
+    if opts[:bootstrap]
+      #FIXME: use Fog's server.ready? method before continuing
+      #
+      sleep(20)
+      Madeira::Provisioner::Capistrano.bootstrap(opts.merge(:dns_name => dns_name))
+    else
+      puts "NOT bootstrapping #{dns_name}"
+    end
+  end
+end

data/lib/madeira/ui/global_command.rb

@@ -0,0 +1,10 @@
+# global flags and switches
+#
+desc            'aws access key id'
+flag            :aws_access_key_id
+
+desc            'aws_secret_access_key'
+flag            :aws_secret_access_key
+
+desc              'verbose'
+switch            [:verbose, :v], :negatable => false

data/lib/madeira/ui/terminate_command.rb

@@ -0,0 +1,18 @@
+desc 'terminate an instance'
+command :terminate do |c|
+
+  c.desc            'dns_name of instance to terminate'
+  c.long_desc       'What is the name of the instance you wish to terminate - eg: ec2-54-253-9-16.ap-southeast-2.compute.amazonaws.com'
+  c.flag            :dns_name
+
+  c.desc            'EC2 region'
+  c.long_desc       'Which EC2 region ?'
+  c.default_value   'ap-southeast-2'
+  c.flag            :region
+
+  c.action do |global_options, options, args|
+    opts=global_options.merge(options)
+    #TODO: confirm before terminating (highline)
+    Madeira::Provider::EC2.terminate(opts)
+  end
+end

data/lib/madeira/version.rb

@@ -0,0 +1,3 @@
+module Madeira
+  VERSION = '0.2.0'
+end

data/madeira.gemspec

@@ -0,0 +1,27 @@
+# Ensure we require the local version and not one we might have installed already
+require File.join([File.dirname(__FILE__),'lib','madeira','version.rb'])
+
+spec = Gem::Specification.new do |s|
+  s.name = 'madeira'
+  s.version = Madeira::VERSION
+  s.author = 'Mick Pollard'
+  s.email = 'aussielunix@gmail.com'
+  s.homepage = 'http://aussie.lunix.com.au'
+  s.platform = Gem::Platform::RUBY
+  s.summary = 'madeira is for creating, terminating and bootstrapping VMs (cloud instances).'
+# Add your other files here if you make them
+  s.files = Dir['Gemfile', 'madeira.gemspec', '{bin,lib,ext}/**/**']
+  s.require_paths << 'lib'
+  s.has_rdoc = true
+  s.extra_rdoc_files = ['madeira.rdoc']
+  s.rdoc_options << '--title' << 'madeira' << '--main' << '-ri'
+  s.bindir = 'bin'
+  s.executables << 'madeira'
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rdoc')
+  s.add_development_dependency('aruba')
+  s.add_runtime_dependency('gli','2.5.5')
+  s.add_runtime_dependency('fog','1.10.0')
+  s.add_runtime_dependency('table_print')
+  s.add_runtime_dependency('capistrano')
+end

data/madeira.rdoc

@@ -0,0 +1,134 @@
+== madeira - create and terminate VMs in the cloud and bootstrap your favourite CM tool (puppet, chef etc)
+
+
+=== Global Options
+=== --aws_access_key_id arg
+
+aws access key id
+
+[Default Value] None
+
+
+=== --aws_secret_access_key arg
+
+aws_secret_access_key
+
+[Default Value] None
+
+
+=== --help
+Show this message
+
+
+
+=== --verbose|-v
+verbose
+
+
+
+=== Commands
+==== Command: <tt>bootstrap </tt>
+bootstrap an instance
+
+This will run all of the capistrano tasks declared in $HOME/madeira/bootstrap.rb
+===== Options
+===== --dns_name arg
+
+dns_name of instance to bootstrap
+
+[Default Value] None
+What is the name of the instance you wish to bootstrap - eg: ec2-54-253-9-16.ap-southeast-2.compute.amazonaws.com
+
+===== --region arg
+
+EC2 region
+
+[Default Value] ap-southeast-2
+Which EC2 region ?
+
+==== Command: <tt>create </tt>
+create a new instance
+
+
+===== Options
+===== --ami arg
+
+ami id to use
+
+[Default Value] ami-fb8611c1
+
+
+===== --keypair arg
+
+keypair to use
+
+[Default Value] general
+What keypair to use for connecting to this instance ?
+
+===== --name arg
+
+instance name
+
+[Default Value] None
+Friendly name to display in AWS console
+
+===== --region arg
+
+EC2 region
+
+[Default Value] ap-southeast-2
+Which EC2 region do you want to bring up an instance in ?
+
+===== --security arg
+
+security group to apply
+
+[Default Value] default
+What securoty group to add to this instance. Currently only one is supported.
+
+===== --size arg
+
+size of instance
+
+[Default Value] t1.micro
+
+
+==== Command: <tt>help  command</tt>
+Shows a list of commands or help for one command
+
+Gets help for the application or its commands. Can also list the commands in a way helpful to creating a bash-style completion function
+===== Options
+===== -c
+List commands one per line, to assist with shell completion
+
+
+
+==== Command: <tt>initconfig </tt>
+Initialize the config file using current global options
+
+Initializes a configuration file where you can set default options for command line flags, both globally and on a per-command basis.  These defaults override the built-in defaults and allow you to omit commonly-used command line flags when invoking this program
+===== Options
+===== --[no-]force
+force overwrite of existing config file
+
+
+
+==== Command: <tt>terminate </tt>
+terminate an instance
+
+
+===== Options
+===== --dns_name arg
+
+dns_name of instance to terminate
+
+[Default Value] None
+What is the name of the instance you wish to terminate - eg: ec2-54-253-9-16.ap-southeast-2.compute.amazonaws.com
+
+===== --region arg
+
+EC2 region
+
+[Default Value] ap-southeast-2
+Which EC2 region ?
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madeira
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capistrano
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.21
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.21
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -43,40 +59,127 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: See http://github.com/aussielunix/madeira
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.5
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: table_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 
 email: aussielunix@gmail.com
-executables: []
+executables:
+- madeira
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- madeira.rdoc
 files:
-- README.md
-- Rakefile
+- Gemfile
+- madeira.gemspec
+- bin/madeira
 - lib/madeira.rb
-- lib/madeira/provisioner/ec2.rb
-- lib/madeira/provisioner.rb
-- lib/madeira/tasks.rb
-homepage: http://github.com/aussielunix/madeira
+- lib/madeira/ui/terminate_command.rb
+- lib/madeira/ui/bootstrap_command.rb
+- lib/madeira/ui/global_command.rb
+- lib/madeira/ui/create_command.rb
+- lib/madeira/provisioner/capistrano.rb
+- lib/madeira/provider.rb
+- lib/madeira/provider/ec2.rb
+- lib/madeira/version.rb
+- ext/tasks/apt.rb
+- ext/tasks/puppet.rb
+- ext/bootstrap.rb
+- madeira.rdoc
+homepage: http://aussie.lunix.com.au
 licenses: []
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --title
+- madeira
+- --main
+- -ri
 require_paths:
 - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -649789194035628970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -649789194035628970
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: ec2 appliance building capistrano lib + tasks
+summary: madeira is for creating, terminating and bootstrapping VMs (cloud instances).
 test_files: []

data/README.md

@@ -1,8 +0,0 @@
-# madeira
-
-Capistrano library with some ruby + capistrano tasks for building ec2
-appliances in much the same way vagrant up and vagrant destroy does.
-
-This is a work in progress at this stage.
-.
-

data/Rakefile

@@ -1,6 +0,0 @@
-require 'rake/testtask'
-
-require 'rake/clean'
-require 'bundler'
-Bundler::GemHelper.install_tasks
-

data/lib/madeira/provisioner.rb

@@ -1,7 +0,0 @@
-# load up all the provisioners
-#
-begin
-  require 'madeira/provisioner/ec2'
-rescue
-  puts 'failed to load madeira/provisioner/ec2'
-end

data/lib/madeira/provisioner/ec2.rb

@@ -1,72 +0,0 @@
-require 'fog'
-require 'capistrano'
-
-module Madeira
-  module Provisioner
-    module EC2
-
-      # create a new ec2 instance
-      #
-      def self.create(options={})
-        # connect to ec2
-        #
-        connect(options)
-
-        # create an instance
-        #
-        server = @fog.servers.create(
-          :image_id   => options[:image_id],
-          :flavor_id  => options[:flavor_id],
-          :key_name   => options[:key_name]
-        )
-
-        # print progress as dots whilst waiting for it to get online
-        #
-        server.wait_for { print "."; ready? }
-        puts "instance started as #{server.dns_name}"
-        ec2_address(server.dns_name)
-      end
-
-      # terminate ec2 instance
-      #
-      def self.terminate(options={})
-        # connect to ec2
-        #
-        connect(options)
-
-        if server = @fog.servers.detect{ |s| s.dns_name == ec2_address }
-          puts "Terminating #{server.dns_name}"
-          server.destroy
-        else
-          puts "Appliance not found or not running"
-        end
-      end
-
-      private
-
-      # create connection to AWS
-      # returns @fog object.
-      #
-      def self.connect(options={})
-        @fog ||= Fog::Compute.new(
-          :provider               => options[:provider] || 'AWS',
-          :region                 => options[:region],
-          :aws_access_key_id      => options[:aws_access_key_id],
-          :aws_secret_access_key  => options[:aws_secret_access_key]
-        )
-      end
-
-
-      # write out the ec2 address to a local file
-      #
-      def self.ec2_address(input='get')
-        file = 'ec2.hostname'
-        if input == 'get'
-          (File.read(file) rescue 'NO-SERVER').strip
-        else
-          File.open(file,'w'){|f|f.write(input)}
-        end
-      end
-    end
-  end
-end

data/lib/madeira/tasks.rb

@@ -1,27 +0,0 @@
-Capistrano::Configuration.instance(:must_exist).load do
-  namespace :instance do
-    namespace :ec2 do
-      desc 'provision a new ec2 instance'
-      task :create do
-        server = Madeira::Provisioner::EC2.create(
-          :image_id               => image_id,
-          :flavor_id              => flavor_id,
-          :key_name               => key_name,
-          :region                 => region,
-          :aws_access_key_id      => aws_access_key_id,
-          :aws_secret_access_key  => aws_secret_access_key
-        )
-      end
-
-      desc 'terminate your t1.micro at ec2'
-      task :terminate do
-        Madeira::Provisioner::EC2.terminate(
-          :key_name               => key_name,
-          :region                 => region,
-          :aws_access_key_id      => aws_access_key_id,
-          :aws_secret_access_key  => aws_secret_access_key
-        )
-      end
-    end
-  end
-end