jamie-ec2 0.2.0 → 0.3.0

data/jamie-ec2.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'jamie', '~> 0.1.0.alpha19'
+  gem.add_dependency 'jamie', '~> 0.1.0.alpha21'
   gem.add_dependency 'fog'
 
   gem.add_development_dependency 'cane'

data/lib/jamie/driver/ec2.rb

@@ -30,33 +30,33 @@ module Jamie
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Ec2 < Jamie::Driver::SSHBase
 
-      default_config 'region',            'us-east-1'
-      default_config 'availability_zone', 'us-east-1b'
-      default_config 'flavor_id',         'm1.small'
-      default_config 'groups',            [ 'default' ]
-      default_config 'username',          'root'
-      default_config 'port',              '22'
+      default_config :region,             'us-east-1'
+      default_config :availability_zone,  'us-east-1b'
+      default_config :flavor_id,          'm1.small'
+      default_config :groups,             [ 'default' ]
+      default_config :username,           'root'
+      default_config :port,               '22'
 
       def create(state)
         server = create_server
-        state['server_id'] = server.id
+        state[:server_id] = server.id
 
-        info("EC2 instance <#{state['server_id']}> created.")
+        info("EC2 instance <#{state[:server_id]}> created.")
         server.wait_for { print "."; ready? } ; print "(server ready)"
-        state['hostname'] = server.public_ip_address
-        wait_for_sshd(state['hostname'])      ; print "(ssh ready)\n"
+        state[:hostname] = server.public_ip_address
+        wait_for_sshd(state[:hostname])      ; print "(ssh ready)\n"
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
       end
 
       def destroy(state)
-        return if state['server_id'].nil?
+        return if state[:server_id].nil?
 
-        server = connection.servers.get(state['server_id'])
+        server = connection.servers.get(state[:server_id])
         server.destroy unless server.nil?
-        info("EC2 instance <#{state['server_id']}> destroyed.")
-        state.delete('server_id')
-        state.delete('hostname')
+        info("EC2 instance <#{state[:server_id]}> destroyed.")
+        state.delete(:server_id)
+        state.delete(:hostname)
       end
 
       private
@@ -64,19 +64,19 @@ module Jamie
       def connection
         Fog::Compute.new(
           :provider               => :aws,
-          :aws_access_key_id      => config['aws_access_key_id'],
-          :aws_secret_access_key  => config['aws_secret_access_key'],
-          :region                 => config['region'],
+          :aws_access_key_id      => config[:aws_access_key_id],
+          :aws_secret_access_key  => config[:aws_secret_access_key],
+          :region                 => config[:region],
         )
       end
 
       def create_server
         connection.servers.create(
-          :availability_zone  => config['availability_zone'],
-          :groups             => config['groups'],
-          :flavor_id          => config['flavor_id'],
-          :image_id           => config['image_id'],
-          :key_name           => config['aws_ssh_key_id'],
+          :availability_zone  => config[:availability_zone],
+          :groups             => config[:groups],
+          :flavor_id          => config[:flavor_id],
+          :image_id           => config[:image_id],
+          :key_name           => config[:aws_ssh_key_id],
         )
       end
     end

data/lib/jamie/driver/ec2_version.rb

@@ -21,6 +21,6 @@ module Jamie
   module Driver
 
     # Version string for EC2 Jamie driver
-    EC2_VERSION = "0.2.0"
+    EC2_VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamie-ec2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jamie
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha19
+        version: 0.1.0.alpha21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha19
+        version: 0.1.0.alpha21
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -117953070356559829
+      hash: 3291648439396549011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -117953070356559829
+      hash: 3291648439396549011
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24