rest_connection 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/rest_connection.rb

@@ -151,7 +151,6 @@ module RestConnection
           begin
             return JSON.load(res.body)
           rescue => e
-            logger("WARNING: failed to parse HTTP response body with JSON.load!")
             return res
           end
         else

data/lib/rest_connection/rightscale/multi_cloud_image_internal.rb

@@ -35,4 +35,14 @@ class MultiCloudImageInternal
     "multi_cloud_image"
   end
 
+  def commit(message)
+    t = URI.parse(self.href)
+    MultiCloudImage.new(:href => connection.post(t.path + "/commit"))
+  end
+
+  def clone
+    t = URI.parse(self.href)
+    MultiCloudImage.new(:href => connection.post(t.path + "/clone"))
+  end
+
 end

data/lib/rest_connection/rightscale/right_script_internal.rb

@@ -0,0 +1,51 @@
+#    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 RightScriptInternal 
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+  include RightScale::Api::Internal
+  extend RightScale::Api::InternalExtend
+
+  def resource_plural_name
+    "right_scripts"
+  end
+
+  def resource_singular_name
+    "right_script"
+  end
+
+  def self.resource_plural_name
+    "right_scripts"
+  end
+
+  def self.resource_singular_name
+    "right_script"
+  end
+
+  # commits a rightscript
+  def commit(message)
+    t = URI.parse(self.href)
+    RightScript.new(:href => connection.post(t.path + "/commit", :commit_message => message))
+  end
+  
+  # clones a RightScript and returns the new RightScript resource that's been created.
+  def clone
+    t = URI.parse(self.href)
+    RightScript.new(:href => connection.post(t.path + "/clone"))
+  end
+    
+end

data/lib/rest_connection/rightscale/rightscale_api_resources.rb

@@ -35,6 +35,7 @@ require 'rest_connection/rightscale/ec2_ebs_snapshot'
 require 'rest_connection/rightscale/server_internal'
 require 'rest_connection/rightscale/ec2_ssh_key_internal'
 require 'rest_connection/rightscale/server_template_internal'
+require 'rest_connection/rightscale/right_script_internal'
 require 'rest_connection/rightscale/multi_cloud_image_internal'
 require 'rest_connection/rightscale/multi_cloud_image_cloud_setting_internal'
 require 'rest_connection/rightscale/ec2_server_array'

data/lib/rest_connection/rightscale/server.rb

@@ -105,11 +105,12 @@ class Server
   end
 
   def stop
-    if self.state != "stopped"
+    # All instances will have a valid href including EBS instances that are "stopped"
+    if self.current_instance_href
       t = URI.parse(self.href)
       connection.post(t.path + '/stop')
     else
-      connection.logger("WARNING: was in #{self.state} so skiping stop call")
+      connection.logger("WARNING: was in #{self.state} and had a current_instance_href so skiping stop call")
     end
   end
 
@@ -225,5 +226,23 @@ class Server
     raise("FATAL: timeout after #{timeout}s waiting for state change")
   end
 
+  # Save the servers parameters to the current server (instead of the next server)
+  def save_current
+    uri = URI.parse(self.href)
+    connection.put(uri.path + "/current", resource_singular_name.to_sym => @params)
+  end
+
+  # Load server's settings from the current server (instead of the next server)
+  def settings_current
+    serv_href = URI.parse(self.href)
+    @params.merge! connection.get(serv_href.path + "/current" + "/settings")
+  end
+
+  # Reload the server's basic information from the current server.
+  def reload_current
+    uri = URI.parse(self.href)
+    @params ? @params.merge!(connection.get(uri.path + "/current")) : @params = connection.get(uri.path)
+  end
+
 end
 

data/lib/rest_connection/rightscale/server_template.rb

@@ -27,6 +27,22 @@ class ServerTemplate
     @params["executables"]
   end
 
+  def alert_specs
+    unless @params["alert_specs"]
+      fetch_alert_specs
+    end
+    @params["alert_specs"]
+  end
+
+  def fetch_alert_specs
+    my_href = URI.parse(self.href)
+    as = []
+    connection.get(my_href.path + "/alert_specs").each do |e|
+      as << AlertSpec.new(e)
+    end
+    @params["alert_specs"] = as
+  end
+    
   def multi_cloud_images
     unless @params["multi_cloud_images"]
       fetch_multi_cloud_images
