kensa 1.4.6 → 1.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c2bf909430b4329cb83a7ae96917ace4910b2cd1
+  data.tar.gz: aea7fe208fa587f969a52796f1de119751422302
+SHA512:
+  metadata.gz: 7f220a7cda2d46980db795aee14dc61529e0bb16a59a4c97ea55363c3b98ae9b00e891440eb63a4389e1cc16c6685ad9042ba5792a345284f174d6eca1d19cdc
+  data.tar.gz: 3517e7d4711c61cc8e999160028f8342c748669b913cbf6578d8c842638b9a7380216fb95b29f849ff8fc10f427518a213a10f601c5f9dafb2cd73cafb678e5b

data/.travis.yml

@@ -5,7 +5,8 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
 notifications:
   email:
-    - csquared@heroku.com
-    - glenn@heroku.com
+    - addons@heroku.com

data/Gemfile.lock

@@ -1,32 +1,23 @@
 PATH
   remote: .
   specs:
-    kensa (1.4.6)
-      launchy (>= 0.3.2)
+    kensa (1.5.0)
+      launchy (~> 2.2.0)
       mechanize (~> 2.6.0)
-      rest-client (>= 1.4.0, < 1.7.0)
-      term-ansicolor (~> 1.0)
+      rest-client (~> 1.4, < 1.7.0)
+      term-ansicolor (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.3)
+    addressable (2.3.5)
     artifice (0.6)
       rack-test
     coderay (1.0.8)
-    colorize (0.5.8)
     contest (0.1.3)
-    coveralls (0.6.7)
-      colorize
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    domain_name (0.5.9)
+    domain_name (0.5.16)
       unf (>= 0.0.5, < 1.0.0)
     fakefs (0.4.2)
-    haml (4.0.1)
-      tilt
     launchy (2.2.0)
       addressable (~> 2.3)
     mechanize (2.6.0)
@@ -38,11 +29,12 @@ GEM
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
     method_source (0.8.1)
-    mime-types (1.21)
-    multi_json (1.7.3)
-    net-http-digest_auth (1.2.1)
-    net-http-persistent (2.8)
-    nokogiri (1.5.9)
+    mime-types (1.25.1)
+    mini_portile (0.5.2)
+    net-http-digest_auth (1.4)
+    net-http-persistent (2.9.4)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
     ntlm-http (0.1.1)
     pry (0.9.11.4)
       coderay (~> 1.0.5)
@@ -57,20 +49,17 @@ GEM
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rr (1.0.4)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
     sinatra (1.4.2)
       rack (~> 1.5, >= 1.5.2)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     slop (3.4.3)
-    term-ansicolor (1.1.3)
-    thor (0.18.1)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     tilt (1.3.6)
     timecop (0.6.1)
-    unf (0.1.1)
+    tins (1.0.0)
+    unf (0.1.3)
       unf_ext
     unf_ext (0.0.6)
     webrobots (0.1.1)
@@ -79,14 +68,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  artifice
-  contest
-  coveralls
-  fakefs
-  haml
+  artifice (~> 0.6)
+  contest (~> 0.1.3)
+  fakefs (~> 0.4.2)
   kensa!
   pry
   rake
-  rr
-  sinatra (>= 0.9)
-  timecop (>= 0.3.5)
+  rr (~> 1.0.4)
+  sinatra (~> 1.4.2)
+  timecop (~> 0.6.1)

data/kensa.gemspec

@@ -25,20 +25,18 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Tool to help Heroku add-on providers integrating their services}
 
