yun 0.0.5 → 0.0.6

data/.travis.yml

@@ -0,0 +1,3 @@
+nguage: ruby
+rvm:
+  - 1.8.7

data/Gemfile

@@ -1,5 +1,13 @@
 source "http://rubygems.org"
 
+gem 'rake'
 gem 'fog', '>= 1.0.0'
 gem 'hirb'
 gem 'thor'
+
+group :test do
+  gem 'rspec'
+  gem 'mocha'
+  gem 'ruby-debug'
+  gem 'nyan-cat-formatter'
+end

data/Gemfile.lock

@@ -2,25 +2,48 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    excon (0.7.6)
-    fog (1.0.0)
+    columnize (0.3.6)
+    diff-lcs (1.1.3)
+    excon (0.9.6)
+    fog (1.1.2)
       builder
-      excon (~> 0.7.3)
+      excon (~> 0.9.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0.3)
       net-scp (~> 1.0.4)
-      net-ssh (~> 2.1.4)
+      net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.1)
-    hirb (0.5.0)
+    hirb (0.6.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    metaclass (0.0.1)
     mime-types (1.17.2)
-    multi_json (1.0.3)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.0.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.1.4)
-    nokogiri (1.5.0)
+    net-ssh (2.3.0)
+    nokogiri (1.5.2)
+    nyan-cat-formatter (0.0.6)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.9)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     ruby-hmac (0.4.0)
     thor (0.14.6)
 
@@ -30,4 +53,9 @@ PLATFORMS
 DEPENDENCIES
   fog (>= 1.0.0)
   hirb
+  mocha
+  nyan-cat-formatter
+  rake
+  rspec
+  ruby-debug
   thor

data/README.md

@@ -1,5 +1,6 @@
 yun 云
 ======
