rest_connection 0.0.23 → 0.1.0

data/lib/rest_connection/ssh_hax.rb

@@ -1,4 +1,4 @@
-#    This file is part of RestConnection 
+#    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
@@ -37,7 +37,7 @@ module SshHax
     ssh_keys
   end
 
-  def run_and_tail(run_this, tail_command, expect, ssh_key=nil, host_dns=self.dns_name)
+  def run_and_tail(run_this, tail_command, expect, ssh_key=nil, host_dns=self.reachable_ip)
     status = nil
     result = nil
     output = ""
@@ -75,7 +75,7 @@ module SshHax
           ch.on_extended_data do |c, type, data|
             #STDERR.print data
           end
-          ch.on_close do 
+          ch.on_close do
           end
           ch.on_process do |c|
             if result
@@ -84,7 +84,7 @@ module SshHax
             end
           end
         end
-      end 
+      end
       cmd_channel.wait
       log_channel.wait
     end
@@ -96,16 +96,16 @@ module SshHax
 
   # 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
+    raise "FATAL: run_executable called on a server with no reachable_ip. You need to run .settings on the server to populate this attribute." unless self.reachable_ip
     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}" 
+      run_this = "rs_run_right_script -i #{script.href.split(/\//).last}"
     elsif script.name
-      run_this = "rs_run_right_script -n #{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]+:)/
@@ -116,9 +116,9 @@ module SshHax
   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
+  # host_dns is optional and will default to objects self.reachable_ip
+  def run_recipe_with_ssh(recipe, ssh_key=nil, host_dns=self.reachable_ip)
+    raise "FATAL: run_script called on a server with no reachable_ip. You need to run .settings on the server to populate this attribute." unless self.reachable_ip
     if recipe.is_a?(Executable)
       recipe = recipe.recipe
     end
@@ -128,59 +128,61 @@ module SshHax
     run_and_tail(run_this, tail_command, expect, ssh_key)
   end
 
-  def spot_check(command, ssh_key=nil, host_dns=self.dns_name, &block)
+  def spot_check(command, ssh_key=nil, host_dns=self.reachable_ip, &block)
     connection.logger "SSHing to #{host_dns}"
     Net::SSH.start(host_dns, 'root', :keys => ssh_key_config(ssh_key)) do |ssh|
       result = ssh.exec!(command)
       yield result
     end
-  end 
+  end
 
   # returns true or false based on command success
-  def spot_check_command?(command, ssh_key=nil, host_dns=self.dns_name)
+  def spot_check_command?(command, ssh_key=nil, host_dns=self.reachable_ip)
     results = spot_check_command(command, ssh_key, host_dns)
     return results[:status] == 0
   end
 
 
   # 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
+  def spot_check_command(command, ssh_key=nil, host_dns=self.reachable_ip, do_not_log_result=false)
+    raise "FATAL: spot_check_command called on a server with no reachable_ip. 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 = ""
     success = false
     retry_count = 0
     while (!success && retry_count < SSH_RETRY_COUNT) do
-    begin
-    Net::SSH.start(host_dns, 'root', :keys => ssh_key_config(ssh_key), :user_known_hosts_file => "/dev/null") do |ssh|
-      cmd_channel = ssh.open_channel do |ch1|
-        ch1.on_request('exit-status') do |ch, data|
-          status = data.read_long
-        end
-        ch1.exec(command) do |ch2, success|
-          unless success
-            status = 1
-          end
-          ch2.on_data do |ch, data|
-            output += data
-          end
-          ch2.on_extended_data do |ch, type, data|
-            output += data
+      begin
+        # Test for ability to connect; Net::SSH.start sometimes hangs under certain server-side sshd configs
+        test_ssh = `ssh -o \"BatchMode=yes\" -o \"ConnectTimeout 5\" root@#{host_dns} -C \"exit\" 2>&1`.chomp
+        raise test_ssh unless test_ssh =~ /permission denied/i or test_ssh.empty?
+
+        Net::SSH.start(host_dns, 'root', :keys => ssh_key_config(ssh_key), :user_known_hosts_file => "/dev/null") do |ssh|
+          cmd_channel = ssh.open_channel do |ch1|
+            ch1.on_request('exit-status') do |ch, data|
+              status = data.read_long
+            end
+            ch1.exec(command) do |ch2, success|
+              unless success
+                status = 1
+              end
+              ch2.on_data do |ch, data|
+                output += data
+              end
+              ch2.on_extended_data do |ch, type, data|
+                output += data
+              end
+            end
           end
         end
+      rescue Exception => e
+        retry_count += 1 # opening the ssh channel failed -- try again.
+        connection.logger "ERROR during SSH session to #{host_dns}, retrying #{retry_count}: #{e} #{e.backtrace}"
+        sleep 10
       end
     end
-    rescue Exception => e
-      retry_count += 1 # opening the ssh channel failed -- try again.
-      connection.logger "ERROR during SSH session to #{host_dns}, retrying #{retry_count}: #{e} #{e.backtrace}"
-      sleep 10
-    end
-    end
-    connection.logger "SSH Run: #{command} on #{host_dns}. Retry was #{retry_count}. Exit status was #{status}. Output below ---\n#{output}\n---"
+    connection.logger "SSH Run: #{command} on #{host_dns}. Retry was #{retry_count}. Exit status was #{status}. Output below ---\n#{output}\n---" unless do_not_log_result
     return {:status => status, :output => output}
-  end 
+  end
 
 end
-
-

data/rest_connection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest_connection}
-  s.version = "0.0.23"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Deininger"]
-  s.date = %q{2011-10-26}
+  s.date = %q{2011-09-10}
   s.description = %q{provides rest_connection}
   s.email = %q{jeremy@rubyonlinux.org}
   s.extra_rdoc_files = [
@@ -84,16 +84,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, ["= 2.3.10"])
-      s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
+      s.add_runtime_dependency(%q<net-ssh>, ["= 2.1.4"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, ["= 2.3.10"])
-      s.add_dependency(%q<net-ssh>, [">= 0"])
+      s.add_dependency(%q<net-ssh>, ["= 2.1.4"])
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, ["= 2.3.10"])
-    s.add_dependency(%q<net-ssh>, [">= 0"])
+    s.add_dependency(%q<net-ssh>, ["= 2.1.4"])
     s.add_dependency(%q<json>, [">= 0"])
   end
 end

data/spec/mcserver_spec.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'rest_connection'
+require 'spec'
+require 'ruby-debug'
+
+describe McServer, "server api object exercise" do
+  before(:all) do
+    @mcserver_v5 = McServer.find("/api/clouds/850/instances/AA5AOKVUOJPC9") # a v5 server
+  end
+
+  it "should run a recipe on a v5 server" do
+    this_template = ServerTemplate.find(@mcserver_v5.server_template_href)
+    run_first = this_template.executables.first
+    audit = @mcserver_v5.run_executable(run_first)
+    audit.wait_for_completed
+  end
+end

data/spec/multi.rb

@@ -0,0 +1,16 @@
+require 'rubygems'
+require 'rest_connection'
+require 'spec'
+require 'ruby-debug'
+
+describe MultiCloudImage do
+  it "goes" do
+
+    mci = MultiCloudImage.find(46563)
+    mci = MultiCloudImage.find(57499)
+    settings = mci.find_and_flatten_settings
+    debugger
+puts "blah"
+
+  end
+end

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 23
-  version: 0.0.23
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jeremy Deininger
+- Timothy Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 -07:00
-default_executable: 
+date: 2011-11-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -40,12 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        - 4
+        version: 2.1.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -62,8 +64,24 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: provides rest_connection
-email: jeremy@rubyonlinux.org
+email: 
+- jeremy@rubyonlinux.org
+- tw.rodriguez@gmail.com
 executables: []
 
 extensions: []
@@ -84,9 +102,16 @@ files:
 - examples/cucumber/step_definitions/spot_check_steps.rb
 - examples/relaunch_deployment.rb
 - examples/right_scale_ec2_instances_api_test.rb
+- git_hooks/post-commit.disabled
+- git_hooks/post-merge.disabled
+- git_hooks/pre-commit
 - lib/rest_connection.rb
+- lib/rest_connection/patches.rb
+- lib/rest_connection/rightscale/account.rb
 - lib/rest_connection/rightscale/alert_spec.rb
 - lib/rest_connection/rightscale/audit_entry.rb
