skeme 0.0.3 → 0.0.4

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "right_aws", "= 2.0.0"
+gem "fog", "~> 0.8.2"
 gem "rest_connection", ">= 0.0.21"
 
 # Add dependencies to develop your gem here.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/cloud_providers/aws.rb

@@ -11,18 +11,19 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-require 'right_aws'
+require 'fog'
 
 module Skeme
   module CloudProviders
     class Aws
-      attr_accessor :logger, :ec2
+      @@logger = nil
+      @@fog_aws_compute = nil
 
       def initialize(options={})
-        @logger = options[:logger]
+        @@logger = options[:logger]
         if options[:aws_access_key_id] && options[:aws_secret_access_key]
-          @logger.info("AWS credentials supplied.  EC2 Tagging Enabled.")
-          @ec2 = Rightscale::Ec2.new(options[:aws_access_key_id], options[:aws_secret_access_key], {:logger => options[:logger]})
+          @@logger.info("AWS credentials supplied.  EC2 Tagging Enabled.")
+          @@fog_aws_compute = Fog::Compute.new({:aws_access_key_id => options[:aws_access_key_id], :aws_secret_access_key => options[:aws_secret_access_key], :provider => 'AWS'})
         end
       end
 
@@ -37,7 +38,7 @@ module Skeme
       private
 
       def tag(params={})
-        if @ec2
+        if @@fog_aws_compute
           tag = params[:ec2_tag] || params[:tag]
           setting = params[:action] == "set"
 
@@ -46,11 +47,11 @@ module Skeme
           supplied_id_type.each do |resource_id_key|
             resource_id = params[resource_id_key]
             if setting
-              @logger.info("Tagging AWS resource id (#{resource_id}) with (#{tag})")
-              @ec2.create_tags(resource_id, [tag])
+              @@logger.info("Tagging AWS resource id (#{resource_id}) with (#{tag})")
+              @@fog_aws_compute.create_tags(resource_id, {tag => nil})
             else
-              @logger.info("Removing tag (#{tag}) from AWS resource id (#{resource_id})")
-              @ec2.delete_tags(resource_id, [tag])
+              @@logger.info("Removing tag (#{tag}) from AWS resource id (#{resource_id})")
+              @@fog_aws_compute.delete_tags(resource_id, {tag => nil})
             end
 
           end

data/lib/skeme.rb

@@ -11,7 +11,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-require 'rubygems'
 require 'cloud_providers/aws.rb'
 require 'managers/rightscale.rb'
 

data/skeme.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{skeme}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan J. Geyer"]
-  s.date = %q{2011-05-26}
+  s.date = %q{2011-05-27}
   s.description = %q{= skeme
 
 Skeme is a library for tagging objects (server instances, storage volumes, etc).  It is intended to allow tagging of the same resource in multiple systems simultaneously.
@@ -57,7 +57,7 @@ further details.
   s.homepage = %q{http://github.com/rgeyer/skeme}
   s.licenses = ["Apache2"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A cloud management tagging library}
   s.test_files = [
     "test/helper.rb",
@@ -68,14 +68,14 @@ further details.
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<right_aws>, ["= 2.0.0"])
+      s.add_runtime_dependency(%q<fog>, ["~> 0.8.2"])
       s.add_runtime_dependency(%q<rest_connection>, [">= 0.0.21"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<right_aws>, ["= 2.0.0"])
+      s.add_dependency(%q<fog>, ["~> 0.8.2"])
       s.add_dependency(%q<rest_connection>, [">= 0.0.21"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -83,7 +83,7 @@ further details.
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<right_aws>, ["= 2.0.0"])
+    s.add_dependency(%q<fog>, ["~> 0.8.2"])
     s.add_dependency(%q<rest_connection>, [">= 0.0.21"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: skeme
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ryan J. Geyer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -07:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,15 +24,15 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 59
         segments: 
-        - 2
         - 0
-        - 0
-        version: 2.0.0
-  name: right_aws
+        - 8
+        - 2
+        version: 0.8.2
+  name: fog
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A cloud management tagging library