rest_connection 1.0.10 → 1.0.11

data/lib/rest_connection/rightscale/rightscale_api_base.rb

@@ -48,11 +48,27 @@ module RightScale
       def refresh_cookie
         # login
         @cookie = nil
+        #####################################################################
+        # HACK: Re-login with API version 1.0 when receiving an API 0.1 call
+        # https://rightsite.gitsrc.com/trac/ticket/16404
+        if @settings[:common_headers]["X_API_VERSION"] == "0.1"
+          @settings[:common_headers]["X_API_VERSION"] = "1.0"
+          @__refreshing_cookie_for_api_0_1__ = true
+        end
+        #####################################################################
         resp = get("login")
         unless resp.code == "302" || resp.code == "204"
           raise "ERROR: Login failed. #{resp.message}. Code:#{resp.code}"
         end
         @cookie = resp.response['set-cookie']
+        #####################################################################
+        # HACK: Reset the API version header to 0.1 so subsequent calls work
+        # https://rightsite.gitsrc.com/trac/ticket/16404
+        if @__refreshing_cookie_for_api_0_1__
+          @settings[:common_headers]["X_API_VERSION"] = "0.1"
+          @__refreshing_cookie_for_api_0_1__ = false
+        end
+        #####################################################################
         true
       end
     end

data/lib/rest_connection/rightscale/server_interface.rb

@@ -137,7 +137,16 @@ class ServerInterface
       next unless hsh[to]
       hsh[to].each { |field|
         vals = opts.select {|k,v| [[hsh["1.0"]] + [hsh["1.5"]]].flatten.include?(k.to_sym) }
-        vals.flatten!
+        # IMPORTANT NOTE REGARDING RUBY VERSIONS!
+        #
+        # In Ruby 1.9.3 the next line of code is required to be written the way it is. Previously, it was written as:
+        # vals.flatten! which doesn't work in Ruby 1.9.3.
+        #
+        # This is because opts is a hash and in Ruby 1.8.7, the select (above) returns an flattened array of
+        # key, value pairs but in 1.9.3 it returns a new hash. flatten! does not exist for hashes so that would
+        # no longer work in Ruby 1.9.3 and the code had to be changed to vals = vals.flatten to work correctly
+        # in both Ruby versions.
+        vals = vals.flatten
         vals.compact!
         if hsh["fn"]
           server[field.to_s] = __send__(hsh["fn"], to, opts[vals.first]) unless vals.first.nil?

data/lib/rest_connection/ssh_hax.rb

@@ -102,6 +102,20 @@ module SshHax
                 output += data
               end
             end
+            # IMPORTANT NOTE REGARDING RUBY VERSIONS!
+            #
+            # In Ruby 1.9.3 the next line of code is required. In Ruby 1.8.x, block variables were introduced into the
+            # scope that the block was called from. Now, in Ruby 1.9.1, blocks introduce their own scope for the block
+            # parameters only. That means, when a block taking a single parameter called x is called, if there are local
+            # variables x and y in scope, then any reference to the variable x within the scope refers to the new
+            # variable the block parameter brings into scope. However, any reference to the variable y in the block
+            # refers to the variable y in scope where the block was called.
+            #
+            # See http://ruby.about.com/od/newinruby191/a/blockvariscope.htm for more details.
+            #
+            # Without the next line of code, the while will never terminate in Ruby 1.9.3. In Ruby 1.8.7 it is
+            # essentially a no-op as success will already be set to true.
+            success = true
           end
         end
       rescue Exception => e

data/lib/rest_connection/version.rb

@@ -1,4 +1,4 @@
 # This gem is versioned with the usual X.Y.Z notation
 module RestConnection
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
 end

data/rest_connection.gemspec

@@ -18,16 +18,26 @@ It currently has support for RightScale API 1.0 and 1.5.
   s.test_files = `git ls-files spec config`.split(' ')
   s.rubygems_version = '1.8.24'
 
-  s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'net-ssh'
   s.add_runtime_dependency 'json'
   s.add_runtime_dependency 'highline'
   s.add_runtime_dependency 'rest-client'
-  # nokogiri >= 1.6.0 requires ruby 1.9
-  s.add_runtime_dependency 'nokogiri', "<1.6.0"
 
   s.add_development_dependency 'rake',         '0.8.7'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rspec',        '1.3.0'
-  s.add_development_dependency 'ruby-debug'
+  # If we're using Ruby 1.9.x
+  if RUBY_VERSION =~ /1.9.*/
+    s.add_runtime_dependency 'activesupport'
+    s.add_runtime_dependency 'nokogiri'
+    s.add_development_dependency 'ruby-debug19'
+  elsif RUBY_VERSION =~ /1.8.*/
+    # Ruby 1.8.x needs limited nokogiri version
+    s.add_runtime_dependency 'nokogiri', "<1.6.0"
+    # Ruby 1.8.x needs limited activesupport version
+    s.add_runtime_dependency 'activesupport', "<4.0.0"
+    s.add_development_dependency 'ruby-debug'
+  else
+    raise "Ruby version '#{RUBY_VERSION}' is not currently supported."
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-17 00:00:00 Z
+date: 2013-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -30,7 +30,7 @@ dependencies:
   type: :runtime
   requirement: *id001
   prerelease: false
-  name: activesupport
+  name: net-ssh
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,7 +44,7 @@ dependencies:
   type: :runtime
   requirement: *id002
   prerelease: false
-  name: net-ssh
+  name: json
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -58,7 +58,7 @@ dependencies:
   type: :runtime
   requirement: *id003
   prerelease: false
-  name: json
+  name: highline
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -72,83 +72,85 @@ dependencies:
   type: :runtime
   requirement: *id004
   prerelease: false
-  name: highline
+  name: rest-client
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
-  type: :runtime
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
   requirement: *id005
   prerelease: false
-  name: rest-client
+  name: rake
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
-        - 6
         - 0
-        version: 1.6.0
-  type: :runtime
+        version: "0"
+  type: :development
   requirement: *id006
   prerelease: false
-  name: nokogiri
+  name: bundler
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        - 8
-        - 7
-        version: 0.8.7
+        version: 1.3.0
   type: :development
   requirement: *id007
   prerelease: false
-  name: rake
+  name: rspec
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
+        - 6
         - 0
-        version: "0"
-  type: :development
+        version: 1.6.0
+  type: :runtime
   requirement: *id008
   prerelease: false
-  name: bundler
+  name: nokogiri
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 63
         segments: 
-        - 1
-        - 3
+        - 4
         - 0
-        version: 1.3.0
-  type: :development
+        - 0
+        version: 4.0.0
+  type: :runtime
   requirement: *id009
   prerelease: false
-  name: rspec
+  name: activesupport
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false