-  s.add_development_dependency(%q<artifice>, [">= 0"])
-  s.add_development_dependency(%q<contest>, [">= 0"])
-  s.add_development_dependency(%q<contest>, [">= 0"])
-  s.add_development_dependency(%q<coveralls>)
-  s.add_development_dependency(%q<fakefs>, [">= 0"])
-  s.add_development_dependency(%q<haml>, [">= 0"])
+  s.add_runtime_dependency(%q<launchy>, "~> 2.2.0")
+  s.add_runtime_dependency(%q<mechanize>, "~> 2.6.0")
+  s.add_runtime_dependency(%q<rest-client>, ["< 1.7.0", "~> 1.4"])
+  s.add_runtime_dependency(%q<term-ansicolor>, "~> 1.3")
+
+  s.add_development_dependency(%q<artifice>, "~> 0.6")
+  s.add_development_dependency(%q<contest>, "~> 0.1.3")
+  s.add_development_dependency(%q<fakefs>, "~> 0.4.2")
   s.add_development_dependency(%q<rake>)
-  s.add_development_dependency(%q<rr>, [">= 0"])
-  s.add_development_dependency(%q<sinatra>, [">= 0.9"])
-  s.add_development_dependency(%q<timecop>, [">= 0.3.5"])
+  s.add_development_dependency(%q<rr>, "~> 1.0.4")
+  s.add_development_dependency(%q<sinatra>, "~> 1.4.2")
+  s.add_development_dependency(%q<timecop>, "~> 0.6.1")
   s.add_development_dependency(%q<pry>)
-  s.add_runtime_dependency(%q<launchy>, [">= 0.3.2"])
-  s.add_runtime_dependency(%q<mechanize>, ["~> 2.6.0"])
-  s.add_runtime_dependency(%q<rest-client>, ["< 1.7.0", ">= 1.4.0"])
-  s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
 end
 

data/lib/heroku/kensa/check.rb

@@ -2,6 +2,7 @@ require 'mechanize'
 require 'socket'
 require 'timeout'
 require 'uri'
+require 'term/ansicolor'
 
 module Heroku
   module Kensa
@@ -60,8 +61,9 @@ module Heroku
         if data['api'][env].is_a? Hash
           base = data['api'][env]['base_url']
           uri = URI.parse(base)
-          base.sub!(uri.query, '') if uri.query
-          base.sub(uri.path, '')
+          uri.query = nil
+          uri.path = ''
+          uri.to_s
         else
           data['api'][env].chomp("/")
         end
@@ -129,9 +131,6 @@ module Heroku
           check "contains config_vars array" do
             data["api"]["config_vars"].is_a?(Array)
           end
-          check "containst at least one config var" do
-            !data["api"]["config_vars"].empty?
-          end
           check "all config vars are uppercase strings" do
             data["api"]["config_vars"].each do |k, v|
               if k =~ /^[A-Z][0-9A-Z_]+$/
@@ -164,6 +163,7 @@ module Heroku
 
 
     class ProvisionResponseCheck < Check
+      include Term::ANSIColor
 
       def call!
         response = data[:provision_response]
@@ -192,7 +192,7 @@ module Heroku
             difference = data['api']['config_vars'] - response['config'].keys 
             unless difference.empty?
               verb = (difference.size == 1) ? "is" : "are"
-              error "#{difference.join(', ')} #{verb} missing from the manifest"
+              print "\n\t", yellow( "#{difference.join(', ')} #{verb} missing from the manifest")
             end
             true
           end
@@ -503,6 +503,7 @@ module Heroku
 
       def call!
         args = data[:args]
+        run ManifestCheck, data
         run ProvisionCheck, data
 
         response = data[:provision_response]

data/lib/heroku/kensa/client.rb

@@ -73,7 +73,6 @@ module Heroku
 
       def run
         abort "! missing command to run; see usage" if @args.empty?
-        run_check ManifestCheck
         run_check AllCheck, :args => @args
       end
 

data/lib/heroku/kensa/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Kensa
-    VERSION = '1.4.6'
+    VERSION = '1.5.0'
   end
 end

data/test/helper.rb

@@ -1,15 +1,12 @@
 require 'heroku/kensa'
 require 'heroku/kensa/client'
 require 'contest'
-require 'coveralls'
 require 'timecop'
 require 'rr'
 require 'artifice'
 require 'test/resources/server'
 require 'fakefs/safe'
 
-Coveralls.wear!
-
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit
 

data/test/manifest_check_test.rb

