yun 0.0.3 → 0.0.4

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+tags

data/README.md

@@ -0,0 +1,63 @@
+yun 云
+======
+
+About
+-----
+
+`yun` is a command line tool for manage Amazon EC2 environment.
+
+It's still working in process. Now it supports `create`, `destroy`,
+`list`, `ssh`, `chef provision` commands.
+
+Ruby Gem
+--------
+
+Install `yun` by
+
+    (sudo) gem install yun
+
+You can find `yun` in rubygems.org
+
+    https://rubygems.org/gems/yun
+
+How to use
+----------
+
+### config file
+After installing `yun`, you need to create a config file `~/.yun`.
+Basically it should contains:
+
+    :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
+
+### create EC2 node
+
+    yun node create NODE_NAME
+
+### list all EC2 node
+
+    yun node list
+
+### destroy EC2 node
+
+    yun node destroy NODE_NAME
+
+### ssh to EC2 node
+
+    yun ssh NODE_NAME
+
+### provision EC2 node using chef
+
+    yun chef NODE_NAME ROLE_NAME
+
+Other
+-----
+
+Feel free to contact me if you have any problem:
+
+* flankerfc at Gmail
+* @冯智超 at Sina Weibo

data/lib/yun/command.rb

@@ -0,0 +1,5 @@
+require 'thor'
+require 'thor/group'
+require 'yun/commands/command_base'
+require 'yun/commands/node_command'
+require 'yun/commands/yun_command'

data/lib/yun/commands/node_command.rb

@@ -1,6 +1,4 @@
 require 'hirb'
-require 'yun/commands/command_base'
-require 'yun/config'
 
 module Yun
   class NodeCommand < Thor
@@ -16,7 +14,7 @@ module Yun
           :type => node.instance_type,
           :image => node.image,
           :ip => node.ip,
-          :created_at => node.created_at,
+          :created_at => node.created_at.strftime("%Y-%m-%d %H:%M:%S"),
           :state => node.state
         }
       end
@@ -24,7 +22,7 @@ module Yun
     end
 
     desc "node create NODE_NAME", "create a node"
-    method_option :image, :aliases => "-i", :default => "ami-11d68a54", :desc => "Amazon Machine Image"
+    method_option :image, :aliases => "-i", :default => "ami-2e10406b", :desc => "Amazon Machine Image"
     method_option :instance_type, :aliases => "-t", :default => "t1.micro", :desc => "Instance Type"
     def create(node_name)
       attributes = create_attributes node_name, options

data/lib/yun/commands/yun_command.rb

@@ -1,8 +1,3 @@
-require 'thor'
-require 'thor/group'
-require 'yun/commands/command_base'
-require 'yun/commands/node_command'
-
 module Yun
   class YunCommand < Thor
 
@@ -10,16 +5,25 @@ module Yun
 
     desc "ssh NODE_NAME", "ssh to a node"
     def ssh node_name
-      key = "~/.ssh/#{Config.key_name}.pem"
-      user_name = "ec2-user"
+      ssh_config = SshConfig.new Config.key_name
+      node = connection.find node_name
+      ssh = Ssh.new node.ip, ssh_config
 
+      ssh.connect
+    end
+
+    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
-      server_ip = node.ip
+      ssh = Ssh.new node.ip, ssh_config
 
-      exec "ssh -i #{key} #{user_name}@#{server_ip}"
+      ssh.chef role
     end
 
     register NodeCommand, :node, "node SUBCOMMAND", "commands for node"
+
+    private
   end
 end
 

data/lib/yun/config.rb

@@ -19,6 +19,10 @@ module Yun
       setting[:key_name]
     end
 
+    def self.chef_repo
+      setting[:chef_repo]
+    end
+
     private
     def self.setting
       @setting ||= YAML.load_file(config_file)[:default]

data/lib/yun/model/ssh.rb

@@ -0,0 +1,79 @@
+require 'net/ssh'
+require 'net/scp'
+
+module Yun
+  class Ssh
+
+    def initialize host, ssh_config
+      @host = host
+      @ssh_config = ssh_config
+    end
+
+    def connect
+      exec "ssh -i #{key_file} #{user}@#{@host}"
+    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
+
+        puts "uploading chef repo"
+        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"
+        remote_command ssh, "echo {\\\"run_list\\\":\\\"role[#{role}]\\\"} > /tmp/node.json"
+
+        puts "executing chef"
+        remote_command ssh, "sudo chef-solo -c /tmp/chef-solo.rb -j /tmp/node.json -r /tmp/chef-solo.tar.gz"
+
+        puts "**********"
+        puts "DONE"
+      end
+    end
+
+    private
+    def user
+      @ssh_config.user
+    end
+
+    def key_file
+      @ssh_config.key_file
+    end
+
+    def make_chef_repo_tar chef_repo
+      tmp_tar = "/tmp/chef-solo.tar.gz"
+      Dir.chdir(chef_repo) do
+        system "tar -czvf #{tmp_tar} ./cookbooks ./roles"
+      end
+      tmp_tar
+    end
+
+    def install_chef_file
+      File.expand_path(File.dirname(__FILE__) + '/../templates/install_chef.sh')
+    end
+
+    def chef_config_file
+      File.expand_path(File.dirname(__FILE__) + '/../templates/chef-solo.rb')
+    end
+
+    def remote_command(ssh, command)
+      ssh.open_channel do |channel|
+        channel.exec(command) do |ch, success|
+          raise "command failed: #{command}" unless success
+
+          channel.on_data do |_ch, data|
+            $stdout.print data
+          end
+
+          channel.on_extended_data do |_ch, _type, data|
+            $stderr.print data
+          end
+        end
+      end.wait
+    end
+  end
+end

data/lib/yun/model/ssh_config.rb

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

data/lib/yun/model.rb

@@ -2,3 +2,5 @@ require 'fog'
 require 'yun/model/connection'
 require 'yun/model/fog_attributes'
 require 'yun/model/node'
+require 'yun/model/ssh'
+require 'yun/model/ssh_config'

data/lib/yun/templates/chef-solo.rb

@@ -0,0 +1,3 @@
+file_cache_path "/var/chef-solo"
+cookbook_path "/var/chef-solo/cookbooks"
+role_path "/var/chef-solo/roles"

data/lib/yun/templates/install_chef.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+sudo apt-get update
+sudo apt-get install -y --force-yes ruby ruby-dev libopenssl-ruby rdoc ri irb build-essential wget ssl-cert git-core
+
+if test ! -x /usr/bin/gem; then
+  cd /tmp
+  wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.10.tgz
+  tar zxf rubygems-1.8.10.tgz
+  cd rubygems-1.8.10
+  sudo ruby setup.rb --no-format-executable
+fi
+
+sudo gem install chef --no-ri --no-rdoc

data/lib/yun/version.rb

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

data/lib/yun.rb

@@ -1,2 +1,3 @@
+require 'yun/config'
+require 'yun/command'
 require 'yun/model'
-require 'yun/commands/yun_command'

data/spec/yun/model/ssh_config_spec.rb

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

data/spec/yun/model/ssh_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Yun::Ssh do
+
+  before do
+    @ssh_config = Yun::SshConfig.new "test_key"
+  end
+
+  it 'should execute the correct ssh command' do
+    ssh = Yun::Ssh.new "127.0.0.1", @ssh_config
+
+    # ssh.connect
+  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.2'
+    Yun::VERSION.should == '0.0.4'
   end
 end

data/yun.gemspec

@@ -21,4 +21,15 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'thor', '>= 0.14.0'
 
   gem.add_development_dependency 'rspec', '~> 2.7'
+
+  gem.post_install_message = <<-MSG
+Thanks for installing yun!
+You need put a config file in your home directory: ~/.yun
+: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
+MSG
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yun
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Feng Zhichao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 Z
+date: 2011-12-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -94,9 +94,11 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- README.md
 - Rakefile
 - bin/yun
 - lib/yun.rb
+- lib/yun/command.rb
 - lib/yun/commands/command_base.rb
 - lib/yun/commands/node_command.rb
 - lib/yun/commands/yun_command.rb
@@ -105,17 +107,32 @@ files:
 - lib/yun/model/connection.rb
 - lib/yun/model/fog_attributes.rb
 - lib/yun/model/node.rb
+- lib/yun/model/ssh.rb
+- lib/yun/model/ssh_config.rb
+- lib/yun/templates/chef-solo.rb
+- lib/yun/templates/install_chef.sh
 - lib/yun/version.rb
 - spec/spec_helper.rb
 - spec/yun/model/connection_spec.rb
 - spec/yun/model/fog_attributes_spec.rb
 - spec/yun/model/node_spec.rb
+- spec/yun/model/ssh_config_spec.rb
+- spec/yun/model/ssh_spec.rb
 - spec/yun/version_spec.rb
 - yun.gemspec
 homepage: https://github.com/flanker/yun
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  Thanks for installing yun!
+  You need put a config file in your home directory: ~/.yun
+  :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
+
 rdoc_options: []
 
 require_paths: