nephele 0.1.0 → 0.1.1

data/README.md

@@ -1,15 +1,25 @@
 Nephele
 ========
-
-Nephele is a thin abstraction layer around major cloud service API's.
-
-Its main goals are simplicity and the unification of common tasks for the sake of working with a set of services.
+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
 
+Setting Your Credentials
+------------------------
+Currently, Nephele expects environment variables to set your service keys.
+
+    RACKSPACE_KEY=your_api_key
+    RACKSPACE_USER=your_user_name
+    NEPHELE_SERVICE_DEFAULT=rackspace
+
+LICENSE
+-------
+SEE LICENSE
+
 Other Interesting Projects
 --------------------------
 * Fog - https://github.com/geemus/fog

data/Rakefile

@@ -24,7 +24,6 @@ Jeweler::Tasks.new do |gem|
   gem.description = %-Light administration utility for popular cloud services-
   gem.email = 'jeffrey.odell@gmail.com'
   gem.authors = ["Jeffrey O'Dell"]
-  gem.executables = ['nephele']
   gem.homepage  = 'https://github.com/jodell/nephele'
 end
 
@@ -40,32 +39,6 @@ Rake::TestTask.new('test:unit') do |t|
   t.verbose = true
 end
 
-def default
-  @@default ||= Nephele.new :service => :default
-end
-
-desc 'List available servers'
-task :servers do
-  ap default.servers.map { |i| i[:name] }
-end
-
-task :list => :servers
-
-desc 'List available images'
-task :images do
-  ap default.images.map { |i| i[:name] }
-end
-
-desc 'List available flavors'
-task :flavors do
-  ap default.flavors.map { |i| i[:name] }
-end
-
-desc 'Show node statuses'
-task :status do
-  puts default.status
-end
-
 desc 'Key a host'
 task :key, [:host] do |t, args|
   host = args[:host] =~ /(.*)@(.*)/ ? args[:host] : "root@#{args[:host]}"
@@ -79,47 +52,6 @@ EoC
   sh cmd
 end
 
-desc 'Reset the node password (performs a reoot)'
-task :password, [:node, :pass] do |t, args|
-  default.server_objs.find { |s| s.name == args[:node] }.update(:adminPass => args[:pass])
-end
-
-desc 'Save an image of the node'
-task :save, [:node, :name] do |t, args|
-  default.server_objs.find { |s| s.name == args[:node] }.create_image args[:name]
-end
-
-desc "Creates a node with name, image name, flavor, optional count:  `rake create[mybox,oberon,'512 server'] count=4`"
-task :create, [:name, :image, :flavor] do |t, args|
-  (ENV['count'] || 1).to_i.times do |i|
-    @node = default.create \
-      :name        => args[:name] + "#{ENV['count'] ? i + 1 : ''}",
-      :image       => Nephele::Rackspace.image_lookup(args[:image]),
-      :flavor      => args[:flavor],
-      :personality => Nephele::Rackspace::Util.personality(ENV['personality'] || :default)
-  end
-end
-
-JODELL_CHEF_BOOTSTRAPPER = 'https://github.com/jodell/cookbooks/raw/master/bin/bootstrap.sh'
-
-desc 'Create a VM and run a chef bootstrapper, optional recipe, bootstrap, cookbooks args'
-task :bootstrap, [:name, :image, :flavor] => :create do |t, args|
-  puts "Bootstrapping: #{args[:name]}..."
-  bootstrapper = ENV['bootstrap'] || JODELL_CHEF_BOOTSTRAPPER
-  alt = ENV['cookbooks']
-  sh %-time ssh root@#{@node.addresses[:public]} "curl #{bootstrapper} > boot && chmod +x boot && ./boot #{alt}"-
-  sh %{time ssh root@#{@node.addresses[:public]} "cd -P /var/chef/cookbooks && rake run[#{ENV['recipe']}]"} if ENV['recipe']
-end
-
-desc 'Destroy, bootstrap'
-task :restrap, [:name, :image, :flavor] => [:destroy, :bootstrap]
-
-desc 'Destroy a node with name `rake destroy[foo]`'
-task :destroy, [:name] do |t, args|
-  puts "Destroying: #{args[:name]}"
-  default.server_objs.find { |s| s.name == args[:name] }.delete!
-end
-
 desc 'Start IRB with the relevant env'
 task :console do
   ARGV.clear and IRB.start

data/TODO

@@ -0,0 +1,2 @@
+* Switch to Fog
+* Support EC2 ASAP

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/neph

@@ -0,0 +1,91 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'optitron'
+begin
+  require 'nephele'
+rescue LoadError
+  $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
+  require 'nephele'
+end
+# awesome_print doesn't seem to play nice with optitron?
+#require 'ap'
+
+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
+
+  desc 'Display a list of servers'
+  def list
+    puts service.servers.map { |i| i[:name] }
+  end
+
+  desc 'Display available images'
+  def images
+    puts service.images.map { |i| i[:name] }
+  end
+
+  desc 'List available flavors'
+  def flavors
+    puts service.flavors.map { |i| i[:name] }
+  end
+
+  desc 'Display server status'
+  def status
+    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)
+    (params['count'] || 1).to_i.times do |i|
+      @node = service.create \
+        :name        => name + "#{params['count'] ? i + 1 : ''}",
+        :image       => Nephele::Rackspace.image_lookup(image),
+        :flavor      => flavor,
+        :personality => Nephele::Rackspace::Util.personality(params['personality'] || :default)
+    end
+  end
+
+  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']
+  end
+
+  desc 'Destroy and bootstrap'
+  def restrap(name, image, flavor)
+    destroy name
+    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
+  end
+
+  def service
+    @@service ||= Nephele.new(:service => :default)
+  end
+end
+
+Nephele::Runner.dispatch

data/bin/nephele

@@ -8,6 +8,7 @@ rescue LoadError
   $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
   require 'nephele'
 end
+# awesome_print doesn't seem to play nice with optitron?
 #require 'ap'
 
 class Nephele::Runner < Optitron::CLI
@@ -24,7 +25,7 @@ class Nephele::Runner < Optitron::CLI
 
   desc 'Display available images'
   def images
-    puts default.images.map { |i| i[:name] }
+    puts service.images.map { |i| i[:name] }
   end
 
   desc 'List available flavors'

data/nephele.gemspec

@@ -5,18 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nephele}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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-07}
-  s.default_executable = %q{nephele}
+  s.date = %q{2011-04-11}
   s.description = %q{Light administration utility for popular cloud services}
   s.email = %q{jeffrey.odell@gmail.com}
-  s.executables = ["nephele"]
+  s.executables = ["neph", "nephele"]
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.md"
+    "README.md",
+    "TODO"
   ]
   s.files = [
     ".autotest",
@@ -24,7 +24,9 @@ Gem::Specification.new do |s|
     "LICENSE",
     "README.md",
     "Rakefile",
+    "TODO",
     "VERSION",
+    "bin/neph",
     "bin/nephele",
     "lib/nephele.rb",
     "lib/nephele/base.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nephele
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jeffrey O'Dell
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 -05:00
-default_executable: nephele
+date: 2011-04-11 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -191,19 +191,23 @@ dependencies:
 description: Light administration utility for popular cloud services
 email: jeffrey.odell@gmail.com
 executables: 
+- neph
 - nephele
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
 - README.md
+- TODO
 files: 
 - .autotest
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - VERSION
+- bin/neph
 - bin/nephele
 - lib/nephele.rb
 - lib/nephele/base.rb