chef-server-api 0.8.8 → 0.8.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/Rakefile +7 -7
  2. data/lib/chef-server-api.rb +3 -3
  3. metadata +21 -13
data/Rakefile CHANGED
@@ -5,7 +5,7 @@ require 'merb-core'
5
5
  require 'merb-core/tasks/merb'
6
6
 
7
7
  GEM_NAME = "chef-server-api"
8
- CHEF_SERVER_VERSION="0.8.8"
8
+ CHEF_SERVER_VERSION="0.8.10"
9
9
  AUTHOR = "Opscode"
10
10
  EMAIL = "chef@opscode.com"
11
11
  HOMEPAGE = "http://wiki.opscode.com/display/chef"
@@ -22,12 +22,12 @@ spec = Gem::Specification.new do |s|
22
22
  s.author = AUTHOR
23
23
  s.email = EMAIL
24
24
  s.homepage = HOMEPAGE
25
-
26
- ["merb-slices",
27
- "merb-core",
28
- "merb-assets",
29
- "merb-helpers",
30
- "thin",
25
+
26
+ s.add_dependency "merb-core", "~> 1.0.0"
27
+ s.add_dependency "merb-slices", "~> 1.0.0"
28
+ s.add_dependency "merb-assets", "~> 1.0.0"
29
+ s.add_dependency "merb-helpers", "~> 1.0.0"
30
+ ["thin",
31
31
  "json",
32
32
  "uuidtools"
33
33
  ].each { |g| s.add_dependency g}
data/lib/chef-server-api.rb CHANGED
@@ -68,9 +68,6 @@ if defined?(Merb::Plugins)
68
68
  Chef::ApiClient.create_design_document
69
69
  Chef::WebUIUser.create_design_document
70
70
 
71
- Chef::Log.info('Loading roles')
72
- Chef::Role.sync_from_disk_to_couchdb
73
-
74
71
  # Create the signing key and certificate
75
72
  Chef::Certificate.generate_signing_ca
76
73
 
@@ -79,6 +76,9 @@ if defined?(Merb::Plugins)
79
76
 
80
77
  # Generate the Web UI Key
81
78
  Chef::Certificate.gen_validation_key(Chef::Config[:web_ui_client_name], Chef::Config[:web_ui_key])
79
+
80
+ Chef::Log.info('Loading roles')
81
+ Chef::Role.sync_from_disk_to_couchdb
82
82
  end
83
83
  end
84
84
 
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,31 +14,35 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-03-17 00:00:00 -07:00
17
+ date: 2010-04-01 00:00:00 -07:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
- name: merb-slices
21
+ name: merb-core
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
33
- name: merb-core
35
+ name: merb-slices
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