yun 0.0.2 → 0.0.3

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/Rakefile

@@ -0,0 +1,4 @@
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')
+
+task :default => :spec

data/lib/yun.rb

@@ -1,2 +1,2 @@
-require 'yun/yun'
-require 'yun/cli'
+require 'yun/model'
+require 'yun/commands/yun_command'

data/lib/yun/commands/command_base.rb

@@ -0,0 +1,20 @@
+require 'thor'
+require 'yun/model/connection'
+
+module Yun
+  module CommandBase
+
+    def connection
+      @connection ||= Connection.new init_data
+    end
+
+    def init_data
+      {
+        :provider => "aws",
+        :aws_access_key_id => Config.aws_access_key_id,
+        :aws_secret_access_key => Config.aws_secret_access_key,
+        :region => Config.region
+      }
+    end
+  end
+end

data/lib/yun/commands/node_command.rb

@@ -1,11 +1,50 @@
-require 'thor'
+require 'hirb'
+require 'yun/commands/command_base'
+require 'yun/config'
 
 module Yun
-  class Node < Thor
+  class NodeCommand < Thor
 
-    desc "list", "list all nodes"
+    include CommandBase
+
+    desc "node list", "list all nodes"
     def list
-      Yun.list
+      node_attributes = connection.list.map do |node|
+        {
+          :id => node.id,
+          :name => node.name,
+          :type => node.instance_type,
+          :image => node.image,
+          :ip => node.ip,
+          :created_at => node.created_at,
+          :state => node.state
+        }
+      end
+      puts Hirb::Helpers::AutoTable.render node_attributes
+    end
+
+    desc "node create NODE_NAME", "create a node"
+    method_option :image, :aliases => "-i", :default => "ami-11d68a54", :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
+      connection.create attributes
+    end
+
+    desc "node destroy NODE_NAME", "destroy a node"
+    def destroy node_name
+      node = connection.find node_name
+      node.destroy
+    end
+
+    private
+    def create_attributes node_name, options
+      {
+        "name" => node_name,
+        :image => options[:image],
+        :instance_type => options[:instance_type],
+        :key_name => Config.key_name
+      }
     end
 
   end

data/lib/yun/commands/yun_command.rb

@@ -0,0 +1,26 @@
+require 'thor'
+require 'thor/group'
+require 'yun/commands/command_base'
+require 'yun/commands/node_command'
+
+module Yun
+  class YunCommand < Thor
+
+    include CommandBase
+
+    desc "ssh NODE_NAME", "ssh to a node"
+    def ssh node_name
+      key = "~/.ssh/#{Config.key_name}.pem"
+      user_name = "ec2-user"
+
+      node = connection.find node_name
+      server_ip = node.ip
+
+      exec "ssh -i #{key} #{user_name}@#{server_ip}"
+    end
+
+    register NodeCommand, :node, "node SUBCOMMAND", "commands for node"
+  end
+end
+
+Yun::YunCommand.start

data/lib/yun/config.rb

@@ -3,24 +3,29 @@ require 'yaml'
 module Yun
   class Config
 
-    def initialize
-      @setting = YAML.load_file(config_file)[:default]
+    def self.aws_access_key_id
+      setting[:aws_access_key_id]
     end
 
-    def config_file
-      @config_file ||= File.expand_path('~/.yun')
+    def self.aws_secret_access_key
+      setting[:aws_secret_access_key]
+    end
+
+    def self.region
+      setting[:region]
     end
 
-    def aws_access_key_id
-      @setting[:aws_access_key_id]
+    def self.key_name
+      setting[:key_name]
     end
 
-    def aws_secret_access_key
-      @setting[:aws_secret_access_key]
+    private
+    def self.setting
+      @setting ||= YAML.load_file(config_file)[:default]
     end
 
-    def region
-      @setting[:region]
+    def self.config_file
+      @config_file ||= File.expand_path('~/.yun')
     end
 
   end

data/lib/yun/model.rb

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

data/lib/yun/model/connection.rb

@@ -0,0 +1,29 @@
+require 'yun/model'
+
+module Yun
+  class Connection
+    def initialize options
+      @servers = Fog::Compute.new(options).servers
+    end
+
+    def create attributes={}
+      fog_attributes = FogAttributes.new attributes
+      server = @servers.create fog_attributes
+      server.wait_for { ready? }
+      Node.new server
+    end
+
+    def list
+      @servers.map do |server|
+        Node.new server
+      end
+    end
+
+    def find node_name
+      list.find do |node|
+        node.name == node_name
+      end
+    end
+
+  end
+end

data/lib/yun/model/fog_attributes.rb

@@ -0,0 +1,40 @@
+module Yun
+  class FogAttributes < Hash
+
+    def initialize attributes
+      convert_basic_attributes attributes
+      convert_tags_attributes attributes
+    end
+
+    private
+    def convert_basic_attributes attributes
+      attributes.each do |key, value|
+        convert key, value
+      end
+    end
+
+    def convert key, value
+      if fog_key_mapping.has_key? key
+        fog_key = fog_key_mapping[key]
+        self[fog_key] = value
+      end
+    end
+
+    def fog_key_mapping
+      {
+        :image => :image_id,
+        :instance_type => :flavor_id,
+        :key_name => :key_name
+      }
+    end
+
+    def convert_tags_attributes attributes
+      tags_key = ["name"]
+      tags_hash = attributes.reject do |key, value|
+        not tags_key.include? key
+      end
+      self[:tags] = tags_hash
+    end
+
+  end
+end

data/lib/yun/model/node.rb

@@ -0,0 +1,46 @@
+module Yun
+  class Node
+
+    def initialize server
+      @server = server
+    end
+
+    def id
+      @server.id
+    end
+
+    def image
+      @server.image_id
+    end
+
+    def instance_type
+      @server.flavor_id
+    end
+
+    def key_name
+      @server.key_name
+    end
+
+    def name
+      @server.tags["name"]
+    end
+
+    def state
+      @server.state
+    end
+
+    def ip
+      @server.public_ip_address
+    end
+
+    def created_at
+      @server.created_at
+    end
+
+    def destroy
+      @server.destroy
+      @server.wait_for { not reload or state == 'terminated' }
+    end
+
+  end
+end

data/lib/yun/version.rb

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

data/spec/spec_helper.rb

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

data/spec/yun/model/connection_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+describe Yun::Connection do
+
+  config = {
+    :provider => 'aws',
+    :aws_access_key_id => 'fake_aws_access_key_id',
+    :aws_secret_access_key => 'fake_secret_access_key',
+    :region => 'us-west-1'
+  }
+
+  before :all do
+    Fog::Compute.new(config).key_pairs.create(:name => 'some_key')
+  end
+
+  after :each do
+    Fog::Compute.new(config).servers.each do |server|
+      server.destroy
+    end
+  end
+
+  context 'create' do
+
+    before :each do
+      @connection = Yun::Connection.new config
+    end
+
+    it 'should create server with default value when no attributes given' do
+      node = @connection.create
+
+      node.instance_type.should == 't1.micro'
+    end
+
+    it 'should make sure the server is running in creation' do
+      node = @connection.create
+
+      node.state.should == 'running'
+    end
+
+    it 'should create server using given attributes' do
+      attributes =
+        {
+          :image => 'test_image_id',
+          :instance_type => 'small_type',
+          :key_name => 'some_key'
+        }
+      node = @connection.create attributes
+
+      node.image.should == 'test_image_id'
+      node.instance_type.should == 'small_type'
+      node.key_name.should == 'some_key'
+    end
+
+    it 'should create server with name' do
+      attributes = { "name" => 'test server' }
+
+      node = @connection.create attributes
+
+      node.name.should == 'test server'
+    end
+
+  end
+
+  context 'list' do
+
+    before :each do
+      @connection = Yun::Connection.new config
+
+      @one_node = @connection.create({ "name" => 'one node' })
+      @other_node = @connection.create({ "name" => 'other node' })
+    end
+
+    it 'should return all the node' do
+      nodes = @connection.list
+
+      nodes.length.should == 2
+      names = nodes.map { |node| node.name }
+      names.sort.should == ['one node', 'other node']
+    end
+
+  end
+
+  context 'find' do
+    before do
+      @connection = Yun::Connection.new config
+      @one_node = @connection.create({ "name" => 'one node' })
+    end
+
+    it 'should find the node by node name' do
+      node = @connection.find 'one node'
+
+      node.name.should == 'one node'
+    end
+  end
+
+end

data/spec/yun/model/fog_attributes_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Yun::FogAttributes do
+
+  it 'should convert attributes to fog attributes hash' do
+    attribute = { :image => 'test_image_id' }
+
+    fog_attr = Yun::FogAttributes.new attribute
+
+    fog_attr[:image_id].should == 'test_image_id'
+  end
+
+  it 'should save name attribute into tags' do
+    attribute = { "name" => 'test name' }
+
+    fog_attr = Yun::FogAttributes.new attribute
+
+    fog_attr[:tags]["name"].should == 'test name'
+  end
+
+end

data/spec/yun/model/node_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe Yun::Node do
+
+  options = {
+    :provider => 'aws',
+    :aws_access_key_id => 'fake_aws_access_key_id',
+    :aws_secret_access_key => 'fake_secret_access_key',
+    :region => 'us-west-1'
+  }
+
+  after :each do
+    Fog::Compute.new(options).servers.each do |server|
+      server.destroy
+    end
+  end
+
+  context 'basic attributes' do
+
+    before do
+      @time = Time.now
+      attributes =
+        {
+          :id => 'id',
+          :image_id => 'some_image',
+          :flavor_id => 'small_type',
+          :key_name => 'some_key',
+          :state => 'running',
+          :public_ip_address => '127.0.0.1',
+          :created_at => @time
+        }
+      @ec2_node = Fog::Compute::AWS::Server.new attributes
+    end
+
+    it 'should convert all the ec2 node attribute' do
+      node = Yun::Node.new @ec2_node
+
+      node.id.should == 'id'
+      node.image.should == 'some_image'
+      node.instance_type.should == 'small_type'
+      node.key_name.should == 'some_key'
+      node.state.should == 'running'
+      node.ip.should == '127.0.0.1'
+      node.created_at == @time
+    end
+
+  end
+
+  context 'node name' do
+
+    before do
+      attributes = { :tags => { "name" => 'test node' } }
+      @ec2_node = Fog::Compute::AWS::Server.new attributes
+    end
+
+    it 'should parse the name in the tags value' do
+      node = Yun::Node.new @ec2_node
+
+      node.name.should == 'test node'
+    end
+
+  end
+
+  context 'destroy' do
+
+    before do
+      @connection = Yun::Connection.new options
+    end
+
+    it 'should destroy ec2 node' do
+      node = @connection.create
+
+      node.destroy
+
+      @connection.list.length.should == 0
+    end
+
+  end
+
+end

data/spec/yun/version_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'yun/version'
+
+describe Yun do
+  it 'should return the version' do
+    Yun::VERSION.should == '0.0.2'
+  end
+end

data/yun.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
   gem.executables  = "yun"
 
   gem.add_runtime_dependency "fog", ">= 1.0.0"
-  gem.add_runtime_dependency 'hirb', '~> 0.4.5'
+  gem.add_runtime_dependency 'hirb', '>= 0.4.5'
   gem.add_runtime_dependency 'thor', '>= 0.14.0'
+
+  gem.add_development_dependency 'rspec', '~> 2.7'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yun
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Feng Zhichao
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-20 00:00:00 Z
+date: 2011-12-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -39,7 +39,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
@@ -65,6 +65,21 @@ dependencies:
         version: 0.14.0
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
+  type: :development
+  version_requirements: *id004
 description: 
 email: 
 - flankerfc@gmail.com
@@ -75,16 +90,27 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- Rakefile
 - bin/yun
 - lib/yun.rb
-- lib/yun/cli.rb
+- lib/yun/commands/command_base.rb
 - lib/yun/commands/node_command.rb
+- lib/yun/commands/yun_command.rb
 - lib/yun/config.rb
+- lib/yun/model.rb
+- lib/yun/model/connection.rb
+- lib/yun/model/fog_attributes.rb
+- lib/yun/model/node.rb
 - lib/yun/version.rb
-- lib/yun/yun.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/version_spec.rb
 - yun.gemspec
 homepage: https://github.com/flanker/yun
 licenses: []

data/lib/yun/cli.rb

@@ -1,12 +0,0 @@
-require 'thor'
-require 'thor/group'
-require 'yun/commands/node_command'
-
-module Yun
-  class CLI < Thor
-
-    register Node, :node, "node", "commands for node"
-  end
-end
-
-Yun::CLI.start

data/lib/yun/yun.rb

@@ -1,32 +0,0 @@
-require 'fog'
-require 'hirb'
-require 'yun/config'
-
-module Yun
-  class Yun
-
-    def self.list
-      config = Config.new
-      options = {:provider => "aws",
-          :aws_access_key_id => config.aws_access_key_id,
-          :aws_secret_access_key => config.aws_secret_access_key,
-          :region => config.region}
-
-      nodes = Fog::Compute.new(options).servers.map do |node|
-        {
-          :id => node.id,
-          :flavor_id => node.flavor_id,
-          :image_id => node.image_id,
-          :address => node.private_ip_address,
-          :created_at => node.created_at,
-          :status => node.state,
-          :instance_type => node.root_device_type
-        }
-      end.sort_by do |node|
-        node[:id] || ""
-      end
-
-      puts Hirb::Helpers::AutoTable.render nodes
-    end
-  end
-end