awsborn 0.9.7 → 0.9.8

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.8

data/awsborn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awsborn}
-  s.version = "0.9.7"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Vrensk", "Jean-Louis Giordano"]
-  s.date = %q{2012-05-03}
+  s.date = %q{2012-05-09}
   s.description = %q{Awsborn lets you define and launch a server cluster on Amazon EC2.}
   s.email = %q{david@icehouse.se}
   s.extra_rdoc_files = [
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/icehouse/awsborn}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Awsborn defines servers as instances with a certain disk volume, which makes it easy to restart missing servers.}
   s.test_files = [
     "spec/aws_constants_spec.rb",
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/awsborn/rake.rb

@@ -92,7 +92,7 @@ module Awsborn
         # Disable annoying "Waiting for console output.."
         Awsborn.verbose = false
 
-        cluster_name = args[:c] || args[:cluster]
+        cluster_name = cluster_param
         if cluster_name
           clusters = Awsborn::ServerCluster.clusters.select {|cluster| cluster.name == cluster_name}
         else
@@ -160,7 +160,7 @@ EOH
       end
 
       def get_hosts (args) #:nodoc:
-        args[:host] && args[:host].split(',') || args[:server] && args[:server].split(',')
+        host_param && host_param.split(',')
       end
 
       def framed (message) #:nodoc:
@@ -168,10 +168,18 @@ EOH
       end
 
       def cluster (args) #:nodoc:
-        name = args[:c] || args[:cluster] || 'cluster1'
+        name = cluster_param || 'cluster1'
         Awsborn::ServerCluster.clusters.detect { |c| c.name == name } || raise("Could not find cluster named '#{name}'")
       end
 
+      def host_param
+        args[:host] || args[:server] || ENV['host'] || ENV['server']
+      end
+
+      def cluster_param
+        args[:c] || args[:cluster] || ENV['c'] || ENV['cluster']
+      end
+
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsborn
 version: !ruby/object:Gem::Version 
-  hash: 53
-  prerelease: 
+  hash: 43
+  prerelease: false
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - David Vrensk
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-03 00:00:00 +02:00
+date: 2012-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Awsborn defines servers as instances with a certain disk volume, which makes it easy to restart missing servers.