vagrant-openstack-provider 0.3.0 → 0.3.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzI3NjM4NTQwZWQwODg5OGRiMjFhNDU5MGViNmY5ZjVlMjAzOTc0NA==
-  data.tar.gz: !binary |-
-    N2UwODBjOGE5ZTgwOGEwYjQ4ZjE3YmMwZjA4ZWVlOGUyYmYyMTI4Zg==
+SHA1:
+  metadata.gz: 646c0f2d9af2adc263a14c00ceeb12e95e1b4959
+  data.tar.gz: 830a3a035677fdecb4d34a8509d2f2277aefe526
 SHA512:
-  metadata.gz: !binary |-
-    MGQ4NzZmYTg3YjNhYzUyMWJhZjQ2YTE3MjA2OTEyNGRhY2FkMmQ5MjgwZjQy
-    NWJlMDk0NGViOTU3MDA0ZDEwMmY3YzY1ZmU0OWQ4NjZiZWRhNzExZmIzNGU5
-    ZGU4OWE0NTFkYWY2MTM2NTcwZWU0MjMzYzA2ZTUxNmM4NTI4OWY=
-  data.tar.gz: !binary |-
-    NDY3YmZmOTA2OWJkMGRlOTE0ODdkYmEwNmM1YzNlZmE5ODlkMjViZWNjMjUx
-    OWY1NTgxZWQwMDBjMmQ1MDllMWE4MGU1MzM0YjZhNTVjM2ZiMDE1ZmE4MzJk
-    ZGE2Y2NhNjFmZjE5NmU1YTBlMWYxYjUzNWM2ZDIzMGQ2MjIyN2Q=
+  metadata.gz: 37f7b1bd1f4bfefe872c1c345bc0f766691d928feb962f410d60cec828dd2d287c6950802977c69ac88d498398e77916eec9913949e4f4cc14d24a15a92a0473
+  data.tar.gz: 3b806a165b43362c97a78e2fdbf9d5fd40b64bf6c7159ce7d08dfb00bafe40c0580247b1258e18b01771c8ba16f4ba3ea242db43a22f66358cdc017a763c427d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.3.2 (September 1, 2014)
+
+BUG FIXES:
+
+   - The provider fails to load colorize gem [#76](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/76)
+   - Sub-command arguments management have change in vagrant 1.5 [#77](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/77)
+
 # 0.3.0 (August 29, 2014)
 
 FEATURES:

data/Gemfile

@@ -19,3 +19,7 @@ group :development do
   gem 'coveralls', require: false
   gem 'debugger'
 end
+
+group :plugins do
+  gem "vagrant-openstack-provider", path: "."
+end

data/lib/vagrant-openstack-provider/client/domain.rb

@@ -13,6 +13,40 @@ module VagrantPlugins
         end
       end
 
+      class Flavor < Item
+        #
+        # THe number of vCPU
+        #
+        attr_accessor :vcpus
+
+        #
+        # The amount of RAM in Megaoctet
+        #
+        attr_accessor :ram
+
+        #
+        # The size of root disk in Gigaoctet
+        #
+        attr_accessor :disk
+
+        def initialize(id, name, vcpus, ram, disk)
+          @vcpus = vcpus
+          @ram  = ram
+          @disk = disk
+          super(id, name)
+        end
+
+        def ==(other)
+          other.class == self.class && other.state == state
+        end
+
+        protected
+
+        def state
+          [@id, @name, @vcpus, @ram, @disk]
+        end
+      end
+
       class FloatingIP
         attr_accessor :ip, :pool, :instance_id
         def initialize(ip, pool, instance_id)

data/lib/vagrant-openstack-provider/client/nova.rb

@@ -18,8 +18,10 @@ module VagrantPlugins
       end
 
       def get_all_flavors(env)
-        flavors_json = get(env, "#{@session.endpoints[:compute]}/flavors")
-        JSON.parse(flavors_json)['flavors'].map { |fl| Item.new(fl['id'], fl['name']) }
+        flavors_json = get(env, "#{@session.endpoints[:compute]}/flavors/detail")
+        JSON.parse(flavors_json)['flavors'].map do |fl|
+          Flavor.new(fl['id'], fl['name'], fl['vcpus'], fl['ram'], fl['disk'])
+        end
       end
 
       def get_all_floating_ips(env)

data/lib/vagrant-openstack-provider/command/flavor_list.rb

@@ -11,9 +11,14 @@ module VagrantPlugins
           I18n.t('vagrant_openstack.command.flavor_list_synopsis')
         end
         def cmd(name, argv, env)
-          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 1
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0 || argv == ['--']
           flavors = env[:openstack_client].nova.get_all_flavors(env)
-          display_item_list(env, flavors)
+
+          rows = []
+          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)
         end
       end
     end

data/lib/vagrant-openstack-provider/command/floatingip_list.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
           I18n.t('vagrant_openstack.command.flaotingip_list_synopsis')
         end
         def cmd(name, argv, env)
-          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 1
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0 || argv == ['--']
 
           floating_ip_pools = env[:openstack_client].nova.get_floating_ip_pools(env)
           floating_ips = env[:openstack_client].nova.get_floating_ips(env)

data/lib/vagrant-openstack-provider/command/image_list.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
           I18n.t('vagrant_openstack.command.image_list_synopsis')
         end
         def cmd(name, argv, env)
-          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 1
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0 || argv == ['--']
           images = env[:openstack_client].nova.get_all_images(env)
           display_item_list(env, images)
         end

data/lib/vagrant-openstack-provider/command/network_list.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
           I18n.t('vagrant_openstack.command.network_list_synopsis')
         end
         def cmd(name, argv, env)
-          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 1
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0 || argv == ['--']
           flavors = env[:openstack_client].neutron.get_private_networks(env)
           display_item_list(env, flavors)
         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/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Openstack
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

data/spec/vagrant-openstack-provider/client/nova_spec.rb

@@ -45,7 +45,7 @@ describe VagrantPlugins::Openstack::NovaClient do
   describe 'get_all_flavors' do
     context 'with token and project_id acquainted' do
       it 'returns all flavors' do
-        stub_request(:get, 'http://nova/a1b2c3/flavors')
+        stub_request(:get, 'http://nova/a1b2c3/flavors/detail')
             .with(
               headers:
               {
@@ -54,15 +54,17 @@ describe VagrantPlugins::Openstack::NovaClient do
               })
             .to_return(
               status: 200,
-              body: '{ "flavors": [ { "id": "f1", "name": "flavor1"}, { "id": "f2", "name": "flavor2"} ] }')
+              body: '{
+                "flavors": [
+                  { "id": "f1", "name": "flavor1", "vcpus":"1", "ram": "1024", "disk": "10"},
+                  { "id": "f2", "name": "flavor2", "vcpus":"2", "ram": "2048", "disk": "20"}
+                ]}')
 
         flavors = @nova_client.get_all_flavors(env)
 
         expect(flavors.length).to eq(2)
-        expect(flavors[0].id).to eq('f1')
-        expect(flavors[0].name).to eq('flavor1')
-        expect(flavors[1].id).to eq('f2')
-        expect(flavors[1].name).to eq('flavor2')
+        expect(flavors[0]).to eq(Flavor.new('f1', 'flavor1', '1', '1024', '10'))
+        expect(flavors[1]).to eq(Flavor.new('f2', 'flavor2', '2', '2048', '20'))
       end
     end
   end

data/vagrant-openstack-provider.gemspec

@@ -11,6 +11,11 @@ Gem::Specification.new do |gem|
   gem.summary       = 'Enables Vagrant to manage machines in Openstack Cloud.'
   gem.homepage      = 'https://github.com/ggiamarchi/vagrant-openstack'
 
+  gem.add_dependency 'restclient', '0.10.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', '~> 2.13.0'
   gem.add_development_dependency 'aruba'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -9,48 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: restclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: sshkey
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: aruba
   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'
 description: Enables Vagrant to manage machines in Openstack Cloud.
@@ -61,8 +117,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
+- ".gitignore"
+- ".rubocop.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -137,12 +193,12 @@ 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: []