kensa 0.4.1 → 0.4.2

data/Rakefile

@@ -27,7 +27,7 @@ begin
     gemspec.add_dependency(%q<launchy>, [">= 0.3.2"])
     gemspec.add_dependency(%q<mechanize>, ["~> 1.0.0"])
 
-    gemspec.version = '0.4.1'
+    gemspec.version = '0.4.2'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/bin/kensa

@@ -5,15 +5,18 @@ require 'term/ansicolor'
 require 'launchy'
 require 'heroku/kensa'
 
-fn="addon-manifest.json"
-async=false
-env="test"
+fn = "addon-manifest.json"
+options = {
+  :async => false,
+  :env   => "test",
+}
 
 ARGV.options do |o|
   o.on("-f file", "--file") {|filename| fn = filename }
+  o.on("--async") { options[:async] = true }
+  o.on("--production") { options[:env] = "production" }
+  o.on("--plan PLANID") { |plan| options[:plan] = plan }
   o.on("-h", "--help") { command = "help" }
-  o.on("--async") { async = true }
-  o.on("--production") { env = "production" }
   o.parse!
 end
 
@@ -84,26 +87,26 @@ when "test"
     run ManifestCheck, fn
   when "provision"
     run ManifestCheck, fn
-    run ProvisionCheck, fn, :async => async, :env => env
+    run ProvisionCheck, fn, options
   when "deprovision"
     id = ARGV.shift || abort("! no id specified; see usage")
     run ManifestCheck, fn
-    run DeprovisionCheck, fn, :id => id, :async => async, :env => env
+    run DeprovisionCheck, fn, options.merge(:id => id)
   when "sso"
     id = ARGV.shift || abort("! no id specified; see usage")
     run ManifestCheck, fn
-    run SsoCheck, fn, :id => id, :env => env
+    run SsoCheck, fn, options.merge(:id => id)
   else
     abort "! Unknown test '#{check}'; see usage"
   end
 when "run"
   abort "! missing command to run; see usage" if ARGV.empty?
   run ManifestCheck, fn
-  run AllCheck, fn, :args => ARGV, :async => async, :env => env
+  run AllCheck, fn, options.merge(:args => ARGV)
 when "sso"
   id = ARGV.shift || abort("! no id specified; see usage")
   data = Yajl::Parser.parse(resolve_manifest(fn)).merge(:id => id)
-  sso = Sso.new(data)
+  sso = Sso.new(data.merge(options))
   puts "Opening #{sso.full_url}"
   Launchy.open sso.full_url
 else
@@ -127,6 +130,9 @@ OPTIONS
   --async
     Check provision call with async response.
 
+  --plan plan-id
+    Use the identified plan when doing provision calls
+
 COMMANDS
 
   init            Creates a skeleton manifest

data/kensa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kensa}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Mizerany", "Pedro Belo", "Adam Wiggins"]
-  s.date = %q{2010-04-07}
+  s.date = %q{2010-05-21}
   s.default_executable = %q{kensa}
   s.description = %q{}
   s.email = %q{pedro@heroku.com}

data/lib/heroku/kensa.rb

@@ -251,7 +251,7 @@ EOJSON
         response = data[:provision_response]
         test "response"
         check "contains an id" do
-          response.has_key?("id")
+          response.is_a?(Hash) && response.has_key?("id")
         end
 
         if response.has_key?("config")
@@ -272,7 +272,7 @@ EOJSON
               if v.is_a?(String)
                 true
               else
-                error "#{v.inspect} is not a string"
+                error "the key #{k} doesn't contain a string (#{v.inspect})"
               end
             end
           end
@@ -329,7 +329,7 @@ EOJSON
           body = RestClient::Resource.new(url, user, pass)[path].send(
             meth,
             *args
-          )
+          ).to_s
 
           code = 200
         rescue RestClient::ExceptionWithResponse => boom
@@ -375,8 +375,7 @@ EOJSON
 
         payload = {
           :heroku_id => APPID,
-          :appname => APPNAME,
-          :plan => @data['plans'].first['id'],
+          :plan => @data[:plan] || @data['plans'].first['id'],
           :callback_url => callback
         }
 
@@ -455,7 +454,7 @@ EOJSON
         id = data[:id]
         raise ArgumentError, "No id specified" if id.nil?
 
