vagrant-openstack-provider 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36585a8dacc29b73947055b81be3b41c1c7fd9ef
-  data.tar.gz: 74481f1a768d1438f31d2ef73a76fc2e2d06961b
+  metadata.gz: 9022e93970b0f478724dc90c2ca175f58fb01709
+  data.tar.gz: fd7fdb5c1d26754414d7ef0fcf090c4262e8a355
 SHA512:
-  metadata.gz: a1483cf07c6d36599a99b441b20bc1f5db2f74df01723e88b6a766b89fd8a5353b3725f9b0427dd93b04d2dcb6b9775e7363e89e781fca8fbd3fb3fdf9ae21ff
-  data.tar.gz: 751776de2b6099cc462e7db5980f1f6aea185e7b361549cc07c7f0eab1ae4729cfbd6938ca8d5ca47d690334bc0794be1ecdeb31c9ae984ac31c73b964bbf5e9
+  metadata.gz: e0f29d5cda71ac448c6bd089aec587a05d0affed2dc2dbcd0df39af8e16e9ba2651a69720907d67047203d3c3e21493a5d06c4e19944a699bb975b2662556d21
+  data.tar.gz: 0347baa297f56ded5ffb9eeffd081808763cb63ec079803ab158616cc867a25036c79392c4a4c929673be1d41ad36e779cccad71529a7d37362c3c9a8201a070

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/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.7.4'
   gem 'appraisal', '1.0.0'
   gem 'rubocop', '0.29.0', require: false
   gem 'coveralls', require: false

data/lib/vagrant-openstack-provider/action/create_stack.rb

@@ -13,12 +13,19 @@ module VagrantPlugins
   module Openstack
     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-openstack-provider/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-openstack-provider/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-openstack-provider/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-openstack-provider/command/floatingip_list.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
           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)
+          display_table(env, ['ID', 'IP', 'Pool', 'Instance ID'], rows)
         end
       end
     end

data/lib/vagrant-openstack-provider/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-openstack-provider/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-openstack-provider/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-openstack-provider/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-openstack-provider/version.rb

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

data/locales/en.yml

@@ -23,7 +23,7 @@ en:
           $ vagrant plugin update vagrant-openstack-provider
     version_unstable: |-
       You're not running a stable version of the 'vagrant-openstack-provider' plugin.
-      Unless you are either developing on vagrant or have deliberatly installed a not
+      Unless you are either developing on vagrant or have deliberately installed a not
       stable version, you should uninstall it an install the latest stable version
       running commands :
 
@@ -173,14 +173,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-openstack-provider/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::Openstack::Action::ProvisionWrapper do
   let(:app) do
     double
@@ -38,6 +27,8 @@ describe VagrantPlugins::Openstack::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::Openstack::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-openstack-provider/command/flavor_list_spec.rb

@@ -31,7 +31,7 @@ describe VagrantPlugins::Openstack::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-openstack-provider/command/floatingip_list_spec.rb

@@ -62,7 +62,7 @@ describe VagrantPlugins::Openstack::Command::FloatingIpList do
 
       expect(env[:ui]).to receive(:info).with('
 +----+------------+-------+-------------+
-| Id | IP         | Pool  | Instance id |
+| ID | IP         | Pool  | Instance ID |
 +----+------------+-------+-------------+
 | 1  | 10.10.10.1 | pool1 |             |
 | 2  | 10.10.10.2 | pool2 | inst001     |

data/spec/vagrant-openstack-provider/command/image_list_spec.rb

@@ -54,7 +54,7 @@ describe VagrantPlugins::Openstack::Command::ImageList do
 
         expect(env[:ui]).to receive(:info).with('
 +------+--------+
-| Id   | Name   |
+| ID   | Name   |
 +------+--------+
 | 0001 | ubuntu |
 | 0002 | centos |
@@ -82,7 +82,7 @@ describe VagrantPlugins::Openstack::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-openstack-provider/command/network_list_spec.rb

@@ -38,7 +38,7 @@ describe VagrantPlugins::Openstack::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::Openstack::Command::NetworkList do
 
       expect(env[:ui]).to receive(:info).with('
 +--------+----------+
-| Id     | Name     |
+| ID     | Name     |
 +--------+----------+
 | pub-01 | public   |
 | net-01 | internal |

data/spec/vagrant-openstack-provider/command/subnet_list_spec.rb

@@ -32,7 +32,7 @@ describe VagrantPlugins::Openstack::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-openstack-provider/command/volume_list_spec.rb

@@ -28,7 +28,7 @@ describe VagrantPlugins::Openstack::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-openstack-provider.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/ggiamarchi/vagrant-openstack-provider'
   gem.license       = 'MIT'
 
-  gem.add_dependency 'json', '1.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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement