cluster 0.5.40 → 0.5.50

data/bin/periodic.sh

@@ -2,7 +2,6 @@
 # This will run periodically to do appropriate backups and cleanups.
 # run as a crontab so the environment is minimal
 
-export GEM_PATH=$(gem env gempath)
 export CREDENTIALS=${HOME}/.cluster/credentials.yml
 
 mysql_user=

data/lib/cluster.rb

@@ -114,8 +114,9 @@ class Cluster
         @sub.new_instance(size, services)
       end
     rescue => err
-      puts "#{Cluster::NAME} cannot start new instance: #{err.message}\n\t#{err.backtrace.join("\n\t")}"
-      exit 2
+      msg ="#{Cluster::NAME} cannot start new instance: #{err.message}\n\t#{err.backtrace.join("\n\t")}"
+      $stderr.puts msg
+      raise RuntimeError.new(msg)
     end
   end
 
@@ -126,33 +127,37 @@ class Cluster
 
   def current(*params)
     unless @sub.in_cluster?
-      puts "#{Cluster::NAME} says that we aren't in the cluster?"
-      exit 2
+      msg = "#{Cluster::NAME} says that we aren't in the cluster?"
+      $stderr.puts  msg
+      raise RuntimeError.new(msg)
     end
 
     unless params.length > 0
-      puts "#{Cluster::NAME} current needs to know what to do?\n\t* services\n\t* name (|| dns)\n\t* ip\n\t* enable\n\t* disable"
-      exit 2
+      msg = "#{Cluster::NAME} current needs to know what to do?\n\t* services\n\t* name (|| dns)\n\t* ip\n\t* enable\n\t* disable"
+      $stderr.puts msg
+      raise ArgumentError.new(msg)
     end
 
+    current = @sub.current_instance
     cmd = params.shift
 
     case cmd.downcase
     when 'services'
-      @sub.current_instance.services
+      current.services - current.disabled_services
     when /^(n|dn)/
-      @sub.current_instance.dns
+      current.dns
     when /^i/
-      @sub.current_instance.ip
+      current.ip
     when /^e/
-     @sub.alter_instances!(@sub.current_instance) {|i| i.enable *params }
+     @sub.alter_instances!(current) {|i| i.enable *params }
     when /^di/
-     @sub.alter_instances!(@sub.current_instance) {|i| i.disable *params }
+     @sub.alter_instances!(current) {|i| i.disable *params }
     when /^s/
-     @sub.alter_instances!(@sub.current_instance) {|i| i.set_state *params }
+     @sub.alter_instances!(current) {|i| i.set_state *params }
     else
-      puts "${Cluster::NAME} current did not understand '#{params.join(' ')}'"
-      exit 1
+      msg = "#{Cluster::NAME} curent did not understand '#{params.join(' ')}'"
+      $stderr.puts msg
+      raise ArgumentError.new(msg)
     end
   end
   alias :instance :current
@@ -170,8 +175,9 @@ class Cluster
            elsif File.readable? File.basename(full_key)
              File.open(File.basename(full_key))
            else
-             puts "#{Cluster::NAME} cannot open a file for storage with key: #{full_key}"
-             exit 2
+             msg = "#{Cluster::NAME} cannot open a file for storage with key: #{full_key}"
+             $stderr.puts msg
+             raise RuntimeError.new(msg)
            end
     @sub.store full_key, file
   end
@@ -180,12 +186,11 @@ class Cluster
     res = @sub.retrieve File.join(service, key)
     if output
       begin
-        File.open(output, 'w') {|f|
-          f.write res
-        }
+        File.open(output, 'w') {|f| f.write res }
       rescue => err
-        puts "#{Cluster::NAME} cannot open #{output} for writing."
-        exit 2
+        msg = "#{Cluster::NAME} cannot open #{output} for writing."
+        $stderr.puts msg
+        raise RuntimeError.new(msg)
       end
     else
       res
@@ -205,16 +210,18 @@ class Cluster
   def save_monitor(filename, key = nil)
     file = open(filename)
     unless file
-      puts "#{Cluster::NAME} cannot open file '#{filename}' for reading."
-      exit 2
+      msg = "#{Cluster::NAME} cannot open file '#{filename}' for reading."
+      $stderr.puts msg
+      raise RuntimeError.new(msg)
     end
 
     key ||= File.basename(filename)
     begin
       @sub.save_monitor file, key
     rescue => err
-      puts "#{Cluster::NAME} could not save monitor configuration: #{err.message}\n\t#{err.backtrace.join("\n\t")}"
-      exit 2
+      msg = "#{Cluster::NAME} could not save monitor configuration: #{err.message}\n\t#{err.backtrace.join("\n\t")}"
+      $stderr.puts msg
+      raise RuntimeError.new(msg)
     end
   end
 
@@ -224,8 +231,9 @@ class Cluster
 
   def fetch_credentials(url)
     unless Cluster::Configuration.credentials?
-      puts "Need to know where to save the incoming credentials."
-      exit 2
+      msg = "Need to know where to save the incoming credentials."
+      $stderr.puts msg
+      raise RuntimeError.new(msg)
     end
 
     out = File.open(Cluster::Configuration[:credentials_file], 'w')
@@ -236,8 +244,9 @@ class Cluster
   def fetch_monitor(output)
     monitor = @sub.fetch_monitor
     unless monitor
-      puts "#{Cluster::NAME} cannot find any monitor information."
-      exit 1
+      msg = "#{Cluster::NAME} cannot find any monitor information."
+      $stderr.puts msg
+      raise RuntimeError.new(msg)
     end
 
     File.open(output, 'w') {|f|

data/lib/cluster/infrastructures/amazon_instance.rb

@@ -193,7 +193,7 @@ class AmazonInstance < Instance
         chmod 600 $MONITOR
         chown $CLUSTER_USER $MONITOR
         mv $MONITOR /etc/god/init.d/cluster.god
-        $GOD load /etc/god/init.d/cluster.god
+        $GOD load /etc/god/init.d/010_cluster.god
       else
         echo "NO MONITOR FILE!"
         exit 1

data/lib/cluster/version.rb

@@ -12,7 +12,7 @@ class Cluster
   class Version < Net::SSH::Version
     MAJOR = 0
     MINOR = 5
-    TINY  = 40
+    TINY  = 50
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 40
-  version: 0.5.40
+  - 50
+  version: 0.5.50
 platform: ruby
 authors: 
 - Simon de Boer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -04:00
+date: 2011-11-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,22 +148,22 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/cluster/cli.rb
-- lib/cluster/configuration.rb
+- lib/cluster/release.rb
 - lib/cluster/infrastructure.rb
-- lib/cluster/infrastructures/amazon.rb
-- lib/cluster/infrastructures/amazon_instance.rb
-- lib/cluster/infrastructures/amazon_release.rb
 - lib/cluster/instance.rb
-- lib/cluster/release.rb
 - lib/cluster/version.rb
+- lib/cluster/configuration.rb
+- lib/cluster/infrastructures/amazon_instance.rb
+- lib/cluster/infrastructures/amazon_release.rb
+- lib/cluster/infrastructures/amazon.rb
+- lib/cluster/cli.rb
 - lib/cluster.rb
 - lib/ext/array.rb
 - lib/ext/cluster_extensions.rb
-- bin/cluster
 - bin/periodic.sh
-- Rakefile
+- bin/cluster
 - VERSION
+- Rakefile
 has_rdoc: true
 homepage: http://oven.s3.amazonaws.com/cluster.gem
 licenses: []