kensa 1.0.0.beta2 → 1.0.0.beta3

data/Rakefile

@@ -10,7 +10,9 @@ 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 = ""
@@ -29,7 +31,7 @@ begin
     gemspec.add_dependency(%q<launchy>, [">= 0.3.2"])
     gemspec.add_dependency(%q<mechanize>, ["~> 1.0.0"])
 
-    gemspec.version = '1.0.0.beta2'
+    gemspec.version = Heroku::Kensa::VERSION
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/bin/kensa

@@ -16,9 +16,9 @@ ARGV.options do |o|
   o.on("-f file", "--file") {|filename| options[:filename] = filename }
   o.on("--async") { options[:async] = true }
   o.on("--production") { options[:env] = "production" }
-  o.on("--plan PLANID") { |plan| options[:plan] = plan }
   o.on("--without-sso") { options[:sso] = false }
   o.on("-h", "--help") { command = "help" }
+  o.on("-v", "--version") { options[:command] = "version" }
   o.parse!
 end
 
@@ -47,9 +47,6 @@ OPTIONS
   --async
     Check provision call with async response.
 
-  --plan plan-id
-    Use the identified plan when doing provision calls
-
   --without-sso
     Skip single sign-on authentication when doing provision calls
 

data/kensa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kensa}
-  s.version = "1.0.0.beta2"
+  s.version = "1.0.0.beta3"
 
   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-07-28}
+  s.date = %q{2010-08-11}
   s.default_executable = %q{kensa}
   s.description = %q{}
   s.email = %q{pedro@heroku.com}

data/lib/heroku/kensa.rb

@@ -2,3 +2,9 @@ require 'heroku/kensa/http'
 require 'heroku/kensa/manifest'
 require 'heroku/kensa/check'
 require 'heroku/kensa/sso'
+
+module Heroku
+  module Kensa
+    VERSION = "1.0.0.beta3"
+  end
+end

data/lib/heroku/kensa/check.rb

@@ -138,27 +138,6 @@ module Heroku
             end
           end
         end
-
-        test "plans"
-        check "key must exist" do
-          data.has_key?("plans")
-        end
-        check "is an array" do
-          data["plans"].is_a?(Array)
-        end
-        check "contains at least one plan" do
-          !data["plans"].empty?
-        end
-        check "all plans are a hash" do
-          data["plans"].all? {|plan| plan.is_a?(Hash) }
-        end
-        check "all plans must have an id" do
-          data["plans"].all? {|plan| plan.has_key?("id") }
-        end
-        check "all plans have an unique id" do
-          ids = data["plans"].map {|plan| plan["id"] }
-          ids.size == ids.uniq.size
-        end
       end
 
     end
@@ -246,7 +225,7 @@ module Heroku
 
         payload = {
           :heroku_id => APPID,
-          :plan => @data[:plan] || @data['plans'].first['id'],
+          :plan => 'test',
           :callback_url => callback
         }
 

data/lib/heroku/kensa/client.rb

@@ -18,7 +18,7 @@ module Heroku
       class CommandInvalid < Exception; end
 
       def run!
-        command = @args.shift
+        command = @args.shift || @options[:command]
         raise CommandInvalid unless command && respond_to?(command)
         send(command)
       end
@@ -66,15 +66,21 @@ module Heroku
         require_heroku
         client   = Heroku::Command.run "auth:client", ['--ignore-keys']
         host     = ENV['ADDONS_HOST'] || 'https://addons.heroku.com'
+        data     = Yajl::Parser.parse(resolve_manifest)
         resource = RestClient::Resource.new(host, client.user, client.password)
         resource['provider/addons'].post(resolve_manifest)
-        puts "Manifest pushed succesfully"
+        puts "-----> Manifest for \"#{data['id']}\" was pushed successfully"
+        puts "       Continue at https://provider.heroku.com/addons/#{data['id']}"
       rescue RestClient::Unauthorized
         abort("Authentication failure")
       rescue RestClient::Forbidden
         abort("Not authorized to push this manifest. Please make sure you have permissions to push it")
       end
 
+      def version
+        puts "Kensa #{VERSION}"
+      end
+
       private
 
         def resolve_manifest

data/lib/heroku/kensa/manifest.rb

@@ -10,10 +10,6 @@ module Heroku
         <<-JSON
 {
   "id": "myaddon",
-  "plans": [
-    { "id": "basic" },
-    { "id": "premium" }
-  ],
   "api": {
     "config_vars": [ "MYADDON_URL" ],
     "username": "heroku",

data/test/manifest_check_test.rb

@@ -5,15 +5,7 @@ class ManifestCheckTest < Test::Unit::TestCase
 
   def check ; ManifestCheck ; end
 
-  setup do
-    @data = Manifest.new.skeleton
-    @data["plans"] << {
-      "id" => "advanced",
-      "name" => "Advanced",
-      "price" => "100",
-      "price_unit" => "month"
-    }
-  end
+  setup { @data = Manifest.new.skeleton }
 
   test "is valid if no errors" do
     assert_valid
@@ -79,34 +71,4 @@ class ManifestCheckTest < Test::Unit::TestCase
     assert_invalid
   end
 
-  test "plans key must exist" do
-    @data.delete("plans")
-    assert_invalid
-  end
-
-  test "plans key must be an Array" do
-    @data["plans"] = ""
-    assert_invalid
-  end
-
-  test "has at least one plan" do
-    @data["plans"] = []
-    assert_invalid
-  end
-
-  test "all plans are a hash" do
-    @data["plans"][0] = ""
-    assert_invalid
-  end
-
-  test "all plans have an id" do
-    @data["plans"].first.delete("id")
-    assert_invalid
-  end
-
-  test "all plans have an unique id" do
-    @data["plans"].first["id"] = @data["plans"].last["id"]
-    assert_invalid
-  end
-
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - beta2
-  version: 1.0.0.beta2
+  - beta3
+  version: 1.0.0.beta3
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 -07:00
+date: 2010-08-11 00:00:00 -07:00
 default_executable: kensa
 dependencies: 
 - !ruby/object:Gem::Dependency