rightscaler 0.1.2 → 0.2.0

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.email = "joshuabates@gmail.com"
     gem.homepage = "http://github.com/joshuabates/rightscaler"
     gem.authors = ["Joshua Bates"]
-    gem.add_dependency(%q<activeresource>, [">= 0"])
+    gem.add_dependency(%q<activeresource>, ["~> 3.0"])
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 1
+:minor: 2
 :patch: 0
 :major: 0
 :build: 

data/lib/rightscaler.rb

@@ -1,10 +1,10 @@
-require 'activesupport'
-require 'activeresource'
+require 'active_support'
+require 'active_resource'
 require "logger"
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 module Rightscaler
-  VERSION = "0.1"
+  VERSION = "0.2.0" # updated to match ../VERSION.yml
 end
 
 require 'rightscaler/resource'
@@ -16,14 +16,26 @@ require 'rightscaler/manage/deployment'
 require 'rightscaler/manage/server'
 require 'rightscaler/manage/status'
 
-# ActiveResource can't manage to do a head request right, this fixes it
+
+# At some point in the past, ActiveResource couldn't manage to do a head
+# request right; this fixes it.
 # https://rails.lighthouseapp.com/projects/8994/tickets/1223-activeresource-head-request-sends-headers-with-a-nil-key#ticket-1223-6
-module ActiveResource
-  class Connection
-    HTTP_FORMAT_HEADER_NAMES[:head] = 'Content-Type'
-    
-    def head(path, headers = {})
-      request(:head, path, build_request_headers(headers, :head))
+# and https://rails.lighthouseapp.com/projects/8994/tickets/3020-activeresourceexists-does-not-work-at-all
+#
+# ActiveResource 3.0.0 fixes this problem (it may have been fixed earlier) and
+# also has a build_request_headers with arity of 3, so the fix below isn't
+# needed and doesn't work.
+
+require 'active_resource/version'
+
+unless ActiveResource::VERSION::MAJOR >= 3
+  module ActiveResource
+    class Connection
+      HTTP_FORMAT_HEADER_NAMES[:head] = 'Content-Type'
+      
+      def head(path, headers = {})
+        request(:head, path, build_request_headers(headers, :head))
+      end
     end
   end
-end
+end

data/rightscaler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rightscaler}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Bates"]
@@ -53,12 +53,12 @@ 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<activeresource>, ["~> 2.3.0"])
+      s.add_runtime_dependency(%q<activeresource>, ["~> 3.0"])
     else
-      s.add_dependency(%q<activeresource>, ["~> 2.3.0"])
+      s.add_dependency(%q<activeresource>, ["~> 3.0"])
     end
   else
-    s.add_dependency(%q<activeresource>, ["~> 2.3.0"])
+    s.add_dependency(%q<activeresource>, ["~> 3.0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rightscaler
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Joshua Bates
@@ -26,12 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 2
         - 3
         - 0
-        version: 2.3.0
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 description: