yam 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f47bffff97620251c3605b228c70f428056959fc
-  data.tar.gz: 23d701b97781aa74840b904d33b4d973b8f374b9
+  metadata.gz: 7a8e86aac55bc10f4b6a051ce670170837cbd326
+  data.tar.gz: d4237220164fe41b9e4083f89fd7fdf705703a9f
 SHA512:
-  metadata.gz: a653837a0baebb878fec3a7ae97790922d35399f35fcc15cae1e932a97957bda62fa01dbcefbfe231136f7a4c77902958983f9641a1ffebb69c382614e3990a7
-  data.tar.gz: 628d2fe473b79b3dd71cd4bbb2372dacea33fa8c9326ea2e94aa7fc589a295047becc3789cdcece6c9f57c98344101582ac9bdcf28cb2037c805960725b5a423
+  metadata.gz: e15c1470fc0516e3e50fba16c137f4ebaf674bb8c93f3570754818074dc00d3fb57e372cf811d8fba3f3086f083d18afb7fde8e8939e201b8898c108766d10a7
+  data.tar.gz: df7a2dac8028741a3f8103da2d59008bf754f1786936482a68e3cf971b5cbb2ecbbc98ce39ccc491319d9b25d8ec65a5b723ba6aa68ead0d2ed7945bcb613a44

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+2.1.0
+====================================
+- Updated version of OAuth2 Client to 2.0.0 to resolve conflicts with intridea's oauth gem
+
 2.1.0
 ====================================
 - Bundled Yammer OAuth2 Client into gem

data/lib/yammer/oauth2_client.rb

@@ -12,10 +12,10 @@
 # See the Apache Version 2.0 License for specific language governing
 # permissions and limitations under the License.
 
-require 'oauth2'
+require 'oauth2-client'
 
 module Yammer
-  class OAuth2Client < OAuth2::Client
+  class OAuth2Client < OAuth2Client::Client
 
     SITE_URL       = 'https://www.yammer.com'
     TOKEN_PATH     = '/oauth2/token'

data/lib/yammer/version.rb

@@ -15,8 +15,8 @@
 module Yammer
   class Version
     MAJOR = 2 unless defined? Yammer::MAJOR
-    MINOR = 1 unless defined? Yammer::MINOR
-    PATCH = 2 unless defined? Yammer::PATCH
+    MINOR = 2 unless defined? Yammer::MINOR
+    PATCH = 0 unless defined? Yammer::PATCH
     PRE = nil unless defined? Yammer::PRE
 
     class << self

data/yam.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_json', '~> 1.8'
   s.add_dependency 'rest-client', '~> 1.6'
   s.add_dependency 'addressable', '~> 2.3'
-  s.add_dependency 'oauth2-client', '~> 1.1'
+  s.add_dependency 'oauth2-client', '~> 2.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yam
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Kevin Mutyaba
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement