Skip to content
This repository

upgrading gems #6

Closed
wants to merge 2 commits into from

2 participants

Aubrey Holland Andy Brett
Aubrey Holland
aub commented April 10, 2012

I wanted to use health_graph with another project that uses koala and found that I got a gem conflict with faraday. health_graph was using an older version and was requiring a specific one, so I modified the gemspec to make the versions flexible and upgraded faraday_middleware to 0.8.

Some other small things were that the Gemfile was specifying the gems rather than using gemspec, and many of the gems were listed multiple times in the gemspec file.

I verified that the tests still pass, and I did a test with the app I'm writing where I found that the gem pulled data correctly.

Any questions, let me know.

Cheers,
Aubrey

added some commits April 10, 2012
remove extraneous gem dependencies, use gemspec in Gemfile, and remov…
…e hard dependencies on specific versions of faraday and friends
013003f
upgrade faraday middleware 31c86e5
Andy Brett
Collaborator

this is resolved with merging in #7.

Andy Brett andrewpbrett closed this May 09, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 2 unique commits by 1 author.

Apr 10, 2012
remove extraneous gem dependencies, use gemspec in Gemfile, and remov…
…e hard dependencies on specific versions of faraday and friends
013003f
upgrade faraday middleware 31c86e5
This page is out of date. Refresh to see the latest.
22  Gemfile
... ...
@@ -1,20 +1,2 @@
1  
-source "http://rubygems.org"
2  
-# Add dependencies required to use your gem here.
3  
-# Example:
4  
-#   gem "activesupport", ">= 2.3.5"
5  
-
6  
-gem "oauth2", "= 0.5.2"
7  
-gem "faraday", "= 0.7.4"
8  
-gem "faraday_middleware", "= 0.7.0"
9  
-gem "hashie", "= 1.2"
10  
-gem "json"
11  
-
12  
-# Add dependencies to develop your gem here.
13  
-# Include everything needed to run rake, tests, features, etc.
14  
-group :development do
15  
-  gem "shoulda", ">= 0"
16  
-  gem "webmock", "= 1.7.4"
17  
-  gem "bundler", "~> 1.0.0"
18  
-  gem "jeweler", "~> 1.6.4"
19  
-  gem "rcov", ">= 0"
20  
-end
  1
+source :rubygems
  2
+gemspec
38  Gemfile.lock
... ...
@@ -1,27 +1,37 @@
  1
+PATH
  2
+  remote: .
  3
+  specs:
  4
+    health_graph (0.5.5)
  5
+      faraday (~> 0.7.4)
  6
+      faraday_middleware (~> 0.8.0)
  7
+      hashie (~> 1.2)
  8
+      json
  9
+      oauth2 (~> 0.5.2)
  10
+
1 11
 GEM
2 12
   remote: http://rubygems.org/
3 13
   specs:
4 14
     addressable (2.2.6)
5 15
     crack (0.3.1)
6  
-    faraday (0.7.4)
7  
-      addressable (~> 2.2.6)
8  
-      multipart-post (~> 1.1.0)
9  
-      rack (>= 1.1.0, < 2)
10  
-    faraday_middleware (0.7.0)
11  
-      faraday (~> 0.7.3)
  16
+    faraday (0.7.6)
  17
+      addressable (~> 2.2)
  18
+      multipart-post (~> 1.1)
  19
+      rack (~> 1.1)
  20
+    faraday_middleware (0.8.6)
  21
+      faraday (< 0.9, >= 0.7.4)
12 22
     git (1.2.5)
13 23
     hashie (1.2.0)
14 24
     jeweler (1.6.4)
15 25
       bundler (~> 1.0)
16 26
       git (>= 1.2.5)
17 27
       rake
18  
-    json (1.6.5)
19  
-    multi_json (1.0.4)
20  
-    multipart-post (1.1.3)
  28
+    json (1.6.6)
  29
+    multi_json (1.1.0)
  30
+    multipart-post (1.1.5)
21 31
     oauth2 (0.5.2)
22 32
       faraday (~> 0.7)
23 33
       multi_json (~> 1.0)
24  
-    rack (1.3.4)
  34
+    rack (1.4.1)
25 35
     rake (0.9.2)
26 36
     rcov (0.9.10)
27 37
     shoulda (2.11.3)
@@ -34,12 +44,8 @@ PLATFORMS
34 44
 
35 45
 DEPENDENCIES
36 46
   bundler (~> 1.0.0)
37  
-  faraday (= 0.7.4)
38  
-  faraday_middleware (= 0.7.0)
39  
-  hashie (= 1.2)
  47
+  health_graph!
40 48
   jeweler (~> 1.6.4)
41  
-  json
42  
-  oauth2 (= 0.5.2)
43 49
   rcov
44 50
   shoulda
45  
-  webmock (= 1.7.4)
  51
+  webmock (~> 1.7.4)
78  health_graph.gemspec
@@ -70,57 +70,39 @@ Gem::Specification.new do |s|
70 70
     s.specification_version = 3
71 71
 
