kensa 1.0.0 → 1.0.1.pre

data/Rakefile

@@ -15,10 +15,10 @@ begin
   require 'heroku/kensa'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "kensa"
-    gemspec.summary = ""
-    gemspec.description = ""
+    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://heroku.com"
+    gemspec.homepage = "http://provider.heroku.com/resources"
     gemspec.authors = ["Blake Mizerany", "Pedro Belo", "Adam Wiggins"]
 
     gemspec.add_development_dependency(%q<turn>, [">= 0"])

data/bin/kensa

@@ -18,6 +18,7 @@ ARGV.options do |o|
   o.on("--production") { options[:env] = "production" }
   o.on("--without-sso") { options[:sso] = false }
   o.on("-h", "--help") { command = "help" }
+  o.on("-p plan", "--plan") { |plan| options[:plan] = plan }
   o.on("-v", "--version") { options[:command] = "version" }
   o.parse!
 end
@@ -44,6 +45,9 @@ OPTIONS
   -h, --help
     Show this message
 
+  -p, --plan
+    Provision the specified plan instead of "test"
+
   --async
     Check provision call with async response.
 
@@ -70,6 +74,9 @@ TEST TYPES
   deprovision <id>
     Simulate a deprovision call from Heroku.
 
+  planchange <id> <new_plan>
+    Simulate a plan change call from Heroku.
+
   sso <id>
     Simulate a single sign-on call from Heroku.
 

data/kensa.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kensa}
-  s.version = "1.0.0"
+  s.version = "1.0.1.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{2010-09-14}
+  s.date = %q{2010-09-27}
   s.default_executable = %q{kensa}
-  s.description = %q{}
+  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 = [
@@ -31,10 +31,11 @@ Gem::Specification.new do |s|
      "lib/heroku/kensa/sso.rb",
      "set-env.sh",
      "test/all_check_test.rb",
-     "test/deprovision_check.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",
@@ -42,17 +43,18 @@ Gem::Specification.new do |s|
      "test/sso_check_test.rb",
      "test/sso_test.rb"
   ]
-  s.homepage = %q{http://heroku.com}
+  s.homepage = %q{http://provider.heroku.com/resources}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{}
+  s.summary = %q{Tool to help Heroku add-on providers integrating their services}
   s.test_files = [
     "test/all_check_test.rb",
-     "test/deprovision_check.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",

data/lib/heroku/kensa.rb

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

data/lib/heroku/kensa/check.rb

@@ -148,10 +148,13 @@ module Heroku
       def call!
         response = data[:provision_response]
         test "response"
+
         check "contains an id" do
           response.is_a?(Hash) && response.has_key?("id")
         end
 
+        screen.message " (id #{response['id']})"
+
         if response.has_key?("config")
           test "config data"
           check "is a hash" do
@@ -225,7 +228,7 @@ module Heroku
 
         payload = {
           :heroku_id => APPID,
-          :plan => 'test',
+          :plan => data[:plan] || 'test',
           :callback_url => callback
         }
 
@@ -328,6 +331,40 @@ module Heroku
     end
 
 
+    class PlanChangeCheck < ApiCheck
+      include HTTP
+
+      def call!
+        id = data[:id]
+        raise ArgumentError, "No id specified" if id.nil?
+
+        new_plan = data[:plan]
+        raise ArgumentError, "No plan specified" if new_plan.nil?
+
+        path = "/heroku/resources/#{CGI::escape(id.to_s)}"
+
+        test "PUT #{path}"
+        check "response" do
+          code, _ = put(credentials, path, { :plan => new_plan})
+          if code == 200
+            true
+          elsif code == -1
+            error("unable to connect to #{url}")
+          else
+            error("expected 200, got #{code}")
+          end
+        end
+
+        check "authentication" do
+          wrong_credentials = ['wrong', 'secret']
+          code, _ = delete(wrong_credentials, path, nil)
+          error("expected 401, got #{code}") if code != 401
+          true
+        end
+      end
+    end
+
+
     class SsoCheck < ApiCheck
       include HTTP
 
@@ -406,13 +443,13 @@ module Heroku
         if args
           screen.message "\n\n"
           screen.message "Starting #{args.first}..."
-          screen.message ""
+          screen.message "\n\n"
 
           run_in_env(config) { system(*args) }
           error("run exited abnormally, expected 0, got #{$?.to_i}") unless $?.to_i == 0
 
-          screen.message ""
-          screen.message "End of #{args.first}"
+          screen.message "\n"
+          screen.message "End of #{args.first}\n"
         end
 
         run DeprovisionCheck, data

data/lib/heroku/kensa/client.rb

@@ -39,6 +39,11 @@ module Heroku
             id = ARGV.shift || abort("! no id specified; see usage")
             run_check ManifestCheck
             run_check DeprovisionCheck, :id => id
+          when "planchange"
+            id   = ARGV.shift || abort("! no id specified; see usage")
+            plan = ARGV.shift || abort("! no plan specified; see usage")
+            run_check ManifestCheck
+            run_check PlanChangeCheck, :id => id, :plan => plan
           when "sso"
             id = ARGV.shift || abort("! no id specified; see usage")
             run_check ManifestCheck
@@ -63,11 +68,10 @@ module Heroku
       end
 
       def push
-        require_heroku
-        client   = Heroku::Command.run "auth:client", ['--ignore-keys']
+        user, password = ask_for_credentials
         host     = ENV['ADDONS_HOST'] || 'https://addons.heroku.com'
         data     = Yajl::Parser.parse(resolve_manifest)
-        resource = RestClient::Resource.new(host, client.user, client.password)
+        resource = RestClient::Resource.new(host, user, password)
         resource['provider/addons'].post(resolve_manifest)
         puts "-----> Manifest for \"#{data['id']}\" was pushed successfully"
         puts "       Continue at https://provider.heroku.com/addons/#{data['id']}"
@@ -99,12 +103,53 @@ module Heroku
           screen.finish
         end
 
-        def require_heroku
-          require 'heroku'
-          require 'heroku/command'
-          require 'heroku/commands/auth'
-        rescue LoadError
-          abort("fatal: Could not load the Heroku gem. Plase make sure the Heroku gem is available and up to date")
+        def running_on_windows?
+          RUBY_PLATFORM =~ /mswin32|mingw32/
+        end
+
+        def echo_off
+          system "stty -echo"
+        end
+
+        def echo_on
+          system "stty echo"
+        end
+
+        def ask_for_credentials
+          puts "Enter your Heroku Provider credentials."
+
+          print "Email: "
+          user = gets.strip
+
+          print "Password: "
+          password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
+
+          [ user, password ]
+        end
+
+        def ask_for_password_on_windows
+          require "Win32API"
+          char = nil
+          password = ''
+
+          while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
+            break if char == 10 || char == 13 # received carriage return or newline
+            if char == 127 || char == 8 # backspace and delete
+              password.slice!(-1, 1)
+            else
+              password << char.chr
+            end
+          end
+          puts
+          return password
+        end
+
+        def ask_for_password
+          echo_off
+          password = gets.strip
+          puts
+          echo_on
+          return password
         end
 
 
@@ -132,7 +177,7 @@ module Heroku
         end
 
         def message(msg)
-          $stdout.puts msg
+          $stdout.print msg
         end
 
         def finish

data/lib/heroku/kensa/http.rb

@@ -13,6 +13,10 @@ module Heroku
         request(:post, credentials, path, payload)
       end
 
+      def put(credentials, path, payload=nil)
+        request(:put, credentials, path, payload)
+      end
+
       def delete(credentials, path, payload=nil)
         request(:delete, credentials, path, payload)
       end

data/test/plan_change_check_test.rb

@@ -0,0 +1,28 @@
+require 'test/helper'
+
+class PlanChangeCheckTest < Test::Unit::TestCase
+  include Heroku::Kensa
+
+  setup do
+    @data = Manifest.new.skeleton.merge :id => 123, :plan => 'premium'
+    @data['api']['username'] = 'test'
+    @data['api']['password'] = 'secret'
+  end
+
+  def check ; PlanChangeCheck ; end
+
+  test "working plan change call" do
+    @data['api']['test'] += "working"
+    assert_valid
+  end
+
+  test "detects invalid status" do
+    @data['api']['test'] += "invalid-status"
+    assert_invalid
+  end
+
+  test "detects missing auth" do
+    @data['api']['test'] += "invalid-missing-auth"
+    assert_invalid
+  end
+end

data/test/resources/server.rb

@@ -64,6 +64,22 @@ post '/invalid-missing-auth/heroku/resources' do
 end
 
 
+put '/working/heroku/resources/:id' do
+  heroku_only!
+  {}.to_json
+end
+
+put '/invalid-missing-auth/heroku/resources/:id' do
+  { :id => 123 }.to_json
+end
+
+put '/invalid-status/heroku/resources/:id' do
+  heroku_only!
+  status 422
+  {}.to_json
+end
+
+
 delete '/working/heroku/resources/:id' do
   heroku_only!
   "Ok"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kensa
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  - pre
+  version: 1.0.1.pre
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -07:00
+date: 2010-09-27 00:00:00 -07:00
 default_executable: kensa
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,7 +139,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   version_requirements: *id009
-description: ""
+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: 
 - kensa
@@ -160,10 +161,11 @@ files:
 - lib/heroku/kensa/sso.rb
 - set-env.sh
 - test/all_check_test.rb
-- test/deprovision_check.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
@@ -171,7 +173,7 @@ files:
 - test/sso_check_test.rb
 - test/sso_test.rb
 has_rdoc: true
-homepage: http://heroku.com
+homepage: http://provider.heroku.com/resources
 licenses: []
 
 post_install_message: 
@@ -188,24 +190,27 @@ 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: 
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: ""
+summary: Tool to help Heroku add-on providers integrating their services
 test_files: 
 - test/all_check_test.rb
-- test/deprovision_check.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