nephele 0.1.13 → 0.1.14

data/Gemfile

@@ -4,15 +4,16 @@ gem 'rake'
 gem 'cloudservers', '~>0.4'
 gem 'awesome_print'
 gem 'optitron'
+gem 'sexp_processor', '~>3.0.5'
 
 group :development do
   gem 'wirble'
   gem 'shoulda'
   gem 'mocha'
   gem 'autotest'
+  gem 'ZenTest', '~>4.4.1'
   gem 'autotest-fsevent'
   gem 'autotest-growl'
-  gem 'bundler'
-  gem 'jeweler', '~>1.5.2'
+  gem 'jeweler'
 end
 

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/bin/neph

@@ -18,6 +18,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 'branch',              'Use this branch of a bootstrapper git repo', :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
 
@@ -50,7 +51,7 @@ class Nephele::Runner < Optitron::CLI
       personality[vpnfile] = '/root/.vpnpass'
     end
     (params['count'] || 1).to_i.times do |i|
-      @node = service.create \
+      @node = service.build_and_wait \
         :name        => name + "#{params['count'] ? i + 1 : ''}",
         :image       => Nephele::Rackspace.image_lookup(image),
         :flavor      => flavor,
@@ -60,6 +61,7 @@ class Nephele::Runner < Optitron::CLI
 
   desc 'Save an image of the node'
   def save(nodename, savename)
+    puts "Saving #{nodename} -> #{savename}"
     service.server_objs.find { |s| s.name == nodename }.create_image savename
   end
 
@@ -100,16 +102,21 @@ class Nephele::Runner < Optitron::CLI
     node_run "curl -L #{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) && git fetch && git pull && rake run[#{params['recipe']}]"
-    ].join
-    node_run recipe_cmd if params['recipe']
+    if params['recipe']
+      recipe_cmd = params['prestrap'] ? prestrap_cmd + ' && ' : ''
+      recipe_cmd += [
+        "cd -P /var/chef/cookbooks && git fetch && git reset --hard HEAD && git clean -fd",
+        "git checkout -f #{params['branch'] || 'master'} && git pull -q",
+        "(bundle check || bundle install) && bundle exec rake run[#{params['recipe']}]"
+      ] * ' && '
+      node_run recipe_cmd
+    end
   end
 
   def node_run(cmd)
-    puts "Running #{cmd}" if ENV['verbose']
-    system %[time ssh -o "StrictHostKeyChecking=no" -A root@#{@node.addresses[:public]} "#{cmd}"]
+    node_cmd = %[time ssh -o "StrictHostKeyChecking=no" -A root@#{@node.addresses[:public].first} "#{cmd}"]
+    puts "Running #{node_cmd}" if ENV['verbose']
+    system node_cmd
   end
 
   def prestrap_cmd

data/bin/nephele

@@ -18,6 +18,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 'branch',              'Use this branch of a bootstrapper git repo', :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
 
@@ -50,7 +51,7 @@ class Nephele::Runner < Optitron::CLI
       personality[vpnfile] = '/root/.vpnpass'
     end
     (params['count'] || 1).to_i.times do |i|
-      @node = service.create \
+      @node = service.build_and_wait \
         :name        => name + "#{params['count'] ? i + 1 : ''}",
         :image       => Nephele::Rackspace.image_lookup(image),
         :flavor      => flavor,
@@ -60,6 +61,7 @@ class Nephele::Runner < Optitron::CLI
 
   desc 'Save an image of the node'
   def save(nodename, savename)
+    puts "Saving #{nodename} -> #{savename}"
     service.server_objs.find { |s| s.name == nodename }.create_image savename
   end
 
@@ -100,16 +102,21 @@ class Nephele::Runner < Optitron::CLI
     node_run "curl -L #{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) && git fetch && git pull && rake run[#{params['recipe']}]"
-    ].join
-    node_run recipe_cmd if params['recipe']
+    if params['recipe']
+      recipe_cmd = params['prestrap'] ? prestrap_cmd + ' && ' : ''
+      recipe_cmd += [
+        "cd -P /var/chef/cookbooks && git fetch && git reset --hard HEAD && git clean -fd",
+        "git checkout -f #{params['branch'] || 'master'} && git pull -q",
+        "(bundle check || bundle install) && bundle exec rake run[#{params['recipe']}]"
+      ] * ' && '
+      node_run recipe_cmd
+    end
   end
 
   def node_run(cmd)
-    puts "Running #{cmd}" if ENV['verbose']
-    system %[time ssh -o "StrictHostKeyChecking=no" -A root@#{@node.addresses[:public]} "#{cmd}"]
+    node_cmd = %[time ssh -o "StrictHostKeyChecking=no" -A root@#{@node.addresses[:public].first} "#{cmd}"]
+    puts "Running #{node_cmd}" if ENV['verbose']
+    system node_cmd
   end
 
   def prestrap_cmd

data/lib/nephele/rackspace.rb

@@ -1,10 +1,13 @@
 require 'tempfile'
+require 'net/http'
 
 class Nephele::Rackspace < Nephele::Base
   attr_reader :nodes
+  attr_accessor :timeout
 
   def initialize(opts = {})
     super
+    @timeout = opts[:timeout] || 180
     populate!
   end
 
@@ -33,11 +36,26 @@ class Nephele::Rackspace < Nephele::Base
       :imageId     => images_id_for_name(opts[:image]),
       :flavorId    => flavors_id_for_name(opts[:flavor]),
       :personality => opts[:personality] || ''
-    puts "Server pass: #{rack_node.adminPass}, ip #{rack_node.addresses[:public]}"
+    puts "Server pass: #{rack_node.adminPass}, ip #{rack_node.addresses[:public].first}"
     register!(rack_node)
     rack_node
   end
 
+  def build_and_wait(opts)
+    rack_node = create(opts)
+    t1 = Time.now
+    begin
+      Timeout::timeout(@timeout) do
+        sleep 2 while rack_node.refresh && rack_node.status != 'ACTIVE'
+        sleep 2 while !(TCPSocket.new(rack_node.addresses[:public].first, 22) rescue nil)
+      end
+    rescue Timeout::Error
+      puts "Server creation timed out after #{@timeout} seconds!"
+    end
+    puts "#{rack_node.status}: #{Time.now - t1}" if ENV['verbose']
+    rack_node
+  end
+
   def destroy(opts)
     id = servers_id_for_name(opts[:name])
     CloudServers::Server.new(conn, id).delete!
@@ -70,7 +88,7 @@ class Nephele::Rackspace < Nephele::Base
         s.status.ljust(max_status),
         s.progress.to_s.ljust(max_progress),
         s.flavor.name.ljust(10),
-        "#{s.addresses[:public]}\n"
+        "#{s.addresses[:public].first}\n"
       ] * ' '
     end
     header + info

data/nephele.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nephele}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeffrey O'Dell"]
-  s.date = %q{2011-06-27}
+  s.date = %q{2011-10-19}
   s.description = %q{Light administration utility for popular cloud services}
   s.email = %q{jeffrey.odell@gmail.com}
   s.executables = ["neph", "nephele"]
@@ -40,10 +40,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.1}
   s.summary = %q{Light administration utility for popular cloud services}
