Permalink
Browse files

Cleaning up Gemfile (and unignored Gemfile.lock) to solidify dependen…

…cies, bumped version
  • Loading branch information...
temujin9 committed Feb 14, 2013
1 parent 7c1b6ba commit 79b229eb5f25c87de6db0fe7613ac2b7d37c9341
Showing with 195 additions and 13 deletions.
  1. +0 −1 .gitignore
  2. +3 −0 CHANGELOG.md
  3. +7 −3 Gemfile
  4. +175 −0 Gemfile.lock
  5. +1 −1 VERSION
  6. +9 −8 ironfan.gemspec
View
@@ -41,7 +41,6 @@ pkg
.rvmrc
.vendor
.bundle
-Gemfile.lock
.rake_test_cache
metadata.json
View
@@ -1,3 +1,6 @@
+# v4.8.0
+* Cleaning up Gemfile and Gemfile.lock to solidify dependencies
+
# v4.7.7
* Allow per-ephemeral-disk options using :disks attribute (thanks @nickmarden)
View
10 Gemfile
@@ -1,10 +1,15 @@
source "http://rubygems.org"
-gem 'chef', ">= 0.10.4"
+gem 'chef', "~> 10.16"
gem 'fog', "~> 1.2"
gem 'formatador', "~> 0.2"
gem 'gorillib', "~> 0.4.2"
+# Everything in the world is being a stupid dick about JSON versions. Pin it
+# to the one that doesn't seem to angrify everyone. Note: pins chef to the
+# 10.16 branch.
+gem 'json', "= 1.5.4"
+
group :development do
gem 'bundler', "~> 1.0"
gem 'rake'
@@ -13,7 +18,6 @@ group :development do
#
gem 'redcarpet', ">= 2.1"
gem 'oj', ">= 1.2"
- gem 'json', :platform => :jruby
end
group :support do
@@ -25,7 +29,7 @@ end
group :test do
gem 'simplecov', ">= 0.5", :platform => :ruby_19
#
- gem 'guard', "~> 1"
+ gem 'guard', "~> 1"
gem 'guard-rspec'
gem 'guard-yard'
gem 'ruby_gntp'
View
@@ -0,0 +1,175 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ archive-tar-minitar (0.5.2)
+ builder (3.1.4)
+ bunny (0.7.9)
+ chef (10.22.0)
+ bunny (>= 0.6.0, < 0.8.0)
+ erubis
+ highline (>= 1.6.9)
+ json (>= 1.4.4, <= 1.7.7)
+ mixlib-authentication (>= 1.3.0)
+ mixlib-cli (>= 1.1.0)
+ mixlib-config (>= 1.1.2)
+ mixlib-log (>= 1.3.0)
+ mixlib-shellout
+ moneta (< 0.7.0)
+ net-ssh (~> 2.6)
+ net-ssh-multi (~> 1.1.0)
+ ohai (>= 0.6.0)
+ rest-client (>= 1.0.4, < 1.7.0)
+ treetop (~> 1.4.9)
+ uuidtools
+ yajl-ruby (~> 1.1)
+ coderay (1.0.8)
+ columnize (0.3.6)
+ configliere (0.4.18)
+ highline (>= 1.5.2)
+ multi_json (>= 1.1)
+ diff-lcs (1.1.3)
+ erubis (2.7.0)
+ excon (0.16.10)
+ fog (1.9.0)
+ builder
+ excon (~> 0.14)
+ formatador (~> 0.2.0)
+ mime-types
+ multi_json (~> 1.0)
+ net-scp (~> 1.0.4)
+ net-ssh (>= 2.1.3)
+ nokogiri (~> 1.5.0)
+ ruby-hmac
+ formatador (0.2.4)
+ git (1.2.5)
+ gorillib (0.4.2)
+ configliere (>= 0.4.13)
+ json
+ multi_json (>= 1.1)
+ grit (2.5.0)
+ diff-lcs (~> 1.1)
+ mime-types (~> 1.15)
+ posix-spawn (~> 0.3.6)
+ guard (1.6.2)
+ listen (>= 0.6.0)
+ lumberjack (>= 1.0.2)
+ pry (>= 0.9.10)
+ terminal-table (>= 1.4.3)
+ thor (>= 0.14.6)
+ guard-rspec (2.4.0)
+ guard (>= 1.1)
+ rspec (~> 2.11)
+ guard-yard (2.0.1)
+ guard (>= 1.1.0)
+ yard (>= 0.7.0)
+ highline (1.6.15)
+ ipaddress (0.8.0)
+ jeweler (1.8.4)
+ bundler (~> 1.0)
+ git (>= 1.2.5)
+ rake
+ rdoc
+ json (1.5.4)
+ linecache19 (0.5.12)
+ ruby_core_source (>= 0.1.4)
+ listen (0.7.2)
+ lumberjack (1.0.2)
+ method_source (0.8.1)
+ mime-types (1.21)
+ mixlib-authentication (1.3.0)
+ mixlib-log
+ mixlib-cli (1.3.0)
+ mixlib-config (1.1.2)
+ mixlib-log (1.4.1)
+ mixlib-shellout (1.1.0)
+ moneta (0.6.0)
+ multi_json (1.6.0)
+ net-scp (1.0.4)
+ net-ssh (>= 1.99.1)
+ net-ssh (2.6.5)
+ net-ssh-gateway (1.2.0)
+ net-ssh (>= 2.6.5)
+ net-ssh-multi (1.1)
+ net-ssh (>= 2.1.4)
+ net-ssh-gateway (>= 0.99.0)
+ nokogiri (1.5.6)
+ ohai (6.16.0)
+ ipaddress
+ mixlib-cli
+ mixlib-config
+ mixlib-log
+ mixlib-shellout
+ systemu
+ yajl-ruby
+ oj (2.0.4)
+ polyglot (0.3.3)
+ posix-spawn (0.3.6)
+ pry (0.9.12)
+ coderay (~> 1.0.5)
+ method_source (~> 0.8)
+ slop (~> 3.4)
+ rake (10.0.3)
+ rdoc (3.12.1)
+ json (~> 1.4)
+ redcarpet (2.2.2)
+ rest-client (1.6.7)
+ mime-types (>= 1.16)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.12.2)
+ ruby-debug-base19 (0.11.25)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby_core_source (>= 0.1.4)
+ ruby-debug19 (0.11.6)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby-debug-base19 (>= 0.11.19)
+ ruby-hmac (0.4.0)
+ ruby_core_source (0.1.5)
+ archive-tar-minitar (>= 0.5.2)
+ ruby_gntp (0.3.4)
+ simplecov (0.7.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
+ slop (3.4.3)
+ systemu (2.5.2)
+ terminal-table (1.4.5)
+ thor (0.17.0)
+ treetop (1.4.12)
+ polyglot
+ polyglot (>= 0.3.1)
+ uuidtools (2.1.3)
+ yajl-ruby (1.1.0)
+ yard (0.8.4.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ bundler (~> 1.0)
+ chef (~> 10.16)
+ fog (~> 1.2)
+ formatador (~> 0.2)
+ gorillib (~> 0.4.2)
+ grit
+ guard (~> 1)
+ guard-rspec
+ guard-yard
+ jeweler (>= 1.6)
+ json (= 1.5.4)
+ oj (>= 1.2)
+ pry
+ rake
+ redcarpet (>= 2.1)
+ rspec (~> 2.8)
+ ruby-debug19
+ ruby_gntp
+ simplecov (>= 0.5)
+ yard (>= 0.7)
View
@@ -1 +1 @@
-4.7.7
+4.8.0
View
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = "ironfan"
- s.version = "4.7.7"
+ s.version = "4.8.0"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Infochimps"]
- s.date = "2013-01-31"
+ s.date = "2013-02-14"
s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
s.email = "coders@infochimps.com"
s.extra_rdoc_files = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
"CHANGELOG.md",
"ELB.md",
"Gemfile",
+ "Gemfile.lock",
"Guardfile",
"LICENSE.md",
"README.md",
@@ -156,42 +157,42 @@ Gem::Specification.new do |s|
s.specification_version = 3
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<chef>, [">= 0.10.4"])
+ s.add_runtime_dependency(%q<chef>, ["~> 10.16"])
s.add_runtime_dependency(%q<fog>, ["~> 1.2"])
s.add_runtime_dependency(%q<formatador>, ["~> 0.2"])
s.add_runtime_dependency(%q<gorillib>, ["~> 0.4.2"])
+ s.add_runtime_dependency(%q<json>, ["= 1.5.4"])
s.add_development_dependency(%q<bundler>, ["~> 1.0"])
s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<rspec>, ["~> 2.8"])
s.add_development_dependency(%q<yard>, [">= 0.7"])
s.add_development_dependency(%q<redcarpet>, [">= 2.1"])
s.add_development_dependency(%q<oj>, [">= 1.2"])
- s.add_development_dependency(%q<json>, [">= 0"])
else
- s.add_dependency(%q<chef>, [">= 0.10.4"])
+ s.add_dependency(%q<chef>, ["~> 10.16"])
s.add_dependency(%q<fog>, ["~> 1.2"])
s.add_dependency(%q<formatador>, ["~> 0.2"])
s.add_dependency(%q<gorillib>, ["~> 0.4.2"])
+ s.add_dependency(%q<json>, ["= 1.5.4"])
s.add_dependency(%q<bundler>, ["~> 1.0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<rspec>, ["~> 2.8"])
s.add_dependency(%q<yard>, [">= 0.7"])
s.add_dependency(%q<redcarpet>, [">= 2.1"])
s.add_dependency(%q<oj>, [">= 1.2"])
- s.add_dependency(%q<json>, [">= 0"])
end
else
- s.add_dependency(%q<chef>, [">= 0.10.4"])
+ s.add_dependency(%q<chef>, ["~> 10.16"])
s.add_dependency(%q<fog>, ["~> 1.2"])
s.add_dependency(%q<formatador>, ["~> 0.2"])
s.add_dependency(%q<gorillib>, ["~> 0.4.2"])
+ s.add_dependency(%q<json>, ["= 1.5.4"])
s.add_dependency(%q<bundler>, ["~> 1.0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<rspec>, ["~> 2.8"])
s.add_dependency(%q<yard>, [">= 0.7"])
s.add_dependency(%q<redcarpet>, [">= 2.1"])
s.add_dependency(%q<oj>, [">= 1.2"])
- s.add_dependency(%q<json>, [">= 0"])
end
end

0 comments on commit 79b229e

Please sign in to comment.