knife-xenserver 1.2.2 → 1.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ # 1.2.3 - Fri 07 Dec 2012
2
+
3
+ * Drop alchemist gem, fixing some compat issues with some ruby 1.9
4
+ implementations. See #6.
5
+
1
6
  # 1.2.2 - Thu 06 Dec 2012
2
7
 
3
8
  * Fixed --storage-repository parameter in 'template create' command
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
22
22
  ## Fog 1.3.1 deps. We'll need to remove them
23
23
  # when using fog upstream
24
24
  s.add_dependency('colored')
25
- s.add_dependency('alchemist')
26
25
  s.add_dependency('uuidtools')
27
26
  s.require_paths = ["lib"]
28
27
  end
@@ -33,7 +33,6 @@ class Chef
33
33
  require 'readline'
34
34
  require 'chef/json_compat'
35
35
  require 'terminal-table/import'
36
- require 'alchemist'
37
36
  end
38
37
 
39
38
  option :xenserver_password,
@@ -92,6 +91,10 @@ class Chef
92
91
  Chef::Config[:knife][key] || config[key]
93
92
  end
94
93
 
94
+ def bytes_to_megabytes(bytes)
95
+ (bytes.to_i / (1024.0 * 1024.0)).round
96
+ end
97
+
95
98
  end
96
99
  end
97
100
  end
@@ -53,7 +53,7 @@ class Chef
53
53
  networks << name
54
54
  end
55
55
  networks = networks.join("\n")
56
- mem = vm.memory_static_max.to_i.bytes.to.megabytes.round
56
+ mem = bytes_to_megabytes(vm.memory_static_max)
57
57
  t << ["#{vm.name}\n #{ui.color('uuid: ', :yellow)}#{vm.uuid}", mem, vm.tools_installed?, networks]
58
58
  end
59
59
  end
@@ -27,7 +27,6 @@ class Chef
27
27
 
28
28
  deps do
29
29
  require 'readline'
30
- require 'alchemist'
31
30
  require 'chef/json_compat'
32
31
  require 'chef/knife/bootstrap'
33
32
  Chef::Knife::Bootstrap.load_deps
@@ -252,7 +251,7 @@ class Chef
252
251
  vm.reload
253
252
 
254
253
  puts "#{ui.color("VM Name", :cyan)}: #{vm.name}"
255
- puts "#{ui.color("VM Memory", :cyan)}: #{vm.memory_static_max.to_i.bytes.to.megabytes.round} MB"
254
+ puts "#{ui.color("VM Memory", :cyan)}: #{bytes_to_megabytes(vm.memory_static_max)} MB"
256
255
 
257
256
  if !config[:skip_bootstrap]
258
257
  # wait for it to be ready to do stuff
@@ -119,7 +119,7 @@ class Chef
119
119
  networks << name
120
120
  end
121
121
  row << networks
122
- row << vm.memory_static_max.to_i.bytes.to.megabytes.round
122
+ row << bytes_to_megabytes(vm.memory_static_max)
123
123
  row << vm.power_state
124
124
  row << vm.tools_installed?
125
125
  table << row
@@ -1,6 +1,6 @@
1
1
  module Knife
2
2
  module XenServer
3
- VERSION = "1.2.2"
3
+ VERSION = "1.2.3"
4
4
  MAJOR, MINOR, TINY = VERSION.split('.')
5
5
  end
6
6
  end
metadata CHANGED
@@ -2,14 +2,14 @@
2
2
  name: knife-xenserver
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.2.2
5
+ version: 1.2.3
6
6
  platform: ruby
7
7
  authors:
8
8
  - Sergio Rubio
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-12-06 00:00:00.000000000 Z
12
+ date: 2013-01-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  type: :runtime
@@ -75,22 +75,6 @@ dependencies:
75
75
  - !ruby/object:Gem::Version
76
76
  version: '0'
77
77
  name: colored
78
- - !ruby/object:Gem::Dependency
79
- type: :runtime
80
- requirement: !ruby/object:Gem::Requirement
81
- none: false
82
- requirements:
83
- - - ! '>='
84
- - !ruby/object:Gem::Version
85
- version: '0'
86
- prerelease: false
87
- version_requirements: !ruby/object:Gem::Requirement
88
- none: false
89
- requirements:
90
- - - ! '>='
91
- - !ruby/object:Gem::Version
92
- version: '0'
93
- name: alchemist
94
78
  - !ruby/object:Gem::Dependency
95
79
  type: :runtime
96
80
  requirement: !ruby/object:Gem::Requirement