+- lib/rest_connection/rightscale/child_account.rb
+- lib/rest_connection/rightscale/cloud.rb
 - lib/rest_connection/rightscale/credential.rb
 - lib/rest_connection/rightscale/deployment.rb
 - lib/rest_connection/rightscale/ec2_ebs_snapshot.rb
@@ -98,29 +123,58 @@ files:
 - lib/rest_connection/rightscale/ec2_ssh_key_internal.rb
 - lib/rest_connection/rightscale/executable.rb
 - lib/rest_connection/rightscale/instance.rb
+- lib/rest_connection/rightscale/instance_type.rb
+- lib/rest_connection/rightscale/macro.rb
+- lib/rest_connection/rightscale/mc_datacenter.rb
+- lib/rest_connection/rightscale/mc_deployment.rb
+- lib/rest_connection/rightscale/mc_image.rb
+- lib/rest_connection/rightscale/mc_instance.rb
+- lib/rest_connection/rightscale/mc_instance_type.rb
+- lib/rest_connection/rightscale/mc_multi_cloud_image.rb
+- lib/rest_connection/rightscale/mc_multi_cloud_image_setting.rb
+- lib/rest_connection/rightscale/mc_security_group.rb
 - lib/rest_connection/rightscale/mc_server.rb
+- lib/rest_connection/rightscale/mc_server_array.rb
+- lib/rest_connection/rightscale/mc_server_template.rb
+- lib/rest_connection/rightscale/mc_ssh_key.rb
+- lib/rest_connection/rightscale/mc_tag.rb
+- lib/rest_connection/rightscale/mc_volume.rb
+- lib/rest_connection/rightscale/mc_volume_attachment.rb
+- lib/rest_connection/rightscale/mc_volume_snapshot.rb
+- lib/rest_connection/rightscale/mc_volume_type.rb
+- lib/rest_connection/rightscale/monitoring_metric.rb
 - lib/rest_connection/rightscale/multi_cloud_image.rb
 - lib/rest_connection/rightscale/multi_cloud_image_cloud_setting_internal.rb
 - lib/rest_connection/rightscale/multi_cloud_image_internal.rb
+- lib/rest_connection/rightscale/permission.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_gateway.rb
 - lib/rest_connection/rightscale/rightscale_api_internal.rb
+- lib/rest_connection/rightscale/rightscale_api_mc_input.rb
+- lib/rest_connection/rightscale/rightscale_api_mc_taggable.rb
 - lib/rest_connection/rightscale/rightscale_api_resources.rb
+- lib/rest_connection/rightscale/rightscale_api_taggable.rb
 - lib/rest_connection/rightscale/rs_internal.rb
+- lib/rest_connection/rightscale/s3_bucket.rb
 - lib/rest_connection/rightscale/server.rb
+- lib/rest_connection/rightscale/server_interface.rb
 - lib/rest_connection/rightscale/server_internal.rb
 - lib/rest_connection/rightscale/server_template.rb
 - lib/rest_connection/rightscale/server_template_internal.rb
 - lib/rest_connection/rightscale/status.rb
 - lib/rest_connection/rightscale/tag.rb
+- lib/rest_connection/rightscale/task.rb
+- lib/rest_connection/rightscale/user.rb
 - lib/rest_connection/ssh_hax.rb
 - rest_connection.gemspec
 - spec/ec2_server_array_spec.rb
 - spec/ec2_ssh_key_internal_spec.rb
 - spec/image_jockey.rb
+- spec/mcserver_spec.rb
 - spec/method_missing_spec.rb
+- spec/multi.rb
 - spec/right_script_internal.rb
 - spec/rs_internal_spec.rb
 - spec/server_internal_spec.rb
@@ -128,8 +182,7 @@ files:
 - spec/server_template_internal.rb
 - spec/spec_helper.rb
 - spec/tag_spec.rb
-has_rdoc: true
-homepage: http://github.com/jeremyd/rest_connection
+homepage: http://github.com/twrodriguez/rest_connection
 licenses: []
 
 post_install_message: 
@@ -158,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: lib for restful connections to the rightscale api