vagrant-openstack-provider 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82b270398ea7be41f726ca43448f7fb1cec2557
-  data.tar.gz: eb97f8ae679c4d35836fc877593fdd995ee754fe
+  metadata.gz: 6f67721a60001e4be971af684ea45cde415f0a3d
+  data.tar.gz: afcfda525e9e92210a028de2fd6a0507a8ba8ede
 SHA512:
-  metadata.gz: f66475446b6b2dd60dd379b7183a2fa4aae6a5ab7608c2d843ff5fdb52c067b68303a797afcc5e38d7e3cd00909716d54997cd9d7a75877454b0632ffbd2a1dc
-  data.tar.gz: 9d81858f8f44ee66f32db61cf97ff477663c8d2586c0c4bc216c944b06a2ff849e92d4bdf72b501d6f9b31e6de12f6ec7f3fbc61e894d3a44d1e6370c8e12718
+  metadata.gz: cb94233253f0602739ece3d40f9224d10a9f210f00c343ba535fd3e79a7b6322f7215a5651b159d249b395568abeac591c15215d51166b6f1563291d6e828ae2
+  data.tar.gz: 97b7d686f7be2b2cc4623ba8250e06c6096d5c218db9b7e2e42d01399b79a21091230e267e1298f7e30e8b7cd100bb2eb33d7ff1601b5933260d4b7072015d49

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.2 (April 25, 2014)
+
+IMPROVEMENTS:
+
+  - Rename everything from vagrant-openstack to vagrant-openstack-provider
+
 # 0.1.1 (April 24, 2014)
 
 BUG FIXES:

data/RELEASE.md

@@ -5,7 +5,7 @@ currently done.
 
 ## Prepare the release
 
-* Update the version in "lib/vagrant-openstack/version.rb"
+* Update the version in "lib/vagrant-openstack-provider/version.rb"
 * Update the version in CHANGELOG.md
 * Use "rake release". This will make sure to tag that commit and push it RubyGems.
 * Update the version again in both files to a dev version for working again.

data/Vagrantfile

@@ -1,9 +1,9 @@
-require 'vagrant-openstack'
+require 'vagrant-openstack-provider'
 
 Vagrant.configure("2") do |config|
 
   config.vm.box = "dummy-openstack"
-  config.vm.box_url = "https://github.com/ggiamarchi/vagrant-openstack-plugin/raw/new_version/source/dummy.box"
+  config.vm.box_url = "https://github.com/ggiamarchi/vagrant-openstack/raw/master/source/dummy.box"
 
   config.ssh.private_key_path = "/home/vagrant/.ssh/id_rsa"
   config.ssh.shell = "sh"

data/features/provision.feature

@@ -1,6 +1,6 @@
 @announce
-@vagrant-openstack
-Feature: vagrant-openstack fog tests
+@vagrant-openstack-provider
+Feature: vagrant-openstack-provider fog tests
 
   Background:
     Given I have Openstack credentials available
@@ -10,7 +10,7 @@ Feature: vagrant-openstack fog tests
     Given a file named "Vagrantfile" with:
     """
     Vagrant.configure("2") do |config|
-      Vagrant.require_plugin "vagrant-openstack"
+      Vagrant.require_plugin "vagrant-openstack-provider"
 
       config.vm.box = "dummy"
       config.ssh.private_key_path = "~/.ssh/id_rsa"
@@ -32,4 +32,4 @@ Feature: vagrant-openstack fog tests
     When I successfully run `bundle exec vagrant up --provider openstack`
     # I want to capture the ID like I do in tests for other tools, but Vagrant doesn't print it!
     # And I get the server from "Instance ID:"
-    Then the server "vagrant-provisioned-server" should be active
+    Then the server "vagrant-provisioned-server" should be active

data/features/{vagrant-openstack.feature → vagrant-openstack-provider.feature}

@@ -1,8 +1,8 @@
 @announce
-@vagrant-openstack
-Feature: vagrant-openstack fog tests
+@vagrant-openstack-provider
+Feature: vagrant-openstack-provider fog tests
   As a Fog developer
-  I want to smoke (or "fog") test vagrant-openstack.
+  I want to smoke (or "fog") test vagrant-openstack-provider.
   So I am confident my upstream changes did not create downstream problems.
 
   Background:
@@ -16,8 +16,8 @@ Feature: vagrant-openstack fog tests
     require File.expand_path '../fog_mock', __FILE__
 
     Vagrant.configure("2") do |config|
-      # dev/test method of loading plugin, normally would be 'vagrant plugin install vagrant-openstack'
-      Vagrant.require_plugin "vagrant-openstack"
+      # dev/test method of loading plugin, normally would be 'vagrant plugin install vagrant-openstack-provider'
+      Vagrant.require_plugin "vagrant-openstack-provider"
 
       config.vm.box = "dummy"
       config.ssh.username = "vagrant" if Fog.mock?
@@ -46,8 +46,8 @@ Scenario: Create a single server (openstack_compute_url)
     require File.expand_path '../fog_mock', __FILE__
 
     Vagrant.configure("2") do |config|
-      # dev/test method of loading plugin, normally would be 'vagrant plugin install vagrant-openstack'
-      Vagrant.require_plugin "vagrant-openstack"
+      # dev/test method of loading plugin, normally would be 'vagrant plugin install vagrant-openstack-provider'
+      Vagrant.require_plugin "vagrant-openstack-provider"
 
       config.vm.box = "dummy"
       config.ssh.username = "vagrant" if Fog.mock?

data/lib/{vagrant-openstack.rb → vagrant-openstack-provider.rb}

@@ -1,10 +1,10 @@
 require "pathname"
 
-require "vagrant-openstack/plugin"
+require "vagrant-openstack-provider/plugin"
 
 module VagrantPlugins
   module Openstack
-    lib_path = Pathname.new(File.expand_path("../vagrant-openstack", __FILE__))
+    lib_path = Pathname.new(File.expand_path("../vagrant-openstack-provider", __FILE__))
     autoload :Errors, lib_path.join("errors")
 
     # This initializes the i18n load path so that the plugin-specific

data/lib/{vagrant-openstack → vagrant-openstack-provider}/action/delete_server.rb

@@ -13,8 +13,8 @@ module VagrantPlugins
         def call(env)
           if env[:machine].id
             env[:ui].info(I18n.t("vagrant_openstack.deleting_server"))
-            server = env[:openstack_compute].servers.get(env[:machine].id)
-            server.destroy
+            client = env[:openstack_client]
+            client.delete_server(env, env[:machine].id)
             env[:machine].id = nil
           end
 

data/lib/{vagrant-openstack → vagrant-openstack-provider}/openstack_client.rb

@@ -59,6 +59,13 @@ module VagrantPlugins
         return JSON.parse(server)['server']['id']
       end
 
+      def delete_server(env, server_id)
+        config = env[:machine].provider_config
+        server = RestClient.delete(config.openstack_compute_url + "/servers/" + server_id,
+          "X-Auth-Token" => @token,
+          :accept => :json)
+      end
+
       def get_server_details(env, server_id)
         config = env[:machine].provider_config
         server_details = RestClient.get(config.openstack_compute_url + "/servers/" + server_id,

data/lib/{vagrant-openstack → vagrant-openstack-provider}/provider.rb

@@ -1,6 +1,6 @@
 require "vagrant"
 
-require "vagrant-openstack/action"
+require "vagrant-openstack-provider/action"
 
 module VagrantPlugins
   module Openstack

data/lib/{vagrant-openstack → vagrant-openstack-provider}/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Openstack
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/vagrant-openstack/config_spec.rb

@@ -8,7 +8,7 @@ if ENV['COVERAGE'] != 'false'
   SimpleCov.start
 end
 
-require "vagrant-openstack/config"
+require "vagrant-openstack-provider/config"
 require 'fog'
 
 describe VagrantPlugins::Openstack::Config do
@@ -59,7 +59,7 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
 
-    it "should not default rsync_includes if overridden" do 
+    it "should not default rsync_includes if overridden" do
       inc = "core"
       subject.send(:rsync_include, inc)
       subject.finalize!

data/stackrc

@@ -1,4 +1,3 @@
-
 #!/bin/bash
 
 # With the addition of Keystone, to use an openstack cloud you should

data/{vagrant-openstack.gemspec → vagrant-openstack-provider.gemspec}

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vagrant-openstack/version'
+require 'vagrant-openstack-provider/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "vagrant-openstack-provider"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -77,31 +77,31 @@ files:
 - features/steps/server_steps.rb
 - features/support/env.rb
 - features/support/fog_mock.rb
-- features/vagrant-openstack.feature
+- features/vagrant-openstack-provider.feature
 - gemfiles/latest_stable.gemfile
 - gemfiles/oldest_current.gemfile
 - gemfiles/previous_release.gemfile
-- lib/vagrant-openstack.rb
-- lib/vagrant-openstack/action.rb
-- lib/vagrant-openstack/action/connect_openstack.rb
-- lib/vagrant-openstack/action/create_server.rb
-- lib/vagrant-openstack/action/delete_server.rb
-- lib/vagrant-openstack/action/is_created.rb
-- lib/vagrant-openstack/action/message_already_created.rb
-- lib/vagrant-openstack/action/message_not_created.rb
-- lib/vagrant-openstack/action/read_ssh_info.rb
-- lib/vagrant-openstack/action/read_state.rb
-- lib/vagrant-openstack/action/sync_folders.rb
-- lib/vagrant-openstack/config.rb
-- lib/vagrant-openstack/errors.rb
-- lib/vagrant-openstack/openstack_client.rb
-- lib/vagrant-openstack/plugin.rb
-- lib/vagrant-openstack/provider.rb
-- lib/vagrant-openstack/version.rb
+- lib/vagrant-openstack-provider.rb
+- lib/vagrant-openstack-provider/action.rb
+- lib/vagrant-openstack-provider/action/connect_openstack.rb
+- lib/vagrant-openstack-provider/action/create_server.rb
+- lib/vagrant-openstack-provider/action/delete_server.rb
+- lib/vagrant-openstack-provider/action/is_created.rb
+- lib/vagrant-openstack-provider/action/message_already_created.rb
+- lib/vagrant-openstack-provider/action/message_not_created.rb
+- lib/vagrant-openstack-provider/action/read_ssh_info.rb
+- lib/vagrant-openstack-provider/action/read_state.rb
+- lib/vagrant-openstack-provider/action/sync_folders.rb
+- lib/vagrant-openstack-provider/config.rb
+- lib/vagrant-openstack-provider/errors.rb
+- lib/vagrant-openstack-provider/openstack_client.rb
+- lib/vagrant-openstack-provider/plugin.rb
+- lib/vagrant-openstack-provider/provider.rb
+- lib/vagrant-openstack-provider/version.rb
 - locales/en.yml
 - spec/vagrant-openstack/config_spec.rb
 - stackrc
-- vagrant-openstack.gemspec
+- vagrant-openstack-provider.gemspec
 homepage: https://github.com/ggiamarchi/vagrant-openstack
 licenses: []
 metadata: {}
@@ -131,5 +131,5 @@ test_files:
 - features/steps/server_steps.rb
 - features/support/env.rb
 - features/support/fog_mock.rb
-- features/vagrant-openstack.feature
+- features/vagrant-openstack-provider.feature
 - spec/vagrant-openstack/config_spec.rb