kensa 1.1.2 → 1.1.3

data/kensa.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{kensa}
-  s.version = "1.1.1"
+  s.version = "1.1.3"
 
   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{2011-01-26}
+  s.date = %q{2011-02-21}
   s.default_executable = %q{kensa}
   s.description = %q{Kensa is a command-line tool to help add-on providers integrating their services with Heroku. It manages manifest files, and provides a TDD-like approach for programmers to test and develop their APIs.}
   s.email = %q{pedro@heroku.com}
@@ -18,49 +18,47 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "README.md",
-     "Rakefile",
-     "bin/kensa",
-     "kensa.gemspec",
-     "lib/heroku/kensa.rb",
-     "lib/heroku/kensa/check.rb",
-     "lib/heroku/kensa/client.rb",
-     "lib/heroku/kensa/http.rb",
-     "lib/heroku/kensa/manifest.rb",
-     "lib/heroku/kensa/sso.rb",
-     "set-env.sh",
-     "test/all_check_test.rb",
-     "test/deprovision_check_test.rb",
-     "test/helper.rb",
-     "test/manifest_check_test.rb",
-     "test/manifest_test.rb",
-     "test/plan_change_check_test.rb",
-     "test/provision_check_test.rb",
-     "test/provision_response_check_test.rb",
-     "test/resources/runner.rb",
-     "test/resources/server.rb",
-     "test/sso_check_test.rb",
-     "test/sso_test.rb"
+    "README.md",
+    "Rakefile",
+    "bin/kensa",
+    "kensa.gemspec",
+    "lib/heroku/kensa.rb",
+    "lib/heroku/kensa/check.rb",
+    "lib/heroku/kensa/client.rb",
+    "lib/heroku/kensa/http.rb",
+    "lib/heroku/kensa/manifest.rb",
+    "lib/heroku/kensa/sso.rb",
+    "set-env.sh",
+    "test/all_check_test.rb",
+    "test/deprovision_check_test.rb",
+    "test/helper.rb",
+    "test/manifest_check_test.rb",
+    "test/manifest_test.rb",
+    "test/plan_change_check_test.rb",
+    "test/provision_check_test.rb",
+    "test/provision_response_check_test.rb",
+    "test/resources/runner.rb",
+    "test/resources/server.rb",
+    "test/sso_check_test.rb",
+    "test/sso_test.rb"
   ]
   s.homepage = %q{http://provider.heroku.com/resources}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Tool to help Heroku add-on providers integrating their services}
   s.test_files = [
     "test/all_check_test.rb",
-     "test/deprovision_check_test.rb",
-     "test/helper.rb",
-     "test/manifest_check_test.rb",
-     "test/manifest_test.rb",
-     "test/plan_change_check_test.rb",
-     "test/provision_check_test.rb",
-     "test/provision_response_check_test.rb",
-     "test/resources/runner.rb",
-     "test/resources/server.rb",
-     "test/sso_check_test.rb",
-     "test/sso_test.rb"
+    "test/deprovision_check_test.rb",
+    "test/helper.rb",
+    "test/manifest_check_test.rb",
+    "test/manifest_test.rb",
+    "test/plan_change_check_test.rb",
+    "test/provision_check_test.rb",
+    "test/provision_response_check_test.rb",
+    "test/resources/runner.rb",
+    "test/resources/server.rb",
+    "test/sso_check_test.rb",
+    "test/sso_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/heroku/kensa.rb

@@ -5,6 +5,6 @@ require 'heroku/kensa/sso'
 
 module Heroku
   module Kensa
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

data/lib/heroku/kensa/client.rb

@@ -33,21 +33,17 @@ module Heroku
           when "manifest"
             run_check ManifestCheck
           when "provision"
-            run_check ManifestCheck
-            run_check ProvisionCheck
+            run_check ManifestCheck, ProvisionCheck
           when "deprovision"
             id = @args.shift || abort("! no id specified; see usage")
-            run_check ManifestCheck
-            run_check DeprovisionCheck, :id => id
+            run_check ManifestCheck, DeprovisionCheck, :id => id
           when "planchange"
             id   = @args.shift || abort("! no id specified; see usage")
             plan = @args.shift || abort("! no plan specified; see usage")
-            run_check ManifestCheck
-            run_check PlanChangeCheck, :id => id, :plan => plan
+            run_check ManifestCheck, PlanChangeCheck, :id => id, :plan => plan
           when "sso"
             id = @args.shift || abort("! no id specified; see usage")
-            run_check ManifestCheck
-            run_check SsoCheck, :id => id
+            run_check ManifestCheck, SsoCheck, :id => id
           else
             abort "! Unknown test '#{check}'; see usage"
         end
@@ -74,7 +70,7 @@ module Heroku
         resource = RestClient::Resource.new(host, user, password)
         resource['provider/addons'].post(resolve_manifest, headers)
         puts "-----> Manifest for \"#{data['id']}\" was pushed successfully"
-        puts "       Continue at #{(heroku_host)}/addons/#{data['id']}"
+        puts "       Continue at #{(heroku_host)}/provider/addons/#{data['id']}"
       rescue RestClient::UnprocessableEntity => e
         abort("FAILED: #{e.http_body}")
       rescue RestClient::Unauthorized
@@ -125,12 +121,18 @@ module Heroku
           File.exists?(filename)
         end
 
-        def run_check(klass, args={})
-          screen = Screen.new
-          data = Yajl::Parser.parse(resolve_manifest)
-          check = klass.new(data.merge(@options.merge(args)), screen)
-          check.call
-          screen.finish
+        def run_check(*args)
+          options = {}
+          options = args.pop if args.last.is_a?(Hash)
+
+          args.each do |klass|
+            screen = Screen.new
+            data   = Yajl::Parser.parse(resolve_manifest)
+            check  = klass.new(data.merge(@options.merge(options)), screen)
+            result = check.call
+            screen.finish
+            exit 1 if !result
+          end
         end
 
         def running_on_windows?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -08:00
+date: 2011-02-21 00:00:00 -08:00
 default_executable: kensa
 dependencies: 
 - !ruby/object:Gem::Dependency