vagrant-sakura 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 377e6c397d621d61e1d26700d65ff16974748ca8
-  data.tar.gz: 292136e9093e73295475595801cb10b0bc3faf57
+  metadata.gz: fa036bfb2f34ad5a5927efc3a83b28322ddd64b3
+  data.tar.gz: e40636b2131472717a7a84fa2e588a120354160c
 SHA512:
-  metadata.gz: ca7f44c45103ec2310ed62a1562266bb995cb546e025110c2701c6e9d6424f1ffa39224d0dde213cc558df3f036ea088aca1b1276f271c0631be73cc70abe4e3
-  data.tar.gz: 457d62c6128fff7883166e234f9c07d07ed250ebe50b136f34f2c8546031da79212b1c13d3f9f81072e79faf385d8c452f27079a8c717f9f3f7d07498b2cecc2
+  metadata.gz: bfe40bc2ccd583e3806d1e98d12e04904f0997c0a921a9a32e37fa599dbdc4099a216d24b334071a4508c5e3d7889108e853370dd7b7854be72713f8f67294c5
+  data.tar.gz: 9271eaaafdbc25c4b60587985f43d709498048de14c20b80f0820054d12434ae919c79cef9b5f6ebab700290c5a73b57d03afcfd3ff1fb03bc6485435bb073b7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
-# 0.1.0 (2013/10/07)
+# 0.0.2 (2013/10/08)
+
+- Add `vagrant sakura-list-id` command.
+- Support `zone_id` configuration.
+
+# 0.0.1 (2013/10/07)
 
 - Initial release.

data/README.md

@@ -44,23 +44,35 @@ $ vagrant box add dummy https://github.com/tsahara/vagrant-sakura/raw/master/dum
 Vagrant.configure("2") do |config|
   config.vm.box = "dummy"
   config.ssh.username = "ubuntu"
+  config.ssh.private_key_path = File.expand_path "~/.ssh/id_rsa"
 
   config.vm.provider :sakura do |sakura|
     sakura.access_token = 'YOUR ACCESS TOKEN'
     sakura.access_token_secret = 'YOUR ACCESS TOKEN SECRET'
