nephele 0.1.5 → 0.1.6

data/README.md

@@ -1,10 +1,9 @@
 Nephele
 ========
-Nephele is a thin administration layer around major cloud service API's.
-Its main goals are simplicity and a unified command line interface for common tasks.
-
-Planned support:
+Nephele is a thin administration layer around major cloud service API's.  Its main goals are simplicity and a unified command line interface for common tasks.
 
+Planned support
+----------------
 * Rackspace
 * EC2
 
@@ -16,6 +15,61 @@ Currently, Nephele expects environment variables to set your service keys.
     RACKSPACE_USER=your_user_name
     NEPHELE_SERVICE_DEFAULT=rackspace
 
+Examples
+--------
+Here's an example of someone inspecting available images and flavors on a Rackspace account, deciding to create and save various 'foo' images based on roles and recipes from joeuser's chef git repo:
+
+    neph images | grep lucid
+
+    neph flavors | grep 512
+
+    neph create foo 'Ubuntu 10.04 LTS (lucid)' '512 server'
+
+    neph create foo 'Ubuntu 10.04 LTS (lucid)' '512 server'
+
+    neph bootstrap foo 'Ubuntu 10.04 LTS (lucid)' '512 server' -r webserver -c git@github.com:joeuser/cookbooks.git
+
+    neph save foo lucid-webserver
+
+    neph restrap foo lucid-webserver '512 server' -r webserver-prod -c git@github.com:joeuser/cookbooks.git
+
+    neph save foo 'lucid-webserver-prod'
+
+    neph destroy foo
+
+Usage
+-----
+Example usage at time of writing:
+
+<pre>
+$ neph --help
+Commands
+
+list                                             # Display a list of servers
+images                                           # Display available images
+flavors                                          # List available flavors
+status                                           # Display server status
+create [name] [image] [flavor]                   # Creates a node with name, image name, flavor
+  -C/--count=[NUMERIC]                           # create foo, foo2, foo3, ...
+save [nodename] [savename]                       # Save an image of the node
+destroy [name]                                   # Destroy a given node
+password [node] [password]                       # Change a password on given node
+delete [image]                                   # Delete an image
+bootstrap [name] [image] [flavor]                # Create a VM and run a chef bootstrapper, optional recipe, bootstrap, cookbooks args
+restrap [name] [image] [flavor]                  # Destroy and bootstrap
+archive [name] [image] [flavor] [savename]       # Boostrap a VM and save an image of it
+
+Global options
+
+-c/--cookbooks=[STRING]                          # optional cookbooks URI
+-p/--personality=[STRING]                        # comma-separated tuple of contents,targetfile to be placed at startup
+-b/--bootstrap=[STRING]                          # optional bootstrapper URI, defaults to https://github.com/jodell/cookbooks/raw/master/bin/bootstrap.sh
+-r/--recipe=[STRING]                             # run this recipe after bootstrapping
+-v/--vpn-credential-file=[STRING]                # specify a vpnpass file to seed the target vm
+-P/--prestrap=[STRING]                           # Executes a command or the contents of a file on a VM prior to bootstrapping
+-?/--help                                        # Print help message
+</pre>
+
 LICENSE
 -------
 SEE LICENSE

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/neph

@@ -3,7 +3,7 @@
 require 'rubygems'
 require 'optitron'
 
-if __FILE__ =~ /bin\/neph/
+if __FILE__ =~ /bin\/neph$/
   $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
   require 'nephele'
 else
@@ -14,11 +14,12 @@ end
 
 class Nephele::Runner < Optitron::CLI
   JODELL_CHEF_BOOTSTRAPPER = 'https://github.com/jodell/cookbooks/raw/master/bin/bootstrap.sh'
-  class_opt 'cookbooks', "optional cookbooks URI", :type => :string
-  class_opt 'personality', 'comma-separated tuple of contents,targetfile to be placed at startup', :type => :string
-  class_opt 'bootstrap', "optional bootstrapper URI, defaults to #{JODELL_CHEF_BOOTSTRAPPER}", :type => :string
-  class_opt 'recipe', "run this recipe after bootstrapping", :type => :string
+  class_opt 'cookbooks',           'optional cookbooks URI', :type => :string
+  class_opt 'personality',         'comma-separated tuple of contents,targetfile to be placed at startup', :type => :string
+  class_opt 'bootstrap',           "optional bootstrapper URI, defaults to #{JODELL_CHEF_BOOTSTRAPPER}", :type => :string
+  class_opt 'recipe',              'run this recipe after bootstrapping', :type => :string
   class_opt 'vpn-credential-file', 'specify a vpnpass file to seed the target vm', :type => :string
+  class_opt 'prestrap',            'Executes a command or the contents of a file on a VM prior to bootstrapping', :type => :string
 
   desc 'Display a list of servers'
   def list
@@ -55,6 +56,7 @@ class Nephele::Runner < Optitron::CLI
         :flavor      => flavor,
         :personality => personality
     end
+    sleep 5
   end
 
   desc 'Save an image of the node'
@@ -80,13 +82,31 @@ class Nephele::Runner < Optitron::CLI
     service.delete_image image
   end
 
+  ##
+  # neph bootstrap ramsay lucid '512 server' -P "export CHEF_LOG_LEVEL=debug; export CHEF_LOG_LOCATION='chef.log'"
+  #
   desc 'Create a VM and run a chef bootstrapper, optional recipe, bootstrap, cookbooks args'
   def bootstrap(name, image, flavor)
     puts "Bootstrapping: #{name}..."
     create name, image, flavor
     bootstrap = params['bootstrap'] || JODELL_CHEF_BOOTSTRAPPER
-    system %-time ssh root@#{@node.addresses[:public]} "curl #{bootstrap} > boot && chmod +x boot && ./boot #{params['cookbooks'] || ''}"-
-    system %{time ssh root@#{@node.addresses[:public]} "cd -P /var/chef/cookbooks && rake run[#{params['recipe']}]"} if params['recipe']
+    node_run "curl #{bootstrap} > boot && chmod +x boot && ./boot #{params['cookbooks'] || ''}"
+    # This is inaccurate. Prestrapping is just for changing chef-solo's verbosity.
+    #
+    recipe_cmd = [
+      "#{params['prestrap'] ? prestrap_cmd + ' && ' : ''}",
+      "cd -P /var/chef/cookbooks && (bundle check || bundle install) && rake update && rake run[#{params['recipe']}]"
+    ].join
+    node_run recipe_cmd if params['recipe']
+  end
+
+  def node_run(cmd)
+    puts "Running #{cmd}" if ENV['verbose']
+    system %-time ssh root@#{@node.addresses[:public]} "#{cmd}"-
+  end
+
+  def prestrap_cmd
+    File.exists?(params['prestrap']) ? File.read(params['prestrap']) : params['prestrap']
   end
 
   desc 'Destroy and bootstrap'

data/bin/nephele

@@ -3,7 +3,7 @@
 require 'rubygems'
 require 'optitron'
 
-if __FILE__ =~ /bin\/neph/
+if __FILE__ =~ /bin\/neph$/
   $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
   require 'nephele'
 else
@@ -14,11 +14,12 @@ end
 
 class Nephele::Runner < Optitron::CLI
   JODELL_CHEF_BOOTSTRAPPER = 'https://github.com/jodell/cookbooks/raw/master/bin/bootstrap.sh'
-  class_opt 'cookbooks', "optional cookbooks URI", :type => :string
-  class_opt 'personality', 'comma-separated tuple of contents,targetfile to be placed at startup', :type => :string
-  class_opt 'bootstrap', "optional bootstrapper URI, defaults to #{JODELL_CHEF_BOOTSTRAPPER}", :type => :string
-  class_opt 'recipe', "run this recipe after bootstrapping", :type => :string
+  class_opt 'cookbooks',           'optional cookbooks URI', :type => :string
+  class_opt 'personality',         'comma-separated tuple of contents,targetfile to be placed at startup', :type => :string
+  class_opt 'bootstrap',           "optional bootstrapper URI, defaults to #{JODELL_CHEF_BOOTSTRAPPER}", :type => :string
+  class_opt 'recipe',              'run this recipe after bootstrapping', :type => :string
   class_opt 'vpn-credential-file', 'specify a vpnpass file to seed the target vm', :type => :string
+  class_opt 'prestrap',            'Executes a command or the contents of a file on a VM prior to bootstrapping', :type => :string
 
   desc 'Display a list of servers'
   def list
@@ -55,6 +56,7 @@ class Nephele::Runner < Optitron::CLI
         :flavor      => flavor,
         :personality => personality
     end
+    sleep 5
   end
 
   desc 'Save an image of the node'
@@ -80,13 +82,31 @@ class Nephele::Runner < Optitron::CLI
     service.delete_image image
   end
 
+  ##
+  # neph bootstrap ramsay lucid '512 server' -P "export CHEF_LOG_LEVEL=debug; export CHEF_LOG_LOCATION='chef.log'"
+  #
   desc 'Create a VM and run a chef bootstrapper, optional recipe, bootstrap, cookbooks args'
   def bootstrap(name, image, flavor)
     puts "Bootstrapping: #{name}..."
     create name, image, flavor
     bootstrap = params['bootstrap'] || JODELL_CHEF_BOOTSTRAPPER
-    system %-time ssh root@#{@node.addresses[:public]} "curl #{bootstrap} > boot && chmod +x boot && ./boot #{params['cookbooks'] || ''}"-
-    system %{time ssh root@#{@node.addresses[:public]} "cd -P /var/chef/cookbooks && rake run[#{params['recipe']}]"} if params['recipe']
+    node_run "curl #{bootstrap} > boot && chmod +x boot && ./boot #{params['cookbooks'] || ''}"
+    # This is inaccurate. Prestrapping is just for changing chef-solo's verbosity.
+    #
+    recipe_cmd = [
+      "#{params['prestrap'] ? prestrap_cmd + ' && ' : ''}",
+      "cd -P /var/chef/cookbooks && (bundle check || bundle install) && rake update && rake run[#{params['recipe']}]"
+    ].join
+    node_run recipe_cmd if params['recipe']
+  end
+
+  def node_run(cmd)
+    puts "Running #{cmd}" if ENV['verbose']
+    system %-time ssh root@#{@node.addresses[:public]} "#{cmd}"-
+  end
+
+  def prestrap_cmd
+    File.exists?(params['prestrap']) ? File.read(params['prestrap']) : params['prestrap']
   end
 
   desc 'Destroy and bootstrap'

data/lib/nephele/rackspace.rb

@@ -43,7 +43,8 @@ class Nephele::Rackspace < Nephele::Base
   end
 
   def delete_image(image)
-    del = image_objs.find { |i| i.name == image } && del.delete!
+    del = image_objs.find { |i| i.name == image }
+    del.delete!
   end
 
   def status

data/nephele.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nephele}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeffrey O'Dell"]
-  s.date = %q{2011-04-12}
+  s.date = %q{2011-04-28}
   s.description = %q{Light administration utility for popular cloud services}
   s.email = %q{jeffrey.odell@gmail.com}
   s.executables = ["neph", "nephele"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nephele
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jeffrey O'Dell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -05:00
+date: 2011-04-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency