nephele 0.1.1 → 0.1.2

data/Rakefile

@@ -27,6 +27,12 @@ Jeweler::Tasks.new do |gem|
   gem.homepage  = 'https://github.com/jodell/nephele'
 end
 
+desc 'rubygems.org publishing'
+task :push do
+  ver = "nephele-#{File.read('VERSION')}"
+  sh "gem build nephele.gemspec; gem push #{ver}.gem && rm #{ver}.gem"
+end
+
 task :default => :'test:unit'
 
 task :tags do

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/neph

@@ -17,6 +17,7 @@ class Nephele::Runner < Optitron::CLI
   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
 
   desc 'Display a list of servers'
   def list
@@ -51,12 +52,17 @@ class Nephele::Runner < Optitron::CLI
   desc "Creates a node with name, image name, flavor"
   opt 'count', 'create foo, foo2, foo3, ...', :type => :numeric
   def create(name, image, flavor)
+    personality = Nephele::Rackspace::Util.personality(params['personality'] || :default)
+    if vpnfile = params['vpn-credential-file'] && !vpnfile.empty?
+      personality.delete_if { |k, v| v == '/root/.vpnpass' }
+      personality[vpnfile] = '/root/.vpnpass'
+    end
     (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)
+        :personality => personality
     end
   end
 

data/bin/nephele

@@ -17,6 +17,7 @@ class Nephele::Runner < Optitron::CLI
   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
 
   desc 'Display a list of servers'
   def list
@@ -51,12 +52,17 @@ class Nephele::Runner < Optitron::CLI
   desc "Creates a node with name, image name, flavor"
   opt 'count', 'create foo, foo2, foo3, ...', :type => :numeric
   def create(name, image, flavor)
+    personality = Nephele::Rackspace::Util.personality(params['personality'] || :default)
+    if vpnfile = params['vpn-credential-file'] && !vpnfile.empty?
+      personality.delete_if { |k, v| v == '/root/.vpnpass' }
+      personality[vpnfile] = '/root/.vpnpass'
+    end
     (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)
+        :personality => personality
     end
   end
 

data/lib/nephele/rackspace.rb

@@ -91,7 +91,8 @@ module Nephele::Rackspace::Util
     def personality(personality)
       if personality == :default
         { generate_key_file => '/root/.ssh/authorized_keys',
-          known_hosts_file => '/root/.ssh/known_hosts' }
+          known_hosts_file => '/root/.ssh/known_hosts',
+          vpn_pass_file => '/root/.vpnpass' }
       else
         acc = {}
         personality.split(',').each_slice(2) { |(k, v)| acc[k] = v }
@@ -103,14 +104,18 @@ module Nephele::Rackspace::Util
       '/tmp/nephele_key_file'.tap do |file| File.open(file, 'w') { |f| f << my_default_key }; end
     end
 
-    def my_default_key
-      File.read(File.expand_path('~/.ssh/id_dsa.pub'))
+    def my_default_key(keyfile = File.expand_path('~/.ssh/id_dsa.pub'))
+      File.read(keyfile)
     end
 
     def known_hosts_file
       '/tmp/known_hosts.nephele'.tap do |file| File.open(file, 'w') { |f| f << known_hosts }; end
     end
 
+    def vpn_pass_file(passfile = File.expand_path('~/.vpnpass'))
+      File.exists?(passfile) && passfile
+    end
+
     # Github
     def known_hosts
       <<-EoS

data/nephele.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nephele}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   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-11}
+  s.date = %q{2011-04-12}
   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: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jeffrey O'Dell
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -05:00
+date: 2011-04-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: cloudservers
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +42,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
+  name: cloudservers
 - !ruby/object:Gem::Dependency 
-  name: awesome_print
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +56,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  requirement: *id003
+  name: awesome_print
 - !ruby/object:Gem::Dependency 
-  name: optitron
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,12 +70,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
+  requirement: *id004
+  name: optitron
 - !ruby/object:Gem::Dependency 
-  name: wirble
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -86,12 +84,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  requirement: *id005
+  name: wirble
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,12 +98,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id006
+  requirement: *id006
+  name: shoulda
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,12 +112,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id007
+  requirement: *id007
+  name: mocha
 - !ruby/object:Gem::Dependency 
-  name: autotest
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -128,12 +126,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id008
+  requirement: *id008
+  name: autotest
 - !ruby/object:Gem::Dependency 
-  name: autotest-fsevent
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,12 +140,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id009
+  requirement: *id009
+  name: autotest-fsevent
 - !ruby/object:Gem::Dependency 
-  name: autotest-growl
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,12 +154,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id010
+  requirement: *id010
+  name: autotest-growl
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -170,12 +168,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id011
+  requirement: *id011
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -186,8 +184,10 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
+  prerelease: false
   type: :development
-  version_requirements: *id012
+  requirement: *id012
+  name: jeweler
 description: Light administration utility for popular cloud services
 email: jeffrey.odell@gmail.com
 executables: