remy 0.0.5 → 0.0.6
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/remy/config/chef.rb +1 -5
- data/lib/remy/version.rb +1 -1
- data/lib/remy.rb +0 -11
- data/lib/tasks/remy.rake +2 -5
- data/spec/remy/config/chef_spec.rb +0 -5
- metadata +18 -18
data/lib/remy/config/chef.rb
CHANGED
@@ -39,11 +39,7 @@ module Remy
|
|
39
39
|
:cookbook_path => [temp_config.cookbook_path].compact.flatten}.merge!(temp_config.node_attributes))
|
40
40
|
|
41
41
|
yml_files.each do |filename|
|
42
|
-
|
43
|
-
@config.deep_merge!(YAML.load(ERB.new(File.read(filename)).result) || {})
|
44
|
-
rescue SystemCallError, IOError
|
45
|
-
# do nothing if the chef.yml file could not be read (it's not needed for every usage of remy, just certain ones)
|
46
|
-
end
|
42
|
+
@config.deep_merge!(YAML.load(ERB.new(File.read(filename)).result) || {})
|
47
43
|
end
|
48
44
|
end
|
49
45
|
|
data/lib/remy/version.rb
CHANGED
data/lib/remy.rb
CHANGED
@@ -44,14 +44,3 @@ require 'remy/utility'
|
|
44
44
|
require 'yaml'
|
45
45
|
dir = File.dirname(__FILE__)
|
46
46
|
Dir[File.join(dir, 'remy', '**', '*.rb')].each {|f| require f.gsub(dir, '')[1, f.length] }
|
47
|
-
|
48
|
-
module Remy
|
49
|
-
begin
|
50
|
-
class Railtie < ::Rails::Railtie
|
51
|
-
rake_tasks do
|
52
|
-
load 'tasks/remy.rake'
|
53
|
-
end
|
54
|
-
end
|
55
|
-
rescue LoadError, NameError
|
56
|
-
end
|
57
|
-
end
|
data/lib/tasks/remy.rake
CHANGED
@@ -34,11 +34,8 @@ namespace :remy do
|
|
34
34
|
|
35
35
|
desc 'create a server and bootstrap chef'
|
36
36
|
task :create_and_bootstrap, :server_name, :flavor_id, :cloud_api_key, :cloud_username, :cloud_provider, :image_id do |task, options|
|
37
|
-
|
38
|
-
|
39
|
-
Rake::Task[:'remy:server:bootstrap'].invoke(result[:ip_address], result[:password])
|
40
|
-
rescue Exception => e
|
41
|
-
end
|
37
|
+
result = Remy::Server.new({:raise_exception => true}.merge(options)).create
|
38
|
+
Rake::Task[:'remy:server:bootstrap'].invoke(result[:ip_address], result[:password])
|
42
39
|
end
|
43
40
|
end
|
44
41
|
end
|
@@ -56,11 +56,6 @@ describe Remy::Config::Chef do
|
|
56
56
|
subject.config.yml_files.should == []
|
57
57
|
end
|
58
58
|
|
59
|
-
it 'should not raise an error if there is a file does does not exist' do
|
60
|
-
expect do
|
61
|
-
subject.configure { |config| config.yml_files = ['does_not_exist.yml'] }
|
62
|
-
end.should_not raise_error
|
63
|
-
end
|
64
59
|
end
|
65
60
|
describe 'json config files' do
|
66
61
|
before do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: remy
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.6
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-07-
|
12
|
+
date: 2012-07-24 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: i18n
|
16
|
-
requirement: &
|
16
|
+
requirement: &70319360713740 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70319360713740
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: json
|
27
|
-
requirement: &
|
27
|
+
requirement: &70319360713320 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70319360713320
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: rspec
|
38
|
-
requirement: &
|
38
|
+
requirement: &70319360712820 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 2.7.0
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70319360712820
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: activesupport
|
49
|
-
requirement: &
|
49
|
+
requirement: &70319360712320 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '2'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *70319360712320
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: chef
|
60
|
-
requirement: &
|
60
|
+
requirement: &70319360711940 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *70319360711940
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rake
|
71
|
-
requirement: &
|
71
|
+
requirement: &70319360711480 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *70319360711480
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: fog
|
82
|
-
requirement: &
|
82
|
+
requirement: &70319360711060 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: '0'
|
88
88
|
type: :runtime
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *70319360711060
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: hashie
|
93
|
-
requirement: &
|
93
|
+
requirement: &70319360710640 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ! '>='
|
@@ -98,7 +98,7 @@ dependencies:
|
|
98
98
|
version: '0'
|
99
99
|
type: :runtime
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *70319360710640
|
102
102
|
description: Easy chef deployment
|
103
103
|
email:
|
104
104
|
- pair+gwoodward+rdy@pivotallabs.com
|