kensa 1.2.0rc1 → 1.2.0rc2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kensa (2.0.0rc2)
+    kensa (1.2.0rc2)
       launchy (~> 2.0.5)
       mechanize (~> 1.0.0)
       rest-client (~> 1.6.7)
@@ -13,25 +13,19 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
-<<<<<<< HEAD
-    ansi (1.3.0)
     archive-tar-minitar (0.5.2)
-=======
->>>>>>> bef831b5998868443cbed5c3bfeeb74220bdc5ba
     artifice (0.6)
       rack-test
+    columnize (0.3.4)
     haml (3.1.3)
     hoe (2.12.3)
       rake (~> 0.8)
     json (1.6.1)
     launchy (2.0.5)
       addressable (~> 2.2.6)
-<<<<<<< HEAD
     linecache (0.43)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-=======
->>>>>>> bef831b5998868443cbed5c3bfeeb74220bdc5ba
     mechanize (1.0.0)
       nokogiri (>= 1.2.1)
     mime-types (1.16)
@@ -42,8 +36,7 @@ GEM
     rake (0.9.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-<<<<<<< HEAD
-    rr (1.0.3)
+    rr (1.0.4)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -59,13 +52,10 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-=======
-    rr (1.0.4)
->>>>>>> bef831b5998868443cbed5c3bfeeb74220bdc5ba
     sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
-    term-ansicolor (1.0.6)
+      tilt (>= 1.2.2, < 2.0)
+    term-ansicolor (1.0.7)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
     tilt (1.3.3)
@@ -80,15 +70,8 @@ DEPENDENCIES
   haml (~> 3.1.3)
   json
   kensa!
-<<<<<<< HEAD
-  rr
+  rr (~> 1.0.4)
   ruby-debug
   ruby-debug19
-  sinatra (>= 0.9)
-  timecop (>= 0.3.5)
-  turn
-=======
-  rr (~> 1.0.4)
   sinatra (~> 1.2.6)
   timecop (~> 0.3.5)
->>>>>>> bef831b5998868443cbed5c3bfeeb74220bdc5ba

data/README.md

@@ -24,6 +24,6 @@ http://provider.heroku.com/resources/technical/build/provisioning
 
 ## Meta #######################################################################
 
-Maintained by Glenn Gillen.
+Maintained by Glenn Gillen and Chris Continanza.
 
 Released under the MIT license. http://github.com/heroku/kensa

data/lib/heroku/kensa.rb

@@ -7,9 +7,4 @@ base_path = File.dirname(__FILE__)
 %w{http manifest sso post_proxy}.each do |lib|
   require "#{base_path}/kensa/#{lib}"
 end
-
-module Heroku
-  module Kensa
-    VERSION = "2.0.0rc"
-  end
-end
+require 'heroku/kensa/version'

data/lib/heroku/kensa/client.rb

@@ -117,12 +117,12 @@ module Heroku
       end
 
       def version
-        puts "Kensa #{VERSION}"
+        puts "Kensa #{Kensa::VERSION}"
       end
 
       private
         def headers
-          { :accept => :json, "X-Kensa-Version" => "1", "User-Agent" => "kensa/#{VERSION}" }
+          { :accept => :json, "X-Kensa-Version" => "1", "User-Agent" => "kensa/#{Kensa::VERSION}" }
         end
 
         def heroku_host

data/lib/heroku/kensa/version.rb

@@ -1,6 +1,6 @@
 module Heroku
   module Kensa
-    VERSION = "1.2.0rc1"
+    VERSION = "1.2.0rc2"
   end
 end
 

data/test/resources/provider_server.rb

@@ -19,7 +19,7 @@ class ProviderServer < Sinatra::Base
     end
 
     def check_token!
-      salt = @manifest && @manifest["sso_salt"]
+      salt = @manifest && @manifest['api']["sso_salt"]
       token = Digest::SHA1.hexdigest([params[:id], salt, params[:timestamp]].join(':'))
       unauthorized! if params[:token] != token
     end

data/test/sso_test.rb

@@ -57,8 +57,6 @@ class SsoTest < Test::Unit::TestCase
 
   def test_creates_the_heroku_nav_data_cookie
     response = sso_login  
-    puts "Hello"
-    puts response.cookies.inspect
 
     assert response.cookies, "SSO sign in should set the heroku-nav-data cookie to the value of the passed nav-data parameter."
     assert_equal @params["nav-data"], response.cookies["heroku-nav-data"], "SSO sign in should set the heroku-nav-data cookie to the value of the passed nav-data parameter."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kensa
 version: !ruby/object:Gem::Version
-  version: 1.2.0rc1
+  version: 1.2.0rc2
   prerelease: 5
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000Z
+date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70119858551140 !ruby/object:Gem::Requirement
+  requirement: &70146387780160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119858551140
+  version_requirements: *70146387780160
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70119858550340 !ruby/object:Gem::Requirement
+  requirement: &70146387779560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +36,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *70119858550340
+  version_requirements: *70146387779560
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70119858549300 !ruby/object:Gem::Requirement
+  requirement: &70146387779040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70119858549300
+  version_requirements: *70146387779040
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70119858548460 !ruby/object:Gem::Requirement
+  requirement: &70146387778560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -58,10 +58,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70119858548460
+  version_requirements: *70146387778560
 - !ruby/object:Gem::Dependency
   name: artifice
-  requirement: &70119858547540 !ruby/object:Gem::Requirement
+  requirement: &70146387778080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,10 +69,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70119858547540
+  version_requirements: *70146387778080
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70119858546680 !ruby/object:Gem::Requirement
+  requirement: &70146387777600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +80,10 @@ dependencies:
         version: 3.1.3
   type: :development
   prerelease: false
-  version_requirements: *70119858546680
+  version_requirements: *70146387777600
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70119858545920 !ruby/object:Gem::Requirement
+  requirement: &70146387777100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +91,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70119858545920
+  version_requirements: *70146387777100
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70119858545100 !ruby/object:Gem::Requirement
+  requirement: &70146387776620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,10 +102,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70119858545100
+  version_requirements: *70146387776620
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70119858544180 !ruby/object:Gem::Requirement
+  requirement: &70146387776120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -113,10 +113,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70119858544180
+  version_requirements: *70146387776120
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70119858543480 !ruby/object:Gem::Requirement
+  requirement: &70146387775620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -124,10 +124,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70119858543480
+  version_requirements: *70146387775620
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70119858542700 !ruby/object:Gem::Requirement
+  requirement: &70146387775060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -135,10 +135,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70119858542700
+  version_requirements: *70146387775060
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70119858541620 !ruby/object:Gem::Requirement
+  requirement: &70146387774560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -146,7 +146,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70119858541620
+  version_requirements: *70146387774560
 description: 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.