-  s.test_files = [
-    "test/helper.rb",
-    "test/tc_base.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -53,41 +49,44 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<cloudservers>, ["~> 0.4"])
       s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
       s.add_runtime_dependency(%q<optitron>, [">= 0"])
+      s.add_runtime_dependency(%q<sexp_processor>, ["~> 3.0.5"])
       s.add_development_dependency(%q<wirble>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
+      s.add_development_dependency(%q<ZenTest>, ["~> 4.4.1"])
       s.add_development_dependency(%q<autotest-fsevent>, [">= 0"])
       s.add_development_dependency(%q<autotest-growl>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<cloudservers>, ["~> 0.4"])
       s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<optitron>, [">= 0"])
+      s.add_dependency(%q<sexp_processor>, ["~> 3.0.5"])
       s.add_dependency(%q<wirble>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
+      s.add_dependency(%q<ZenTest>, ["~> 4.4.1"])
       s.add_dependency(%q<autotest-fsevent>, [">= 0"])
       s.add_dependency(%q<autotest-growl>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<cloudservers>, ["~> 0.4"])
     s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<optitron>, [">= 0"])
+    s.add_dependency(%q<sexp_processor>, ["~> 3.0.5"])
     s.add_dependency(%q<wirble>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
+    s.add_dependency(%q<ZenTest>, ["~> 4.4.1"])
     s.add_dependency(%q<autotest-fsevent>, [">= 0"])
     s.add_dependency(%q<autotest-growl>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: nephele
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 13
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Jeffrey O'Dell
@@ -15,180 +10,152 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 -05:00
+date: 2011-10-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :runtime
-  requirement: *id001
-  name: rake
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: cloudservers
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
         version: "0.4"
-  prerelease: false
   type: :runtime
-  requirement: *id002
-  name: cloudservers
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: awesome_print
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :runtime
-  requirement: *id003
-  name: awesome_print
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: optitron
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :runtime
-  requirement: *id004
-  name: optitron
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: sexp_processor
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: 3.0.5
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: *id005
-  name: wirble
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: wirble
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id006
-  name: shoulda
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: shoulda
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id007
-  name: mocha
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: mocha
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id008
-  name: autotest
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: autotest
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
+  type: :development
   prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 4.4.1
   type: :development
-  requirement: *id009
-  name: autotest-fsevent
+  prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: autotest-fsevent
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id010
-  name: autotest-growl
+  prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: autotest-growl
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id011
-  name: bundler
+  prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: jeweler
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  prerelease: false
+        version: "0"
   type: :development
-  requirement: *id012
-  name: jeweler
+  prerelease: false
+  version_requirements: *id013
 description: Light administration utility for popular cloud services
 email: jeffrey.odell@gmail.com
 executables: 
@@ -231,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 565433683656449259
       segments: 
       - 0
       version: "0"
@@ -240,9 +207,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
@@ -251,6 +215,5 @@ rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Light administration utility for popular cloud services
-test_files: 
-- test/helper.rb
-- test/tc_base.rb
+test_files: []
+