vagrant-sakura 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed22d90e7ac0a847a3df3114dfb4d3c72f09ed03
-  data.tar.gz: c515ec435d3c2bfec4d73e6c2fb2a9fa49d5405b
+  metadata.gz: 91ae77db719a831bfc178948c26fbe82e7df357a
+  data.tar.gz: b354a3f5f56a44a814ac3465bdef5b566c08c1f4
 SHA512:
-  metadata.gz: d06e0b32afab6b86ae38cbe7a4d85284968a7d03c565de5778eabb7e10d5352446fabf6496905c05032a87caac374a7ab90ea37f2e9033bd4a12e0758cc9fa5f
-  data.tar.gz: 7ea023edc7e7aa70a994e2c9cccd55dfe3855ec40b687b424b2abf0899d904955ec90f37de2167f74a9c84239dd222abb1a9ab3ae33161d99abe3d8aaa85d57f
+  metadata.gz: 5dbc6a375afe6b557a9a20ae23ce293f8888b08c0c2e76523283feee697a8c39708ec728e6e456891de9f0ad29f4d46dfc6f4265a5b8776931530bec85e84687
+  data.tar.gz: 2cc0c550aa9ecf306f90d2f680924b727cb31b5a6f253e138756bf493f052177f414a3180c64639d5a620dd9b842695e05e5030c624854505293dfc5b3325f1b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.0.5 (2014/04/19)
+
+- Fix Vagrant 1.5 compatibility.
+- Update default disk archive.
+
+# 0.0.4 (2013/11/06)
+
+- Support `disk_id` configuration to reuse Disk resource.
+
 # 0.0.3 (2013/10/22)
 
 - Support `provision` command.

data/Gemfile

@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
 
-gemspec
-
 group :development do
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.5.3'
+end
+
+group :plugins do
+  gem "vagrant-sakura", path: "."
 end

data/README.md

@@ -1,5 +1,7 @@
 # Vagrant Sakura Provider
 
+[![Gem Version](https://badge.fury.io/rb/vagrant-sakura.png)](http://badge.fury.io/rb/vagrant-sakura)
+
 この gem は [Vagrant](http://www.vagrantup.com) に
 [さくらのクラウド](http://cloud.sakura.ad.jp)上のサーバを操作する
 機能を追加する provider です。
@@ -9,7 +11,10 @@
 * さくらのクラウド上にサーバを作成できます。
 * サーバに SSH ログインできます。
 * サーバを停止/再開(オフ/オン)できます。
-* provision は動きません。
+* Chef をはじめとする provisioner が動きます。
+
+なお Chef を利用する場合は `vagrant-omnibus` プラグインを使ってサーバ上に
+Chef をインストールしてください。
 
 ## インストール
 

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

@@ -26,6 +26,9 @@ module VagrantPlugins
           end
 
           disks = response["Server"]["Disks"].map { |disk| disk["ID"] }
+          disks.delete_if { |diskid|
+            diskid == env[:machine].provider_config.disk_id.to_s
+          }
           data = { "WithDisk" => disks }
           response = api.delete("/server/#{serverid}", data)
           # error check

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

@@ -13,12 +13,13 @@ module VagrantPlugins
           puts ""
 
           puts "---- Archives ----"
-          puts "%-14s %s" % ["ID", "Name"]
+          puts "%-14s %5s  %s" % ["ID", "Size", "Name"]
           r = api.get("/archive")
           r["Archives"].sort { |a, b|
             a["DisplayOrder"] <=> b["DisplayOrder"]
           }.each { |archive|
-            puts "%-14u %s" % [archive["ID"], archive["Name"]]
+            gb = archive["SizeMB"] / 1024
+            puts "%-14u %3uGB  %s" % [archive["ID"], gb, archive["Name"]]
           }
           puts ""
 

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

@@ -30,39 +30,43 @@ module VagrantPlugins
           env[:ui].info(" -- Disk Source Archive: #{disk_source_archive}")
 
           api = env[:sakura_api]
-          data = {
-            "Disk" => {
-              "Name" => server_name,
-              "Plan" => { "ID" => disk_plan },
-              "Connection" => "virtio",
-              "SourceArchive" => {
-                "ID" => disk_source_archive
-              } 
+
+          if env[:machine].provider_config.disk_id
+            diskid = env[:machine].provider_config.disk_id
+
+          else
+            data = {
+              "Disk" => {
+                "Name" => server_name,
+                "Plan" => { "ID" => disk_plan },
+                "Connection" => "virtio",
+                "SourceArchive" => {
+                  "ID" => disk_source_archive
+                } 
+              }
             }
-          }
-          response = api.post("/disk", data)
-          unless response["Disk"]["ID"]
-            raise 'no Disk ID returned'
-          end
-          diskid = response["Disk"]["ID"]
-          # Disk Created
-
-          while true
-            response = api.get("/disk/#{diskid}")
-            case response["Disk"]["Availability"]
-            when "available"
-              break
-            when "migrating"
-              migrated = response["Disk"]["MigratedMB"]
-              size = response["Disk"]["SizeMB"]
-              env[:ui].info("Disk #{diskid} is migrating (#{migrated}/#{size})")
-            else
-              status = presponse["Disk"]["Availability"]
-              env[:ui].info("Disk #{diskid} is #{status}")
+            response = api.post("/disk", data)
+            unless response["Disk"]["ID"]
+              raise 'no Disk ID returned'
+            end
+            diskid = response["Disk"]["ID"]
+
+            while true
+              response = api.get("/disk/#{diskid}")
+              case response["Disk"]["Availability"]
+              when "available"
+                break
+              when "migrating"
+                migrated = response["Disk"]["MigratedMB"]
+                size = response["Disk"]["SizeMB"]
+                env[:ui].info("Disk #{diskid} is migrating (#{migrated}/#{size})")
+              else
+                status = presponse["Disk"]["Availability"]
+                env[:ui].info("Disk #{diskid} is #{status}")
+              end
+              sleep 3
             end
-            sleep 3
           end
-          # Wait for Disk is available
 
           data = {
             "Server" => {
@@ -80,8 +84,13 @@ module VagrantPlugins
           env[:machine].id = serverid = response["Server"]["ID"]
           # Server Created
 
-          response = api.put("/disk/#{diskid}/to/server/#{serverid}")
-          # Disk mounted to Server
+          begin
+            response = api.put("/disk/#{diskid}/to/server/#{serverid}")
+            # Disk mounted to Server
+          rescue VagrantPlugins::Sakura::Driver::NotFoundError
+            terminate(env)
+            raise
+          end
 
           data = {
             "UserSubnet" => {}

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

@@ -68,10 +68,14 @@ module VagrantPlugins
               "chown #{ssh_info[:username]} '#{guestpath}'")
 
             # Rsync over to the guest path using the SSH info
+            ssharg = "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no"
+            ssharg += Array(ssh_info[:private_key_path]).map { |path|
+              " -i '#{path}'"
+            }.join
             command = [
               "rsync", "--verbose", "--archive", "-z",
               "--exclude", ".vagrant/", "--exclude", "Vagrantfile",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              "-e", ssharg,
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 

data/lib/vagrant-sakura/action.rb

@@ -131,7 +131,7 @@ module VagrantPlugins
 
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
-          b.use HandleBoxUrl
+          b.use HandleBox
           b.use ConfigValidate
           b.use ConnectSakura
           b.use Call, ReadState do |env, b2|

data/lib/vagrant-sakura/command.rb

@@ -1,6 +1,10 @@
 module VagrantPlugins
   module Sakura
     class Command < Vagrant.plugin(2, :command)
+      def self.synopsis
+        "query Sakura for available archives and server plans"
+      end
+
       def execute
         with_target_vms(nil, { :provider => "sakura" }) do |vm|
           vm.action(:list_id)

data/lib/vagrant-sakura/config.rb

@@ -13,6 +13,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :access_token_secret
 
+      # The ID of the disk to be connected to the server.
+      #
+      # @return [Fixnum]
+      attr_accessor :disk_id
+
       # The plan ID of the disk to be connected to the server.
       #
       # @return [Fixnum]
@@ -44,6 +49,7 @@ module VagrantPlugins
       def initialize
         @access_token        = UNSET_VALUE
         @access_token_secret = UNSET_VALUE
+        @disk_id             = UNSET_VALUE
         @disk_plan           = UNSET_VALUE
         @disk_source_archive = UNSET_VALUE
         @server_name         = UNSET_VALUE
@@ -61,12 +67,16 @@ module VagrantPlugins
           @access_token_secret = ENV['SAKURA_ACCESS_TOKEN_SECRET']
         end
 
+        if @disk_id == UNSET_VALUE
+          @disk_id = nil  # create a new disk
+        end
+
         if @disk_plan == UNSET_VALUE
           @disk_plan = 4  # SSD
         end
 
         if @disk_source_archive == UNSET_VALUE
-          @disk_source_archive = 112500182464  # Ubuntu 12.04
+          @disk_source_archive = 112500459149 # Ubuntu Server 12.04.3 LTS 64bit
         end
 
         if @server_name == UNSET_VALUE

data/lib/vagrant-sakura/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Sakura
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
   end
 end

data/vagrant-sakura.gemspec

@@ -17,7 +17,4 @@ Gem::Specification.new do |spec|
   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,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-sakura
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Tomoyuki Sahara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2014-04-19 00:00:00.000000000 Z
+dependencies: []
 description: Enables Vagrant to manage machines in Sakura Cloud.
 email:
 - sahara@surt.net
@@ -45,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE-vagrant-aws.txt
@@ -92,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in Sakura Cloud.