+[![Build Status](https://secure.travis-ci.org/flanker/yun.png?branch=master)](http://travis-ci.org/flanker/yun)
 
 About
 -----
@@ -25,18 +26,40 @@ How to use
 
 ### config file
 After installing `yun`, you need to create a config file `~/.yun`.
-Basically it should contains:
 
+Here is an example configuration:
+
+    #######################################################
+    # Yun Credentials File
+    #
     :default:
       :aws_access_key_id: YOUR_AWS_ACCESS_KEY_ID
       :aws_secret_access_key: YOUR_AWS_SECRET_ACCESS_KEY
       :region: us-west-1
       :key_name: YOUR_KEY_PAIR_NAME
-      :chef_repo: /PATH/TO/YOUR/CHEF_REPO
+      :chef_repo: /PATH/TO/YOUR/CHEF_REPO (optional)
+      :os:
+        :ubuntu:
+          :image: ami-cba1fe8e
+          :user: ubuntu
+        :amazon:
+          :image: ami-1bd68a5e
+          :user: ec2-user
+        :windows:
+          :image: ami-ed3768a8
+          :user:
+        :centos:
+          :image: ami-dd2f7298
+          :user: root
 
 ### create EC2 node
 
-    yun node create NODE_NAME
+    yun node create NODE_NAME --os OS_NAME --instance_type INSTANCE_TYPE
+
+OS_NAME could be os listed in your `~/.yun` configuration file (`ubuntu`,
+`amazon`, `centos`, etc).
+
+INSTANCE_TYPE could be `micro`, `small`, etc
 
 ### list all EC2 node
 
@@ -60,4 +83,5 @@ Other
 Feel free to contact me if you have any problem:
 
 * flankerfc at Gmail
-* @冯智超 at Sina Weibo
+* [@fengzhichao](https://twitter.com/#!/fengzhichao)
+* [@冯智超](http://www.weibo.com/flankerfc)

data/Rakefile

@@ -1,4 +1,6 @@
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.rspec_opts = '--format NyanCatFormatter'
+end
 
 task :default => :spec

data/lib/yun/command.rb

@@ -2,4 +2,5 @@ require 'thor'
 require 'thor/group'
 require 'yun/commands/command_base'
 require 'yun/commands/node_command'
+require 'yun/commands/image_command'
 require 'yun/commands/yun_command'

data/lib/yun/commands/image_command.rb

@@ -0,0 +1,19 @@
+module Yun
+  class ImageCommand < Thor
+
+    include CommandBase
+
+    desc "image list", "list all available images"
+    def list
+      images = Config.images
+      result = images.keys.map do |key|
+        {
+          "image id" => images[key][:image],
+          "os type" => key,
+          "login user" => images[key][:user]
+        }
+      end
+      puts Hirb::Helpers::AutoTable.render result
+    end
+  end
+end

data/lib/yun/commands/node_command.rb

@@ -27,11 +27,22 @@ module Yun
     method_option :instance_type, :aliases => "-t", :default => "micro", :desc => "Instance Type"
     def create(node_name)
       $stdout.sync = true
+
       attributes = create_attributes node_name, options
+
       print "creating node."
-      connection.create attributes do
+
+      node = connection.create attributes do
         print "."
       end
+
+      print "node #{node_name} created."
+      print "\nwaiting sshd ready."
+
+      node.wait_for_ssh_ready { print "." }
+
+      print "node #{node_name} is ssh ready."
+
       puts "\ndone"
     end
 

data/lib/yun/commands/yun_command.rb

@@ -22,6 +22,7 @@ module Yun
     end
 
     register NodeCommand, :node, "node SUBCOMMAND", "commands for node"
+    register ImageCommand, :image, "image SUBCOMMAND", "commands for image"
 
     private
   end

data/lib/yun/config.rb

@@ -31,6 +31,10 @@ module Yun
       setting[:os][os_name.to_sym][:user]
     end
 
+    def self.images
+      setting[:os]
+    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/command_executor'
 require 'yun/model/instance_type'
 require 'yun/model/connection'
 require 'yun/model/fog_attributes'

data/lib/yun/model/command_executor.rb

@@ -0,0 +1,9 @@
+module Yun
+  class CommandExecutor
+
+    def sys_exec command
+      exec command
+    end
+
+  end
+end

data/lib/yun/model/node.rb

@@ -61,5 +61,14 @@ module Yun
       @server.state == 'terminated'
     end
 
+    def wait_for_ssh_ready &block
+      ssh_config = SshConfig.new user, key_name
+      ssh = Ssh.new ip, ssh_config
+      @server.wait_for do
+        instance_eval(&block) if block_given?
+        ssh.is_ssh_ready?
+      end
+    end
+
   end
 end

data/lib/yun/model/ssh.rb

@@ -4,15 +4,27 @@ require 'net/scp'
 module Yun
   class Ssh
 
+    attr_accessor :executor
+
     def initialize host, ssh_config
       @host = host
       @ssh_config = ssh_config
+      self.executor = Yun::CommandExecutor.new
     end
 
     def connect
       ssh_command = "ssh -i #{key_file} #{user}@#{@host}"
       puts ssh_command
-      exec ssh_command
+      executor.sys_exec ssh_command
+    end
+
+    def is_ssh_ready?
+      tcp_socket = TCPSocket.new(@host, 22)
+      IO.select([tcp_socket], nil, nil, 10)
+    rescue Exception
+      false
+    ensure
+      tcp_socket && tcp_socket.close
     end
 
     def chef role

data/lib/yun/version.rb

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

data/spec/spec_helper.rb

@@ -1,10 +1,11 @@
+require 'rubygems'
 require 'rspec'
 require 'fog'
 require 'yun'
+require 'mocha'
 
 Fog.mock!
 
 RSpec.configure do |config|
   config.color_enabled = true
-  config.formatter     = 'documentation'
 end

data/spec/yun/model/node_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'fog/aws/models/compute/server'
 
 describe Yun::Node do
 
@@ -46,7 +47,7 @@ describe Yun::Node do
 
   end
 
-  context 'node name' do
+  context 'node creation' do
 
     before do
       attributes = { :tags => { "name" => 'test node' } }
@@ -61,7 +62,7 @@ describe Yun::Node do
 
   end
 
-  context 'destroy' do
+  context 'node destroy' do
 
     before do
       @connection = Yun::Connection.new options

data/spec/yun/model/ssh_spec.rb

@@ -3,12 +3,17 @@ require 'spec_helper'
 describe Yun::Ssh do
 
   before do
-    @ssh_config = Yun::SshConfig.new "user", "test_key"
+    ssh_config = Yun::SshConfig.new "user", "test_key"
+    @ssh = Yun::Ssh.new "127.0.0.1", ssh_config
+    @fake_executor = mock 'executor'
+    @ssh.executor = @fake_executor
   end
 
   it 'should execute the correct ssh command' do
-    ssh = Yun::Ssh.new "127.0.0.1", @ssh_config
+    expected_command = "ssh -i ~/.ssh/test_key.pem user@127.0.0.1"
+    @fake_executor.expects(:sys_exec).with(expected_command).returns(true)
 
-    # ssh.connect
+    @ssh.connect.should be_true
   end
+
 end

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.5'
+    Yun::VERSION.should == '0.0.6'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yun
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Feng Zhichao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-08 00:00:00 Z
+date: 2012-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -92,6 +92,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -100,10 +101,12 @@ files:
 - lib/yun.rb
 - lib/yun/command.rb
 - lib/yun/commands/command_base.rb
+- lib/yun/commands/image_command.rb
 - lib/yun/commands/node_command.rb
 - lib/yun/commands/yun_command.rb
 - lib/yun/config.rb
 - lib/yun/model.rb
+- lib/yun/model/command_executor.rb
 - lib/yun/model/connection.rb
 - lib/yun/model/fog_attributes.rb
 - lib/yun/model/instance_type.rb