ironfan 3.1.5 → 3.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. data/Gemfile +7 -8
  2. data/README.md +6 -0
  3. data/TODO.md +140 -29
  4. data/VERSION +1 -1
  5. data/config/ubuntu10.04-ironfan.erb +11 -5
  6. data/config/ubuntu11.10-ironfan.erb +12 -6
  7. data/ironfan.gemspec +25 -23
  8. data/lib/chef/knife/bootstrap/centos6.2-ironfan.erb +148 -0
  9. data/lib/chef/knife/bootstrap/ubuntu10.04-ironfan.erb +11 -5
  10. data/lib/chef/knife/bootstrap/ubuntu11.10-ironfan.erb +12 -6
  11. data/lib/chef/knife/cluster_bootstrap.rb +4 -3
  12. data/lib/chef/knife/cluster_kick.rb +9 -8
  13. data/lib/chef/knife/cluster_kill.rb +1 -0
  14. data/lib/chef/knife/cluster_launch.rb +2 -2
  15. data/lib/chef/knife/cluster_proxy.rb +5 -4
  16. data/lib/chef/knife/cluster_show.rb +1 -1
  17. data/lib/chef/knife/cluster_ssh.rb +6 -5
  18. data/lib/chef/knife/cluster_stop.rb +3 -0
  19. data/lib/chef/knife/cluster_vagrant.rb +2 -2
  20. data/lib/chef/knife/ironfan_knife_common.rb +1 -1
  21. data/lib/chef/knife/vagrant/skeleton_vagrantfile.rb +5 -2
  22. data/lib/ironfan/chef_layer.rb +3 -1
  23. data/lib/ironfan/cloud.rb +146 -107
  24. data/lib/ironfan/discovery.rb +13 -0
  25. data/lib/ironfan/fog_layer.rb +42 -3
  26. data/lib/ironfan/security_group.rb +16 -4
  27. data/lib/ironfan/server.rb +29 -0
  28. data/lib/ironfan.rb +1 -1
  29. data/notes/INSTALL-cloud_setup.md +14 -11
  30. data/notes/INSTALL.md +6 -1
  31. data/notes/core_concepts.md +1 -1
  32. data/notes/ec2-pricing_and_capacity.md +24 -18
  33. data/notes/version-3_2.md +273 -0
  34. data/spec/spec_helper.rb +26 -34
  35. metadata +31 -29
data/spec/spec_helper.rb CHANGED
@@ -1,13 +1,17 @@
1
1
  require 'rubygems' unless defined?(Gem)
2
2
  require 'bundler'
3
- # begin
4
- # Bundler.setup(:default, :development)
5
- # rescue Bundler::BundlerError => e
6
- # $stderr.puts e.message
7
- # $stderr.puts "Run `bundle install` to install missing gems"
8
- # exit e.status_code
9
- # end
10
- require 'spork'
3
+ begin
4
+ Bundler.setup(:default, :development)
5
+ rescue Bundler::BundlerError => e
6
+ $stderr.puts e.message
7
+ $stderr.puts "Run `bundle install` to install missing gems"
8
+ exit e.status_code
9
+ end
10
+
11
+ require 'rspec'
12
+ require 'chef'
13
+ require 'chef/knife'
14
+ require 'fog'
11
15
 
12
16
  unless defined?(IRONFAN_DIR)
13
17
  IRONFAN_DIR = File.expand_path(File.dirname(__FILE__)+'/..')
@@ -16,35 +20,23 @@ unless defined?(IRONFAN_DIR)
16
20
  Dir[IRONFAN_DIR("vendor/*/lib")].each{|dir| p dir ; $LOAD_PATH.unshift(File.expand_path(dir)) } ; $LOAD_PATH.uniq!
17
21
  end
18
22
 
19
- Spork.prefork do # This code is run only once when the spork server is started
20
-
21
- require 'rspec'
22
- require 'chef'
23
- require 'chef/knife'
24
- require 'fog'
23
+ Fog.mock!
24
+ Fog::Mock.delay = 0
25
25
 
26
- Fog.mock!
27
- Fog::Mock.delay = 0
26
+ CHEF_CONFIG_FILE = File.expand_path(IRONFAN_DIR('spec/test_config.rb')) unless defined?(CHEF_CONFIG_FILE)
27
+ Chef::Config.from_file(CHEF_CONFIG_FILE)
28
28
 
29
- CHEF_CONFIG_FILE = File.expand_path(IRONFAN_DIR('spec/test_config.rb')) unless defined?(CHEF_CONFIG_FILE)
30
- Chef::Config.from_file(CHEF_CONFIG_FILE)
29
+ # Requires custom matchers & macros, etc from files in ./spec_helper/
30
+ Dir[IRONFAN_DIR("spec/spec_helper/*.rb")].each {|f| require f}
31
31
 
