virtualmaster 0.0.4 → 0.0.5

data/lib/vmaster/cli.rb

@@ -14,6 +14,11 @@ module VirtualMaster
 
         @@config = config.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
 
+        unless @@config[:profiles]
+          puts "WARNING: Please, reconfigure virtualmaster-cli (delete your '~/.virtualmaster' and run `virtualmaster config` again). This way you can use custom instance profiles correctly (new in version 0.0.5)"
+          puts
+        end
+
         @@api = DeltaCloud.new(@@config[:username], @@config[:password], VirtualMaster::DEFAULT_URL)
       end
 

data/lib/vmaster/config_command.rb

@@ -32,7 +32,8 @@ command :config do |c|
         'username' => options.username,
         'password' => options.password,
         'default_image' => VirtualMaster::DEFAULT_IMAGE,
-        'images' => VirtualMaster::IMAGES
+        'images' => VirtualMaster::IMAGES,
+        'profiles' => VirtualMaster::PROFILES
       }
 
       File.open(config_file, 'w') do |f|

data/lib/vmaster/helpers.rb

@@ -20,7 +20,7 @@ module VirtualMaster
     },
     :micro => {
       :memory => 512,
-      :storage => 6144
+      :storage => 10240,
     },
     :milli => {
       :memory => 1024,
@@ -28,19 +28,18 @@ module VirtualMaster
     },
     :small => {
       :memory => 2048,
-      :storage => 30720
+      :storage => 30720,
     },
     :medium => {
       :memory => 4096,
-      :storage => 40960
+      :storage => 40960,
+    },
+    :large => {
+      :memory => 8192,
+      :storage => 8192,
     }
-    #:large => {
-    #  :memory => 8192,
-    #  :storage => 8192
-    #}
   }
 
-
   module Helpers
     def self.get_instances
       VirtualMaster::CLI.api.instances
@@ -57,7 +56,7 @@ module VirtualMaster
     def self.get_hw_profile(memory, storage)
       api = VirtualMaster::CLI.api
 
-      profile_list = api.hardware_profiles.reject { |p| p.memory.value.to_i != memory && p.storage.value.to_i != storage }
+      profile_list = api.hardware_profiles.select { |p| p.memory.value.to_i == memory && p.storage.value.to_i == storage }
 
       profile_list.first
     end

data/lib/vmaster/server_commands.rb

@@ -55,7 +55,9 @@ command :create do |c|
     # instance hardware profile
     profile_name = options.profile || VirtualMaster::DEFAULT_PROFILE
 
-    profile = VirtualMaster::PROFILES[profile_name.to_sym]
+    profile = VirtualMaster::CLI.config[:profiles][profile_name.to_sym]
+    profile = VirtualMaster::PROFILES[profile_name.to_sym] unless profile
+
     abort "Image name '#{options.profile}' not recognized!" unless profile
 
     hwp = VirtualMaster::Helpers.get_hw_profile(profile[:memory], profile[:storage])

data/lib/vmaster/version.rb

@@ -1,3 +1,3 @@
 module VirtualMaster
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtualmaster
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70140390251200 !ruby/object:Gem::Requirement
+  requirement: &70178919324560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70140390251200
+  version_requirements: *70178919324560
 - !ruby/object:Gem::Dependency
   name: deltacloud-client
-  requirement: &70140390250700 !ruby/object:Gem::Requirement
+  requirement: &70178919324060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70140390250700
+  version_requirements: *70178919324060
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70140255842280 !ruby/object:Gem::Requirement
+  requirement: &70178922995280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70140255842280
+  version_requirements: *70178922995280
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70140255840660 !ruby/object:Gem::Requirement
+  requirement: &70178922993280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70140255840660
+  version_requirements: *70178922993280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70140255839140 !ruby/object:Gem::Requirement
+  requirement: &70178922992020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70140255839140
+  version_requirements: *70178922992020
 description: Command line interface to VirtualMaster. Control your virtual infrastructure.
 email:
 - radim@laststation.net