@@ -46,5 +62,15 @@ class ServerTemplate
   def fetch_multi_cloud_images
     @params["multi_cloud_images"] = RsInternal.get_server_template_multi_cloud_images(self.href)
   end
-    
+
+  # The RightScale api calls this 'duplicate' but is more popularly known as 'clone' from a users perspective
+  def duplicate
+    my_href = URI.parse(self.href)
+    ServerTemplate.new(:href => connection.post(my_href.path + "/duplicate"))
+  end
+
+  def clone
+    duplicate
+  end
+
 end

data/lib/rest_connection/rightscale/server_template_internal.rb

@@ -55,4 +55,38 @@ class ServerTemplateInternal
     connection.get(t.path + "/multi_cloud_images")
   end
 
+  # message <~String>: commit message string (required)
+  def commit(message)
+    t = URI.parse(self.href)
+    ServerTemplate.new(:href => connection.post(t.path + "/commit", :commit_message => message))
+  end
+
+  # <~Executable> executable, an Executable object to add
+  # <~String> Apply, a string designating the type of executable: "boot", "operational", "decommission".  Default is operational
+  def add_executable(executable, apply="operational")
+    t = URI.parse(self.href)
+    params = {}
+    if executable.recipe?
+      params[:recipe] = executable.href
+    else
+      params[:right_script_href] = executable.href
+    end
+    params[:apply] = apply
+    connection.post(t.path + "/add_executable", params)
+  end
+
+  # <~Executable> executable, an Executable object to delete 
+  # <~String> Apply, a string designating the type of executable: "boot", "operational", "decommission".  Default is operational
+  def delete_executable(executable, apply="operational")
+    t = URI.parse(self.href)
+    params = {}
+    if executable.recipe?
+      params[:recipe] = executable.href
+    else
+      params[:right_script_href] = executable.href
+    end
+    params[:apply] = apply
+    connection.delete(t.path + "/delete_executable", params)
+  end
+
 end

data/lib/rest_connection/ssh_hax.rb

@@ -145,6 +145,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)
+    raise "FATAL: spot_check_command called on a server with no dns_name. You need to run .settings on the server to populate this attribute." unless host_dns
     connection.logger "SSHing to #{host_dns} using key(s) #{ssh_key_config(ssh_key)}"
     status = nil
     output = ""

