kensa 1.1.4 → 1.2.0rc1

data/.gitignore

@@ -0,0 +1,5 @@
+addon-manifest.json
+pkg/
+.rvmrc
+tags
+bundle/

data/Gemfile

@@ -1,9 +1,6 @@
-source :gemcutter
+source "http://rubygems.org"
 gemspec
-group :development do 
-  gem 'json'
-  gem 'contest'
-  gem 'haml'
-  gem 'jeweler'
-  gem 'rr'
+group :development do
+  gem 'ruby-debug', :platform => :mri_18
+  gem 'ruby-debug19', :platform => :mri_19
 end

data/Gemfile.lock

@@ -1,58 +1,94 @@
 PATH
   remote: .
   specs:
-    kensa (1.1.4)
-      kensa
-      launchy (>= 0.3.2)
+    kensa (2.0.0rc2)
+      launchy (~> 2.0.5)
       mechanize (~> 1.0.0)
-      rest-client (< 1.7.0, >= 1.4.0)
-      term-ansicolor (~> 1.0)
-      yajl-ruby (~> 0.6)
+      rest-client (~> 1.6.7)
+      term-ansicolor (~> 1.0.6)
+      test-unit (~> 1.2.3)
+      yajl-ruby (~> 0.8.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
+<<<<<<< HEAD
     ansi (1.3.0)
-    contest (0.1.3)
-    git (1.2.5)
-    haml (3.1.2)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.5.3)
+    archive-tar-minitar (0.5.2)
+=======
+>>>>>>> bef831b5998868443cbed5c3bfeeb74220bdc5ba
+    artifice (0.6)
+      rack-test
+    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)
     nokogiri (1.5.0)
-    rack (1.3.2)
+    rack (1.3.3)
+    rack-test (0.6.1)
+      rack (>= 1.0)
     rake (0.9.2)
-    rest-client (1.6.3)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
+<<<<<<< HEAD
     rr (1.0.3)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      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 (>= 1.2.2, < 2.0)
+      tilt (< 2.0, >= 1.2.2)
     term-ansicolor (1.0.6)
-    tilt (1.3.2)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
+    tilt (1.3.3)
     timecop (0.3.5)
