rest_connection 0.0.23 → 0.1.0

data/README.rdoc

@@ -4,7 +4,7 @@
   "gem install rest_connection"
 
 ==== Installing from source
-  "git clone http://github.com/jeremyd/rest_connection.git"
+  "git clone http://github.com/twrodriguez/rest_connection.git"
   "gem install jeweler rspec"
   "rake check_dependencies" <- Install any gems listed.
   "rake install"
@@ -40,8 +40,8 @@ Copy the example from GEMHOME/rest_connection/examples/rest_api_config.yaml.samp
   my_servers.each { |s| s.wait_for_state("stopped") }
 
 === Activate an Ec2ServerArray / Display instances IPs
-  
-  my_array = Ec2ServerArray.find(opts[:href])  
+
+  my_array = Ec2ServerArray.find(opts[:href])
   my_array.active = true
   my_array.save
 

data/Rakefile

@@ -4,12 +4,13 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.name = "rest_connection"
   gemspec.summary = "lib for restful connections to the rightscale api"
   gemspec.description = "provides rest_connection"
-  gemspec.email = "jeremy@rubyonlinux.org"
-  gemspec.homepage = "http://github.com/jeremyd/rest_connection"
-  gemspec.authors = ["Jeremy Deininger"]
+  gemspec.email = ["jeremy@rubyonlinux.org", "tw.rodriguez@gmail.com"]
+  gemspec.homepage = "http://github.com/twrodriguez/rest_connection"
+  gemspec.authors = ["Jeremy Deininger", "Timothy Rodriguez"]
   gemspec.add_dependency('activesupport', "=2.3.10")
-  gemspec.add_dependency('net-ssh')
+  gemspec.add_dependency('net-ssh', "=2.1.4")
   gemspec.add_dependency('json')
+  gemspec.add_dependency('highline')
 end
 Jeweler::GemcutterTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.1.0

data/git_hooks/post-commit.disabled

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rake build
+gem install ../pkg/virtualmonkey*.gem --no-rdoc --no-ri

data/git_hooks/post-merge.disabled

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rake build
+gem install ../pkg/virtualmonkey*.gem --no-rdoc --no-ri

data/git_hooks/pre-commit

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+whitespace=""
+for FILE in `git diff-index --name-only HEAD --` ; do
+  if test -e $FILE; then
+    if [[ -n `grep "\\s\\s*$" $FILE` ]]; then whitespace="$whitespace $FILE"; fi
+    # Remove trailing whitespace
+    sed -i "s/\\s\\s*$//g" $FILE
+    # Remove tabs
+    sed -i "s/\t/  /g" $FILE
+    # If a file is ruby, check for syntax errors
+    if [[ -n `find $FILE -regex ".*\.rb$"` ]]; then
+      if [[ "$fail" -eq 0 || -z "$fail" ]]; then
+        `ruby -c $FILE 1> /dev/null`; fail=$?
+      else
+        `ruby -c $FILE 1> /dev/null`
+      fi
+    fi
+  fi
+done
+
+# Built-in git checks
+git diff-index --check HEAD --
+
+if [[ "$fail" -ne 0 && -n "$fail" ]]; then
+  echo "Syntax Errors Found. Aborting commit"
+  exit 1
+fi
+
+for FILE in $whitespace; do
+  echo "Whitespace problem fixed. Please re-add '$FILE' to your commit"
+done
+if [[ -n "$whitespace" ]]; then exit 1; fi
+
+# Check that project metadata files exist
+for FILE in "Rakefile" "README.rdoc" "VERSION" ".gitignore" "rest_connection.gemspec"; do
+  if test ! -e $FILE; then
+    echo "$FILE not present. Aborting commit"
+    exit 1
+  fi
+done
+
+# Check that username and user emails are filled properly
+username=`git config --get user.name`
+useremail=`git config --get user.email`
+emaildomain=`echo $useremail | grep -o "[^@]*$"`
+if [[ "$username" == "" ]]; then
+  echo "Please set your git user.name by running 'git config user.name <your github username>'"
+  exit 1
+elif [[ "$useremail" == "" ]] || ! host "$emaildomain" &> /dev/null; then
+  echo "Please set your git user.email by running 'git config user.email <your github email>'"
+  exit 1
+fi

data/lib/rest_connection.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
@@ -19,9 +19,56 @@ require 'json'
 require 'yaml'
 require 'cgi'
 require 'rest_connection/rightscale/rightscale_api_resources'
+require 'rest_connection/patches'
 require 'logger'
+require 'highline/import'
 
 module RestConnection