@@ -92,11 +92,6 @@ class ManifestCheckTest < Test::Unit::TestCase
           assert_invalid
         end
 
-        test "contains at least one config var" do
-          @data["api"]["config_vars"].clear
-          assert_invalid
-        end
-
         test "all config vars are in upper case" do
           @data["api"]["config_vars"] << 'MYADDON_invalid_var'
           assert_invalid

data/test/manifest_test.rb

@@ -37,10 +37,10 @@ class ManifestTest < Test::Unit::TestCase
 
     test 'uses post format for test url' do
       assert_equal @manifest.skeleton['api']['test']['base_url'], 'http://localhost:4567/heroku/resources'
-      assert_equal @manifest.skeleton['api']['test']['sso_url'],  'http://localhost:4566/sso/login'
+      assert_equal @manifest.skeleton['api']['test']['sso_url'],  'http://localhost:4567/sso/login'
     end
 
-    test 'uses post format for test url' do
+    test 'uses post format for production url' do
       assert_equal @manifest.skeleton['api']['production']['base_url'], 'https://yourapp.com/heroku/resources'
       assert_equal @manifest.skeleton['api']['production']['sso_url'], 'https://yourapp.com/sso/login'
     end

data/test/options_parsing_test.rb

@@ -46,12 +46,12 @@ class OptionParsingTest < Test::Unit::TestCase
     assert_equal 'true', options['foo']
   end
 
-  test "parsing --flag=value" do
+  test "parsing --flag=value (with equals)" do
     options = options_for_cmd("test provision --foo=bar")
     assert_equal 'bar', options['foo']
   end
 
-  test "parsing --flag value" do
+  test "parsing --flag value (without equals)" do
     options = options_for_cmd("test provision --foo bar")
     assert_equal 'bar', options['foo']
   end

data/test/provision_check_test.rb

@@ -18,6 +18,12 @@ class ProvisionCheckTest < Test::Unit::TestCase
         assert_equal c.url, 'http://localhost:4567' 
       end
 
+      test "supports subdomains with the same name as path" do
+        @data['api']['test'] = {'base_url' => 'http://heroku.myhost.dev/heroku'}
+        c = check.new(@data)
+        assert_equal c.url, 'http://heroku.myhost.dev' 
+      end
+
       test "working provision call" do
         use_provider_endpoint "working"
         assert_valid

data/test/provision_response_check_test.rb

@@ -67,11 +67,6 @@ class ProvisionResponseCheckTest < Test::Unit::TestCase
       assert_invalid
     end
 
-    test "asserts all vars in manifest are in response" do
-      @response["config"].delete('MYADDON_CONFIG')
-      assert_invalid
-    end
-
     test "is valid otherwise" do
       @response["config"]["MYADDON_URL"] = "http://localhost/abc" 
       assert_valid

data/test/resources/server.rb

@@ -38,14 +38,18 @@ helpers do
   
   def login(heroku_user=true)
   @header = heroku_user
-  haml <<-HAML
-%html
-%body
-  - if @header
-    #heroku-header
-      %h1 Heroku
-  %h1 Sample Addon
-HAML
+  erb <<-ERB
+<html>
+  <body>
+    <% if @header %>
+      <div id="heroku-header">
+        <h1>Heroku</h1>
+      </div>
+    <% end %>
+    <h1>Sample Add-on</h1>
+  </body>
+</html>
+ERB
   end
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kensa
 version: !ruby/object:Gem::Version
-  version: 1.4.6
-  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors:
 - Blake Mizerany
@@ -14,254 +13,182 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: artifice
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: contest
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.6.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: contest
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: artifice
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: contest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-- !ruby/object:Gem::Dependency
-  name: mechanize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 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.
@@ -271,8 +198,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -310,33 +237,26 @@ files:
 homepage: http://provider.heroku.com/resources
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1941356029524696932
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1941356029524696932
 requirements: []
 rubyforge_project: kensa
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tool to help Heroku add-on providers integrating their services
 test_files:
 - test/all_check_test.rb