-        path = "/heroku/resources/#{id}"
+        path = "/heroku/resources/#{CGI::escape(id.to_s)}"
 
         test "DELETE #{path}"
         check "response" do
@@ -487,7 +486,8 @@ EOJSON
       def initialize(data)
         @id   = data[:id]
         @salt = data['api']['sso_salt']
-        @url  = data["api"]["test"].chomp('/')
+        env   = data[:env] || 'test'
+        @url  = data["api"][env].chomp('/')
       end
 
       def path

data/test/provision_check_test.rb

@@ -5,46 +5,40 @@ class ProvisionCheckTest < Test::Unit::TestCase
 
   setup do
     @data = Manifest.skeleton
-    @responses = [
-      [200, to_json({ :id => 456 })],
-      [401, "Unauthorized"]
-    ]
+    @data['api']['username'] = 'test'
+    @data['api']['password'] = 'secret'
   end
 
   def check ; ProvisionCheck ; end
 
-  test "valid on 200 for the regular check, and 401 for the auth check" do
-    assert_valid do |check|
-      stub :post, check, @responses
-    end
+  test "working provision call" do
+    @data['api']['test'] += "working"
+    assert_valid
   end
 
-  test "invalid JSON" do
-    @responses[0] = [200, "---"]
-    assert_invalid do |check|
-      stub :post, check, @responses
-    end
+  test "detects invalid JSON" do
+    @data['api']['test'] += "invalid-json"
+    assert_invalid
   end
 
-  test "status other than 200" do
-    @responses[0] = [500, to_json({ :id => 456 })]
-    assert_invalid do |check|
-      stub :post, check, @responses
-    end
+  test "detects invalid response" do
+    @data['api']['test'] += "invalid-response"
+    assert_invalid
   end
 
-  test "runs provision response check" do
-    @responses[0] = [200, to_json({ :noid => 456 })]
-    assert_invalid do |check|
-      stub :post, check, @responses
-    end
+  test "detects invalid status" do
+    @data['api']['test'] += "invalid-status"
+    assert_invalid
   end
 
-  test "runs auth check" do
-    @responses[1] = [200, to_json({ :id => 456 })]
-    assert_invalid do |check|
-      stub :post, check, @responses
-    end
+  test "detects missing id" do
+    @data['api']['test'] += "invalid-missing-id"
+    assert_invalid
+  end
+
+  test "detects missing auth" do
+    @data['api']['test'] += "invalid-missing-auth"
+    assert_invalid
   end
 
 end

data/test/resources/test_server.rb

@@ -1,9 +1,22 @@
 require 'rubygems'
 require 'sinatra'
+require 'json'
 
 enable :sessions
 
 helpers do
+  def heroku_only!
+    unless auth_heroku?
+      response['WWW-Authenticate'] = %(Basic realm="Kensa Test Server")
+      unauthorized!(401)
+    end
+  end
+
+  def auth_heroku?
+    @auth ||=  Rack::Auth::Basic::Request.new(request.env)
+    @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == ['test', 'secret']
+  end
+
   def unauthorized!(status=403)
     throw(:halt, [status, "Not authorized\n"])
   end
@@ -18,6 +31,37 @@ helpers do
   end
 end
 
+post '/working/heroku/resources' do
+  heroku_only!
+  { :id => 123 }.to_json
+end
+
+post '/invalid-json/heroku/resources' do
+  heroku_only!
+  'invalidjson'
+end
+
+post '/invalid-response/heroku/resources' do
+  heroku_only!
+  nil.to_json
+end
+
+post '/invalid-status/heroku/resources' do
+  heroku_only!
+  status 422
+  { :id => 123 }.to_json
+end
+
+post '/invalid-missing-id/heroku/resources' do
+  heroku_only!
+  { :noid => 123 }.to_json
+end
+
+post '/invalid-missing-auth/heroku/resources' do
+  { :id => 123 }.to_json
+end
+
+
 get '/working/heroku/resources/:id' do
   unauthorized! unless params[:id] && params[:token]
   unauthorized! unless params[:timestamp].to_i > (Time.now-60*2).to_i

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -07:00
+date: 2010-05-21 00:00:00 -07:00
 default_executable: kensa
 dependencies: 
 - !ruby/object:Gem::Dependency