+  AWS_CLOUDS = [{"cloud_id" => 1, "name" => "AWS US-East"},
+                {"cloud_id" => 2, "name" => "AWS EU"},
+                {"cloud_id" => 3, "name" => "AWS US-West"},
+                {"cloud_id" => 4, "name" => "AWS AP-Singapore"},
+                {"cloud_id" => 5, "name" => "AWS AP-Tokyo"}]
+
+    # Check for API 0.1 Access
+  def self.api0_1?
+    unless class_variable_defined?("@@api0_1")
+      begin
+        Ec2SshKeyInternal.find_all
+        @@api0_1 = true
+      rescue
+        @@api0_1 = false
+      end
+    end
+    return @@api0_1
+  end
+
+  # Check for API 1.0 Access
+  def self.api1_0?
+    unless class_variable_defined?("@@api1_0")
+      begin
+        Ec2SecurityGroup.find_all
+        @@api1_0 = true
+      rescue
+        @@api1_0 = false
+      end
+    end
+    return @@api1_0
+  end
+
+  # Check for API 1.5 Beta Access
+  def self.api1_5?
+    unless class_variable_defined?("@@api1_5")
+      begin
+        Cloud.find_all
+        @@api1_5 = true
+      rescue
+        @@api1_5 = false
+      end
+    end
+    return @@api1_5
+  end
+
   class Connection
     # Settings is a hash of options for customizing the connection.
     # settings.merge! {
@@ -35,9 +82,13 @@ module RestConnection
     # Settings are loaded from a yaml configuration file in users home directory.
     # Copy the example config from the gemhome/config/rest_api_config.yaml.sample to ~/.rest_connection/rest_api_config.yaml
     # OR to /etc/rest_connection/rest_api_config.yaml
+    # Here's an example of overriding the settings in the configuration file:
+    #   Server.connection.settings[:api_url] = "https://my.rightscale.com/api/acct/1234"
     #
     def initialize(config_yaml = File.join(File.expand_path("~"), ".rest_connection", "rest_api_config.yaml"))
       @@logger = nil
+      @@user = nil
+      @@pass = nil
       etc_config = File.join("#{File::SEPARATOR}etc", "rest_connection", "rest_api_config.yaml")
       if File.exists?(config_yaml)
         @settings = YAML::load(IO.read(config_yaml))
@@ -50,33 +101,41 @@ module RestConnection
       end
       @settings[:extension] = ".js"
       @settings[:api_href] = @settings[:api_url] unless @settings[:api_href]
+      unless @settings[:user]
+        @@user = ask("Username:") unless @@user
+        @settings[:user] = @@user
+      end
+      unless @settings[:pass]
+        @@pass = ask("Password:") { |q| q.echo = false } unless @@pass
+        @settings[:pass] = @@pass
+      end
     end
 
     # Main HTTP connection loop. Common settings are set here, then we yield(BASE_URI, OPTIONAL_HEADERS) to other methods for each type of HTTP request: GET, PUT, POST, DELETE
-    # 
+    #
     # The block must return a Net::HTTP Request. You have a chance to taylor the request inside the block that you pass by modifying the url and headers.
     #
     # rest_connect do |base_uri, headers|
     #   headers.merge! {:my_header => "blah"}
     #   Net::HTTP::Get.new(base_uri, headers)
     # end
-    #   
+    #
     def rest_connect(&block)
       uri = URI.parse(@settings[:api_href])
       http = Net::HTTP.new(uri.host, uri.port)
       if uri.scheme == 'https'
-        http.use_ssl = true 
+        http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
       headers = @settings[:common_headers]
-      headers.merge!("Cookie" => @cookie) if @cookie 
+      headers.merge!("Cookie" => @cookie) if @cookie
       http.start do |http|
         req = yield(uri, headers)
         unless @cookie
           req.basic_auth(@settings[:user], @settings[:pass]) if @settings[:user]
         end
         logger("#{req.method}: #{req.path}")
-        logger("\trequest body: #{req.body}") if req.body
+        logger("\trequest body: #{req.body}") if req.body and req.body !~ /password/
         response, body = http.request(req)
         handle_response(response)
       end
@@ -94,7 +153,7 @@ module RestConnection
         Net::HTTP::Get.new(new_path, headers)
       end
     end
-    
+
     # connection.post(server_url + "/start")
     #
     # href = "/api/base_new" if this begins with a slash then the url will be used as absolute path.
@@ -122,7 +181,7 @@ module RestConnection
       rest_connect do |base_uri, headers|
         href = "#{base_uri}/#{href}" unless begins_with_slash(href)
         new_path = URI.escape(href)
-        req = Net::HTTP::Put.new(new_path, headers) 
+        req = Net::HTTP::Put.new(new_path, headers)
         req.set_content_type('application/json')
         req.body = additional_parameters.to_json
         req
@@ -146,11 +205,11 @@ module RestConnection
     end
 
     # handle_response
-    # res = HTTP response 
+    # res = HTTP response
     #
     # decoding and post processing goes here. This is where you may need some customization if you want to handle the response differently (or not at all!).  Luckily it's easy to modify based on this handler.
     def handle_response(res)
-      if res.code.to_i == 201
+      if res.code.to_i == 201 or res.code.to_i == 202
         return res['Location']
       elsif [200,203,204,302].detect { |d| d == res.code.to_i }
         if res.body
@@ -162,7 +221,7 @@ module RestConnection
         else
           return res
         end
-      else 
+      else
         raise "invalid response HTTP code: #{res.code.to_i}, #{res.code}, #{res.body}"
       end
     end
@@ -184,7 +243,11 @@ module RestConnection
         @@logger.info(init_message)
       end
 
-      @@logger.info(message)
+      if @settings.nil?
+        @@logger.info(message)
+      else
+        @@logger.info("[API v#{@settings[:common_headers]['X_API_VERSION']} ]" + message)
+      end
     end
 
     # used by requestify to build parameters strings

data/lib/rest_connection/patches.rb

@@ -0,0 +1,106 @@
+# Hash Patches
+
+class Hash
+  # Merges self with another second, recursively.
+  #
+  # This code was lovingly stolen from some random gem:
+  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+  #
+  # Thanks to whoever made it.
+  #
+  # Modified to provide same functionality with Arrays
+
+  def deep_merge(second)
+    target = dup
+    return target unless second
+    second.keys.each do |k|
+      if second[k].is_a? Array and self[k].is_a? Array
+        target[k] = target[k].deep_merge(second[k])
+        next
+      elsif second[k].is_a? Hash and self[k].is_a? Hash
+        target[k] = target[k].deep_merge(second[k])
+        next
+      end
+      target[k] = second[k]
+    end
+    target
+  end
+
+  # From: http://www.gemtacular.com/gemdocs/cerberus-0.2.2/doc/classes/Hash.html
+  # File lib/cerberus/utils.rb, line 42
+  # Modified to provide same functionality with Arrays
+
+  def deep_merge!(second)
+    return nil unless second
+    second.each_pair do |k,v|
+      if self[k].is_a?(Array) and second[k].is_a?(Array)
+        self[k].deep_merge!(second[k])
+      elsif self[k].is_a?(Hash) and second[k].is_a?(Hash)
+        self[k].deep_merge!(second[k])
+      else
+        self[k] = second[k]
+      end
+    end
+  end
+end
+
+# Array Patches
+
+class Array
+  def deep_merge(second)
+    target = dup
+    return target unless second
+    second.each_index do |k|
+      if second[k].is_a? Array and self[k].is_a? Array
+        target[k] = target[k].deep_merge(second[k])
+        next
+      elsif second[k].is_a? Hash and self[k].is_a? Hash
+        target[k] = target[k].deep_merge(second[k])
+        next
+      end
+      target << second[k] unless target.include?(second[k])
+    end
+    target
+  end
+
+  def deep_merge!(second)
+    return nil unless second
+    second.each_index do |k|
+      if self[k].is_a?(Array) and second[k].is_a?(Array)
+        self[k].deep_merge!(second[k])
+      elsif self[k].is_a?(Hash) and second[k].is_a?(Hash)
+        self[k].deep_merge!(second[k])
+      else
+        self << second[k] unless self.include?(second[k])
+      end
+    end
+  end
+
+  def *(second)
+    if second.is_a?(Integer)
+      ret = []
+      second.times { |i| ret += dup }
+      return ret
+    elsif second.is_a?(Array)
+      ret = []
+      each { |x| second.each { |y| ret << [x,y].flatten } }
+      return ret
+    else
+      raise TypeError.new("can't convert #{second.class} into Integer")
+    end
+  end
+
+  def **(second)
+    if second.is_a?(Integer)
+      ret = dup
+      (second - 1).times {
+        temp = []
+        ret.each { |x| each { |y| temp << [x,y].flatten } }
+        ret = temp
+      }
+      return ret
+    else
+      raise TypeError.new("can't convert #{second.class} into Integer")
+    end
+  end
+end

data/lib/rest_connection/rightscale/account.rb

@@ -0,0 +1,27 @@
+#    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 Beta v1.5 API access to use these internal API calls.
+#
+
+#
+# Account Resource requires "admin" role
+#
+
+class Account
+  include RightScale::Api::Gateway
+  extend RightScale::Api::GatewayExtend
+end

data/lib/rest_connection/rightscale/alert_spec.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
@@ -24,4 +24,4 @@ class AlertSpec
   end
 
 
-end 
+end

data/lib/rest_connection/rightscale/audit_entry.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
@@ -31,18 +31,18 @@ class AuditEntry
   def wait_for_state(state, timeout=900)
     while(timeout > 0)
       reload
+      return true if state == self.state
       connection.logger("state is #{self.state}, waiting for #{state}")
       friendly_url = "https://my.rightscale.com/audit_entries/"
       friendly_url += self.href.split(/\//).last
       raise "FATAL error, #{self.summary}\nSee Audit: API:#{self.href}, WWW:<a href='#{friendly_url}'>#{friendly_url}</a>\n" if self.state == 'failed'
       sleep 30
       timeout -= 30
-      return true if state == self.state
     end
     raise "FATAL: Timeout waiting for Executable to complete.  State was #{self.state}" if timeout <= 0
   end
 
-  def wait_for_completed(legacy=nil)
-    wait_for_state("completed")
+  def wait_for_completed(timeout=900)
+    wait_for_state("completed", timeout)
   end
-end 
+end