unit-hosting 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f29e14997354c9b0ae59fd98fe0fa9bcf3f0f5ae
-  data.tar.gz: 56d761f0e16aa2530203724c2d5e6c15e6b68043
+  metadata.gz: 98119bd883670b1b0926c70ecedca0a05f895b38
+  data.tar.gz: 3561a6bf65164b4815a141adaa78ccc20bc7faa4
 SHA512:
-  metadata.gz: a5de70ce5fe11cc46a048a86c3ee0f4eff116d3817d24582a9bcbba7f83957b025a3996391e9ff35830a758bb775454418a4bd979d190133ac4624e3800f5d45
-  data.tar.gz: bae38cf9038953002ffe4f8cc0e629fd18d3da8d4c1f05af0a926ba2b91c58bbddd9beac774dfdcf1edf7f1c731ccfc755b15515e34178d44dc56027599d3960
+  metadata.gz: aa306e08ec7432af886974060d2d8682bffdb36f9a5ccf59b1dc898c393074991bada5881e7038a9833b6b9f880a122844c0ac30e12f04b89bd3907da5402b4a
+  data.tar.gz: f3c0cb3920efb4298028bc41b50a094f92e5e3a150a15ee2c7f88265142ee82a870c21a937a0d80887a6f0027361cf1271a484274c2b9e42989aea44935e41d6

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0

data/Gemfile

@@ -1,20 +1,25 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+
 gem 'mutter'
 gem "keystorage", "~> 0.4.13"
-gem 'mechanize'
 gem 'highline', '> 1.6'
 gem 'progressbar', '>= 0.9.0'
 gem 'httpclient', '>= 2.1.6.1'
 gem 'command-line-utils' , '>= 0.0.1'
-# gem 'rdoc'
+gem 'active_support'
+gem 'i18n'
+gem 'nokogiri','~> 1.5.9'
+gem 'mechanize', '2.6.0'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
-  # gem "shoulda", ">= 0"
-  gem "bundler"
   gem "jeweler"
 end
+
+group :development,:test do
+  gem 'simplecov'
+  gem 'coveralls', :require =>false
+  gem "bundler"
+  gem 'rake'
+  gem 'rspec'
+  gem 'webmock'
+end

data/README.md

@@ -1,14 +1,25 @@
-unit-hosting
-=============
-
-This is a command to manage virtual servers on UnitHosting(http://www.unit-hosting.com).
+Unit Hosting support libs for Ruby
+==================================
 
 [![Build Status](https://travis-ci.org/tumf/unit-hosting.png?branch=master)](https://travis-ci.org/tumf/unit-hosting)
+[![Coverage Status](https://coveralls.io/repos/tumf/unit-hosting/badge.png?branch=master)](https://coveralls.io/r/tumf/unit-hosting?branch=master)
+[![Gem Version](https://badge.fury.io/rb/unit-hosting.png)](http://badge.fury.io/rb/unit-hosting)
+[![Code Climate](https://codeclimate.com/github/tumf/unit-hosting.png)](https://codeclimate.com/github/tumf/unit-hosting)
+[![Dependency Status](https://gemnasium.com/tumf/unit-hosting.png)](https://gemnasium.com/tumf/unit-hosting)
+
+
+This is a library and CLI tools to manage virtual servers on [UnitHosting](http://www.unit-hosting.com).
+
+Ruby versions 1.8.7, 1.9.2, 1.9.3, 2.0.0
+
+> **GitHub**
+> https://github.com/tumf/unit-hosting
+
 
 Install
 -------
 
-    sudo gem install unit-hosting
+    [sudo] gem install unit-hosting
  
  > **RubyGems.org**
  > https://rubygems.org/gems/unit-hosting
@@ -16,22 +27,12 @@ Install
 Usage
 -----
 
- unit-hosting [global options] command [command options] args..
+    unit-hosting [global options] command [command options] args..
 
 Global Options
 ---------------
 
 
-Development
------------
-
-MySQLサーバの起動
-
-```
-sudo mysql.server start
-```
-
-
 Commands
 --------
 
@@ -48,6 +49,4 @@ See Also
 Copyright
 ---------
 
-Copyright (c) 2011 Yoshihiro TAKAHARA. See LICENSE.txt for
-further details.
-
+Copyright (c) 2011-2014 Yoshihiro TAKAHARA. See LICENSE.txt for further details.

data/Rakefile

@@ -26,14 +26,6 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-
-
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new("spec")
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/unit-hosting.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'active_support/core_ext'
+require 'i18n'
 
 require "highline/import"
 require "keystorage"
@@ -8,5 +10,3 @@ require 'xmlrpc/client'
 require 'rexml/document'
 require 'openssl'
 
-require 'unit-hosting/agent'
-require 'unit-hosting/commands'

data/lib/unit-hosting/agent.rb

@@ -1,17 +1,18 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require "mechanize"
-
+require "unit-hosting/group"
 module UnitHosting
-  UHURL = "https://cloud.unit-hosting.com"
   class Agent < Mechanize
+    attr_accessor :endpoint
     def initialize
       super
+      @endpoint = "https://cloud.unit-hosting.com"
       max_history = 0
     end
 
     def getr path
-      get(UHURL + path)
+      get(@endpoint + path)
     end
     
     def login id,password

data/lib/unit-hosting/api/base.rb

@@ -8,7 +8,8 @@ module UnitHosting
     end
     module_function :keypath
     class Base
-      attr_reader :instance_id,:api_key;
+      attr_reader :instance_id,:api_key
+      attr_accessor :server
       def initialize(instance_id=nil,api_key=nil)
         @instance_id = instance_id
         @api_key = api_key
@@ -40,7 +41,9 @@ module UnitHosting
       def server_call(method,param = {})
         param["instance_id"] = @instance_id
         param["api_key"] = @api_key
-        return @server.call(method,param)
+        result = @server.call(method,param)
+        # puts @server.http_last_response.body
+        return result
       end
     end
   end

data/lib/unit-hosting/api/vm.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
+require 'active_support/inflector'
 require 'unit-hosting/api/base'
 
 module UnitHosting
@@ -10,36 +11,31 @@ module UnitHosting
         @api_key_elm = '/server/key'
         super
       end
-      def reboot
-        server_call("vm.reboot")
-      end
-      def start
-        server_call("vm.start")
-      end
-      def shutdown
-        server_call("vm.shutdown")
-      end
-      def power_off
-        server_call("vm.powerOff")
-      end
-      def destroy
-        server_call("vm.destroy")
-      end
-      def status?
-        server_call("vm.getStatus")
+
+      def to_api(name)
+        "vm.#{name}"
+      end
+      
+      def method_missing(name, *args)
+        name = name.to_s
+        name = if /(.*)\?$/ =~ name
+                 "get#{$1.camelize}"
+               else
+                 name.camelize(:lower)
+               end
+        if args.blank?
+          server_call(to_api(name))
+        else
+          server_call(to_api(name),*args)
+        end
       end
+
       def memory_unit_size size
         server_call("vm.setMemoryUnitSize",{"size" => size})
       end
       def cpu_unit_num num
         server_call("vm.setCpuUnitNum",{"num" => num})
       end
-      def memory_unit_size?
-        server_call("vm.getMemoryUnitSize")
-      end
-      def cpu_unit_num?
-        server_call("vm.getCpuUnitNum")
-      end
       def ips
         server_call("vm.getIpInfo")
       end
@@ -67,6 +63,12 @@ module UnitHosting
       def get_vm_data(key)
         server_call("vm.getVmData",{"key" =>key})
       end
+      def set_pv_args(val)
+        server_call("vm.setPvArgs",{"pv_args" =>val})
+      end
+      def get_pv_args
+        server_call("vm.getPvArgs")
+      end
     end
   end
 end

data/lib/unit-hosting/api/vm_group.rb

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 require 'unit-hosting/api/base'
 require 'unit-hosting/api/vm'
+require 'unit-hosting/api/vm_recipe'
 
 module UnitHosting
   module Api
@@ -19,6 +20,7 @@ module UnitHosting
         vms.each do |vm|
           return vm["api_key"] if vm["instance_id"] == instance_id
         end
+        nil #missing
       end
       # instance_idに紐づくvmを返す
       def vm(instance_id)

data/lib/unit-hosting/cache.rb

@@ -6,7 +6,26 @@ require 'unit-hosting/group'
 module UnitHosting
   class Cache < PStore
     def groups
-      transaction { |ps| ps["groups"] ||=[] }.extend(Groups)
+      transaction { |ps|
+        ps["groups"] ||= [].extend(UnitHosting::Groups)
+      }
     end
+    
+    def update_all_groups! gs
+      transaction { |ps|
+        ps["groups"] = gs.update
+      }
+    end
+
+    def update_group! group
+      transaction { |ps|
+        groups = ps["groups"].reject { |g|
+          g.instance_id == group.instance_id
+        }
+        groups << group.update
+        ps["groups"] = groups
+      }
+    end
+
   end
 end

data/lib/unit-hosting/cli.rb

@@ -3,6 +3,7 @@
 require 'unit-hosting/commands'
 module UnitHosting
   class CLI < CommandLineUtils::CLI
+    attr_accessor :commands
     def initialize
       super
       @commands = Commands.new

data/lib/unit-hosting/commands.rb

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 #require "rubygems"
 
-require "unit-hosting"
 require "unit-hosting/api"
 require "unit-hosting/agent"
 require "unit-hosting/cache"
@@ -10,41 +9,49 @@ require "unit-hosting/cache"
 
 module UnitHosting
   class Commands < CommandLineUtils::Commands
-    # CommandLineUtils::COMMANDS += 
-    def initialize
-      super
+    class ArgumentError < StandardError;end
+    class LoginError < ArgumentError; end
+    class GroupNotFound < ArgumentError; end
+    # CommandLineUtils::COMMANDS +=
+    attr_accessor :agent, :cache, :keyname
+    def initialize endpoint =nil
+      @keyname = "unit-hosting"
+      @endpoint = endpoint
+      @command_options = []
+      super()
       @commands += ["login","logout","update","groups","group"]
       @agent = Agent.new
-      @cache_file =  ENV['HOME']+"/.unit-hosting.cache"
-      @cache = Cache.new(@cache_file)
+      @agent.endpoint = @endpoint
+      @cache = nil
+    end
 
+    def cache
+      @cache ||= Cache.new(cache_file)
     end
 
     def login
       opt = OptionParser.new
       opt.parse!(@command_options)
-      @summery = "Login to https://cloud.unit-hosting.com ."
+      @summery = "Login to #{@endpoint} ."
       @banner = ""
       return opt if @help
 
-      user = ask('Enter user: ') do |q|
-        q.validate = /\w+/
-      end
-
       ok = false
       while(!ok) 
+        user = ask('Enter user: ') do |q|
+          q.validate = /\w+/
+        end
         password = ask("Enter your password: ") do |q|
           q.validate = /\w+/
           q.echo = false
         end
-
         @agent.login(user,password)
-        if @agent.login? # => OK
+        if @agent.login?
           ok = true
-          Keystorage.set("unit-hosting",user,password)
-          puts "login OK"
+          Keystorage.set(@keyname,user,password)
+          $stderr.puts "login OK"
         else
-          puts "password mismatch"
+          $stderr.puts "password mismatch"
         end
       end
     end
@@ -52,15 +59,14 @@ module UnitHosting
     def logout
       opt = OptionParser.new
       opt.parse!(@command_options)
-      @summery = "Logout from https://cloud.unit-hosting.com ."
+      @summery = "Logout from #{@endpoint} ."
       @banner = ""
       return opt if @help
-      Keystorage.delete("unit-hosting")
+      Keystorage.delete(@keyname)
     end
 
     include UnitHosting::Api
-    def update
-      all = false
+    def update all = false
       opt = OptionParser.new
       opt.on('-a','--all', 'update all cache') { all = true }
       opt.parse!(@command_options)
@@ -69,31 +75,13 @@ module UnitHosting
       return opt if @help
       gid = @command_options.shift
 
-
       start
-      gs = @agent.groups.collect { |g|
-        unless g.key.empty?
-          v = @cache.groups.find{ |c| c.instance_id == g.instance_id }
-          v.update if v and v.vms == nil
-          g.vms = v.vms if v
-          g
-        end
-      }.compact
-      @cache.transaction { |ps|
-        if all
-          ps["groups"] = gs.find_all { |g|
-            !g.key.empty?
-          }.extend(Groups).update
-        else
-          group = ask_group(gid,gs)
-          ps["groups"] = gs.collect{ |g|
-            unless g.key.empty?
-              g.update if g.instance_id == group.instance_id
-              g
-            end
-          }.compact.extend(Groups)
-        end
-      }
+      if all
+        cache.update_all_groups!(@agent.groups)
+      else
+        group = ask_group(gid,cache.groups)
+        cache.update_group!(group)
+      end
     end
 
     def groups
@@ -102,8 +90,7 @@ module UnitHosting
       @summery = "List sever groups."
       @banner = ""
       return opt if @help
-
-      puts @cache.groups.tablize
+      STDOUT.puts cache.groups.try(:tablize)
     end
 
     def group
@@ -114,7 +101,7 @@ module UnitHosting
       return opt if @help
 
       id = @command_options.shift
-      group = ask_group(id,@cache.groups)
+      group = ask_group(id,cache.groups)
       puts group.tablize if group
     end
 
@@ -129,27 +116,30 @@ module UnitHosting
     private
     def start
       return true if @agent.login?
-      user =  Keystorage.list("unit-hosting").shift
+      
+      user = Keystorage.list(@keyname).shift
       login unless user
       if user
-        @agent.login(user,Keystorage.get("unit-hosting",user))
+        @agent.login(user,Keystorage.get(@keyname,user))
         login unless @agent.login?
       end
+      raise LoginError,"Can't start session" unless @agent.login?
     end
-
     def ask_group(id,gs)
       unless id
         puts gs.extend(Groups).tablize
-        id = ask('Enter group id ([q]uit): ',gs.ids << 'q') { |q|
+        id = ask('Enter group id: ',gs.ids) { |q|
           q.validate = /\w+/
           q.readline = true
         }
       end
-      raise SystemExit if id == "q"
       group = gs.find { |g| id == g.instance_id  }
-      raise "Group #{id} is not exists." unless group
+      raise GroupNotFound,"Group #{id} is not exists." unless group
       group
     end
 
+    def cache_file file = ".unit-hosting.cache"
+      File.join ENV['HOME'],file
+    end
   end
 end