sml-rubber 0.9.1 → 0.9.3

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.3

data/generators/vulcanize/templates/base/Capfile

@@ -3,13 +3,10 @@ load 'deploy' if respond_to?(:namespace) # cap2 differentiator
 env = ENV['RUBBER_ENV'] ||= (ENV['RAILS_ENV'] || 'production')
 root = File.dirname(__FILE__)
 
-begin
-  # first try as a rails plugin
-  require 'vendor/plugins/rubber/lib/rubber.rb'
-rescue LoadError
-  # then try as a gem
-  require 'rubber'
-end
+# this tries first as a rails plugin then as a gem
+$:.unshift "#{root}/vendor/plugins/rubber/lib/"
+require 'rubber'
+
 Rubber::initialize(root, env)
 require 'rubber/capistrano'
 

data/generators/vulcanize/templates/base/lib/tasks/rubber.rake

@@ -1,16 +1,13 @@
 # rails tries to load this from generator dir, so skip it.
 if __FILE__ !~ /rubber\/generators\/vulcanize/
 
-  begin
-    # first try as a rails plugin
-    require "#{File.dirname(__FILE__)}/../../vendor/plugins/rubber/lib/rubber.rb"
-  rescue LoadError
-    # then try as a gem
-    require 'rubber'
-  end
-
   env = ENV['RUBBER_ENV'] ||= (ENV['RAILS_ENV'] || 'development')
   root = File.dirname(__FILE__) + '/../..'
+
+  # this tries first as a rails plugin then as a gem
+  $:.unshift "#{root}/vendor/plugins/rubber/lib/"
+  require 'rubber'
+
   Rubber::initialize(root, env)
 
   require 'rubber/tasks/rubber'

data/lib/rubber/cloud/aws.rb

@@ -23,8 +23,10 @@ module Rubber
 
       def describe_instances(instance_id=nil)
         instances = []
+        opts = {}
+        opts[:instance_id] = instance_id if instance_id
 
-        response = @ec2.describe_instances(:instance_id => instance_id)
+        response = @ec2.describe_instances(opts)
         response.reservationSet.item.each do |ritem|
           ritem.instancesSet.item.each do |item|
             instance = {}

data/lib/rubber/dns/nettica.rb

@@ -7,7 +7,7 @@ module Rubber
       def initialize(env)
         super(env)
         @nettica_env = @env.dns_providers.nettica
-        @client = Nettica::Client.new(@nettica_env.user, @nettica_env.password)
+        @client = ::Nettica::Client.new(@nettica_env.user, @nettica_env.password)
         @ttl = (@nettica_env.ttl || 300).to_i
         @record_type = @nettica_env.record_type || "A"
       end

data/lib/rubber/dns.rb

@@ -4,7 +4,7 @@ module Rubber
   module Dns
 
     def self.get_provider(provider, env)
-      require "rubber/cloud/#{provider}"
+      require "rubber/dns/#{provider}"
       clazz = Rubber::Dns.const_get(provider.capitalize)
       return clazz.new(env)
     end

data/lib/rubber.rb

@@ -2,9 +2,11 @@ $:.unshift(File.dirname(__FILE__))
 
 module Rubber
 
+  VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION')).chomp
+
   def self.initialize(project_root, project_env)
     return if defined?(RUBBER_ROOT) && defined?(RUBBER_ENV)
-    
+
     Object.const_set('RUBBER_ENV', project_env)
     Object.const_set('RUBBER_ROOT', project_root)
 
@@ -24,7 +26,6 @@ module Rubber
     end
   end
 
-  VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION')).chomp
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sml-rubber
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 -07:00
+date: 2009-07-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency