kensa 1.2.0 → 1.2.1

data/lib/heroku/kensa/post_proxy.rb

@@ -27,7 +27,7 @@ class Heroku::Kensa::PostProxy < WEBrick::HTTPServer
         </body>
       </html>
     HTML
-    res["Content-Lengh"] = res.body.size
+    res["Content-Length"] = res.body.size
     @status = :Shutdown
   end
 end

data/lib/heroku/kensa/screen.rb

@@ -16,6 +16,9 @@ module Heroku
 
       def message(msg)
       end
+
+      def finish
+      end
     end
 
     class IOScreen

data/lib/heroku/kensa/sso.rb

@@ -79,7 +79,7 @@ module Heroku
       end
 
       def sample_nav_data
-        json = Yajl::Encoder.encode({
+        json = OkJson.encode({
           :addon => 'Your Addon',
           :appname => 'myapp',
           :addons => [

data/lib/heroku/kensa/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Kensa
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/test/all_check_test.rb

@@ -2,6 +2,7 @@ require 'test/helper'
 
 class AllCheckTest < Test::Unit::TestCase
   include Heroku::Kensa
+  include ProviderMock
 
   setup do
     @data = Manifest.new(:method => :get).skeleton

data/test/helper.rb

@@ -3,17 +3,28 @@ require 'heroku/kensa/client'
 require 'contest'
 require 'timecop'
 require 'rr'
-require 'yajl'
+require 'artifice'
+require 'test/resources/server'
 
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit
 
+  module ProviderMock
+    def setup
+      Artifice.activate_with(ProviderServer)
+    end
+
+    def teardown
+      Artifice.deactivate
+    end
+  end
+
   def kensa(command)
-    Heroku::Kensa::Client.new(command.split, :silent => true).run!
+    Heroku::Kensa::Client.new(command.split, :silent => true, :test => true).run!
   end
 
   def read_json(filename)
-    Yajl::Parser.parse(File.open(filename).read)
+    OkJson.decode(File.open(filename).read)
   end
 
   #this prepends a prefix for the provider server
@@ -61,7 +72,7 @@ class Test::Unit::TestCase
   end
 
   def to_json(data, headers={})
-    body = Yajl::Encoder.encode(data)
+    body = OkJson.encode(data)
     add_headers(body, headers)
   end
 

data/test/init_test.rb

@@ -12,6 +12,16 @@ class InitTest < Test::Unit::TestCase
     FakeFS.deactivate!
   end
   
+  def test_init_default_so_sso_post
+    kensa "init"
+    manifest = read_json(@filename)
+    %w{test production}.each do |env|
+      assert manifest['api'][env] =~ /^http/
+    end
+    assert !File.exist?('.env')
+  end
+
+=begin
   def test_init_default_so_sso_post
     kensa "init"
     manifest = read_json(@filename)
@@ -22,6 +32,7 @@ class InitTest < Test::Unit::TestCase
     end
     assert !File.exist?('.env')
   end
+=end
 
   def test_init_uses_file_flag
     @filename = 'foo.json'
@@ -41,14 +52,27 @@ class InitTest < Test::Unit::TestCase
     assert !File.exist?('.env')
   end
 
-  def test_init_with_env_flag
-    kensa "init --foreman"
+  def assert_foreman_env(env, manifest)
+    assert env.include?("SSO_SALT=#{manifest['api']['sso_salt']}\n")
+    assert env.include?("HEROKU_USERNAME=#{manifest['id']}\n")
+    assert env.include?("HEROKU_PASSWORD=#{manifest['api']['password']}")
+  end
+
+  def test_init_with_foreman_flag_and_get
+    kensa "init --foreman --sso get"
+    env = File.open(".env").read
+    manifest = read_json(@filename)
+    assert manifest['api']['test'] =~ /:5000/
+    assert manifest['api']['test'] =~ /:5000/
+    assert_foreman_env env, manifest
+  end
+
+  def test_init_with_foreman_flag_and_post
+    kensa "init --foreman --sso post"
     env = File.open(".env").read
     manifest = read_json(@filename)
     assert manifest['api']['test']['base_url'] =~ /:5000/
     assert manifest['api']['test']['sso_url'] =~ /:5000/
-    assert env.include?("SSO_SALT=#{manifest['api']['sso_salt']}\n")
-    assert env.include?("HEROKU_USERNAME=#{manifest['id']}\n")
-    assert env.include?("HEROKU_PASSWORD=#{manifest['api']['password']}")
+    assert_foreman_env env, manifest
   end
 end

data/test/manifest_check_test.rb

@@ -59,30 +59,37 @@ class ManifestCheckTest < Test::Unit::TestCase
         end
       end
 
-      test "api contains config_vars array" do
-        @data["api"]["config_vars"] = "test"
-        assert_invalid
+      test "api does not require config_vars" do
+        @data["api"].delete "config_vars"
+        assert_valid
       end
 
-      test "api contains at least one config var" do
-        @data["api"]["config_vars"].clear
-        assert_invalid
-      end
+      context "with config vars" do
+        test "api contains config_vars array" do
+          @data["api"]["config_vars"] = "test"
+          assert_invalid
+        end
 
-      test "all config vars are in upper case" do
-        @data["api"]["config_vars"] << 'MYADDON_invalid_var'
-        assert_invalid
-      end
+        test "contains at least one config var" do
+          @data["api"]["config_vars"].clear
+          assert_invalid
+        end
 
-      test "assert config var prefixes match addon id" do
-        @data["api"]["config_vars"] << 'MONGO_URL'
-        assert_invalid
-      end
+        test "all config vars are in upper case" do
+          @data["api"]["config_vars"] << 'MYADDON_invalid_var'
+          assert_invalid
+        end
 
-      test "replaces dashes for underscores on the config var check" do
-        @data["id"] = "MY-ADDON"
-        @data["api"]["config_vars"] = ["MY_ADDON_URL"]
-        assert_valid
+        test "assert config var prefixes match addon id" do
+          @data["api"]["config_vars"] << 'MONGO_URL'
+          assert_invalid
+        end
+
+        test "replaces dashes for underscores on the config var check" do
+          @data["id"] = "MY-ADDON"
+          @data["api"]["config_vars"] = ["MY_ADDON_URL"]
+          assert_valid
+        end
       end
 
       test "username is deprecated" do

data/test/options_parsing_test.rb

@@ -0,0 +1,64 @@
+require 'test/helper'
+
+class OptionParsingTest < Test::Unit::TestCase 
+  include Heroku::Kensa
+
+  def options_for_cmd(string)
+    client = Client.new(string.split)
+    options = client.options[:options]
+  end
+
+  test "parameters get forwarded to provider" do
+    Artifice.activate_with(lambda { |env|
+      params = OkJson.decode env['rack.input'].read
+      options = params['options']
+      assert_equal 'true', options['foo']
+      assert_equal 'baz', options['bar']
+      assert_equal 'baz', options['fap']
+      [201, {}, 'hello']
+    }) do 
+      kensa "init --sso get"
+      kensa "test provision --foo --bar=baz --fap baz"
+    end
+  end
+
+  def assert_normal_options(options)
+    assert_equal true,   options[:async]
+    assert_equal 'true', options[:options]['foo']
+    assert_equal 'foo',  options[:plan]
+    assert_equal 'foo.json',   options[:filename]
+    assert_equal 'production', options[:env] 
+  end
+
+  test "leaves normal args alone" do
+    cmd = "test provision --foo --production --async --file foo.json --plan foo"
+    assert_normal_options Client.new(cmd.split).options
+  end
+
+  test "works with single dash -s tyle flags" do
+    cmd = "test provision --foo --production --async -f foo.json -p foo"
+    assert_normal_options Client.new(cmd.split).options
+  end
+
+  test "parsing --flag" do
+    options = options_for_cmd("test provision --foo")
+    assert_equal 'true', options['foo']
+  end
+
+  test "parsing --flag=value" do
+    options = options_for_cmd("test provision --foo=bar")
+    assert_equal 'bar', options['foo']
+  end
+
+  test "parsing --flag value" do
+    options = options_for_cmd("test provision --foo bar")
+    assert_equal 'bar', options['foo']
+  end
+
+  test "parsing mixed" do
+    options = options_for_cmd("test provision --foo --bar foo --baz")
+    assert_equal 'true', options['foo']
+    assert_equal 'true', options['baz']
+    assert_equal 'foo',  options['bar']
+  end
+end

data/test/plan_change_check_test.rb

@@ -2,6 +2,7 @@ require 'test/helper'
 
 class PlanChangeCheckTest < Test::Unit::TestCase
   include Heroku::Kensa
+  include ProviderMock
 
   %w{get post}.each do |method|
     context "with sso #{method}" do

data/test/provision_check_test.rb

@@ -2,6 +2,7 @@ require 'test/helper'
 
 class ProvisionCheckTest < Test::Unit::TestCase
   include Heroku::Kensa
+  include ProviderMock
 
   def check ; ProvisionCheck ; end
 
@@ -22,6 +23,12 @@ class ProvisionCheckTest < Test::Unit::TestCase
         assert_valid
       end
 
+      test "provision call with extra params" do
+        use_provider_endpoint "cmd-line-options"
+        @data[:options] = {:foo => 'bar', :bar => 'baz'}
+        assert_valid
+      end
+
       test "detects invalid JSON" do
         use_provider_endpoint "invalid-json"
         assert_invalid

data/test/resources/server.rb

@@ -1,9 +1,14 @@
 require 'rubygems'
-require 'sinatra'
-require 'json'
+require 'sinatra/base'
+require File.expand_path('../../../lib/heroku/kensa/okjson', __FILE__)
 
-enable :sessions
+class Hash
+  def to_json
+    OkJson.encode(self)
+  end
+end
 
+class ProviderServer < Sinatra::Base
 helpers do
   def heroku_only!
     unless auth_heroku?
@@ -26,17 +31,22 @@ helpers do
   end
 
   def json_must_include(keys)
-    params = JSON.parse(request.body.read)
+    params = OkJson.decode(request.body.read)
     keys.each do |param|
       raise "#{param} not included with request" unless params.keys.include? param
     end
   end
   
   def login(heroku_user=true)
-    session.clear
-    session[:logged_in] = true
-    session[:heroku]    = heroku_user
-    redirect '/'
+  @header = heroku_user
+  haml <<-HAML
+%html
+%body
+  - if @header
+    #heroku-header
+      %h1 Heroku
+  %h1 Sample Addon
+HAML
   end
 end
 
@@ -53,6 +63,8 @@ end
 
 post '/cmd-line-options/heroku/resources' do
   heroku_only!
+  options = OkJson.decode(request.body.read)['options']
+  raise "Where are my options?" unless options['foo'] && options['bar']
   { :id => 123 }.to_json
 end
 
@@ -63,7 +75,7 @@ end
 
 post '/invalid-response/heroku/resources' do
   heroku_only!
-  nil.to_json
+  'null'
 end
 
 post '/invalid-status/heroku/resources' do
@@ -117,7 +129,7 @@ get '/working/heroku/resources/:id' do
 end
 
 post '/working/sso/login' do
-  puts params.inspect
+  #puts params.inspect
   sso
 end
 
@@ -213,15 +225,9 @@ end
 
 get '/' do
   unauthorized! unless session[:logged_in]
-  haml :index
 end
 
-__END__
-
-@@ index
-%html
-  %body
-    - if session[:heroku]
-      #heroku-header
-        %h1 Heroku
-    %h1 Sample Addon
+if $0 == __FILE__
+ self.run!
+end
+end

data/test/sso_check_test.rb

@@ -2,7 +2,7 @@ require 'test/helper'
 
 class SsoCheckTest < Test::Unit::TestCase
   include Heroku::Kensa
-
+  include ProviderMock
 
   def check ; SsoCheck ; end
   %w{get post}.each do |method| 

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: kensa
-version: !ruby/object:Gem::Version
-  version: 1.2.0
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 1
+  version: 1.2.1
 platform: ruby
-authors:
+authors: 
 - Blake Mizerany
 - Pedro Belo
 - Adam Wiggins
@@ -13,164 +18,207 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: contest
-  requirement: &70130076419400 !ruby/object:Gem::Requirement
+
+date: 2011-12-14 00:00:00 -08:00
+default_executable: kensa
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  name: contest
   prerelease: false
-  version_requirements: *70130076419400
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: &70130076416540 !ruby/object:Gem::Requirement
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
   type: :development
+  name: timecop
   prerelease: false
-  version_requirements: *70130076416540
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70130076414660 !ruby/object:Gem::Requirement
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :development
+  name: sinatra
   prerelease: false
-  version_requirements: *70130076414660
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70130076412640 !ruby/object:Gem::Requirement
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70130076412640
-- !ruby/object:Gem::Dependency
   name: contest
-  requirement: &70130076411500 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70130076411500
-- !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70130076410000 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70130076410000
-- !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70130076408820 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70130076408820
-- !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70130076407080 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  name: artifice
   prerelease: false
-  version_requirements: *70130076407080
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &70130076404080 !ruby/object:Gem::Requirement
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 7
+        - 0
         version: 1.7.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
   type: :runtime
+  name: rest-client
   prerelease: false
-  version_requirements: *70130076404080
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &70130076399200 !ruby/object:Gem::Requirement
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70130076399200
-- !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70130076396960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70130076396960
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: &70130076393800 !ruby/object:Gem::Requirement
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
   type: :runtime
+  name: launchy
   prerelease: false
-  version_requirements: *70130076393800
-- !ruby/object:Gem::Dependency
-  name: mechanize
-  requirement: &70130076392720 !ruby/object:Gem::Requirement
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :runtime
+  name: mechanize
   prerelease: false
-  version_requirements: *70130076392720
-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.
+  version_requirements: *id012
+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.
 email: pedro@heroku.com
-executables:
+executables: 
 - kensa
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -183,6 +231,7 @@ files:
 - lib/heroku/kensa/git.rb
 - lib/heroku/kensa/http.rb
 - lib/heroku/kensa/manifest.rb
+- lib/heroku/kensa/okjson.rb
 - lib/heroku/kensa/post_proxy.rb
 - lib/heroku/kensa/screen.rb
 - lib/heroku/kensa/sso.rb
@@ -195,6 +244,7 @@ files:
 - test/init_test.rb
 - test/manifest_check_test.rb
 - test/manifest_test.rb
+- test/options_parsing_test.rb
 - test/plan_change_check_test.rb
 - test/provision_check_test.rb
 - test/provision_response_check_test.rb
@@ -202,37 +252,41 @@ files:
 - test/resources/server.rb
 - test/sso_check_test.rb
 - test/sso_test.rb
+has_rdoc: true
 homepage: http://provider.heroku.com/resources
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 3834118791582110421
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 3834118791582110421
+      version: "0"
 requirements: []
+
 rubyforge_project: kensa
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Tool to help Heroku add-on providers integrating their services
-test_files:
+test_files: 
 - test/all_check_test.rb
 - test/create_test.rb
 - test/deprovision_check_test.rb
@@ -240,6 +294,7 @@ test_files:
 - test/init_test.rb
 - test/manifest_check_test.rb
 - test/manifest_test.rb
+- test/options_parsing_test.rb
 - test/plan_change_check_test.rb
 - test/provision_check_test.rb
 - test/provision_response_check_test.rb