vagrant-conoha 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3b670188cfada0827be286002ddc75a75af43be
-  data.tar.gz: 42359eb660971fa2f1de755fbeb09e68c15e4f96
+  metadata.gz: 1f9e567b352ad7363774274cbea6550bbf01c1dc
+  data.tar.gz: 8c691159e46f9782317a64153f4b48f58e0bd3c6
 SHA512:
-  metadata.gz: dc3e08728010426fe4799fc9559102a01d27a2864825864e11647a0805c7152eafee86d94bc52f0ebe07ad2104b71635ec0955d56e3e4dac6dcee5a292e59004
-  data.tar.gz: a20ab6ddd2140894a9a0d5b92433cae7c056b33924db199a6bb7ada08374cafe0165d320f20bc0886029abcc5a254aff97341fa64ca808eb115d09730a4d93eb
+  metadata.gz: c5fd61edd482dca4ca1df193b44791ef3b65eb8ab9741c2edad453eda19761a9e313746e286e0d9577a6150f98301032313fe819e65053c5570e9288f264a8d6
+  data.tar.gz: 4c81e34573458debc06ea34d77325717a272b83bad161bf63a736c9bde6b1c53907e132cdc4091057ef485dbb4a15f4da1694e0b367d50c4fc48cdf31dfcb1f2

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   Exclude:
+    - '.bundle/**/*'
     - 'out/**/*'
     - '**/Vagrantfile'
 
@@ -12,6 +13,9 @@ Style/Encoding:
 Style/Documentation:
   Enabled: false
 
+Style/ClassVars:
+  Enabled: false
+
 Metrics/ClassLength:
   Max: 300
 

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.1.6
+ - upstream(0.7.2)に追従した
+
+# 0.1.5
+ - テストがコケていたのを修正
+
+# 0.1.4
+ - sync_folders: rsyncが無い場合は自動でインストールするようにした
+
+# 0.1.3
+  - fix #1
+
 # 0.1.1 (August 26, 2015)
   - VPSのrootパスワードを設定できるようにした(APIのAdminPassパラメータに対応)
 

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.6.5'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.1'
   gem 'appraisal', '1.0.0'
   gem 'rubocop', '0.29.0', require: false
   gem 'coveralls', require: false

data/Vagrantfile

@@ -20,6 +20,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # vagrantがSSH接続する際のユーザ名を指定します。
   config.ssh.username = 'root'
 
+  # CentOS系など/etc/sudoersにrequirettyが書いてある場合に必要になります。
+  config.ssh.pty      = true
+
   config.vm.provider :conoha do |conoha|
 
     # IdentityEndpointを指定します

data/functional_tests/Vagrantfile

@@ -4,6 +4,7 @@ Vagrant.configure('2') do |config|
 
   config.vm.box = 'openstack'
   config.vm.box_url = 'https://github.com/ggiamarchi/vagrant-openstack/raw/master/source/dummy.box'
+  config.vm.boot_timeout = ENV['OS_SSH_TIMEOUT'].to_i
 
   config.ssh.private_key_path = ENV['OS_KEYPAIR_PRIVATE_KEY']
   config.ssh.pty = true
@@ -16,7 +17,6 @@ Vagrant.configure('2') do |config|
     os.openstack_compute_url  = ENV['OS_COMPUTE_URL']
     os.openstack_network_url  = ENV['OS_NETWORK_URL']
     os.tenant_name            = ENV['OS_TENANT_NAME']
-    os.ssh_timeout            = ENV['OS_SSH_TIMEOUT'].to_i
     os.sync_method            = ENV['OS_SYNC_METHOD']
     os.flavor                 = ENV['OS_FLAVOR']
     os.image                  = ENV['OS_IMAGE']

data/lib/vagrant-conoha/action.rb

@@ -17,6 +17,7 @@ module VagrantPlugins
             if env[:machine_state_id] == :not_created
               b2.use Message, I18n.t('vagrant_openstack.not_created')
             else
+              b2.use(ProvisionerCleanup, :before)
               b2.use DeleteServer
               b2.use DeleteStack
             end
@@ -33,7 +34,11 @@ module VagrantPlugins
             if env[:machine_state_id] == :not_created
               b2.use Message, I18n.t('vagrant_openstack.not_created')
             else
-              b2.use ProvisionWrapper
+              if env[:machine].provider_config.meta_args_support
+                b2.use ProvisionWrapper
+              else
+                b2.use Provision
+              end
               b2.use SyncFolders
             end
           end
@@ -99,12 +104,27 @@ module VagrantPlugins
             case env[:machine_state_id]
             when :not_created
               ssh_disabled = env[:machine].provider_config.ssh_disabled
-              b2.use ProvisionWrapper unless ssh_disabled
+              unless ssh_disabled
+                if env[:machine].provider_config.meta_args_support
+                  b2.use ProvisionWrapper
+                else
+                  b2.use Provision
+                end
+              end
               b2.use SyncFolders
               b2.use CreateStack
               b2.use CreateServer
               b2.use Message, I18n.t('vagrant_openstack.ssh_disabled_provisioning') if ssh_disabled
-              b2.use WaitForServerToBeAccessible unless ssh_disabled
+              unless ssh_disabled
+                # Handle legacy ssh_timeout option
+                timeout = env[:machine].provider_config.ssh_timeout
+                unless timeout.nil?
+                  env[:machine].ui.warn I18n.t('vagrant_openstack.config.ssh_timeout_deprecated')
+                  env[:machine].config.vm.boot_timeout = timeout
+                end
+
+                b2.use WaitForCommunicator
+              end
             when :shutoff
               b2.use StartServer
             when :suspended
@@ -215,7 +235,6 @@ module VagrantPlugins
       autoload :ProvisionWrapper, action_root.join('provision')
       autoload :WaitForServerToStop, action_root.join('wait_stop')
       autoload :WaitForServerToBeActive, action_root.join('wait_active')
-      autoload :WaitForServerToBeAccessible, action_root.join('wait_accessible')
 
       private
 

data/lib/vagrant-conoha/action/create_stack.rb

@@ -13,12 +13,19 @@ module VagrantPlugins
   module ConoHa
     module Action
       class CreateStack < AbstractAction
+        @@is_created = false
+
         def initialize(app, _env)
           @app = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::create_stack')
         end
 
         def execute(env)
+          if @@is_created
+            @app.call(env)
+            return
+          end
+
           @logger.info 'Start create stacks action'
 
           config = env[:machine].provider_config
@@ -43,6 +50,7 @@ module VagrantPlugins
             waiting_for_stack_to_be_created(env, stack[:name], stack_id)
           end unless config.stacks.nil?
 
+          @@is_created = true
           @app.call(env)
         end
 

data/lib/vagrant-conoha/action/delete_stack.rb

@@ -26,7 +26,7 @@ module VagrantPlugins
           list_stack_files(env).each do |stack|
             env[:ui].info(I18n.t('vagrant_openstack.delete_stack'))
             env[:ui].info(" -- Stack Name : #{stack[:name]}")
-            env[:ui].info(" -- Stack Id   : #{stack[:id]}")
+            env[:ui].info(" -- Stack ID   : #{stack[:id]}")
 
             heat.delete_stack(env, stack[:name], stack[:id])
 

data/lib/vagrant-conoha/action/provision.rb

@@ -31,7 +31,7 @@ module VagrantPlugins
         end
 
         def run_provisioner(env)
-          if env[:provisioner].class == VagrantPlugins::Shell::Provisioner
+          if env[:provisioner].is_a?(Vagrant.plugin('2').manager.provisioners[:shell])
             handle_shell_meta_args(env)
           end
           env[:provisioner].provision

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

