yun 0.0.4 → 0.0.5

data/lib/yun/commands/node_command.rb

@@ -1,4 +1,5 @@
 require 'hirb'
+require 'pp'
 
 module Yun
   class NodeCommand < Thor
@@ -12,7 +13,7 @@ module Yun
           :id => node.id,
           :name => node.name,
           :type => node.instance_type,
-          :image => node.image,
+          :os => node.os,
           :ip => node.ip,
           :created_at => node.created_at.strftime("%Y-%m-%d %H:%M:%S"),
           :state => node.state
@@ -22,25 +23,43 @@ module Yun
     end
 
     desc "node create NODE_NAME", "create a node"
-    method_option :image, :aliases => "-i", :default => "ami-2e10406b", :desc => "Amazon Machine Image"
-    method_option :instance_type, :aliases => "-t", :default => "t1.micro", :desc => "Instance Type"
+    method_option :os, :aliases => "-o", :default => "ubuntu", :desc => "OS Name"
+    method_option :instance_type, :aliases => "-t", :default => "micro", :desc => "Instance Type"
     def create(node_name)
+      $stdout.sync = true
       attributes = create_attributes node_name, options
-      connection.create attributes
+      print "creating node."
+      connection.create attributes do
+        print "."
+      end
+      puts "\ndone"
     end
 
     desc "node destroy NODE_NAME", "destroy a node"
     def destroy node_name
+      $stdout.sync = true
+      node = connection.find node_name
+      print "destroy node."
+      node.destroy { print "." }
+      puts "\ndone"
+    end
+
+    desc "node info NODE_NAME", "show a node's info"
+    def info node_name
+      $stdout.sync = true
       node = connection.find node_name
-      node.destroy
+      pp node.all_info
     end
 
     private
     def create_attributes node_name, options
+      os = options[:os]
       {
         "name" => node_name,
-        :image => options[:image],
-        :instance_type => options[:instance_type],
+        "os" => os,
+        "user" => Config.get_user(os),
+        :image => Config.get_image(os),
+        :instance_type => InstanceType.parse(options[:instance_type]),
         :key_name => Config.key_name
       }
     end

data/lib/yun/commands/yun_command.rb

@@ -5,8 +5,8 @@ module Yun
 
     desc "ssh NODE_NAME", "ssh to a node"
     def ssh node_name
-      ssh_config = SshConfig.new Config.key_name
       node = connection.find node_name
+      ssh_config = SshConfig.new node.user, node.key_name
       ssh = Ssh.new node.ip, ssh_config
 
       ssh.connect
@@ -14,8 +14,8 @@ module Yun
 
     desc "test NODE_NAME, ROLE", "provision node with chef"
     def chef node_name, role
-      ssh_config = SshConfig.new Config.key_name
       node = connection.find node_name
+      ssh_config = SshConfig.new node.user, node.key_name
       ssh = Ssh.new node.ip, ssh_config
 
       ssh.chef role

data/lib/yun/config.rb

@@ -23,6 +23,14 @@ module Yun
       setting[:chef_repo]
     end
 
+    def self.get_image os_name
+      setting[:os][os_name.to_sym][:image]
+    end
+
+    def self.get_user os_name
+      setting[:os][os_name.to_sym][:user]
+    end
+
     private
     def self.setting
       @setting ||= YAML.load_file(config_file)[:default]

data/lib/yun/model.rb

@@ -1,4 +1,5 @@
 require 'fog'
+require 'yun/model/instance_type'
 require 'yun/model/connection'
 require 'yun/model/fog_attributes'
 require 'yun/model/node'

data/lib/yun/model/connection.rb

@@ -6,10 +6,13 @@ module Yun
       @servers = Fog::Compute.new(options).servers
     end
 
-    def create attributes={}
+    def create attributes={}, &block
       fog_attributes = FogAttributes.new attributes
       server = @servers.create fog_attributes
-      server.wait_for { ready? }
+      server.wait_for do
+        instance_eval(&block) if block_given?
+        ready?
+      end
       Node.new server
     end
 
@@ -20,9 +23,14 @@ module Yun
     end
 
     def find node_name
-      list.find do |node|
-        node.name == node_name
+      node = list.find do |node|
+        node.name == node_name and not node.is_destroyed?
+      end
+      if node == nil
+        puts "Error: Cannot find node #{node_name}"
+        exit 1
       end
+      node
     end
 
   end

data/lib/yun/model/fog_attributes.rb

@@ -29,7 +29,7 @@ module Yun
     end
 
     def convert_tags_attributes attributes
-      tags_key = ["name"]
+      tags_key = ["name", "os", "user"]
       tags_hash = attributes.reject do |key, value|
         not tags_key.include? key
       end

data/lib/yun/model/instance_type.rb

@@ -0,0 +1,10 @@
+module Yun
+  class InstanceType
+    def self.parse readable_type
+      case readable_type
+        when "micro" then "t1.micro"
+        when "small" then "m1.small"
+      end
+    end
+  end
+end

data/lib/yun/model/node.rb

@@ -25,6 +25,14 @@ module Yun
       @server.tags["name"]
     end
 
+    def os
+      @server.tags["os"]
+    end
+
+    def user
+      @server.tags["user"]
+    end
+
     def state
       @server.state
     end
@@ -37,9 +45,20 @@ module Yun
       @server.created_at
     end
 
-    def destroy
+    def destroy &block
       @server.destroy
-      @server.wait_for { not reload or state == 'terminated' }
+      @server.wait_for do
+        instance_eval(&block) if block_given?
+        not reload or state == 'terminated'
+      end
+    end
+
+    def all_info
+      @server
+    end
+
+    def is_destroyed?
+      @server.state == 'terminated'
     end
 
   end

data/lib/yun/model/ssh.rb

@@ -10,14 +10,13 @@ module Yun
     end
 
     def connect
-      exec "ssh -i #{key_file} #{user}@#{@host}"
+      ssh_command = "ssh -i #{key_file} #{user}@#{@host}"
+      puts ssh_command
+      exec ssh_command
     end
 
     def chef role
       Net::SSH.start(@host, user, :keys => [key_file]) do |ssh|
-        puts "installing chef"
-        remote_command ssh, "bash /tmp/install_chef_file.sh"
-
         puts "packaging chef repo"
         tmp_chef_repo_tar = make_chef_repo_tar Config.chef_repo
 
@@ -25,6 +24,10 @@ module Yun
         ssh.scp.upload! tmp_chef_repo_tar, tmp_chef_repo_tar
         ssh.scp.upload! install_chef_file, "/tmp/install_chef_file.sh"
         ssh.scp.upload! chef_config_file, "/tmp/chef-solo.rb"
+
+        puts "installing chef"
+        remote_command ssh, "bash /tmp/install_chef_file.sh"
+
         remote_command ssh, "echo {\\\"run_list\\\":\\\"role[#{role}]\\\"} > /tmp/node.json"
 
         puts "executing chef"

data/lib/yun/model/ssh_config.rb

@@ -1,17 +1,18 @@
 module Yun
   class SshConfig
 
-    def initialize key_name
+    def initialize user, key_name
+      @user = user
       @key_name = key_name
     end
 
     def user
-      "bitnami"
+      @user
     end
 
     def key_file
       "~/.ssh/#{@key_name}.pem"
     end
-      
+
   end
 end

data/lib/yun/version.rb

@@ -1,3 +1,3 @@
 module Yun
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/yun/model/instance_type_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Yun::InstanceType do
+
+  it 'should parse the human readable name to ec2 instance type' do
+    Yun::InstanceType.parse("micro").should == "t1.micro"
+    Yun::InstanceType.parse("small").should == "m1.small"
+  end
+end
+

data/spec/yun/model/ssh_config_spec.rb

@@ -3,13 +3,14 @@ require 'spec_helper'
 describe Yun::SshConfig do
 
   before do
+    @user = 'some_user'
     @key_name = 'some_key'
   end
 
   it 'should construct from config object' do
-    ssh_config = Yun::SshConfig.new @key_name
+    ssh_config = Yun::SshConfig.new @user, @key_name
 
-    ssh_config.user.should == 'ec2-user'
+    ssh_config.user.should == @user
     ssh_config.key_file.should == '~/.ssh/some_key.pem'
   end
 

data/spec/yun/model/ssh_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Yun::Ssh do
 
   before do
-    @ssh_config = Yun::SshConfig.new "test_key"
+    @ssh_config = Yun::SshConfig.new "user", "test_key"
   end
 
   it 'should execute the correct ssh command' do

data/spec/yun/version_spec.rb

@@ -3,6 +3,6 @@ require 'yun/version'
 
 describe Yun do
   it 'should return the version' do
-    Yun::VERSION.should == '0.0.4'
+    Yun::VERSION.should == '0.0.5'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yun
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Feng Zhichao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-10 00:00:00 Z
+date: 2012-01-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -106,6 +106,7 @@ files:
 - lib/yun/model.rb
 - lib/yun/model/connection.rb
 - lib/yun/model/fog_attributes.rb
+- lib/yun/model/instance_type.rb
 - lib/yun/model/node.rb
 - lib/yun/model/ssh.rb
 - lib/yun/model/ssh_config.rb
@@ -115,6 +116,7 @@ files:
 - spec/spec_helper.rb
 - spec/yun/model/connection_spec.rb
 - spec/yun/model/fog_attributes_spec.rb
+- spec/yun/model/instance_type_spec.rb
 - spec/yun/model/node_spec.rb
 - spec/yun/model/ssh_config_spec.rb
 - spec/yun/model/ssh_spec.rb