chef-server 0.8.8 → 0.8.10

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.
Files changed (5) hide show
  1. data/bin/chef-server +3 -7
  2. data/bin/chef-server-webui +2 -6
  3. data/config/dependencies-webui.rb +1 -1
  4. data/lib/tasks/package.rake +5 -3
  5. metadata +19 -11
data/bin/chef-server CHANGED
@@ -26,21 +26,17 @@
26
26
  require "rubygems"
27
27
  require "merb-core"
28
28
 
29
+ CHEF_SERVER_VERSION = "0.8.10"
30
+
29
31
  [ 'chef', 'chef-server-api' ].each do |lib|
30
32
  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib")))
31
33
  library = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb"))
32
34
  require library if File.exists?(library)
33
35
  end
34
36
 
35
- ObjectSpace.each_object(Gem::Specification) do |gem|
36
- next unless gem.name == "chef-server"
37
- CHEF_SERVER_VERSION = gem.version.to_s
38
- break
39
- end
40
-
41
37
  # Ensure the chef gem we load is the same version as the chef server
42
38
  unless defined?(Chef)
43
- gem "chef", "=" + CHEF_SERVER_VERSION if CHEF_SERVER_VERSION
39
+ gem "chef", "=" + CHEF_SERVER_VERSION
44
40
  require 'chef'
45
41
  end
46
42
 
data/bin/chef-server-webui CHANGED
@@ -32,15 +32,11 @@ require "merb-core"
32
32
  require library if File.exists?(library)
33
33
  end
34
34
 
35
- ObjectSpace.each_object(Gem::Specification) do |gem|
36
- next unless gem.name == "chef-server"
37
- CHEF_SERVER_VERSION = gem.version.to_s
38
- break
39
- end
35
+ CHEF_SERVER_VERSION = "0.8.10"
40
36
 
41
37
  # Ensure the chef gem we load is the same version as the chef server
42
38
  unless defined?(Chef)
43
- gem "chef", "=" + CHEF_SERVER_VERSION if CHEF_SERVER_VERSION
39
+ gem "chef", "=" + CHEF_SERVER_VERSION
44
40
  require 'chef'
45
41
  end
46
42
 
data/config/dependencies-webui.rb CHANGED
@@ -10,7 +10,7 @@ dependency "chef", :immediate=>true unless defined?(Chef)
10
10
  begin
11
11
  require 'chef'
12
12
  require 'chef-server-webui'
13
- rescue
13
+ rescue LoadError
14
14
  end
15
15
 
16
16
  # For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
data/lib/tasks/package.rake CHANGED
@@ -12,9 +12,11 @@ spec = Gem::Specification.new do |s|
12
12
  s.author = AUTHOR
13
13
  s.email = EMAIL
14
14
  s.homepage = HOMEPAGE
15
-
16
- %w{ merb-core merb-haml merb-assets
17
- merb-helpers thin haml
15
+ s.add_dependency "merb-core", "~> 1.0.0"
16
+ s.add_dependency "merb-haml", "~> 1.0.0"
17
+ s.add_dependency "merb-assets", "~> 1.0.0"
18
+ s.add_dependency "merb-helpers", "~> 1.0.0"
19
+ %w{ thin haml
18
20
  ruby-openid json coderay}.each { |gem| s.add_dependency gem }
19
21
 
20
22
  s.bindir = "bin"
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 8
8
- - 8
9
- version: 0.8.8
8
+ - 10
9
+ version: 0.8.10
10
10
  platform: ruby
11
11
  authors:
12
12
  - Opscode
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-03-17 00:00:00 -07:00
17
+ date: 2010-03-31 00:00:00 -07:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
@@ -22,11 +22,13 @@ dependencies:
22
22
  prerelease: false
23
23
  requirement: &id001 !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ">="
25
+ - - ~>
26
26
  - !ruby/object:Gem::Version
27
27
  segments:
28
+ - 1
28
29
  - 0
29
- version: "0"
30
+ - 0
31
+ version: 1.0.0
30
32
  type: :runtime
31
33
  version_requirements: *id001
32
34
  - !ruby/object:Gem::Dependency
@@ -34,11 +36,13 @@ dependencies:
34
36
  prerelease: false
35
37
  requirement: &id002 !ruby/object:Gem::Requirement
36
38
  requirements:
37
- - - ">="
39
+ - - ~>
38
40
  - !ruby/object:Gem::Version
39
41
  segments:
42
+ - 1
40
43
  - 0
41
- version: "0"
44
+ - 0
45
+ version: 1.0.0
42
46
  type: :runtime
43
47
  version_requirements: *id002
44
48
  - !ruby/object:Gem::Dependency
@@ -46,11 +50,13 @@ dependencies:
46
50
  prerelease: false
47
51
  requirement: &id003 !ruby/object:Gem::Requirement
48
52
  requirements:
49
- - - ">="
53
+ - - ~>
50
54
  - !ruby/object:Gem::Version
51
55
  segments:
56
+ - 1
52
57
  - 0
53
- version: "0"
58
+ - 0
59
+ version: 1.0.0
54
60
  type: :runtime
55
61
  version_requirements: *id003
56
62
  - !ruby/object:Gem::Dependency
@@ -58,11 +64,13 @@ dependencies:
58
64
  prerelease: false
59
65
  requirement: &id004 !ruby/object:Gem::Requirement
60
66
  requirements:
61
- - - ">="
67
+ - - ~>
62
68
  - !ruby/object:Gem::Version
63
69
  segments:
70
+ - 1
64
71
  - 0
65
- version: "0"
72
+ - 0
73
+ version: 1.0.0
66
74
  type: :runtime
67
75
  version_requirements: *id004
68
76
  - !ruby/object:Gem::Dependency