@@ -83,6 +83,15 @@ module VagrantPlugins
               incls << incl
             end
 
+            # Create ssh params for rsync
+            # we need them as one string because rsync -e expects one string
+            ssh_params = [
+              "ssh -p #{ssh_info[:port]}",
+              '-o StrictHostKeyChecking=no',
+              '-o UserKnownHostsFile=/dev/null',
+              '-o IdentitiesOnly=yes',
+              "#{ssh_key_options(ssh_info)}"].join(' ')
+
             # Rsync over to the guest path using the SSH info. add
             # .hg/ and .git/ to exclude list as that isn't covered in
             # --cvs-exclude
@@ -93,7 +102,7 @@ module VagrantPlugins
               '--exclude', '.git/',
               '--chmod', 'ugo=rwX',
               *includes,
-              '-e', "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options(ssh_info)}",
+              '-e', ssh_params,
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
             command.compact!

data/lib/vagrant-conoha/command/flavor_list.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
           flavors.each do |f|
             rows << [f.id, f.name, f.vcpus, f.ram, f.disk]
           end
-          display_table(env, ['Id', 'Name', 'vCPU', 'RAM (Mo)', 'Disk size (Go)'], rows)
+          display_table(env, ['ID', 'Name', 'vCPU', 'RAM (Mo)', 'Disk size (Go)'], rows)
         end
       end
     end

data/lib/vagrant-conoha/command/floatingip_list.rb

@@ -0,0 +1,32 @@
+require 'vagrant-conoha/command/openstack_command'
+
+module VagrantPlugins
+  module ConoHa
+    module Command
+      class FloatingIpList < OpenstackCommand
+        def self.synopsis
+          I18n.t('vagrant_openstack.command.flaotingip_list_synopsis')
+        end
+
+        def cmd(name, argv, env)
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
+
+          floating_ip_pools = env[:openstack_client].nova.get_floating_ip_pools(env)
+          floating_ips = env[:openstack_client].nova.get_floating_ips(env)
+
+          rows = []
+          floating_ip_pools.each do |floating_ip_pool|
+            rows << [floating_ip_pool['name']]
+          end
+          display_table(env, ['Floating IP pools'], rows)
+
+          rows = []
+          floating_ips.each do |floating_ip|
+            rows << [floating_ip['id'], floating_ip['ip'], floating_ip['pool'], floating_ip['instance_id']]
+          end
+          display_table(env, ['ID', 'IP', 'Pool', 'Instance ID'], rows)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-conoha/command/image_list.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
         def cmd(name, argv, env)
           fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
           rows = []
-          headers = %w(Id Name)
+          headers = %w(ID Name)
           if env[:openstack_client].session.endpoints.key? :image
             images = env[:openstack_client].glance.get_all_images(env)
             images.each { |i| rows << [i.id, i.name, i.visibility, i.size.to_i / 1024 / 1024, i.min_ram, i.min_disk] }

data/lib/vagrant-conoha/command/subnet_list.rb

@@ -14,7 +14,7 @@ module VagrantPlugins
           env[:openstack_client].neutron.get_subnets(env).each do |subnet|
             rows << [subnet.id, subnet.name, subnet.cidr, subnet.enable_dhcp, subnet.network_id]
           end
-          display_table(env, ['Id', 'Name', 'CIDR', 'DHCP', 'Network Id'], rows)
+          display_table(env, ['ID', 'Name', 'CIDR', 'DHCP', 'Network ID'], rows)
         end
       end
     end

data/lib/vagrant-conoha/command/utils.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
           items.each do |item|
             rows << [item.id, item.name]
           end
-          display_table(env, %w(Id Name), rows)
+          display_table(env, %w(ID Name), rows)
         end
 
         def display_table(env, headers, rows)

data/lib/vagrant-conoha/command/volume_list.rb