-    turn (0.8.2)
-      ansi (>= 1.2.2)
     yajl-ruby (0.8.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  contest
-  haml
-  jeweler
+  artifice (~> 0.6)
+  haml (~> 3.1.3)
   json
   kensa!
+<<<<<<< HEAD
   rr
+  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 Pedro Belo.
+Maintained by Glenn Gillen.
 
 Released under the MIT license. http://github.com/heroku/kensa

data/Rakefile

@@ -1,39 +1,12 @@
+$:.unshift File.dirname(__FILE__)
+require "bundler/gem_tasks"
+
 desc 'Run all unit tests'
 task :test do
-  fork do
-    exec "ruby test/resources/server.rb > /dev/null 2>&1"
-    #exec "ruby test/resources/server.rb > log.txt 2>&1"
+  puts require "test/helper"
+  Dir["test/*_test.rb"].each do |test_file|
+    require test_file
   end
-  system "turn test"
-  system "ps -ax | grep test/resources/server.rb | grep -v grep | awk '{print $1}' | xargs kill"
 end
 
 task :default => :test
-
-begin
-  $: << File.join(File.dirname(__FILE__), 'lib')
-  require 'jeweler'
-  require 'heroku/kensa'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "kensa"
-    gemspec.summary = "Tool to help Heroku add-on providers integrating their services"
-    gemspec.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."
-    gemspec.email = "pedro@heroku.com"
-    gemspec.homepage = "http://provider.heroku.com/resources"
-    gemspec.authors = ["Blake Mizerany", "Pedro Belo", "Adam Wiggins", "Chris Continanza"]
-
-    gemspec.add_development_dependency(%q<turn>, [">= 0"])
-    gemspec.add_development_dependency(%q<contest>, [">= 0"])
-    gemspec.add_development_dependency(%q<timecop>, [">= 0.3.5"])
-    gemspec.add_development_dependency(%q<sinatra>, [">= 0.9"])
-    gemspec.add_dependency(%q<rest-client>, [">= 1.4.0", "< 1.7.0"])
-    gemspec.add_dependency(%q<yajl-ruby>, ["~> 0.6"])
-    gemspec.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
-    gemspec.add_dependency(%q<launchy>, [">= 0.3.2"])
-    gemspec.add_dependency(%q<mechanize>, ["~> 1.0.0"])
-
-    gemspec.version = Heroku::Kensa::VERSION
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end

data/kensa.gemspec

@@ -1,104 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "heroku/kensa/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{kensa}
-  s.version = "1.1.4"
+  s.name = "kensa"
+  s.summary = "Tool to help Heroku add-on providers integrating their services"
+  s.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."
+  s.email = "glenn@heroku.com"
+  s.homepage = "http://provider.heroku.com/resources"
+  s.authors = ["Blake Mizerany", "Pedro Belo", "Adam Wiggins", "Chris Continanza", "Glenn Gillen"]
+  s.version   = Heroku::Kensa::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Blake Mizerany", "Pedro Belo", "Adam Wiggins", 'Chris Continanza']
-  s.date = %q{2011-08-22}
-  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}
-  s.executables = ["kensa"]
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "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/post_proxy.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.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Tool to help Heroku add-on providers integrating their services}
+  s.rubyforge_project = "kensa"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<turn>, [">= 0"])
-      s.add_development_dependency(%q<contest>, [">= 0"])
-      s.add_development_dependency(%q<timecop>, [">= 0.3.5"])
-      s.add_development_dependency(%q<sinatra>, [">= 0.9"])
-      s.add_development_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<contest>, [">= 0"])
-      s.add_development_dependency(%q<haml>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rr>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, ["< 1.7.0", ">= 1.4.0"])
-      s.add_runtime_dependency(%q<yajl-ruby>, ["~> 0.6"])
-      s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<launchy>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<mechanize>, ["~> 1.0.0"])
-    else
-      s.add_dependency(%q<turn>, [">= 0"])
-      s.add_dependency(%q<contest>, [">= 0"])
-      s.add_dependency(%q<timecop>, [">= 0.3.5"])
-      s.add_dependency(%q<sinatra>, [">= 0.9"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<contest>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rr>, [">= 0"])
-      s.add_dependency(%q<rest-client>, ["< 1.7.0", ">= 1.4.0"])
-      s.add_dependency(%q<yajl-ruby>, ["~> 0.6"])
-      s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
-      s.add_dependency(%q<launchy>, [">= 0.3.2"])
-      s.add_dependency(%q<mechanize>, ["~> 1.0.0"])
-    end
-  else
-    s.add_dependency(%q<turn>, [">= 0"])
-    s.add_dependency(%q<contest>, [">= 0"])
-    s.add_dependency(%q<timecop>, [">= 0.3.5"])
-    s.add_dependency(%q<sinatra>, [">= 0.9"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<contest>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rr>, [">= 0"])
-    s.add_dependency(%q<rest-client>, ["< 1.7.0", ">= 1.4.0"])
-    s.add_dependency(%q<yajl-ruby>, ["~> 0.6"])
-    s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
-    s.add_dependency(%q<launchy>, [">= 0.3.2"])
-    s.add_dependency(%q<mechanize>, ["~> 1.0.0"])
-  end
+  s.add_development_dependency(%q<json>, [">= 0"])
+  s.add_development_dependency(%q<sinatra>, ["~> 1.2.6"])
+  s.add_development_dependency(%q<timecop>, ["~> 0.3.5"])
+  s.add_development_dependency(%q<rr>, ["~> 1.0.4"])
+  s.add_development_dependency(%q<artifice>, ["~> 0.6"])
+  s.add_development_dependency(%q<haml>, ["~> 3.1.3"])
+  s.add_runtime_dependency(%q<test-unit>, ["~> 1.2.3"])
+  s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
+  s.add_runtime_dependency(%q<yajl-ruby>, ["~> 0.8.3"])
+  s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0.6"])
+  s.add_runtime_dependency(%q<launchy>, ["~> 2.0.5"])
+  s.add_runtime_dependency(%q<mechanize>, ["~> 1.0.0"])
 end
-

data/lib/heroku/kensa/client.rb

@@ -31,19 +31,39 @@ module Heroku
       def test
         case check = @args.shift
           when "manifest"
-            run_check ManifestCheck
+            require "#{File.dirname(__FILE__)}/../../../test/manifest_test"
+            require 'test/unit/ui/console/testrunner'
+            $manifest = Yajl::Parser.parse(resolve_manifest)
+            Test::Unit.run = true
+            Test::Unit::UI::Console::TestRunner.new(ManifestTest.suite).start
           when "provision"
-            run_check ManifestCheck, ProvisionCheck
+            require "#{File.dirname(__FILE__)}/../../../test/provision_test"
+            require 'test/unit/ui/console/testrunner'
+            $manifest = Yajl::Parser.parse(resolve_manifest)
+            Test::Unit.run = true
+            Test::Unit::UI::Console::TestRunner.new(ProvisionTest.suite).start
           when "deprovision"
             id = @args.shift || abort("! no id specified; see usage")
-            run_check ManifestCheck, DeprovisionCheck, :id => id
+            require "#{File.dirname(__FILE__)}/../../../test/deprovision_test"
+            require 'test/unit/ui/console/testrunner'
+            $manifest = Yajl::Parser.parse(resolve_manifest).merge("user_id" => id)
+            Test::Unit.run = true
+            Test::Unit::UI::Console::TestRunner.new(DeprovisionTest.suite).start
           when "planchange"
             id   = @args.shift || abort("! no id specified; see usage")
             plan = @args.shift || abort("! no plan specified; see usage")
-            run_check ManifestCheck, PlanChangeCheck, :id => id, :plan => plan
+            require "#{File.dirname(__FILE__)}/../../../test/plan_change_test"
+            require 'test/unit/ui/console/testrunner'
+            $manifest = Yajl::Parser.parse(resolve_manifest).merge("user_id" => id)
+            Test::Unit.run = true
+            Test::Unit::UI::Console::TestRunner.new(PlanChangeTest.suite).start
           when "sso"
             id = @args.shift || abort("! no id specified; see usage")
-            run_check ManifestCheck, SsoCheck, :id => id
+            require "#{File.dirname(__FILE__)}/../../../test/sso_test"
+            require 'test/unit/ui/console/testrunner'
+            $manifest = Yajl::Parser.parse(resolve_manifest).merge("user_id" => id)
+            Test::Unit.run = true
+            Test::Unit::UI::Console::TestRunner.new(SsoTest.suite).start
           else
             abort "! Unknown test '#{check}'; see usage"
         end

data/lib/heroku/kensa/manifest.rb

@@ -11,10 +11,16 @@ module Heroku
 {
   "id": "myaddon",
   "api": {
-    "config_vars": [ "MYADDON_URL" ],
+    "config_vars": [ "MYADDON_USER", "MYADDON_URL" ],
     "password": "#{generate_password(16)}",#{ sso_key }
-    "production": "https://yourapp.com/",
-    "test": "http://localhost:4567/"
+    "production": {
+      "base_url": "https://yourapp.com/heroku/resources",
+      "sso_url": "https://yourapp.com/sso/login"
+    },
+    "test": {
+      "base_url": "http://localhost:4567/heroku/resources",
+      "sso_url": "http://localhost:4567/sso/login"
+    }
   }
 }
 JSON

data/lib/heroku/kensa/sso.rb

@@ -3,31 +3,41 @@ require 'restclient'
 module Heroku
   module Kensa
     class Sso
-      attr_accessor :id, :url, :proxy_port, :timestamp, :token
+      attr_accessor :id, :url, :proxy_port, :timestamp, :token, :sso_url
 
       def initialize(data)
         @id   = data[:id]
         @salt = data['api']['sso_salt']
 
         env   = data.fetch :env, 'test'
-        @url  = data["api"][env].chomp('/')
-        @use_post   = data['api']['sso'].to_s.match(/post/i)
+        if data["api"][env].is_a?(Hash)
+          @url  = data["api"][env]["base_url"].chomp('/')
+          @sso_url = data["api"][env]["sso_url"].chomp('/')
+          @use_post = true
+        else
+          @url  = data["api"][env].chomp('/')
+          @use_post = false
+        end
         @proxy_port = find_available_port
         @timestamp  = Time.now.to_i
         @token      = make_token(@timestamp)
       end
 
       def path
-        extra = self.POST? ? '/sso' : ''
-        "/heroku/resources/#{id}#{extra}"
+        extra = self.post? ? '/sso' : ''
+        if self.post?
+          self.sso_url
+        else
+          "/heroku/resources/#{id}"
+        end
       end
 
-      def POST?
+      def post?
         @use_post
       end
 
       def sso_url
-        if self.POST?
+        if self.post?
           "http://localhost:#{@proxy_port}/"
         else
           full_url
@@ -40,13 +50,13 @@ module Heroku
       alias get_url full_url
 
       def post_url
-        [ url, path ].join
+        @sso_url
       end
 
       def timestamp=(other)
         @timestamp = other
         @token = make_token(@timestamp)
-      end 
+      end
 
       def make_token(t)
         Digest::SHA1.hexdigest([@id, @salt, t].join(':'))
@@ -54,7 +64,7 @@ module Heroku
 
       def querystring
         return '' unless @salt
-        '?' + query_data 
+        '?' + query_data
       end
 
       def query_data
@@ -62,7 +72,7 @@ module Heroku
       end
 
       def query_params
-        { 'token' => @token,  
+        { 'token' => @token,
           'timestamp' => @timestamp.to_s,
           'nav-data' => sample_nav_data,
           'user'     => 'username@example.com' }
@@ -87,7 +97,7 @@ module Heroku
       end
 
       def message
-        if self.POST?
+        if self.post?
           "POSTing #{query_data} to #{post_url} via proxy on port #{@proxy_port}"
         else
           "Opening #{full_url}"
@@ -107,13 +117,13 @@ module Heroku
       end
 
       def run_proxy
-        return unless self.POST?
+        return unless self.post?
         server = PostProxy.new self
         @proxy = server
 
         trap("INT") { server.stop }
         pid = fork do
-          server.start 
+          server.start
         end
         at_exit { server.stop; Process.waitpid pid }
       end

data/lib/heroku/kensa/version.rb

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

data/lib/heroku/kensa.rb

@@ -1,11 +1,15 @@
-require 'heroku/kensa/http'
-require 'heroku/kensa/manifest'
-require 'heroku/kensa/check'
-require 'heroku/kensa/sso'
-require 'heroku/kensa/post_proxy'
+require 'yajl'
+require 'mechanize'
+require 'socket'
+require 'timeout'
+require 'uri'
+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 = "1.1.4"
+    VERSION = "2.0.0rc"
   end
 end

data/test/deprovision_test.rb

@@ -0,0 +1,30 @@
+$:.unshift(File.expand_path("../..",__FILE__))
+require 'test/lib/dependencies'
+class DeprovisionTest < Test::Unit::TestCase
+
+  def setup
+    super
+    @params = {}
+  end
+
+  def deprovision(auth = nil)
+    delete "/heroku/resources/123", auth
+  end
+
+  def test_working_deprovision_call
+    response = deprovision
+    assert_equal 200, response.code, "Expects a 200 - OK response/status code when successfully deprovisioned."
+  end
+
+  def test_detects_missing_auth
+    response = deprovision(auth = false)
+    assert_equal 401, response.code, "Provisioning request should require authentication."
+
+    response = deprovision(auth = [manifest["id"]+"a", manifest["api"]["password"]])
+    assert_equal 401, response.code, "Provisioning request appears to allow any username, should require '#{manifest["id"]}'."
+
+    response = deprovision(auth = [manifest["id"], manifest["api"]["password"]+"a"])
+    assert_equal 401, response.code, "Provisioning request appears to allow any password, should require '#{manifest["api"]["password"]}'."
+  end
+
+end

data/test/helper.rb

@@ -1,54 +1,21 @@
-require 'heroku/kensa'
-require 'contest'
+require 'rubygems'
+require 'bundler/setup'
 require 'timecop'
 require 'rr'
+require 'test/unit'
+require 'lib/heroku/kensa'
+require 'test/resources/provider_server'
 
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit
 
-  # in your test, do 
-  # @screen = STDOUTScreen.new
-  def assert_valid(data=@data, &blk)
-    check = create_check(data, &blk)
-    check.screen = @screen if @screen
-    assert check.call
+  def setup
+    Timecop.freeze Time.now.utc
+    Artifice.activate_with(ProviderServer.new(manifest))
   end
 
-  def assert_invalid(data=@data, &blk)
-    check = create_check(data, &blk)
-    check.screen = @screen if @screen
-    assert !check.call
-  end
-
-  def create_check(data, &blk)
-    check = self.check.new(data)
-    blk.call(check) if blk
-    check
-  end
-
-  module Headerize
-    attr_accessor :headers
-  end
-
-  def to_json(data, headers={})
-    body = Yajl::Encoder.encode(data)
-    add_headers(body, headers)
-  end
-
-  def add_headers(o, headers={})
-    o.extend Headerize
-    o.headers = {}
-    o.headers["Content-Type"] ||= "application/json"
-    o.headers.merge!(headers)
-    o
-  end
-
-  def kensa_stub(meth, o, returns)
-    o.instance_eval { @returns = Array(returns) }
-    eval <<-EVAL
-    def o.#{meth}(*args)
-      @returns.shift or fail("Nothing else to return from stub'ed method")
-    end
-    EVAL
+  def teardown
+    Timecop.return
+    Artifice.deactivate
   end
 end

data/test/lib/dependencies.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+require 'artifice'
+require 'rest-client'
+require 'yajl'
+require 'lib/heroku/kensa/manifest'
+%w{response test_case formatter}.each do |lib|
+  require "test/lib/#{lib}"
+end