-    #sakura.sshkey_id = '112500313986'
-    #sakura.disk_source_archive = 112500182464
+    sakura.sshkey_id = 'YOUR PUBLIC KEY ID'
   end
 end
 ```
 
 そして ``vagrant up --provider=sakrua`` を実行してください。
 
+サーバのディスクソースを ``sakura.disk_source_archive`` で指定しなかった
+場合のデフォルトは ``112500182464`` で Ubuntu 12.04.2LTS-server 64bit です。
+このディスクソースのログインアカウントは ``root`` ではないため、
+``config.ssh.username`` で指定してやる必要があります。
+
 なお、さくらのクラウド API を利用するための API キー(ACCESS TOKEN)と
 シークレットトークン(ACCESS TOKEN SECRET)は環境変数
 ``SAKURA_ACCESS_TOKEN`` と ``SAKURA_ACCESS_TOKEN_SECRET``で指定することも
 できます。
 
+## コマンド
+`sakura-list-id` コマンドを使って、`Vagrantfile` で指定するリソース ID
+を調べることができます。
+```
+$ vagrant sakuara-list-id
+...
+```
 
 ## 設定
 
@@ -73,7 +85,7 @@ end
 - ``server_name`` - サーバ名
 - ``server_plan`` - 作成するサーバのプラン ID
 - ``sshkey_id`` - サーバへのログインに利用する SSH 公開鍵のリソース ID
-- ``zone_id`` - は、まだゾーンが石狩第一しかないので指定できません :)
+- ``zone_id`` - ゾーン ID (石狩第1=`is1a`, 石狩第2=`is1b`)
 
 ## ネットワーク
 ``vagrant-sakura`` は ``config.vm.network`` を利用したネットワークの構築を

data/lib/vagrant-sakura/action/connect_sakura.rb

@@ -1,4 +1,3 @@
-require "log4r"
 require 'vagrant-sakura/driver/api'
 
 module VagrantPlugins
@@ -6,14 +5,14 @@ module VagrantPlugins
     module Action
       class ConnectSakura
         def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_sakura::action::connect_sakura")
+          @app = app
         end
 
         def call(env)
           token  = env[:machine].provider_config.access_token
           secret = env[:machine].provider_config.access_token_secret
-          env[:sakura_api] = Driver::API.new(token, secret)
+          zone   = env[:machine].provider_config.zone_id
+          env[:sakura_api] = Driver::API.new(token, secret, zone)
 
           @app.call(env)
         end

data/lib/vagrant-sakura/action/list_id.rb

@@ -0,0 +1,38 @@
+module VagrantPlugins
+  module Sakura
+    module Action
+      class ListId
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          api = env[:sakura_api]
+
+          puts "Zone: %s" % env[:machine].provider_config.zone_id
+          puts ""
+
+          puts "---- Archives ----"
+          puts "%-14s %s" % ["ID", "Name"]
+          r = api.get("/archive")
+          r["Archives"].sort { |a, b|
+            a["DisplayOrder"] <=> b["DisplayOrder"]
+          }.each { |archive|
+            puts "%-14u %s" % [archive["ID"], archive["Name"]]
+          }
+          puts ""
+
+          puts "---- Server Plans ----"
+          puts "%-7s %-70s" % ["ID",  "Name"]
+          r = api.get("/product/server")
+          r["ServerPlans"].each { |plan|
+            puts "%-7u %s" % [plan["ID"], plan["Name"]]
+          }
+          puts ""
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-sakura/action/run_instance.rb

@@ -33,7 +33,6 @@ module VagrantPlugins
           data = {
             "Disk" => {
               "Name" => server_name,
-              "Zone" => { "ID" => 31001 },      # Ishikari only
               "Plan" => { "ID" => disk_plan },
               "Connection" => "virtio",
               "SourceArchive" => {
@@ -68,7 +67,6 @@ module VagrantPlugins
           data = {
             "Server" => {
               "Name" => server_name,
-              "Zone" => { "ID" => 31001 },        # Ishikari
               "ServerPlan" => { "ID" => server_plan },
               "ConnectedSwitches" => [
                 { "Scope" => "shared", "BandWidthMbps" => 100 }

data/lib/vagrant-sakura/action.rb

@@ -35,6 +35,14 @@ module VagrantPlugins
         end
       end
 
+      def self.action_list_id
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectSakura
+          b.use ListId
+        end
+      end
+
 #      def self.action_provision
 #        Vagrant::Action::Builder.new.tap do |b|
 #          b.use ConfigValidate
@@ -143,6 +151,7 @@ module VagrantPlugins
       autoload :DeleteServer, action_root.join("delete_server")
       autoload :IsCreated, action_root.join("is_created")
       autoload :Halt, action_root.join("halt")
+      autoload :ListId, action_root.join("list_id")
       autoload :MessageAlreadyCreated, action_root.join("message_already_created")
       autoload :MessageDown, action_root.join("message_down")
       autoload :MessageNotCreated, action_root.join("message_not_created")

data/lib/vagrant-sakura/command.rb

@@ -2,8 +2,8 @@ module VagrantPlugins
   module Sakura
     class Command < Vagrant.plugin(2, :command)
       def execute
-        with_target_vms do |vm|
-          vm.action(:plans)
+        with_target_vms(nil, { :provider => "sakura" }) do |vm|
+          vm.action(:list_id)
         end
         0
       end

data/lib/vagrant-sakura/config.rb

@@ -38,8 +38,8 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :sshkey_id
 
-      # No Zone ID config - there is only one zone available now :)
-      #attr_accessor :zone_id
+      # The ID of the zone.
+      attr_accessor :zone_id
 
       def initialize
         @access_token        = UNSET_VALUE
@@ -49,6 +49,7 @@ module VagrantPlugins
         @server_name         = UNSET_VALUE
         @server_plan         = UNSET_VALUE
         @sshkey_id           = UNSET_VALUE
+        @zone_id             = UNSET_VALUE
       end
 
       def finalize!
@@ -79,6 +80,10 @@ module VagrantPlugins
         if @sshkey_id == UNSET_VALUE
           @sshkey_id = nil
         end
+
+        if @zone_id == UNSET_VALUE
+          @zone_id = "is1a"  # the first zone
+        end
       end
 
       def validate(machine)

data/lib/vagrant-sakura/driver/api.rb

@@ -1,3 +1,4 @@
+require 'log4r'
 require 'net/https'
 require 'json'
 
@@ -5,15 +6,15 @@ module VagrantPlugins
   module Sakura
     module Driver
       APIHOST   = "secure.sakura.ad.jp"
-      APIPREFIX = "/cloud/api/cloud/1.0"
       CERTFILE = File.expand_path("../cert.pem", __FILE__)
 
       class API
-        def initialize(access_token, access_token_secret)
+        def initialize(access_token, access_token_secret, zone_id)
           @logger = Log4r::Logger.new("vagrant::provider::sakura")
 
           @access_token = access_token
           @access_token_secret = access_token_secret
+          @prefix = "/cloud/zone/#{zone_id}/api/cloud/1.1"
 
           @https = Net::HTTP.new(APIHOST, 443)
           @https.use_ssl = true
@@ -23,25 +24,25 @@ module VagrantPlugins
         end
 
         def delete(resource, data = nil)
-          request = Net::HTTP::Delete.new(APIPREFIX + resource)
+          request = Net::HTTP::Delete.new(@prefix + resource)
           request.body = data.to_json if data
           do_request request
         end
 
         def get(resource, data = nil)
-          request = Net::HTTP::Get.new(APIPREFIX + resource)
+          request = Net::HTTP::Get.new(@prefix + resource)
           request.body = data.to_json if data
           do_request request
         end
 
         def post(resource, data)
-          request = Net::HTTP::Post.new(APIPREFIX + resource)
+          request = Net::HTTP::Post.new(@prefix + resource)
           request.body = data.to_json
           do_request request
         end
 
         def put(resource, data = nil)
-          request = Net::HTTP::Put.new(APIPREFIX + resource)
+          request = Net::HTTP::Put.new(@prefix + resource)
           request.body = if data then data.to_json else '' end
           do_request request
         end
@@ -56,6 +57,8 @@ module VagrantPlugins
           case response.code
           when /2../
             # Success
+          when "400"
+            raise BadRequestError, emsg
           when "404"
             raise NotFoundError, emsg
           when "409"
@@ -69,6 +72,7 @@ module VagrantPlugins
         private :do_request
       end
 
+      class BadRequestError < RuntimeError; end
       class ConflictError < RuntimeError; end
       class GenericError < RuntimeError; end
       class NotFoundError < RuntimeError; end

data/lib/vagrant-sakura/plugin.rb

@@ -23,10 +23,10 @@ module VagrantPlugins
         Provider
       end
 
-#      command(:'sakura-plans') do
-#        require_relative "command"
-#        Command
-#      end
+      command(:'sakura-list-id') do
+        require_relative "command"
+        Command
+      end
 
       def self.setup_i18n
         I18n.load_path << File.expand_path("locales/en.yml", Sakura.source_root)

data/lib/vagrant-sakura/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Sakura
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/vagrant-sakura.gemspec

@@ -0,0 +1,23 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'vagrant-sakura/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "vagrant-sakura"
+  spec.version       = VagrantPlugins::Sakura::VERSION
+  spec.authors       = ["Tomoyuki Sahara"]
+  spec.email         = ["sahara@surt.net"]
+  spec.description   = %q{Enables Vagrant to manage machines in Sakura Cloud.}
+  spec.summary       = %q{Enables Vagrant to manage machines in Sakura Cloud.}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sakura
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tomoyuki Sahara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ files:
 - lib/vagrant-sakura/action/delete_server.rb
 - lib/vagrant-sakura/action/halt.rb
 - lib/vagrant-sakura/action/is_created.rb
+- lib/vagrant-sakura/action/list_id.rb
 - lib/vagrant-sakura/action/message_already_created.rb
 - lib/vagrant-sakura/action/message_down.rb
 - lib/vagrant-sakura/action/message_not_created.rb
@@ -78,6 +79,7 @@ files:
 - lib/vagrant-sakura/provider.rb
 - lib/vagrant-sakura/version.rb
 - locales/en.yml
+- vagrant-sakura.gemspec
 homepage: ''
 licenses:
 - MIT