72 72
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
73  
-      s.add_runtime_dependency(%q<oauth2>, ["= 0.5.2"])
74  
-      s.add_runtime_dependency(%q<faraday>, ["= 0.7.4"])
75  
-      s.add_runtime_dependency(%q<faraday_middleware>, ["= 0.7.0"])
76  
-      s.add_runtime_dependency(%q<hashie>, ["= 1.2"])
77  
-      s.add_runtime_dependency(%q<json>, [">= 0"])
78  
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
79  
-      s.add_development_dependency(%q<webmock>, ["= 1.7.4"])
80  
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
81  
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
82  
-      s.add_development_dependency(%q<rcov>, [">= 0"])
83  
-      s.add_runtime_dependency(%q<oauth2>, ["= 0.5.2"])
84  
-      s.add_runtime_dependency(%q<faraday>, ["= 0.7.4"])
85  
-      s.add_runtime_dependency(%q<faraday_middleware>, ["= 0.7.0"])
86  
-      s.add_runtime_dependency(%q<hashie>, ["= 1.2"])
87  
-      s.add_runtime_dependency(%q<webmock>, ["= 1.7.6"])
88  
-      s.add_runtime_dependency(%q<json>, [">= 0"])
  73
+      s.add_runtime_dependency('oauth2', ["~> 0.5.2"])
  74
+      s.add_runtime_dependency('faraday', ["~> 0.7.4"])
  75
+      s.add_runtime_dependency('faraday_middleware', ["~> 0.8.0"])
  76
+      s.add_runtime_dependency('hashie', ["~> 1.2"])
  77
+      s.add_runtime_dependency('json', [">= 0"])
  78
+      s.add_development_dependency('shoulda', [">= 0"])
  79
+      s.add_development_dependency('webmock', ["~> 1.7.4"])
  80
+      s.add_development_dependency('bundler', ["~> 1.0.0"])
  81
+      s.add_development_dependency('jeweler', ["~> 1.6.4"])
  82
+      s.add_development_dependency('rcov', [">= 0"])
89 83
     else
90  
-      s.add_dependency(%q<oauth2>, ["= 0.5.2"])
91  
-      s.add_dependency(%q<faraday>, ["= 0.7.4"])
92  
-      s.add_dependency(%q<faraday_middleware>, ["= 0.7.0"])
93  
-      s.add_dependency(%q<hashie>, ["= 1.2"])
94  
-      s.add_dependency(%q<json>, [">= 0"])
95  
-      s.add_dependency(%q<shoulda>, [">= 0"])
96  
-      s.add_dependency(%q<webmock>, ["= 1.7.4"])
97  
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
98  
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
99  
-      s.add_dependency(%q<rcov>, [">= 0"])
100  
-      s.add_dependency(%q<oauth2>, ["= 0.5.2"])
101  
-      s.add_dependency(%q<faraday>, ["= 0.7.4"])
102  
-      s.add_dependency(%q<faraday_middleware>, ["= 0.7.0"])
103  
-      s.add_dependency(%q<hashie>, ["= 1.2"])
104  
-      s.add_dependency(%q<webmock>, ["= 1.7.6"])
105  
-      s.add_dependency(%q<json>, [">= 0"])
  84
+      s.add_dependency('oauth2', ["~> 0.5.2"])
  85
+      s.add_dependency('faraday', ["~> 0.7.4"])
  86
+      s.add_dependency('faraday_middleware', ["~> 0.8.0"])
  87
+      s.add_dependency('hashie', ["~> 1.2"])
  88
+      s.add_dependency('json', [">= 0"])
  89
+      s.add_dependency('shoulda', [">= 0"])
  90
+      s.add_dependency('webmock', ["~> 1.7.4"])
  91
+      s.add_dependency('bundler', ["~> 1.0.0"])
  92
+      s.add_dependency('jeweler', ["~> 1.6.4"])
  93
+      s.add_dependency('rcov', [">= 0"])
106 94
     end
107 95
   else
108  
-    s.add_dependency(%q<oauth2>, ["= 0.5.2"])
109  
-    s.add_dependency(%q<faraday>, ["= 0.7.4"])
110  
-    s.add_dependency(%q<faraday_middleware>, ["= 0.7.0"])
111  
-    s.add_dependency(%q<hashie>, ["= 1.2"])
112  
-    s.add_dependency(%q<json>, [">= 0"])
113  
-    s.add_dependency(%q<shoulda>, [">= 0"])
114  
-    s.add_dependency(%q<webmock>, ["= 1.7.4"])
115  
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
116  
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
117  
-    s.add_dependency(%q<rcov>, [">= 0"])
118  
-    s.add_dependency(%q<oauth2>, ["= 0.5.2"])
119  
-    s.add_dependency(%q<faraday>, ["= 0.7.4"])
120  
-    s.add_dependency(%q<faraday_middleware>, ["= 0.7.0"])
121  
-    s.add_dependency(%q<hashie>, ["= 1.2"])
122  
-    s.add_dependency(%q<webmock>, ["= 1.7.6"])
123  
-    s.add_dependency(%q<json>, [">= 0"])
  96
+    s.add_dependency('oauth2', ["~> 0.5.2"])
  97
+    s.add_dependency('faraday', ["~> 0.7.4"])
  98
+    s.add_dependency('faraday_middleware', ["~> 0.8.0"])
  99
+    s.add_dependency('hashie', ["~> 1.2"])
  100
+    s.add_dependency('json', [">= 0"])
  101
+    s.add_dependency('shoulda', [">= 0"])
  102
+    s.add_dependency('webmock', ["~> 1.7.4"])
  103
+    s.add_dependency('bundler', ["~> 1.0.0"])
  104
+    s.add_dependency('jeweler', ["~> 1.6.4"])
  105
+    s.add_dependency('rcov', [">= 0"])
124 106
   end
125 107
 end
126 108
 
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.