@@ -17,7 +17,7 @@ module VagrantPlugins
             attachment = "#{v.instance_id} (#{v.device})" unless v.instance_id.nil?
             rows << [v.id, v.name, v.size, v.status, attachment]
           end
-          display_table(env, ['Id', 'Name', 'Size (Go)', 'Status', 'Attachment (instance id and device)'], rows)
+          display_table(env, ['ID', 'Name', 'Size (Go)', 'Status', 'Attachment (instance ID and device)'], rows)
         end
       end
     end

data/lib/vagrant-conoha/config.rb

@@ -78,8 +78,9 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :ssh_username
 
-      # The SSH timeout use after server creation. If server startup is too long
-      # the timeout value can be increase with this variable. Default is 60 seconds
+      # The SSH timeout use after server creation.
+      #
+      # Deprecated. Use config.vm.boot_timeout instead.
       #
       # @return [Integer]
       attr_accessor :ssh_timeout
@@ -199,6 +200,10 @@ module VagrantPlugins
       # @return [HttpConfig]
       attr_accessor :http
 
+      #
+      # @return [Boolean]
+      attr_accessor :meta_args_support
+
       def initialize
         @password = UNSET_VALUE
         @openstack_compute_url = UNSET_VALUE
@@ -241,6 +246,7 @@ module VagrantPlugins
         @server_delete_timeout = UNSET_VALUE
         @stack_create_timeout = UNSET_VALUE
         @stack_delete_timeout = UNSET_VALUE
+        @meta_args_support = UNSET_VALUE
         @http = HttpConfig.new
       end
 
@@ -316,15 +322,17 @@ module VagrantPlugins
         @ssh_disabled = false if @ssh_disabled == UNSET_VALUE
 
         # The SSH values by default are nil, and the top-level config
-        # `config.ssh` values are used.
+        # `config.ssh` and `config.vm.boot_timeout` values are used.
         @ssh_username = nil if @ssh_username == UNSET_VALUE
-        @ssh_timeout = 180 if @ssh_timeout == UNSET_VALUE
+        @ssh_timeout = nil if @ssh_timeout == UNSET_VALUE
+
         @server_create_timeout = 200 if @server_create_timeout == UNSET_VALUE
         @server_active_timeout = 200 if @server_active_timeout == UNSET_VALUE
         @server_stop_timeout = 200 if @server_stop_timeout == UNSET_VALUE
         @server_delete_timeout = 200 if @server_delete_timeout == UNSET_VALUE
         @stack_create_timeout = 200 if @stack_create_timeout == UNSET_VALUE
         @stack_delete_timeout = 200 if @stack_delete_timeout == UNSET_VALUE
+        @meta_args_support = false if @meta_args_support == UNSET_VALUE
         @networks = nil if @networks.empty?
         @volumes = nil if @volumes.empty?
         @stacks = nil if @stacks.empty?

data/lib/vagrant-conoha/provider.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
         # Run a custom action called "read_ssh_info" which does what it
         # says and puts the resulting SSH info into the `:machine_ssh_info`
         # key in the environment.
-        env = @machine.action('read_ssh_info')
+        env = @machine.action('read_ssh_info', lock: false)
         env[:machine_ssh_info]
       end
 
@@ -30,7 +30,7 @@ module VagrantPlugins
         # Run a custom action we define called "read_state" which does
         # what it says. It puts the state in the `:machine_state_id`
         # key in the environment.
-        env = @machine.action('read_state')
+        env = @machine.action('read_state', lock: false)
 
         state_id = env[:machine_state_id]
 

data/lib/vagrant-conoha/version.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
     # Stable versions must respect the pattern given
     # by VagrantPlugins::ConoHa::VERSION_PATTERN
     #
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
 
     #
     # Stable version must respect the naming convention 'x.y.z'

data/locales/en.yml

@@ -134,6 +134,10 @@ en:
         standard vagrant configuration option `config.ssh.username` instead
       ssh_username_required: |-
         vagrant standard configuration option `ssh.username` is required
+      ssh_timeout_deprecated: |-
+        ssh_timeout provider config is deprecated for vagrant-openstack provider.
+        If you are using it, it will continue to work but we recommend switching
+        to the standard vagrant configuration option `config.vm.boot_timeout`.
       invalid_value_for_parameter: |-
         Invalid value '%{value}' for parameter '%{parameter}'
       invalid_admin_pass: |-
@@ -177,14 +181,14 @@ en:
       sync_method_error: |-
         Value '%{sync_method_value}' is not allowed for 'sync_method' configuration parameter. Valid values are 'rsync' and 'none'
       rsync_error: |-
-        There was an error when attemping to rsync a share folder.
+        There was an error when attempting to rsync a share folder.
         Please inspect the error message below for more info.
 
         Host path: %{hostpath}
         Guest path: %{guestpath}
         Error: %{stderr}
       ssh_unavailble: |-
-        SSH server anavailable on instance %{host}. You should maybe increase the timeout value which currently is %{timeout} second(s).
+        SSH server unavailable on instance %{host}. You should maybe increase the timeout value which currently is %{timeout} second(s).
       no_arg_required_for_command: |-
         Command '%{cmd}' does not required any argument.
       unrecognized_arg_for_command: |-

data/spec/vagrant-conoha/action/provision_spec.rb

@@ -17,17 +17,6 @@ class FakeShellProvisioner < FakeProvisioner
   end
 end
 
-#
-# Monkeypatch the VagrantPlugins::Shell module
-# to enabled using an FakeShellProvisioner in
-# place of a the real shell provisioner class
-#
-module VagrantPlugins
-  module Shell
-    Provisioner = FakeShellProvisioner
-  end
-end
-
 describe VagrantPlugins::ConoHa::Action::ProvisionWrapper do
   let(:app) do
     double
@@ -38,6 +27,8 @@ describe VagrantPlugins::ConoHa::Action::ProvisionWrapper do
   end
 
   before :each do
+    # Stub lookup for provisioners and return a hash containing the test mock.
+    allow(Vagrant.plugin('2').manager).to receive(:provisioners).and_return(shell: FakeShellProvisioner)
     @action = ProvisionWrapper.new(app, nil)
   end
 
@@ -57,6 +48,8 @@ describe VagrantPlugins::ConoHa::Action::InternalProvisionWrapper do
   end
 
   before :each do
+    # Stub lookup for provisioners and return a hash containing the test mock.
+    allow(Vagrant.plugin('2').manager).to receive(:provisioners).and_return(shell: FakeShellProvisioner)
     @action = InternalProvisionWrapper.new(nil, env)
   end
 

data/spec/vagrant-conoha/action/sync_folders_spec.rb

@@ -111,7 +111,7 @@ describe VagrantPlugins::ConoHa::Action::SyncFolders do
                             '--chmod',
                             'ugo=rwX',
                             '-e',
-                            "ssh -p 23 -o StrictHostKeyChecking=no -i '/tmp/key.pem' ",
+                            "ssh -p 23 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -i '/tmp/key.pem' ",
                             '/home/john/vagrant/',
                             'user@1.2.3.4:/vagrant',
                             '--exclude-from',

data/spec/vagrant-conoha/command/flavor_list_spec.rb