data/rest_connection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest_connection}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Deininger"]
-  s.date = %q{2010-10-20}
+  s.date = %q{2010-11-01}
   s.description = %q{provides rest_connection}
   s.email = %q{jeremy@rubyonlinux.org}
   s.extra_rdoc_files = [
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
      "lib/rest_connection/rightscale/multi_cloud_image_cloud_setting_internal.rb",
      "lib/rest_connection/rightscale/multi_cloud_image_internal.rb",
      "lib/rest_connection/rightscale/right_script.rb",
+     "lib/rest_connection/rightscale/right_script_internal.rb",
      "lib/rest_connection/rightscale/rightscale_api_base.rb",
      "lib/rest_connection/rightscale/rightscale_api_internal.rb",
      "lib/rest_connection/rightscale/rightscale_api_resources.rb",
@@ -62,9 +63,12 @@ Gem::Specification.new do |s|
      "spec/ec2_ssh_key_internal_spec.rb",
      "spec/image_jockey.rb",
      "spec/method_missing_spec.rb",
+     "spec/right_script_internal.rb",
      "spec/rs_internal_spec.rb",
      "spec/server_internal_spec.rb",
      "spec/server_spec.rb",
+     "spec/server_template_internal.rb",
+     "spec/spec_helper.rb",
      "spec/tag_spec.rb"
   ]
   s.homepage = %q{http://github.com/jeremyd/rest_connection}
@@ -74,8 +78,11 @@ Gem::Specification.new do |s|
   s.summary = %q{lib for restful connections to the rightscale api}
   s.test_files = [
     "spec/server_internal_spec.rb",
+     "spec/spec_helper.rb",
      "spec/method_missing_spec.rb",
+     "spec/server_template_internal.rb",
      "spec/server_spec.rb",
+     "spec/right_script_internal.rb",
      "spec/ec2_ssh_key_internal_spec.rb",
      "spec/rs_internal_spec.rb",
      "spec/tag_spec.rb",

data/spec/image_jockey.rb

@@ -19,12 +19,21 @@ describe MultiCloudImageInternal, "exercises the mci internal api" do
     trash.class.should == Array
     trash.first.class.should == Hash
     @really_new_st.delete_multi_cloud_image(@mci.href)
+
+    # test clone
+    @new_mci_test = @mci2.clone
+
+    # test commit
+    @new_mci_test.commit("hello commits world")
+
   end
 
   after(:all) do
+    @int_new_mci_test = MultiCloudImageInternal.new(:href => @new_mci_test.href)
     @new_st.destroy
-    #@mci.destroy
-    #@mci2.destroy
+    @mci.destroy
+    @mci2.destroy
+    @int_new_mci_test.destroy
   end
   
 

data/spec/right_script_internal.rb

@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'ruby-debug'
+
+describe RightScriptInternal, "exercises the right_script internal api" do
+
+  it "should do some stuff" do
+    @some_script = RightScriptInternal.new(:href => "https://my.rightscale.com/api/acct/2901/right_scripts/256669")
+
+    # Test commit
+    @some_script.commit("hello commits world")
+
+    # Test clone
+    @new_script = @some_script.clone
+
+    # Test update
+    @same_script = RightScriptInternal.new(:href => @new_script.href)
+    @same_script.name = "newname123"
+    @same_script.save
+
+  end
+
+  after(:all) do
+    # can't cleanup, don't have destroy calls
+    #@new_script.destroy
+  end
+  
+
+end

data/spec/server_template_internal.rb

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'ruby-debug'
+
+describe ServerTemplateInternal, "exercises the server_template internal api" do
+
+  it "should do some stuff" do
+    some_image_href = "https://moo.rightscale.com/api/acct/0/ec2_images/ami-0859bb61?cloud_id=1"
+    @mci = MultiCloudImageInternal.create(:name => "123deleteme-test test 1234", :description => "woah")
+    @new_setting = MultiCloudImageCloudSettingInternal.create(:multi_cloud_image_href => @mci.href, :cloud_id => 1, :ec2_image_href => some_image_href, :aws_instance_type => "m1.small")
+    @new_st = ServerTemplate.create(:multi_cloud_image_href => @mci.href, :nickname => "123deleteme-test test 123456", :description => "1234")
+    @executable = Executable.new('right_script' => {:href => "https://moo.rightscale.com/api/acct/2901/right_scripts/256669"})
+    @st = ServerTemplateInternal.new(:href => @new_st.href)
+
+    # Test commit
+    @st.commit('hello commits world')
+
+    # Test clone
+    @clone = @new_st.clone
+    @clone.reload
+
+    # Test add_executable
+    @st.add_executable(@executable, "boot")
+
+    # Test delete_executable
+    @st.delete_executable(@executable, "boot")
+  end
+
+  after(:all) do
+    @new_st.destroy
+    @mci.destroy
+    @clone.destroy
+  end
+  
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
+require 'rest_connection'
+require 'spec'
+require 'fileutils'
+require 'logger'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Jeremy Deininger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -07:00
+date: 2010-11-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,7 @@ files:
 - lib/rest_connection/rightscale/multi_cloud_image_cloud_setting_internal.rb
 - lib/rest_connection/rightscale/multi_cloud_image_internal.rb
 - lib/rest_connection/rightscale/right_script.rb
+- lib/rest_connection/rightscale/right_script_internal.rb
 - lib/rest_connection/rightscale/rightscale_api_base.rb
 - lib/rest_connection/rightscale/rightscale_api_internal.rb
 - lib/rest_connection/rightscale/rightscale_api_resources.rb
@@ -115,9 +116,12 @@ files:
 - spec/ec2_ssh_key_internal_spec.rb
 - spec/image_jockey.rb
 - spec/method_missing_spec.rb
+- spec/right_script_internal.rb
 - spec/rs_internal_spec.rb
 - spec/server_internal_spec.rb
 - spec/server_spec.rb
+- spec/server_template_internal.rb
+- spec/spec_helper.rb
 - spec/tag_spec.rb
 has_rdoc: true
 homepage: http://github.com/jeremyd/rest_connection
@@ -155,8 +159,11 @@ specification_version: 3
 summary: lib for restful connections to the rightscale api
 test_files: 
 - spec/server_internal_spec.rb
+- spec/spec_helper.rb
 - spec/method_missing_spec.rb
+- spec/server_template_internal.rb
 - spec/server_spec.rb
+- spec/right_script_internal.rb
 - spec/ec2_ssh_key_internal_spec.rb
 - spec/rs_internal_spec.rb
 - spec/tag_spec.rb