Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

resolved conflic with ironfan-pantry

  • Loading branch information...
commit 1ac28c22645489034de9a19748b61ecfefae2ed2 2 parents cd94a9d + 33c3dbb
@sya sya authored
View
37 Gemfile
@@ -1,19 +1,40 @@
source "http://rubygems.org"
-gem 'chef', "= 0.10.8"
-gem 'ironfan', "~> 3.1.0.rc1"
+#
+# Chef
+#
-group :development do
+gem 'chef', "= 0.10.8"
+gem 'ironfan', "~> 3.1.0.rc1"
+
+gem 'vagrant', "~> 0.9.7"
+gem 'veewee', "~> 0.2.3"
+
+#
+# Test drivers
+#
+
+group :test do
gem 'rake'
- gem 'bundler', "~> 1"
- gem 'rspec', "~> 2.5"
- gem 'yard', "~> 0.6"
+ gem 'bundler', "~> 1"
+ gem 'rspec', "~> 2.5"
+ gem 'cucumber', "~> 1.1"
+end
+
+#
+# Development
+#
+
+group :development do
+ gem 'yard', "~> 0.6"
+ gem 'jeweler'
gem 'ruby_gntp'
- gem 'guard'
- gem 'guard-process'
+ gem 'guard', "~> 1"
+ gem 'guard-process', "~> 1"
gem 'guard-chef', :git => 'git@github.com:infochimps/guard-chef.git'
+ gem 'guard-cucumber'
end
group :support do
View
15 Guardfile
@@ -9,9 +9,14 @@
# run the right knife command on changes within the cookbooks, roles and data_bags directories
guard 'chef' do
- watch(%r{vendor/[^/]+/([\w\-\:\.\/]+)}){|m| fn = "cookbooks/#{m[1]}" ; fn if File.exists?(fn) }
- watch(%r{^.*cookbooks/([\w\-\:\.\/]+)/})
- watch(%r{^roles/([\w\-\:\.\/]+)\.(rb|json)\z})
- watch(%r{^data_bags/([\w\-\:\.\/]+)/})
- watch(%r{^environments/[\w\-\:\.\/]+\.(rb|json)\z})
+ file_chars = '[\w\-\:\.]+'
+ path_chars = '[\w\-\:\.\/]+'
+ # watch files in vendor/foo-pantry/cookbooks/*; act on them if they are
+ # symlinked into action
+ watch(%r{vendor/[^/]+/((?:cookbooks|roles|data_bags)/#{path_chars})}){|m| m[1] if File.exists?(m[1]) }
+ #
+ watch(%r{^[^/]*cookbooks/(#{path_chars})/})
+ watch(%r{^data_bags/(#{path_chars})/})
+ watch(%r{^roles/(#{file_chars})\.(rb|json)\z})
+ watch(%r{^environments/(#{file_chars}\.(rb|json))\z})
end
View
3  clusters/sandbox.rb
@@ -31,8 +31,7 @@
facet :simple do
instances 2
role :hadoop_s3_keys
- recipe 'route53::default'
- recipe 'route53::ec2'
+ role :set_hostname
end
facet :raid_demo do
View
2  knife/credentials
View
4 knife/knife.rb
@@ -28,8 +28,8 @@
#
# Load the vendored ironfan lib if present
#
-if File.exists?("#{homebase}/vendor/ironfan/lib")
- $LOAD_PATH.unshift("#{homebase}/vendor/ironfan/lib")
+if File.exists?("#{homebase}/vendor/ironfan-knife/lib")
+ $LOAD_PATH.unshift("#{homebase}/vendor/ironfan-knife/lib")
end
log_level :info
View
1  roles/set_domain_name.rb
View
1  roles/set_hostname.rb
2  vendor/ironfan-pantry
@@ -1 +1 @@
-Subproject commit 43a5d92d598059cfb7382b010a88e3549ae227ff
+Subproject commit a4f88cb9ce5cb730d66de7276aa4116a2d028873
Please sign in to comment.
Something went wrong with that request. Please try again.