32
- # Requires custom matchers & macros, etc from files in ./spec_helper/
33
- Dir[IRONFAN_DIR("spec/spec_helper/*.rb")].each {|f| require f}
34
-
35
- def load_example_cluster(name)
36
- require(IRONFAN_DIR('clusters', "#{name}.rb"))
37
- end
38
- def get_example_cluster name
39
- load_example_cluster(name)
40
- Ironfan.cluster(name)
41
- end
42
-
43
- # Configure rspec
44
- RSpec.configure do |config|
45
- end
32
+ def load_example_cluster(name)
33
+ require(IRONFAN_DIR('clusters', "#{name}.rb"))
34
+ end
35
+ def get_example_cluster name
36
+ load_example_cluster(name)
37
+ Ironfan.cluster(name)
46
38
  end
47
39
 
48
- Spork.each_run do
49
- # This code will be run each time you run your specs.
40
+ # Configure rspec
41
+ RSpec.configure do |config|
50
42
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ironfan
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.5
4
+ version: 3.1.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,77 +9,77 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-04-02 00:00:00.000000000 Z
12
+ date: 2012-06-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: chef
16
- requirement: &70162771110700 !ruby/object:Gem::Requirement
16
+ requirement: &70096497952380 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
- - - ~>
19
+ - - ! '>='
20
20
  - !ruby/object:Gem::Version
21
21
  version: 0.10.4
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70162771110700
24
+ version_requirements: *70096497952380
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: fog
27
- requirement: &70162771109680 !ruby/object:Gem::Requirement
27
+ requirement: &70096497951860 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
31
31
  - !ruby/object:Gem::Version
32
- version: 1.2.0
32
+ version: '1.2'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70162771109680
35
+ version_requirements: *70096497951860
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: formatador
38
- requirement: &70162771109180 !ruby/object:Gem::Requirement
38
+ requirement: &70096497951280 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
42
42
  - !ruby/object:Gem::Version
43
- version: 0.2.1
43
+ version: '0.2'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70162771109180
46
+ version_requirements: *70096497951280
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: gorillib
49
- requirement: &70162771108660 !ruby/object:Gem::Requirement
49
+ requirement: &70096497950680 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
53
53
  - !ruby/object:Gem::Version
54
- version: 0.1.7
54
+ version: '0.1'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70162771108660
57
+ version_requirements: *70096497950680
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: bundler
60
- requirement: &70162771108140 !ruby/object:Gem::Requirement
60
+ requirement: &70096497950160 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
- - - ~>
63
+ - - ! '>='
64
64
  - !ruby/object:Gem::Version
65
- version: '1'
65
+ version: '1.1'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70162771108140
68
+ version_requirements: *70096497950160
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: jeweler
71
- requirement: &70162771107560 !ruby/object:Gem::Requirement
71
+ requirement: &70096497949600 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
- - - ~>
74
+ - - ! '>='
75
75
  - !ruby/object:Gem::Version
76
76
  version: '1.6'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70162771107560
79
+ version_requirements: *70096497949600
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rspec
82
- requirement: &70162771106960 !ruby/object:Gem::Requirement
82
+ requirement: &70096497949080 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,21 +87,21 @@ dependencies:
87
87
  version: '2.5'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70162771106960
90
+ version_requirements: *70096497949080
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: yard
93
- requirement: &70162771106400 !ruby/object:Gem::Requirement
93
+ requirement: &70096497948540 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
- - - ~>
96
+ - - ! '>='
97
97
  - !ruby/object:Gem::Version
98
98
  version: '0.6'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70162771106400
101
+ version_requirements: *70096497948540
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: redcarpet
104
- requirement: &70162771105860 !ruby/object:Gem::Requirement
104
+ requirement: &70096497947960 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: '2'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70162771105860
112
+ version_requirements: *70096497947960
113
113
  description: Ironfan allows you to orchestrate not just systems but clusters of machines.
114
114
  It includes a powerful layer on top of knife and a collection of cloud cookbooks.
115
115
  email: coders@infochimps.com
@@ -136,6 +136,7 @@ files:
136
136
  - config/ubuntu10.04-ironfan.erb
137
137
  - config/ubuntu11.10-ironfan.erb
138
138
  - ironfan.gemspec
139
+ - lib/chef/knife/bootstrap/centos6.2-ironfan.erb
139
140
  - lib/chef/knife/bootstrap/ubuntu10.04-ironfan.erb
140
141
  - lib/chef/knife/bootstrap/ubuntu11.10-ironfan.erb
141
142
  - lib/chef/knife/cluster_bootstrap.rb
@@ -200,6 +201,7 @@ files:
200
201
  - notes/silverware.md
201
202
  - notes/style_guide.md
202
203
  - notes/tips_and_troubleshooting.md
204
+ - notes/version-3_2.md
203
205
  - notes/walkthrough-hadoop.md
204
206
  - notes/walkthrough-web.md
205
207
  - spec/ironfan/cluster_spec.rb
@@ -226,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
226
228
  version: '0'
227
229
  segments:
228
230
  - 0
229
- hash: -2369371738440792103
231
+ hash: 237204052974286677
230
232
  required_rubygems_version: !ruby/object:Gem::Requirement
231
233
  none: false
232
234
  requirements: