kensa 1.0.2 → 1.1.0.pre

data/Rakefile

@@ -25,7 +25,7 @@ begin
     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<rest-client>, ["~> 1.4.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"])

data/kensa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kensa}
-  s.version = "1.0.2"
+  s.version = "1.1.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Mizerany", "Pedro Belo", "Adam Wiggins"]
-  s.date = %q{2011-01-16}
+  s.date = %q{2011-01-20}
   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}
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<rest-client>, [">= 1.4.0", "< 1.7.0"])
+      s.add_runtime_dependency(%q<rest-client>, ["~> 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"])
@@ -82,7 +82,7 @@ Gem::Specification.new do |s|
       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<rest-client>, [">= 1.4.0", "< 1.7.0"])
+      s.add_dependency(%q<rest-client>, ["~> 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"])
@@ -93,7 +93,7 @@ Gem::Specification.new do |s|
     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<rest-client>, [">= 1.4.0", "< 1.7.0"])
+    s.add_dependency(%q<rest-client>, ["~> 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"])

data/lib/heroku/kensa.rb

@@ -5,6 +5,6 @@ require 'heroku/kensa/sso'
 
 module Heroku
   module Kensa
-    VERSION = "1.0.2"
+    VERSION = "1.1.0.pre"
   end
 end

data/lib/heroku/kensa/check.rb

@@ -99,9 +99,6 @@ module Heroku
         check "is a hash" do
           data["api"].is_a?(Hash)
         end
-        check "contains username" do
-          data["api"].has_key?("username") && data["api"]["username"] != ""
-        end
         check "contains password" do
           data["api"].has_key?("password") && data["api"]["password"] != ""
         end
@@ -139,6 +136,12 @@ module Heroku
             end
           end
         end
+        check "deprecated fields" do
+          if data["api"].has_key?("username")
+            error "username is deprecated: Please authenticate using the add-on id."
+          end
+          true
+        end
       end
 
     end
@@ -206,7 +209,7 @@ module Heroku
       end
 
       def credentials
-         %w( username password ).map { |attr| data["api"][attr] }
+        [ data['id'], data['api']['password'] ]
       end
     end
 

data/lib/heroku/kensa/client.rb

@@ -25,7 +25,7 @@ module Heroku
 
       def init
         Manifest.new(filename, @options).write
-        Screen.new.message "Initialized new addon manifest in #{filename}"
+        Screen.new.message "Initialized new addon manifest in #{filename}\n"
       end
 
       def test
@@ -76,6 +76,8 @@ module Heroku
         resource['provider/addons'].post(resolve_manifest, headers)
         puts "-----> Manifest for \"#{data['id']}\" was pushed successfully"
         puts "       Continue at https://provider.heroku.com/addons/#{data['id']}"
+      rescue RestClient::UnprocessableEntity => e
+        abort("FAILED: #{e.http_body}")
       rescue RestClient::Unauthorized
         abort("Authentication failure")
       rescue RestClient::Forbidden

data/lib/heroku/kensa/manifest.rb

@@ -12,8 +12,7 @@ module Heroku
   "id": "myaddon",
   "api": {
     "config_vars": [ "MYADDON_URL" ],
-    "username": "heroku",
-    "password": "b1EWrHYXE1R5J71D",#{ sso_key }
+    "password": "#{generate_password(16)}",#{ sso_key }
     "production": "https://yourapp.com/",
     "test": "http://localhost:4567/"
   }

data/test/all_check_test.rb

@@ -5,7 +5,6 @@ class AllCheckTest < Test::Unit::TestCase
 
   setup do
     @data = Manifest.new.skeleton
-    @data['api']['username'] = 'test'
     @data['api']['password'] = 'secret'
     @data['api']['test'] += "working"
     @file = File.dirname(__FILE__) + "/resources/runner.rb"

data/test/manifest_check_test.rb

@@ -26,11 +26,6 @@ class ManifestCheckTest < Test::Unit::TestCase
     assert_invalid
   end
 
-  test "api has a username" do
-    @data["api"].delete("username")
-    assert_invalid
-  end
-
   test "api has a password" do
     @data["api"].delete("password")
     assert_invalid
@@ -77,4 +72,8 @@ class ManifestCheckTest < Test::Unit::TestCase
     assert_valid
   end
 
+  test "username is deprecated" do
+    @data["api"]["username"] = "heroku"
+    assert_invalid
+  end
 end

data/test/manifest_test.rb

@@ -9,6 +9,18 @@ class ManifestTest < Test::Unit::TestCase
     test 'have sso salt' do
       assert_not_nil @manifest.skeleton['api']['sso_salt']
     end
+
+    test 'generates a new sso salt every time' do
+      assert @manifest.skeleton['api']['ssl_salt'] != Manifest.new.skeleton['api']['sso_salt']
+    end
+
+    test 'has an api password' do
+      assert_not_nil @manifest.skeleton['api']['password']
+    end
+
+    test 'generates a new password every time' do
+      assert @manifest.skeleton['api']['password'] != Manifest.new.skeleton['api']['password']
+    end
   end
 
   context 'manifest without sso' do

data/test/plan_change_check_test.rb

@@ -5,7 +5,6 @@ class PlanChangeCheckTest < Test::Unit::TestCase
 
   setup do
     @data = Manifest.new.skeleton.merge :id => 123, :plan => 'premium'
-    @data['api']['username'] = 'test'
     @data['api']['password'] = 'secret'
   end
 

data/test/provision_check_test.rb

@@ -5,7 +5,6 @@ class ProvisionCheckTest < Test::Unit::TestCase
 
   setup do
     @data = Manifest.new.skeleton
-    @data['api']['username'] = 'test'
     @data['api']['password'] = 'secret'
   end
 

data/test/resources/server.rb

@@ -14,7 +14,7 @@ helpers do
 
   def auth_heroku?
     @auth ||=  Rack::Auth::Basic::Request.new(request.env)
-    @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == ['test', 'secret']
+    @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == ['myaddon', 'secret']
   end
 
   def unauthorized!(status=403)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kensa
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  - pre
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -08:00
+date: 2011-01-20 00:00:00 -08:00
 default_executable: kensa
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,20 +76,13 @@ dependencies:
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 4
         - 0
         version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 0
-        version: 1.7.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -196,11 +190,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: