rest_connection 0.0.3 → 0.0.4

data/.gitignore

@@ -0,0 +1,2 @@
+*.swp
+*.swo

data/Rakefile

@@ -9,6 +9,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.authors = ["Jeremy Deininger"]
   gemspec.add_dependency('activesupport')
   gemspec.add_dependency('net-ssh')
+  gemspec.add_dependency('json')
 end
 Jeweler::GemcutterTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/config/rest_api_config.yaml.sample

@@ -1,7 +1,10 @@
 --- 
+:ssh_keys: 
+- ~/.ssh/my_server_key
+- ~/.ssh/my_server_key-eu
+- ~/.ssh/my_server_key-west
 :pass: myUltraSecurePasswordz
 :user: myUserEmail@MyMailDomain.com
 :api_url: https://my.rightscale.com/api/acct/00000000
-:ssh_key: ~/.ssh/my-server-key
 :common_headers: 
   X_API_VERSION: "1.0"

data/examples/console.rb

@@ -2,8 +2,6 @@ require 'rubygems'
 require 'rest_connection'
 require 'ruby-debug'
 
-s=Server.find(746271)
-s.relaunch
-
+debugger
 puts "done!"
 

data/examples/restart_instance_agent.rb

@@ -7,6 +7,7 @@ require 'net/ssh'
 opts = Trollop::options do
   opt :deployment, "deployment nickname", :type => :string, :required => true
   opt :only, "regex string matching the nickname of the servers you want to relaunch. This excludes servers that do not match\nExample --only ubuntu", :type => :string, :required => false
+  opt :hard, "hard reset, uninstalls right_resources premium gem (for code update), and restarts the instance agent", :type => :bool, :required => false
 end
 
 # find all servers in the deployment (the fast way)
@@ -16,13 +17,13 @@ servers = servers.select { |s| s.nickname =~ /#{opts[:only]}/ } if opts[:only]
 
 servers.each do |s|
   s.wait_for_operational_with_dns
-#    s.spot_check("/opt/rightscale/sandbox/bin/gem uninstall right_resources_premium") do |result|
-#      puts result
-#    end
-# monit will restart it
-# OR-- monit -c /opt/rightscale/etc/monitrc restart instance
-#    s.spot_check("rnac --stop instance") do |result|
-#      puts result
-#    end
-   s.run_recipe("database_test::dev_pristine_restore")
+  if opts[:hard]
+    s.spot_check("gem uninstall right_resources_premium") do |result|
+      puts result
+    end
+    s.spot_check("monit restart instance") do |result|
+      puts result
+    end
+  end
+  s.run_recipe("database_test::dev_pristine_restore")
 end

data/lib/rest_connection.rb

@@ -169,13 +169,10 @@ module RestConnection
     def logger(message)
       init_message = "Initializing Logging using "
       if @@logger.nil?
-        if @settings[:log_file]
-          @@logger = Logger.new(@settings[:log_file])
-          init_message += @settings[:log_file]
-        elsif ENV['REST_CONNECTION_LOG']
+        if ENV['REST_CONNECTION_LOG']
           @@logger = Logger.new(ENV['REST_CONNECTION_LOG'])
           init_message += ENV['REST_CONNECTION_LOG']
-        else @settings[:log_file]
+        else
           @@logger = Logger.new(STDOUT)
           init_message += "STDOUT"
         end

data/lib/rest_connection/rightscale/audit_entry.rb

@@ -0,0 +1,44 @@
+#    This file is part of RestConnection 
+#
+#    RestConnection is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    RestConnection is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+#
+#class AuditEntry
+#  attr_accessor :status, :output
+#  def initialize(opts)
+#    @status = opts[:status]
+#    @output = opts[:output]
+#  end
+#  def wait_for_completed(audit_link = "no audit link available")
+#    raise "FATAL: script failed. see audit #{audit_link}" unless @status
+#  end
+#end
+
+class AuditEntry
+  include  RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+
+  def wait_for_state(state)
+    while(1)
+      reload
+      connection.logger("state is #{self.state}, waiting for #{state}")
+      raise "FATAL error, script failed\nSee Audit: #{self.href}" if self.state == 'failed'
+      sleep 5
+      return true if state == self.state
+    end
+  end
+
+  def wait_for_completed(legacy=nil)
+    wait_for_state("completed")
+  end
+end 

data/lib/rest_connection/rightscale/deployment.rb

@@ -13,7 +13,10 @@
 #    You should have received a copy of the GNU General Public License
 #    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
 
-class Deployment < RightScale::Api::Base
+class Deployment 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+
   def set_input(name, value)
     deploy_href = URI.parse(self.href)
     connection.put(deploy_href.path, :deployment => {:parameters => {name => value} })

data/lib/rest_connection/rightscale/ec2_security_group.rb

@@ -13,5 +13,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
 
-class Ec2SecurityGroup < RightScale::Api::Base
+class Ec2SecurityGroup 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
 end

data/lib/rest_connection/rightscale/ec2_server_array.rb

@@ -19,7 +19,9 @@
 # st.executables.find(:nickname
 # a.run_script_on_all(
 
-class Ec2ServerArray < RightScale::Api::Base
+class Ec2ServerArray 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
   def run_script_on_all(script, server_template_hrefs, inputs=nil)
      serv_href = URI.parse(self.href)
      options = Hash.new

data/lib/rest_connection/rightscale/ec2_ssh_key.rb

@@ -13,5 +13,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
 
-class Ec2SshKey < RightScale::Api::Base
+class Ec2SshKey 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
 end

data/lib/rest_connection/rightscale/executable.rb

@@ -1,4 +1,6 @@
-class Executable < RightScale::Api::Base
+class Executable 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
 
   # executable can be EITHER a right_script or recipe
   # executable example params format:

data/lib/rest_connection/rightscale/instance.rb

@@ -16,7 +16,9 @@
 # This is an instance facing api and can only be used with
 # an authentication URL normally found in the instance's userdata called
 # RS_API_URL
-class Instance < RightScale::Api::Base
+class Instance 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
   #def create_ebs_volume_from_snap(snap_aws_id)
   #  connection.post('create_ebs_volume.js', :aws_id => snap_aws_id )
   #end 

data/lib/rest_connection/rightscale/multi_cloud_image.rb

@@ -13,5 +13,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
 
-class MultiCloudImage < RightScale::Api::Base
+class MultiCloudImage 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
 end

data/lib/rest_connection/rightscale/right_script.rb

@@ -14,7 +14,9 @@
 #    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
 
 
-class RightScript < RightScale::Api::Base
+class RightScript 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
   def self.from_yaml(yaml)
     scripts = []
     x = YAML.load(yaml)

data/lib/rest_connection/rightscale/rightscale_api_base.rb

@@ -17,51 +17,27 @@ require 'active_support'
 
 module RightScale
   module Api
-    class Base
-      # The params hash of attributes for direct manipulation
-      attr_accessor :params
-
-      def self.connection()
-        @@connection ||= RestConnection::Connection.new
-      end
+    module BaseExtend
       def connection()
         @@connection ||= RestConnection::Connection.new
       end
 
-      def initialize(params = {})
-        @params = params
-      end
-
-      def self.resource_plural_name
+      def resource_plural_name
         self.to_s.underscore.pluralize
       end 
 
-      def self.resource_singluar_name
+      def resource_singluar_name
         self.to_s.underscore
       end
-
-      def resource_plural_name
-        self.class.to_s.underscore.pluralize
-      end
-
-      def resource_singular_name
-        self.class.to_s.underscore
-      end
-
-      def save
-        uri = URI.parse(self.href)
-        connection.put(uri.path, resource_singular_name.to_sym => @params)
-      end
-
       # matches using result of block match expression
       # ex: Server.find_by(:nickname) { |n| n =~ /production/ }
-      def self.find_by(attrib, &block)
+      def find_by(attrib, &block)
         self.find_all.select do |s| 
           yield(s[attrib.to_s])
         end
       end
 
-      def self.find_all
+      def find_all
         a = Array.new
         connection.get(self.resource_plural_name).each do |object|
           a << self.new(object)
@@ -69,21 +45,16 @@ module RightScale
         return a
       end
 
-      def self.find_by_nickname(nickname)
+      def find_by_nickname(nickname)
         connection.logger("DEPRICATION WARNING: use of find_by_nickname is depricated, please use find_by(:nickname) { |n| n == '#{nickname}' } ")
         self.find_by(:nickname) { |n| n == nickname }
       end
 
-      def reload
-        uri = URI.parse(self.href)
-        @params ? @params.merge!(connection.get(uri.path)) : @params = connection.get(uri.path)
-      end
-
       # the argument can be 
       # 1) takes href (URI), 
       # 2) or id (Integer)
       # 3) or symbol :all, :first, :last
-      def self.find(href, &block)
+      def find(href, &block)
         if href.is_a?(Integer)
           return self.new(connection.get(self.resource_plural_name + "/#{href}"))
         elsif href.is_a?(Symbol)
@@ -104,12 +75,12 @@ module RightScale
         nil
       end
 
-      def self.find_by_id(id)
+      def find_by_id(id)
         connection.logger("DEPRICATION WARNING: use of find_by_id is depricated, please use find(id) ")
         self.find(id)
       end
 
-      def self.create(opts)
+      def create(opts)
         location = connection.post(self.resource_plural_name, self.resource_singluar_name.to_sym => opts)
         newrecord = self.new('href' => location)
         newrecord.reload
@@ -117,12 +88,12 @@ module RightScale
       end
 
 # filter is only implemented on some api endpoints
-      def self.find_by_nickname_speed(nickname)
+      def find_by_nickname_speed(nickname)
         self.find_with_filter('nickname' => nickname)
       end
 
 # filter is only implemented on some api endpoints
-      def self.find_with_filter(filter = {})
+      def find_with_filter(filter = {})
         filter_params = ""
         filter.each {|key,val| filter_params += "filter[]=#{key}=#{val}&"}
         a = Array.new
@@ -131,6 +102,36 @@ module RightScale
         end
         return a
       end
+    end
+
+    module Base
+      # The params hash of attributes for direct manipulation
+      attr_accessor :params
+      def initialize(params = {})
+        @params = params
+      end
+
+      def connection()
+        @@connection ||= RestConnection::Connection.new
+      end
+   
+      def resource_plural_name
+        self.class.to_s.underscore.pluralize
+      end
+
+      def resource_singular_name
+        self.class.to_s.underscore
+      end
+
+      def save
+        uri = URI.parse(self.href)
+        connection.put(uri.path, resource_singular_name.to_sym => @params)
+      end
+
+      def reload
+        uri = URI.parse(self.href)
+        @params ? @params.merge!(connection.get(uri.path)) : @params = connection.get(uri.path)
+      end
 
       def destroy
         my_href = URI.parse(self.href)
@@ -148,8 +149,11 @@ module RightScale
         elsif @params[mn_dash]
           @params[mn_dash] = args[0] if assignment
           return @params[mn_dash] 
+        elsif @params[mn.to_sym]
+          return @params[mn.to_sym]
         else  
-          raise "called unknown method #{method_name} with #{args.inspect}"
+          return nil
+          #raise "called unknown method #{method_name} with #{args.inspect}"
         end
       end
 

data/lib/rest_connection/rightscale/rightscale_api_resources.rb

@@ -24,3 +24,5 @@ require 'rest_connection/rightscale/ec2_security_group'
 require 'rest_connection/rightscale/ec2_ssh_key'
 require 'rest_connection/rightscale/multi_cloud_image'
 require 'rest_connection/rightscale/tag'
+require 'rest_connection/rightscale/rs_internal'
+require 'rest_connection/rightscale/audit_entry'

data/lib/rest_connection/rightscale/rs_internal.rb

@@ -0,0 +1,42 @@
+#    This file is part of RestConnection 
+#
+#    RestConnection is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    RestConnection is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+
+#    
+# You must have special API access to use these internal API calls.
+# 
+class RsInternal 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+
+  def connection
+    @@little_brother_connection ||= RestConnection::Connection.new
+    @@little_brother_connection.settings[:common_headers] = { 'X-API-VERSION' => '0.1' }
+    @@little_brother_connection
+  end
+
+  def self.connection
+    @@little_brother_connection ||= RestConnection::Connection.new
+    @@little_brother_connection.settings[:common_headers] = { 'X-API-VERSION' => '0.1' }
+    @@little_brother_connection
+  end
+
+  def self.get_server_template_multi_cloud_images(server_template_href)
+    connection.get("rs_internal/get_server_template_multi_cloud_images","server_template_href=#{server_template_href}")
+  end
+
+  def self.set_server_multi_cloud_image(server_href, mci_href)
+    connection.put("rs_internal/set_server_multi_cloud_image", {:server_href => server_href, :multi_cloud_image_href => mci_href})
+  end
+end

data/lib/rest_connection/rightscale/server.rb

@@ -15,8 +15,11 @@
 
 require 'rest_connection/ssh_hax'
 
-class Server < RightScale::Api::Base
+class Server 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
   include SshHax
+
   def self.create(opts)
     create_options = Hash.new
     create_options[self.resource_singluar_name.to_sym] = opts
@@ -74,8 +77,34 @@ class Server < RightScale::Api::Base
     end
   end
 
-  # This method takes a RightScript or Executable, and optional run time parameters in an options hash.
+  # This should be used with v5 images only.
+  # executable to run can be an Executable or RightScript object
+  def run_executable(executable, opts=nil)
+    script_options = Hash.new
+    script_options[:server] = Hash.new
+    if executable.is_a?(Executable)
+      if executable.recipe?
+        script_options[:server][:recipe] = executable.recipe
+      else
+        script_options[:server][:right_script_href] = executable.right_script.href
+      end
+    elsif executable.is_a?(RightScript)
+      script_options[:server][:right_script_href] = executable.href
+    else
+      raise "Invalid class passed to run_executable, needs Executable or RightScript, was:#{executable.class}"
+    end
+
+    serv_href = URI.parse(self.href)
+    script_options[:server][:parameters] = opts unless opts.nil?
+    location = connection.post(serv_href.path + '/run_executable', script_options)
+    AuditEntry.new('href' => location)
+  end
+
+  # This should be used with v4 images only.
   def run_script(script,opts=nil)
+    if script.is_a?(Executable)
+      script = script.right_script
+    end
     serv_href = URI.parse(self.href)
     script_options = Hash.new
     script_options[:server] = Hash.new
@@ -127,6 +156,7 @@ class Server < RightScale::Api::Base
     self.start  
   end
 
+
 #  DOES NOT WORK: fragile web scraping
 #  def relaunch
 #    unless state == "stopped"

data/lib/rest_connection/rightscale/server_template.rb

@@ -13,7 +13,9 @@
 #    You should have received a copy of the GNU General Public License
 #    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
 
-class ServerTemplate < RightScale::Api::Base
+class ServerTemplate 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
   def initialize(params)
     @params = params
     fetch_executables
@@ -28,4 +30,9 @@ class ServerTemplate < RightScale::Api::Base
     end
     @params["executables"] = ex
   end
+
+  def fetch_multi_cloud_images
+    @params["multi_cloud_images"] = RsInternal.get_server_template_multi_cloud_images(self.href)
+  end
+    
 end

data/lib/rest_connection/rightscale/status.rb

@@ -12,8 +12,14 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    For now this is a stub for using with the ssh enabled Server#run_script
 
-class Status < RightScale::Api::Base
+#This is the v4 image only work status api.
+# was used by Server#run_script (depricating..)
+class Status 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
   def wait_for_completed(audit_link = "no audit link available")
     while(1)
       reload

data/lib/rest_connection/rightscale/tag.rb

@@ -13,7 +13,9 @@
 #    You should have received a copy of the GNU General Public License
 #    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
 
-class Tag < RightScale::Api::Base
+class Tag 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
 
   def self.search(resource_name, tags)
     result = connection.get("/tags/search", :resource_type => resource_name.to_s, :tags => tags )

data/lib/rest_connection/ssh_hax.rb

@@ -35,18 +35,11 @@ module SshHax
     ssh_keys
   end
 
-  # recipe can be either a String, or an Executable
-  # host_dns is optional and will default to objects self.dns_name
-  def run_recipe(recipe, ssh_key=nil, host_dns=self.dns_name)
-    if recipe.is_a?(Executable)
-      recipe = recipe.recipe
-    end
+  def run_and_tail(run_this, tail_command, expect, ssh_key=nil, host_dns=self.dns_name)
     status = nil
     result = nil
     output = ""
-    tail_command ="tail -f -n1 /var/log/messages"
-    expect = /RightLink.*RS> ([completed|failed]+: < #{recipe} >)/
-    run_this = "rs_run_recipe -n '#{recipe}'"
+    connection.logger("Running: #{run_this}")
     Net::SSH.start(host_dns, 'root', :keys => ssh_key_config(ssh_key)) do |ssh|
       cmd_channel = ssh.open_channel do |ch1|
         ch1.on_request('exit-status') do |ch, data|
@@ -93,12 +86,46 @@ module SshHax
       cmd_channel.wait
       log_channel.wait
     end
-    success = result.include?('completed')
     connection.logger output
+    success = result.include?('completed')
     connection.logger "Converge failed. See server audit: #{self.audit_link}" unless success
     return {:status => success, :output => output}
   end
 
+  # script is an Executable object with minimally nick or id set
+  def run_executable_with_ssh(script, options={}, ssh_key=nil)
+    raise "FATAL: run_executable called on a server with no dns_name. You need to run .settings on the server to populate this attribute." unless self.dns_name
+    if script.is_a?(Executable)
+      script = script.right_script
+    end
+
+    raise "FATAL: unrecognized format for script.  Must be an Executable or RightScript with href or name attributes" unless (script.is_a?(RightScript)) && (script.href || script.name)
+    if script.href
+      run_this = "rs_run_right_script -i #{script.href.split(/\//).last}" 
+    elsif script.name
+      run_this = "rs_run_right_script -n #{script.name}" 
+    end
+    tail_command ="tail -f -n1 /var/log/messages"
+    expect = /RightLink.*RS> ([completed|failed]+:)/
+    options.each do |key, value|
+      run_this += " -p #{key}=#{value}"
+    end
+    AuditEntry.new(run_and_tail(run_this, tail_command, expect))
+  end
+
+  # recipe can be either a String, or an Executable
+  # host_dns is optional and will default to objects self.dns_name
+  def run_recipe_with_ssh(recipe, ssh_key=nil, host_dns=self.dns_name)
+    raise "FATAL: run_script called on a server with no dns_name. You need to run .settings on the server to populate this attribute." unless self.dns_name
+    if recipe.is_a?(Executable)
+      recipe = recipe.recipe
+    end
+    tail_command ="tail -f -n1 /var/log/messages"
+    expect = /RightLink.*RS> ([completed|failed]+: < #{recipe} >)/
+    run_this = "rs_run_recipe -n '#{recipe}'"
+    run_and_tail(run_this, tail_command, expect, ssh_key)
+  end
+
   def spot_check(command, ssh_key=nil, host_dns=self.dns_name, &block)
     connection.logger "SSHing to #{host_dns}"
     Net::SSH.start(host_dns, 'root', :keys => ssh_key_config(ssh_key)) do |ssh|
@@ -116,7 +143,7 @@ module SshHax
 
   # returns hash of exit_status and output from command
   def spot_check_command(command, ssh_key=nil, host_dns=self.dns_name)
-    connection.logger "SSHing to #{host_dns} using key #{ssh_key}"
+    connection.logger "SSHing to #{host_dns} using key(s) #{ssh_key_config(ssh_key)}"
     status = nil
     output = ""
     Net::SSH.start(host_dns, 'root', :keys => ssh_key_config(ssh_key)) do |ssh|
@@ -131,6 +158,7 @@ module SshHax
             status = 1
           end
           ch2.on_data do |ch, data|
+
             output += data
           end
           ch2.on_extended_data do |ch, type, data|

data/rest_connection.gemspec

@@ -5,18 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest_connection}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Deininger"]
-  s.date = %q{2010-03-18}
+  s.date = %q{2010-04-15}
   s.description = %q{provides rest_connection}
   s.email = %q{jeremy@rubyonlinux.org}
   s.extra_rdoc_files = [
     "README"
   ]
   s.files = [
-    "README",
+    ".gitignore",
+     "README",
      "Rakefile",
      "VERSION",
      "config/rest_api_config.yaml.sample",
@@ -31,6 +32,7 @@ Gem::Specification.new do |s|
      "examples/run_php_chef_sequence.rb",
      "examples/set_deployment_template_href.rb",
      "lib/rest_connection.rb",
+     "lib/rest_connection/rightscale/audit_entry.rb",
      "lib/rest_connection/rightscale/deployment.rb",
      "lib/rest_connection/rightscale/ec2_security_group.rb",
      "lib/rest_connection/rightscale/ec2_server_array.rb",
@@ -41,12 +43,15 @@ Gem::Specification.new do |s|
      "lib/rest_connection/rightscale/right_script.rb",
      "lib/rest_connection/rightscale/rightscale_api_base.rb",
      "lib/rest_connection/rightscale/rightscale_api_resources.rb",
+     "lib/rest_connection/rightscale/rs_internal.rb",
      "lib/rest_connection/rightscale/server.rb",
      "lib/rest_connection/rightscale/server_template.rb",
      "lib/rest_connection/rightscale/status.rb",
      "lib/rest_connection/rightscale/tag.rb",
      "lib/rest_connection/ssh_hax.rb",
-     "rest_connection.gemspec"
+     "rest_connection.gemspec",
+     "spec/rs_internal_spec.rb",
+     "spec/server_spec.rb"
   ]
   s.homepage = %q{http://github.com/jeremyd/rest_connection}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -54,17 +59,18 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{lib for restful connections to the rightscale api}
   s.test_files = [
-    "examples/console.rb",
-     "examples/dev_setup.rb",
-     "examples/relaunch_deployment.rb",
+    "spec/server_spec.rb",
+     "spec/rs_internal_spec.rb",
      "examples/restart_instance_agent.rb",
+     "examples/console.rb",
+     "examples/run_php_chef_sequence.rb",
+     "examples/set_deployment_template_href.rb",
+     "examples/dev_setup.rb",
      "examples/right_scale_ec2_instances_api_test.rb",
-     "examples/run_ebs_sequence.rb",
+     "examples/relaunch_deployment.rb",
      "examples/run_ebs_terminate.rb",
      "examples/run_mysql_chef_sequence.rb",
-     "examples/run_php_chef_sequence.rb",
-     "examples/set_deployment_images.rb",
-     "examples/set_deployment_template_href.rb"
+     "examples/run_ebs_sequence.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -74,13 +80,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<net-ssh>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<net-ssh>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end
 

data/spec/rs_internal_spec.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'rest_connection'
+require 'spec'
+require 'ruby-debug'
+
+describe RsInternal, "exercises the rs_internal api" do
+  before(:all) do
+    @st = ServerTemplate.find(27418)
+  end
+
+# this will never be checked in, these tests are too hardwired
+# (doesn't mean it's not useful)
+  it "should get all the mcis for this hardcoded template and set this hardcoded server" do
+    mcis = RsInternal.get_server_template_multi_cloud_images(@st.href)
+    mcis.empty?.should_not == true
+    mcis.first['href'].include?("https://").should == true
+
+    server = "/servers/752944"
+    success = RsInternal.set_server_multi_cloud_image(server, mcis.first['href'])
+
+    debugger
+    puts "blah"
+
+  end
+
+end

data/spec/server_spec.rb

@@ -0,0 +1,34 @@
+require 'rubygems'
+require 'rest_connection'
+require 'spec'
+require 'ruby-debug'
+
+describe Server, "server api object exercise" do
+  before(:all) do
+    @server_v4_right_script = Server.find(752616) # a v4 server
+    @server_v5_recipe = Server.find(697640) # a v5 server
+    @server_v5_right_script = Server.find() # a v5 server
+  end
+
+  it "should run a right_script on a v4 server" do
+    this_template = ServerTemplate.find(@server_v4_right_script.server_template_href)
+    run_first = this_template.executables.first
+    location = @server_v4_right_script.run_executable(run_first)
+    audit = AuditEntry.new(:href => location)
+    audit.wait_for_completed
+  end
+
+  it "should run a recipe on a v5 server" do
+    this_template = ServerTemplate.find(@server_v5_recipe.server_template_href)
+    run_first = this_template.executables.first
+    audit = @server_v5_recipe.run_executable(run_first)
+    audit.wait_for_completed
+  end
+
+  it "should run a right_script on a v5 server" do
+    this_template = ServerTemplate.find(@server_v5_right_script.server_template_href)
+    run_first = this_template.executables.first
+    audit = @server_v5_right_script.run_executable(run_first)
+    audit.wait_for_completed
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -07:00
+date: 2010-04-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: provides rest_connection
 email: jeremy@rubyonlinux.org
 executables: []
@@ -50,6 +62,7 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
+- .gitignore
 - README
 - Rakefile
 - VERSION
@@ -65,6 +78,7 @@ files:
 - examples/run_php_chef_sequence.rb
 - examples/set_deployment_template_href.rb
 - lib/rest_connection.rb
+- lib/rest_connection/rightscale/audit_entry.rb
 - lib/rest_connection/rightscale/deployment.rb
 - lib/rest_connection/rightscale/ec2_security_group.rb
 - lib/rest_connection/rightscale/ec2_server_array.rb
@@ -75,12 +89,15 @@ files:
 - lib/rest_connection/rightscale/right_script.rb
 - lib/rest_connection/rightscale/rightscale_api_base.rb
 - lib/rest_connection/rightscale/rightscale_api_resources.rb
+- lib/rest_connection/rightscale/rs_internal.rb
 - lib/rest_connection/rightscale/server.rb
 - lib/rest_connection/rightscale/server_template.rb
 - lib/rest_connection/rightscale/status.rb
 - lib/rest_connection/rightscale/tag.rb
 - lib/rest_connection/ssh_hax.rb
 - rest_connection.gemspec
+- spec/rs_internal_spec.rb
+- spec/server_spec.rb
 has_rdoc: true
 homepage: http://github.com/jeremyd/rest_connection
 licenses: []
@@ -112,14 +129,15 @@ signing_key:
 specification_version: 3
 summary: lib for restful connections to the rightscale api
 test_files: 
+- spec/server_spec.rb
+- spec/rs_internal_spec.rb
+- examples/restart_instance_agent.rb
 - examples/console.rb
+- examples/run_php_chef_sequence.rb
+- examples/set_deployment_template_href.rb
 - examples/dev_setup.rb
-- examples/relaunch_deployment.rb
-- examples/restart_instance_agent.rb
 - examples/right_scale_ec2_instances_api_test.rb
-- examples/run_ebs_sequence.rb
+- examples/relaunch_deployment.rb
 - examples/run_ebs_terminate.rb
 - examples/run_mysql_chef_sequence.rb
-- examples/run_php_chef_sequence.rb
-- examples/set_deployment_images.rb
-- examples/set_deployment_template_href.rb
+- examples/run_ebs_sequence.rb