nephele 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/neph

@@ -2,11 +2,12 @@
 
 require 'rubygems'
 require 'optitron'
-begin
-  require 'nephele'
-rescue LoadError
+
+if __FILE__ =~ /bin\/neph/
   $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
   require 'nephele'
+else
+  require 'nephele'
 end
 # awesome_print doesn't seem to play nice with optitron?
 #require 'ap'
@@ -39,16 +40,6 @@ class Nephele::Runner < Optitron::CLI
     puts service.status
   end
 
-  desc 'Change a password on given node'
-  def password(node_string, password_string)
-    service.server_objs.find { |s| s.name == node_string }.update(:adminPass => password_string)
-  end
-
-  desc 'Save an image of the node'
-  def save(node_string, savename_string)
-    service.server_objs.find { |s| s.name == node_string }.create_image name_string
-  end
-
   desc "Creates a node with name, image name, flavor"
   opt 'count', 'create foo, foo2, foo3, ...', :type => :numeric
   def create(name, image, flavor)
@@ -66,6 +57,29 @@ class Nephele::Runner < Optitron::CLI
     end
   end
 
+  desc 'Save an image of the node'
+  def save(nodename, savename)
+    service.server_objs.find { |s| s.name == nodename }.create_image savename
+  end
+
+  desc 'Destroy a given node'
+  def destroy(name_string)
+    if node = service.server_objs.find { |s| s.name == name_string }
+      puts "Destroying: #{name_string}"
+      node.delete!
+    end
+  end
+
+  desc 'Change a password on given node'
+  def password(node_string, password_string)
+    service.server_objs.find { |s| s.name == node_string }.update(:adminPass => password_string)
+  end
+
+  desc 'Delete an image'
+  def delete(image)
+    service.delete_image image
+  end
+
   desc 'Create a VM and run a chef bootstrapper, optional recipe, bootstrap, cookbooks args'
   def bootstrap(name, image, flavor)
     puts "Bootstrapping: #{name}..."
@@ -81,12 +95,10 @@ class Nephele::Runner < Optitron::CLI
     bootstrap name, image, flavor
   end
 
-  desc 'Destroy a given node'
-  def destroy(name_string)
-    if node = service.server_objs.find { |s| s.name == name_string }
-      puts "Destroying: #{name_string}"
-      node.delete!
-    end
+  desc 'Boostrap a VM and save an image of it'
+  def archive(name, image, flavor, savename)
+    bootstrap name, image, flavor
+    save name, savename
   end
 
   def service

data/bin/nephele

@@ -2,11 +2,12 @@
 
 require 'rubygems'
 require 'optitron'
-begin
-  require 'nephele'
-rescue LoadError
+
+if __FILE__ =~ /bin\/neph/
   $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
   require 'nephele'
+else
+  require 'nephele'
 end
 # awesome_print doesn't seem to play nice with optitron?
 #require 'ap'
@@ -39,16 +40,6 @@ class Nephele::Runner < Optitron::CLI
     puts service.status
   end
 
-  desc 'Change a password on given node'
-  def password(node_string, password_string)
-    service.server_objs.find { |s| s.name == node_string }.update(:adminPass => password_string)
-  end
-
-  desc 'Save an image of the node'
-  def save(node_string, savename_string)
-    service.server_objs.find { |s| s.name == node_string }.create_image name_string
-  end
-
   desc "Creates a node with name, image name, flavor"
   opt 'count', 'create foo, foo2, foo3, ...', :type => :numeric
   def create(name, image, flavor)
@@ -66,6 +57,29 @@ class Nephele::Runner < Optitron::CLI
     end
   end
 
+  desc 'Save an image of the node'
+  def save(nodename, savename)
+    service.server_objs.find { |s| s.name == nodename }.create_image savename
+  end
+
+  desc 'Destroy a given node'
+  def destroy(name_string)
+    if node = service.server_objs.find { |s| s.name == name_string }
+      puts "Destroying: #{name_string}"
+      node.delete!
+    end
+  end
+
+  desc 'Change a password on given node'
+  def password(node_string, password_string)
+    service.server_objs.find { |s| s.name == node_string }.update(:adminPass => password_string)
+  end
+
+  desc 'Delete an image'
+  def delete(image)
+    service.delete_image image
+  end
+
   desc 'Create a VM and run a chef bootstrapper, optional recipe, bootstrap, cookbooks args'
   def bootstrap(name, image, flavor)
     puts "Bootstrapping: #{name}..."
@@ -81,12 +95,10 @@ class Nephele::Runner < Optitron::CLI
     bootstrap name, image, flavor
   end
 
-  desc 'Destroy a given node'
-  def destroy(name_string)
-    if node = service.server_objs.find { |s| s.name == name_string }
-      puts "Destroying: #{name_string}"
-      node.delete!
-    end
+  desc 'Boostrap a VM and save an image of it'
+  def archive(name, image, flavor, savename)
+    bootstrap name, image, flavor
+    save name, savename
   end
 
   def service

data/lib/nephele/rackspace.rb

@@ -42,6 +42,10 @@ class Nephele::Rackspace < Nephele::Base
     @nodes.delete_if { |n| n.id == id }
   end
 
+  def delete_image(image)
+    del = image_objs.find { |i| i.name == image } && del.delete!
+  end
+
   def status
     header = "#{'NAME'.ljust(20)} #{'STATUS'.ljust(6)} #{'-%-'.ljust(3)} #{'Kind'.ljust(10)} Public IP\n"
     info = server_objs.inject('') do |acc, s|
@@ -78,7 +82,7 @@ class Nephele::Rackspace < Nephele::Base
 
   def self.image_lookup(name)
     case name
-    when /lucid/
+    when /^lucid$/
       "Ubuntu 10.04 LTS (lucid)"
     else
       name

data/nephele.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nephele}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeffrey O'Dell"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nephele
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jeffrey O'Dell