virtualmaster 0.0.7 → 0.1.0

data/.gitignore

@@ -1,6 +1,5 @@
 *.gem
 .bundle
-Gemfile.lock
 pkg/*
 vendor/bundle
 vendor/cache

data/Gemfile.lock

@@ -0,0 +1,40 @@
+PATH
+  remote: .
+  specs:
+    virtualmaster (0.1.0)
+      commander (~> 4.1.2)
+      deltacloud-client (~> 0.5.0)
+      net-ssh (~> 2.3.0)
+      terminal-table (~> 1.4.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    commander (4.1.2)
+      highline (~> 1.6.11)
+    deltacloud-client (0.5.0)
+      nokogiri (>= 1.4.3)
+      rest-client (>= 1.6.1)
+    diff-lcs (1.1.3)
+    highline (1.6.11)
+    mime-types (1.18)
+    net-ssh (2.3.0)
+    nokogiri (1.5.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    terminal-table (1.4.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec (~> 2)
+  virtualmaster!

data/README.mdown

@@ -1,6 +1,7 @@
-# VirtualMaster command line interface
+# Virtualmaster command line interface
 
-Proof of concept of VirtualMaster command line interface
+
+Proof of concept of Virtualmaster command line interface
 
     # virtualmaster config
     Running virtualmaster for first time.
@@ -13,13 +14,18 @@ Proof of concept of VirtualMaster command line interface
 
     Settings stored within ~/.virtualmaster
 
-    # virtualmaster create demo1 --image lucid
-    Using image 'lucid' with id (999).
-    Creating 'micro' instance (512 MB memory/5 GB storage).
-    Instance launch request accepted (instance id 44444).
-
+    # virtualmaster create demo1 --image ubuntu_lucid
+    Using image 'ubuntu_lucid' with ID 124
+    Creating 'micro' instance (512 MB memory/10 GB storage)
+    Instance launch request accepted. Instance ID 47135
+    
     Default password 'AdVc:PBi8&7L'.
 
+    Waiting for instance................
+    Instance ready.
+
+    Try to login using `ssh root@80.79.29.246'
+
     # virtualmaster instances
     +-------+---------+----------------+
     | name  | state   | ip_address     |
@@ -33,22 +39,21 @@ The current version of `virtualmaster` command line interface should work with R
 
 ## Automatically install SSH keys
 
-VirtualMaster CLI can install your SSH keys to a remote machine automatically using `--copy-id` switch.
+Virtualmaster CLI can install your SSH keys to a remote machine automatically using `--identity IDENTITY_FILE` command-line option.
 
-
-	virtualmaster create demo1 --image ubuntu_lucid --copy-id 
+	virtualmaster create demo1 --image ubuntu_lucid --identity ~/.ssh/id_rsa
 	Using image 'ubuntu_lucid' with ID 124
 	Creating 'micro' instance (512 MB memory/10 GB storage)
 	Instance launch request accepted. Instance ID 45387
 
 	Default password 'vBK7i!kK'
+
 	Waiting for instance............
-	Loading identity file
+  Instance ready.
+
+	Loading identity file /Users/virtualmaster/.ssh/id_rsa
 
-	Instance ready!
 	Try to login using `ssh root@195.140.253.130'
-	
-If you want to specify other key (ie. not ~/.ssh/id\_rsa) use option `--identity IDENTITY_FILE`.
 
 ## Instance size
 

data/bin/virtualmaster

@@ -12,19 +12,24 @@ end
 
 program :name, "virtualmaster"
 program :version, VirtualMaster::VERSION
-program :description, "VirtualMaster command line interface"
+program :description, "Virtualmaster command line interface"
 program :help_formatter, :compact
 
 default_command :help
 
 VirtualMaster::CLI.run do
-end
+  # load callback
+  callback_files = File.join(File.dirname(__FILE__), "../lib/vmaster/callbacks/*.rb")
+  Dir.glob(callback_files).each do |f|
+    VirtualMaster::Callbacks.load_file(f)
+  end
 
-include Commander::UI
-include Commander::UI::AskForClass
-include Commander::Delegates
+  # TODO find callbacks in other rubygems
 
-$terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 5 rescue 80 if $stdin.tty?
+  # include commands
+  require 'vmaster/config_command'
+  require 'vmaster/server_commands'
+end
 
 Commander::Runner.instance.run!
 

data/lib/vmaster.rb

@@ -4,6 +4,7 @@ require "vmaster/version"
 require "vmaster/helpers"
 require "vmaster/cli"
 require "vmaster/request"
+require "vmaster/callbacks"
 
 require 'commander'
 require 'commander/delegates'
@@ -17,9 +18,3 @@ include Commander::UI::AskForClass
 include Commander::Delegates
 
 $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 5 rescue 80 if $stdin.tty?
-
-
-# include commands
-require 'vmaster/config_command'
-require 'vmaster/server_commands'
-

data/lib/vmaster/callbacks.rb

@@ -0,0 +1,92 @@
+# encoding: utf-8
+
+def callback(name, &block)
+  cb = VirtualMaster::Callbacks::Callback.new(name, &block)
+
+  VirtualMaster::CLI.callbacks << cb
+end
+
+module VirtualMaster
+  module Callbacks
+
+    class Callback
+      attr_reader :name
+
+      def initialize(name, &block)
+        @name = name
+        @blocks = {}
+        @option = nil
+        
+        instance_eval &block
+      end
+
+      def before(event, &block)
+        store_callback(event, :before, &block)
+      end
+
+      def after(event, &block)
+        store_callback(event, :after, &block)
+      end
+
+      # 
+      # command line options provide configuration
+      # 
+      # TODO support for multiple options
+      #
+      def option(name, type, description)
+        @option = {
+          :name => name,
+          :type => type,
+          :description => description
+        }
+      end
+
+      def fire(event, phase, options, server)
+        @blocks[event][phase].call(options, server) if includes?(event, phase) && options[@option[:name]]
+      end
+
+      def to_s
+        @blocks.inspect
+      end
+
+      def has_option?
+        not @option.nil?
+      end
+
+      def to_option
+        arguments = []
+
+        option_name = "--#{@option[:name]}"
+        option_name << " VALUE" if @option[:type]
+
+        arguments << option_name
+        arguments << @option[:type] if @option[:type]
+        arguments << @option[:description]
+      end
+
+    private
+
+      def includes?(event, phase)
+        @blocks.include?(event) && @blocks[event].include?(phase)
+      end
+
+      def store_callback(event, phase, &block)
+        callbacks = @blocks[event] || {}
+
+        callbacks[phase] = block
+
+        @blocks[event] = callbacks
+      end
+    end
+
+    def self.load_file(file)
+      load file
+    end
+
+    def self.trigger_event(event, phase, options, server = {})
+      CLI.callbacks.each do |callback|
+        callback.fire(event, phase, options, server)
+      end
+    end
+  end
+end

data/lib/vmaster/callbacks/demo_callback.rb

@@ -0,0 +1,16 @@
+#
+# Demo callback
+#
+
+callback :demo do
+  option :demo, nil, 'Value to print'
+
+  after :create do |options, server|
+    puts "Hello world"
+  end
+
+  after :shutdown do 
+    puts "That's all folks!"
+  end
+end
+

data/lib/vmaster/callbacks/ssh_keys_callback.rb

@@ -0,0 +1,36 @@
+#
+# SSH keys callback
+# 
+
+require 'net/ssh'
+require 'base64'
+require 'openssl'
+
+callback :ssh_copy_id do
+  option :identity, String, 'Identity file which is going to be copied to target machine'
+
+  before :create do |options|
+    # FIXME requires support for optional values
+    options[:identity] ||= File.join(ENV['HOME'], '.ssh/id_rsa')
+
+    abort "Specified identity file #{options[:identity]} doesn't exist!" unless File.exist?(options[:identity])
+  end
+
+  after :create do |options, server|
+    authorized_key = nil
+
+    say "Loading identity file #{options[:identity]}\n"
+    key = OpenSSL::PKey::RSA.new File.read options[:identity]
+
+    # build authorized key output string
+    authtype = key.class.to_s.split('::').last.downcase
+    b64pub = ::Base64.encode64(key.to_blob).strip.gsub(/[\r\n]/, '')
+    authorized_key = "ssh-%s %s\n" % [authtype, b64pub]  # => ssh-rsa AAAAB3NzaC1...=
+
+    Net::SSH.start(server.public_addresses.first[:address], 'root', :password => options[:password]) do |ssh|
+      # TODO exception handling
+      output = ssh.exec!("mkdir ~/.ssh")
+      output = ssh.exec!("echo '#{authorized_key}' >>~/.ssh/authorized_keys")
+    end
+  end
+end

data/lib/vmaster/cli.rb

@@ -5,6 +5,7 @@ module VirtualMaster
   class CLI
     @@api = nil
     @@config = nil
+    @@callbacks = []
 
     def self.run
       # load config
@@ -39,5 +40,10 @@ module VirtualMaster
     def self.config
       @@config
     end
+
+    def self.callbacks
+      @@callbacks
+    end
   end
 end
+

data/lib/vmaster/server_commands.rb

@@ -12,24 +12,32 @@ log.level = Logger::WARN
 
 command :create do |c|
   c.description = "Launch new server instance"
+
   c.option '--image TEMPLATE', String, 'instance template to use'
   c.option '--profile PROFILE', String, 'instance hardware profile'
-  c.option '--copy-id', 'install public key on a machine'
-  c.option '--identity IDENTITY', String, 'SSH identity to use (with --copy-id)'
   c.option '--zone ZONE', String, 'Availability zone to launch instance i'
   c.option '--level LEVEL', String, 'Instance level to use (personal, production)'
-  c.option '--wait', 'wait for instance to become operational'
+  c.option '--detached', 'Do not wait for instance to become operational (disables callbacks)'
+
+  # generate options for callbacks
+  VirtualMaster::CLI.callbacks.each do |cb|
+    c.send :option, *(cb.to_option)
+  end
+
   c.action do |args, options|
     # default values
-    options.default :identity => File.join(ENV['HOME'], '.ssh/id_rsa')
     options.default :zone => "prague-l1"
     options.default :level => "personal"
+    options.default :interactive => true
 
     name = args.shift || abort('Server name required')
 
     # verify server name
     abort("Virtual server with name #{name} already exists!") if VirtualMaster::Helpers.get_instance(name)
 
+    # support for non-interactive mode
+    options.interactive = false if options.detached
+
     # image 
     image_name = nil
     image_id = VirtualMaster::CLI.config[:default_image] || VirtualHost::DEFAULT_IMAGE
@@ -66,11 +74,14 @@ command :create do |c|
     hwp = VirtualMaster::Helpers.get_hw_profile(profile[:memory], profile[:storage])
     abort "Internal error: hardware profile not available" unless hwp
 
+    # before :create callbacks
+    VirtualMaster::Callbacks.trigger_event(:create, :before, options.__hash__, nil)
+
     say "Creating '#{profile_name}' instance (#{profile[:memory]} MB memory/#{profile[:storage]/1024} GB storage)"
     
     realm = "#{options.zone}-#{options.level}"
     
-    instance = VirtualMaster::Helpers.create_instance(name, image_id, hwp.id, realm)
+    instance = VirtualMaster::Helpers.create_instance(name, image_id, hwp.id, realm) if options.interactive
 
     # TODO handle exceptions (invalid image/profile, limits, etc.)
 
@@ -78,11 +89,14 @@ command :create do |c|
 
     # FIXME authentication is missrepresented within Ruby object
     password = instance.authentication[:username]
-    say "\n"
+    puts
     say "Default password '#{password}'"
+    puts
+
+    options.password = password
 
     # copy-id implies waiting for instance to become operational
-    if options.wait || options.copy_id
+    if options.interactive
       print 'Waiting for instance'
 
       while (instance = VirtualMaster::Helpers.get_instance(name)).state != "RUNNING" do
@@ -92,30 +106,12 @@ command :create do |c|
       end
       
       puts
+      puts "Instance ready."
+
+      # TODO consistent naming (instance vs server)
+      VirtualMaster::Callbacks.trigger_event(:create, :after, options.__hash__, instance)
 
-      # copy ssh id
-      if options.copy_id
-        authorized_key = nil
-
-        abort "Specified identity file #{options.identity} doesn't exists!" unless File.exist?(options.identity)
-        
-        say "Loading identity file\n"
-        key = OpenSSL::PKey::RSA.new File.read options.identity
-        
-        # build authorized key output string
-        authtype = key.class.to_s.split('::').last.downcase
-        b64pub = ::Base64.encode64(key.to_blob).strip.gsub(/[\r\n]/, '')
-        authorized_key = "ssh-%s %s\n" % [authtype, b64pub]  # => ssh-rsa AAAAB3NzaC1...=
-        
-        Net::SSH.start(instance.public_addresses.first[:address], 'root', :password => password) do |ssh|
-          # TODO exception handling
-          output = ssh.exec!("mkdir ~/.ssh")
-          output = ssh.exec!("echo '#{authorized_key}' >>~/.ssh/authorized_keys")
-        end
-      end
-      
       puts
-      puts "Instance ready!"
       puts "Try to login using `ssh root@#{instance.public_addresses.first[:address]}'"      
     end
   end

data/lib/vmaster/version.rb

@@ -1,3 +1,3 @@
 module VirtualMaster
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'vmaster'
 
 program :name, "virtualmaster"
 program :version, VirtualMaster::VERSION
-program :description, "VirtualMaster command line interface"
+program :description, "Virtualmaster command line interface"
 program :help_formatter, :compact
 
 default_command :test

data/virtualmaster.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Radim Marek"]
   s.email       = ["radim@laststation.net"]
   s.homepage    = "https://github.com/virtualmaster/virtualmaster-cli"
-  s.summary     = %q{Command line interface to VirtualMaster}
-  s.description = %q{Command line interface to VirtualMaster. Control your virtual infrastructure.}
+  s.summary     = %q{Command line interface to Virtualmaster}
+  s.description = %q{Command line interface to Virtualmaster. Control your virtual infrastructure.}
 
   s.rubyforge_project = "vmaster"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtualmaster
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70327968586800 !ruby/object:Gem::Requirement
+  requirement: &70096844415120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70327968586800
+  version_requirements: *70096844415120
 - !ruby/object:Gem::Dependency
   name: deltacloud-client
-  requirement: &70327968586300 !ruby/object:Gem::Requirement
+  requirement: &70096844414580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70327968586300
+  version_requirements: *70096844414580
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70327967699220 !ruby/object:Gem::Requirement
+  requirement: &70096844414100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70327967699220
+  version_requirements: *70096844414100
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70327967698520 !ruby/object:Gem::Requirement
+  requirement: &70096844413440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70327967698520
+  version_requirements: *70096844413440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70327967697440 !ruby/object:Gem::Requirement
+  requirement: &70096844412820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,8 +65,8 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70327967697440
-description: Command line interface to VirtualMaster. Control your virtual infrastructure.
+  version_requirements: *70096844412820
+description: Command line interface to Virtualmaster. Control your virtual infrastructure.
 email:
 - radim@laststation.net
 executables:
@@ -76,10 +76,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - README.mdown
 - Rakefile
 - bin/virtualmaster
 - lib/vmaster.rb
+- lib/vmaster/callbacks.rb
+- lib/vmaster/callbacks/demo_callback.rb
+- lib/vmaster/callbacks/ssh_keys_callback.rb
 - lib/vmaster/cli.rb
 - lib/vmaster/config_command.rb
 - lib/vmaster/helpers.rb
@@ -112,7 +116,7 @@ rubyforge_project: vmaster
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Command line interface to VirtualMaster
+summary: Command line interface to Virtualmaster
 test_files:
 - spec/commands_spec.rb
 - spec/spec_helper.rb