From 573cad34df4edd6d548793d5e519c9140e4d7816 Mon Sep 17 00:00:00 2001
From: Morten Primdahl <morten@zendesk.com>
Date: Fri, 11 May 2012 15:22:17 -0700
Subject: [PATCH] Aligning dependencies between Gemfile and the gemspec.

It's unfortunate that the gemspec and Gemfile was out of sync, one
listed canonix as a dependency, another xmlcanonicalizer.

Tests pass with this commit and future changes should stick to
modifying the gemspec unless you for some good reason need e.g.
bundler groups or platform restrictions.
---
 Gemfile           |  7 +------
 Gemfile.lock      | 20 +++++++++++++-------
 ruby-saml.gemspec | 29 ++++++-----------------------
 3 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/Gemfile b/Gemfile
index a14f62a98..d65e2a669 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'rake'
-gem 'shoulda', "~>3.0.1"
-gem 'mocha', "~>0.10.5"
-gem 'ruby-debug', "~>0.10.4"
-gem 'uuid', "~>2.3.5"
-gem 'xmlcanonicalizer', "~>0.1.1"
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index d702c699a..d8633f20b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,14 @@
+PATH
+  remote: .
+  specs:
+    ruby-saml (0.5.3)
+      canonix (= 0.1.1)
+      uuid (~> 2.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
+    canonix (0.1.1)
     columnize (0.3.6)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
@@ -9,7 +17,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    rake (0.8.7)
+    rake (0.9.2.2)
     rbx-require-relative (0.0.9)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
@@ -24,15 +32,13 @@ GEM
     systemu (2.5.0)
     uuid (2.3.5)
       macaddr (~> 1.0)
-    xmlcanonicalizer (0.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  mocha (~> 0.10.5)
+  mocha
   rake
-  ruby-debug (~> 0.10.4)
-  shoulda (~> 3.0.1)
-  uuid (~> 2.3.5)
-  xmlcanonicalizer (~> 0.1.1)
+  ruby-debug
+  ruby-saml!
+  shoulda
diff --git a/ruby-saml.gemspec b/ruby-saml.gemspec
index 63432401d..bd1ab5f4b 100644
--- a/ruby-saml.gemspec
+++ b/ruby-saml.gemspec
@@ -23,29 +23,12 @@ Gem::Specification.new do |s|
   s.summary = %q{SAML Ruby Tookit}
   s.test_files = `git ls-files test/*`.split("\n")
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_runtime_dependency("canonix", ["0.1.1"])
+  s.add_runtime_dependency("uuid", ["~> 2.3"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<canonix>, ["~> 0.1"])
-      s.add_runtime_dependency(%q<uuid>, ["~> 2.3"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<canonix>, ["~> 0.1"])
-      s.add_dependency(%q<uuid>, ["~> 2.3"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<canonix>, ["~> 0.1"])
-    s.add_dependency(%q<uuid>, ["~> 2.3"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-  end
+  s.add_development_dependency("shoulda", [">= 0"])
+  s.add_development_dependency("rake", [">= 0"])
+  s.add_development_dependency("ruby-debug", [">= 0"])
+  s.add_development_dependency("mocha", [">= 0"])
 end