@@ -31,7 +31,7 @@ describe VagrantPlugins::ConoHa::Command::FlavorList do
 
       expect(env[:ui]).to receive(:info).with('
 +-----+-------+------+----------+----------------+
-| Id  | Name  | vCPU | RAM (Mo) | Disk size (Go) |
+| ID  | Name  | vCPU | RAM (Mo) | Disk size (Go) |
 +-----+-------+------+----------+----------------+
 | 001 | small | 1    | 1024     | 10             |
 | 002 | large | 4    | 4096     | 100            |

data/spec/vagrant-conoha/command/floatingip_list_spec.rb

@@ -0,0 +1,74 @@
+require 'vagrant-conoha/spec_helper'
+
+describe VagrantPlugins::ConoHa::Command::FloatingIpList do
+  describe 'cmd' do
+    let(:nova) do
+      double('nova').tap do |nova|
+        nova.stub(:get_floating_ip_pools) do
+          [
+            {
+              'name' => 'pool1'
+            },
+            {
+              'name' => 'pool2'
+            }
+          ]
+        end
+        nova.stub(:get_floating_ips) do
+          [
+            {
+              'fixed_ip' => nil,
+              'id' => 1,
+              'instance_id' => nil,
+              'ip' => '10.10.10.1',
+              'pool' => 'pool1'
+            },
+            {
+              'fixed_ip' => nil,
+              'id' => 2,
+              'instance_id' => 'inst001',
+              'ip' => '10.10.10.2',
+              'pool' => 'pool2'
+            }
+          ]
+        end
+      end
+    end
+
+    let(:env) do
+      {}.tap do |env|
+        env[:ui] = double('ui')
+        env[:ui].stub(:info).with(anything)
+        env[:openstack_client] = double
+        env[:openstack_client].stub(:nova) { nova }
+      end
+    end
+
+    before :each do
+      @floating_ip_list_cmd = VagrantPlugins::ConoHa::Command::FloatingIpList.new(nil, env)
+    end
+
+    it 'prints floating ip and floating ip pool from server' do
+      nova.should_receive(:get_floating_ip_pools).with(env)
+      nova.should_receive(:get_floating_ips).with(env)
+
+      expect(env[:ui]).to receive(:info).with('
++-------------------+
+| Floating IP pools |
++-------------------+
+| pool1             |
+| pool2             |
++-------------------+').ordered
+
+      expect(env[:ui]).to receive(:info).with('
++----+------------+-------+-------------+
+| ID | IP         | Pool  | Instance ID |
++----+------------+-------+-------------+
+| 1  | 10.10.10.1 | pool1 |             |
+| 2  | 10.10.10.2 | pool2 | inst001     |
++----+------------+-------+-------------+').ordered
+
+      @floating_ip_list_cmd.cmd('floatingip-list', [], env)
+    end
+  end
+end

data/spec/vagrant-conoha/command/image_list_spec.rb

@@ -54,7 +54,7 @@ describe VagrantPlugins::ConoHa::Command::ImageList do
 
         expect(env[:ui]).to receive(:info).with('
 +------+--------+
-| Id   | Name   |
+| ID   | Name   |
 +------+--------+
 | 0001 | ubuntu |
 | 0002 | centos |
@@ -82,7 +82,7 @@ describe VagrantPlugins::ConoHa::Command::ImageList do
 
         expect(env[:ui]).to receive(:info).with('
 +------+--------+------------+-----------+--------------+---------------+
-| Id   | Name   | Visibility | Size (Mo) | Min RAM (Go) | Min Disk (Go) |
+| ID   | Name   | Visibility | Size (Mo) | Min RAM (Go) | Min Disk (Go) |
 +------+--------+------------+-----------+--------------+---------------+
 | 0001 | ubuntu | public     | 700       | 1            | 10            |
 | 0002 | centos | private    | 800       | 2            | 20            |

data/spec/vagrant-conoha/command/network_list_spec.rb

@@ -38,7 +38,7 @@ describe VagrantPlugins::ConoHa::Command::NetworkList do
 
       expect(env[:ui]).to receive(:info).with('
 +--------+----------+
-| Id     | Name     |
+| ID     | Name     |
 +--------+----------+
 | net-01 | internal |
 | net-02 | external |
@@ -52,7 +52,7 @@ describe VagrantPlugins::ConoHa::Command::NetworkList do
 
       expect(env[:ui]).to receive(:info).with('
 +--------+----------+
-| Id     | Name     |
+| ID     | Name     |
 +--------+----------+
 | pub-01 | public   |
 | net-01 | internal |

data/spec/vagrant-conoha/command/subnet_list_spec.rb

@@ -32,7 +32,7 @@ describe VagrantPlugins::ConoHa::Command::SubnetList do
 
       expect(env[:ui]).to receive(:info).with('
 +-----------+----------+------------------+-------+------------+
-| Id        | Name     | CIDR             | DHCP  | Network Id |
+| ID        | Name     | CIDR             | DHCP  | Network ID |
 +-----------+----------+------------------+-------+------------+
 | subnet-01 | Subnet 1 | 192.168.1.0/24   | true  | net-01     |
 | subnet-02 | Subnet 2 | 192.168.2.0/24   | false | net-01     |

data/spec/vagrant-conoha/command/volume_list_spec.rb

@@ -28,7 +28,7 @@ describe VagrantPlugins::ConoHa::Command::VolumeList do
       cinder.should_receive(:get_all_volumes).with(env)
       expect(env[:ui]).to receive(:info).with('
 +-----+--------+-----------+-----------+-------------------------------------+
-| Id  | Name   | Size (Go) | Status    | Attachment (instance id and device) |
+| ID  | Name   | Size (Go) | Status    | Attachment (instance ID and device) |
 +-----+--------+-----------+-----------+-------------------------------------+
 | 987 | vol-01 | 2         | available |                                     |
 | 654 | vol-02 | 4         | in-use    | inst-01 (/dev/vdc)                  |

data/vagrant-conoha.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/hironobu-s/vagrant-conoha/'
   gem.license       = 'MIT'
 
-  gem.add_dependency 'json', '~> 1.8.3'
-  gem.add_dependency 'rest-client', '>= 1.6.9'
-  gem.add_dependency 'terminal-table', '1.5.2'
-  gem.add_dependency 'sshkey', '1.7.0'
-  gem.add_dependency 'colorize', '0.7.7'
+  gem.add_dependency 'json', '1.8.3'
+  gem.add_dependency 'rest-client', '~> 1.6.0'
+  gem.add_dependency 'terminal-table', '1.4.5'
+  gem.add_dependency 'sshkey', '1.6.1'
+  gem.add_dependency 'colorize', '0.7.3'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.1.0'

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-conoha
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Hironobu Saitoh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.9
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.9
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: sshkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ files:
 - lib/vagrant-conoha/client/rest_utils.rb
 - lib/vagrant-conoha/command/abstract_command.rb
 - lib/vagrant-conoha/command/flavor_list.rb
+- lib/vagrant-conoha/command/floatingip_list.rb
 - lib/vagrant-conoha/command/image_list.rb
 - lib/vagrant-conoha/command/main.rb
 - lib/vagrant-conoha/command/network_list.rb
@@ -264,6 +265,7 @@ files:
 - spec/vagrant-conoha/client/nova_spec.rb
 - spec/vagrant-conoha/client/utils_spec.rb
 - spec/vagrant-conoha/command/flavor_list_spec.rb
+- spec/vagrant-conoha/command/floatingip_list_spec.rb
 - spec/vagrant-conoha/command/image_list_spec.rb
 - spec/vagrant-conoha/command/network_list_spec.rb
 - spec/vagrant-conoha/command/reset_spec.rb
@@ -329,6 +331,7 @@ test_files:
 - spec/vagrant-conoha/client/nova_spec.rb
 - spec/vagrant-conoha/client/utils_spec.rb
 - spec/vagrant-conoha/command/flavor_list_spec.rb
+- spec/vagrant-conoha/command/floatingip_list_spec.rb
 - spec/vagrant-conoha/command/image_list_spec.rb
 - spec/vagrant-conoha/command/network_list_spec.rb
 - spec/vagrant-conoha/command/reset_spec.rb