af-addon-tester 0.0.2 → 0.0.3

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 .bundle
 Gemfile.lock
+.DS_store
 pkg/*
-manifest.json
+*.ignore
+

data/README.md

@@ -3,7 +3,7 @@ af-addon-tester
 
 <img src="http://appfog.com/images/logo.png" />
 
-Allows developers to test App Fog add-ons
+Allows developers to test add-ons compatible with App Fog
 
 ## Setup ##
 
@@ -46,9 +46,9 @@ If cloned:
 
     $ bin/af-addon-tester <path to manifest>
 
-If Gem
+If Gem:
 
-    $ $ af-addon-tester <path to manifest>
+    $ af-addon-tester <path to manifest>
 
 
 ## Meta ##

data/bin/af-addon-tester

@@ -7,8 +7,12 @@ require 'rubygems'
 require 'json'
 require 'digest/sha1'
 require 'af-addon-tester'
+require 'restclient'
 
-manifest_path = ARGV.first
+manifest_path = ARGV.last
+
+do_asyc = ARGV.include?('-a')
+username = nil
 
 begin
   manifest_file = File.open(File.expand_path(manifest_path), 'r')
@@ -16,11 +20,11 @@ begin
   manifest = JSON.parse(manifest_json)
 
   raise "Missing id" if manifest['id'].nil?
+  username = manifest['api']['username'] || manifest['id']
   raise "Missing api section" if manifest['api'].nil?
-  raise "Missing api password" if manifest['api']['username'].nil?
   raise "Missing api password" if manifest['api']['password'].nil?
   raise "Missing apt test url" if manifest['api']['test'].nil?
-  raise "Manifest must have atleast one plan" if manifest['api']['plans'].nil? || manifest['api']['plans'][0].nil? || manifest['api']['plans'][0]['id'].nil?
+  raise "Manifest must have atleast one plan" if manifest['plans'].nil? || manifest['plans'][0].nil? || manifest['plans'][0]['id'].nil?
   raise "missing api config_vars" if manifest['api']['config_vars'].nil?
   raise "Missing api sso_salt" if manifest['api']['sso_salt'].nil?
 
@@ -34,18 +38,26 @@ config_prefix = manifest['id'].gsub('-','_').upcase + '_'
 bad_user = 'bad_user'
 bad_password = 'bad_pass'
 
-addon = Rest.new(manifest['api']['test'], manifest['api']['username'], manifest['api']['password'])
+addon = RestClient::Resource.new manifest['api']['test'], {:user => username, :password => manifest['api']['password']}
+headers = { :accept => "application/json", :content_type => "application/json", "User-Agent" => "af-addon-tester/#{VERSION}" }
+  
 resp = nil
+code = nil
 
 validate "Provisioning" do
-  params = {}
-  payload = { 'customer_id' => manifest['id'], 'plan' => manifest['api']['plans'][0]['id'], 'callback_url' => callback_url, 'options' => '{}' }
-  resp = addon.post(manifest['api']['test'], params, JSON.generate(payload))
-  failed("response code: #{resp.code} - #{resp.message}") if resp.code != "200"
+  payload = { 'customer_id' => manifest['id'], 'plan' => manifest['plans'][0]['id'], 'callback_url' => callback_url, 'options' => '{}' }
+  begin
+    resp = addon['/provider/resources'].post JSON.generate(payload), headers
+    failed("response code: #{resp.code}") if resp.code != 200
+    code = 200
+  rescue RestClient::ExceptionWithResponse => rest_err
+    code = rest_err.http_code
+    failed("response code: #{rest_err.message}") 
+  end
   passed
 end
 
-  if resp.code == "200"
+  if code == 200
   provision_info = nil
   validate "Valid JSON response" do
     begin
@@ -90,81 +102,91 @@ end
     resource_id = provision_info['id']
     unless resource_id.nil?
       validate "Update resource" do
-        params = {}
-        payload = { 'plan' => 'paid', 'callback_url' => callback_url, 'options' => '{}' }
-        resp = addon.put(manifest['api']['test'] + "/#{resource_id}", params, JSON.generate(payload))
-        failed("response code: #{resp.code}") if resp.code != "200"
-        passed
-      end
-
-      READLEN = 1024 * 10
-      reader, writer = IO.pipe
-      out = nil
-      validate "Callback" do
-        child = fork do
-          reader.close
-          server = TCPServer.open(9990)
-          client = server.accept
-          writer.write(client.readpartial(READLEN))
-          client.write("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")
-          client.close
-          writer.close
-        end
-        sleep(1)
-        out = reader.readpartial(READLEN)
-        passed
-      end
-
-      callback_info = nil    
-      isValidCallback = false
-      validate "Valid callback response" do
-        _, json = out.split("\r\n\r\n")
+        payload = { 'customer_id' => manifest['id'], 'plan' => 'sandbox' }
         begin
-          callback_info = JSON.parse(json)
-        rescue Exception => e
-          failed e.message
+          resp = addon["/provider/resources/#{resource_id}"].put JSON.generate(payload), headers
+          failed("response code: #{resp.code}") if resp.code != 200
+        rescue RestClient::ExceptionWithResponse => rest_err
+          failed("response code: #{rest_err.message}") 
         end
-        isValidCallback = true
         passed
       end
 
-      if isValidCallback
-        validate "All callback config keys are in manifest" do
-          callback_info['config'].each do |key, value|
-            unless manifest['api']['config_vars'].include? key; failed "#{key} not found in config"; end
+      if do_asyc
+        READLEN = 1024 * 10
+        reader, writer = IO.pipe
+        out = nil
+        validate "Callback" do
+          child = fork do
+            reader.close
+            server = TCPServer.open(9990)
+            client = server.accept
+            writer.write(client.readpartial(READLEN))
+            client.write("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")
+            client.close
+            writer.close
           end
+          sleep(1)
+          out = reader.readpartial(READLEN)
+          passed
         end
 
-        validate "All callback manifest config keys are in response" do
-          manifest['api']['config_vars'].each do |key, value|
-            unless callback_info['config'].include? key; failed "#{key} not found in manifest"; end
+        callback_info = nil    
+        isValidCallback = false
+        validate "Valid callback response" do
+          _, json = out.split("\r\n\r\n")
+          begin
+            callback_info = JSON.parse(json)
+          rescue Exception => e
+            failed e.message
           end
+          isValidCallback = true
+          passed
         end
 
-        validate "All callback config keys are prefixed with addon name" do
-          callback_info['config'].each do |key, value|
-            unless key.start_with? config_prefix; failed "#{key} does not begin with #{config_prefix}"; end
+        if isValidCallback
+          validate "All callback config keys are in manifest" do
+            callback_info['config'].each do |key, value|
+              unless manifest['api']['config_vars'].include? key; failed "#{key} not found in config"; end
+            end
+          end
+
+          validate "All callback manifest config keys are in response" do
+            manifest['api']['config_vars'].each do |key, value|
+              unless callback_info['config'].include? key; failed "#{key} not found in manifest"; end
+            end
+          end
+
+          validate "All callback config keys are prefixed with addon name" do
+            callback_info['config'].each do |key, value|
+              unless key.start_with? config_prefix; failed "#{key} does not begin with #{config_prefix}"; end
+            end
+            passed
           end
-          passed
         end
       end
-
+      
       validate "SSO link" do
         timestamp = Time.now.to_i
         authstring = resource_id.to_s + ':' + manifest['api']['sso_salt'] + ':' + timestamp.to_s
         token = Digest::SHA1.hexdigest(authstring)
-        resp = addon.get(manifest['api']['test'] + "/#{resource_id}?token=#{token}&timestamp=#{timestamp}")
-        passed unless resp.code != "200"
-      end
-
-      validate "Deprovision" do
-        params = {}
-        payload = { 'customer_id' => manifest['id'], 'plan' => manifest['api']['plans'][0]['id'], 'callback_url' => callback_url, 'options' => '{}' }
-        resp = addon.delete(manifest['api']['test'] + "/#{resource_id}", params, JSON.generate(payload))
-        failed("response code: #{resp.code}") if resp.code != "200"
+        addon_sso = RestClient::Resource.new manifest['api']['test']
+        sso_headers = { :accept => "text/html", :content_type => "text/html", "User-Agent" => "af-addon-tester/#{VERSION}" }
+        begin
+          resp = addon_sso["/provider/resources/#{resource_id}?token=#{token}&timestamp=#{timestamp}"].get sso_headers
+          failed("response code: #{resp.code}") if resp.code != 200
+        rescue RestClient::ExceptionWithResponse => rest_err
+          failed("response code: #{rest_err.message}") 
+        end
         passed
       end
 
+     # validate "Deprovision" do
+      #  resp = addon["/provider/resources/#{resource_id}"].delete
+      #  failed("response code: #{resp.code}") if resp.code != 200
+      #  passed
+      #end
+
     end
   end
 
@@ -173,12 +195,16 @@ else
 end
 
 validate "Bad credentials test" do
-  params = {}
-  payload = { 'customer_id' => manifest['id'], 'plan' => manifest['api']['plans'][0]['id'], 'callback_url' => callback_url, 'options' => '{}' }
+  payload = { 'customer_id' => manifest['id'], 'plan' => manifest['plans'][0]['id'], 'callback_url' => callback_url, 'options' => '{}' }
 
-  addon_bad_auth = Rest.new(manifest['api']['test'], bad_user, bad_password)
-  resp = addon.post(manifest['api']['test'], params, JSON.generate(payload))
+  addon_bad_auth = RestClient::Resource.new manifest['api']['test'], { :username => bad_user, :password => bad_password }
 
-  failed if resp.code == "200"
-  passed
+  code = nil
+  begin
+    resp = addon_bad_auth["/provider/resources"].post JSON.generate(payload), headers
+    code = resp.code
+  rescue RestClient::ExceptionWithResponse => rest_err
+    code = rest_err.http_code
+  end
+  passed unless code == 200
 end

data/config/manifest.example.json

@@ -1,17 +1,17 @@
 {
   "id":"myaddon",
+  "plans":[
+    {"id":"free"}
+  ],
   "api":{
-    "plans":[
-      {"id":"free"}
-    ],
     "config_vars": {
       "MYADDON_URL":"http://some.url.com",
       "MYADDON_VAR1":"cats",
       "MYADDON_VAR2":"dogs"
     },
-    "test":"http://localhost:4567/myaddon/resources",
+    "test":"http://localhost:4567",
     "username":"myaddon",
-    "password":"cavef6azebRewruvecuch",
+    "password":"NVUQ1OqNtuc74HiE",
     "sso_salt":"8ouy3ayLEyOA7HLAKO2Yo"
   }
 }

data/lib/af-addon-tester.rb

@@ -1,4 +1,3 @@
 require "af-addon-tester/version"
 require "af-addon-tester/colorize"
 require "af-addon-tester/test"
-require "af-addon-tester/rest"

data/lib/af-addon-tester/version.rb

@@ -1,5 +1,5 @@
 module AppFog
   module AddonTester
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tim Santeford
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 -08:00
+date: 2012-01-15 00:00:00 -08:00
 default_executable: af-addon-tester
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,6 @@ files:
 - config/manifest.example.json
 - lib/af-addon-tester.rb
 - lib/af-addon-tester/colorize.rb
-- lib/af-addon-tester/rest.rb
 - lib/af-addon-tester/test.rb
 - lib/af-addon-tester/version.rb
 has_rdoc: true

data/lib/af-addon-tester/rest.rb

@@ -1,106 +0,0 @@
-require 'net/http'
-require 'net/https'
-require 'uri'
-require 'cgi'
-
-class Rest
-
-  $user = nil
-  $password = nil
-  $http = nil
-  $cookies = {}
-  $last_resp = nil
-  $last_params = nil
-
-  $useragent = ''
-
-  def initialize(url, user = nil, password = nil)
-    $user = user
-    $password = password
-
-    uri = URI(url)
-    $http = Net::HTTP.new(uri.host, uri.port)
-
-    if uri.scheme == 'https'
-      $http.use_ssl = true
-      $http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    else
-      $http.use_ssl = false
-    end
-  end
-
-  def get(url, params = nil, additional_header = nil)
-    header = { 'Cookie' => cookie_to_s, 'User-Agent' => $useragent }
-    header = header.merge(additional_header) unless additional_header.nil?
-    req = Net::HTTP::Get.new(url, header)
-    make_request(req, params)
-  end
-
-  def post(url, params, payload = nil, additional_header = nil)
-    header = { 'Cookie' => cookie_to_s, 'User-Agent' => $useragent }
-    header = header.merge(additional_header) unless additional_header.nil?
-    req = Net::HTTP::Post.new(url, { 'Cookie' => cookie_to_s, 'User-Agent' => $useragent })
-    make_request(req, params, payload)
-  end
-
-  def put(url, params, payload = nil)
-    req = Net::HTTP::Put.new(url, { 'Cookie' => cookie_to_s, 'User-Agent' => $useragent })
-    make_request(req, params, payload)
-  end
-
-  def delete(url, params = nil, payload = nil)
-    req = Net::HTTP::Delete.new(url, { 'Cookie' => cookie_to_s, 'User-Agent' => $useragent })
-    make_request(req, params, payload)
-  end
-
-  def cookies
-    $cookies
-  end
-  def cookies=(dough)
-    $cookies = dough
-  end
-
-  def inspect
-    puts "#{bwhite(resp.code)} - #{$last_resp.message}" 
-    puts $last_params.inspect
-    puts "Cookies: " + $cookies.inspect
-    puts $last_resp.body
-  end
-
-private
-
-  def cookie_to_s
-    cookiestr = ''
-    $cookies.each do |key, value|
-       cookiestr += "#{key}=#{value}, "
-    end
-    cookiestr[0..-2]
-  end
-
-  def make_request(req, params = nil, payload = nil)
-    $last_params = params
-    req.basic_auth($user, $password) unless $user.nil?
-    req.set_form_data(params, ';') unless params.nil?
-
-    unless payload.nil?
-     req.body = payload
-     req.set_content_type('multipart/form-data')
-    end
-
-    begin
-      $last_resp = $http.request(req)
-
-      unless $last_resp['set-cookie'].nil?
-        $last_resp['set-cookie'].split(', ').each do |cookie|
-          key, value = cookie.split('=')
-          $cookies[key] = value
-        end
-      end
-    rescue NoMethodError
-      return Net::HTTPInternalServerError.new '1.1', '500', 'Internal server error'
-    end
-
-    $last_resp
-  end
-
-end