samorau 0.2.0 → 0.3.0

data/Rakefile

@@ -16,7 +16,7 @@ begin
     gemspec.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
     gemspec.add_dependency(%q<launchy>, [">= 0.3.2"])
 
-    gemspec.version = '0.2.0'
+    gemspec.version = '0.3.0'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/bin/samorau

@@ -84,11 +84,11 @@ when "test"
     run ManifestCheck, fn
   when "provision"
     run ManifestCheck, fn
-    run CreateCheck, fn, :async => async, :env => env
+    run ProvisionCheck, fn, :async => async, :env => env
   when "deprovision"
     id = ARGV.shift || abort("! no id specified; see usage")
     run ManifestCheck, fn
-    run DeleteCheck, fn, :id => id, :async => async, :env => env
+    run DeprovisionCheck, fn, :id => id, :async => async, :env => env
   when "sso"
     id = ARGV.shift || abort("! no id specified; see usage")
     run ManifestCheck, fn

data/lib/heroku/samorau.rb

@@ -10,35 +10,43 @@ module Heroku
     module Manifest
 
       def self.init(filename)
-        json = Yajl::Encoder.encode(skeleton, :pretty => true)
-        open(filename, 'w') {|f| f << json }
+        open(filename, 'w') {|f| f << skeleton_str }
       end
 
       def self.skeleton
-        {
-          "name" => "myaddon",
-
-          "api" => {
-            "username" => "heroku",
-            "password" => generate_password,
-            "sso_salt" => generate_password(40),
-            "test" => "http://localhost:4567/",
-            "production" => "https://yourapp.com/",
-            "config_vars" => ["MYADDON_URL"]
-          },
-
-          "plans" => [
-            {
-              "name" => "Basic",
-              "price" => "0",
-              "price_unit" => "month"
-            }
-          ]
-        }
+        Yajl::Parser.parse(skeleton_str)
       end
 
+      def self.skeleton_str
+        return <<EOJSON
+{
+  "id": "myaddon",
+  "name": "My Addon",
+  "plans": [
+    {
+      "id": "basic",
+      "name": "Basic",
+      "price": "0",
+      "price_unit": "month"
+    }
+  ],
+  "api": {
+    "config_vars": [
+      "MYADDON_URL"
+    ],
+    "production": "https://yourapp.com/",
+    "test": "http://localhost:4567/",
+    "username": "heroku",
+    "password": "#{generate_password(16)}",
+    "sso_salt": "#{generate_password(16)}"
+  }
+}
+EOJSON
+      end
+
+      PasswordChars = chars = ['a'..'z', 'A'..'Z', '0'..'9'].map { |r| r.to_a }.flatten
       def self.generate_password(size=16)
-        Array.new(size/2) { rand(256) }.pack('C*').unpack('H*').first
+        Array.new(size) { PasswordChars[rand(PasswordChars.size)] }.join
       end
 
     end
@@ -116,6 +124,17 @@ module Heroku
       ValidPriceUnits = %w[month dyno_hour]
 
       def call!
+        test "manifest id key"
+        check "if exists" do
+          data.has_key?("id")
+        end
+        check "is a string" do
+          data["id"].is_a?(String)
+        end
+        check "is not blank" do
+          !data["id"].empty?
+        end
+
         test "manifest name key"
         check "if exists" do
           data.has_key?("name")
@@ -178,6 +197,13 @@ module Heroku
         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
         check "all plans have a name" do
           data["plans"].all? {|plan| plan.has_key?("name") }
         end
@@ -208,10 +234,10 @@ module Heroku
     end
 
 
-    class CreateResponseCheck < Check
+    class ProvisionResponseCheck < Check
 
       def call!
-        response = data[:create_response]
+        response = data[:provision_response]
         test "response"
         check "contains an id" do
           response.has_key?("id")
@@ -304,11 +330,12 @@ module Heroku
       end
     end
 
-    class CreateCheck < ApiCheck
+    class ProvisionCheck < ApiCheck
       include HTTP
 
       READLEN = 1024 * 10
       APPID = "app123@heroku.com"
+      APPNAME = "myapp"
 
       def call!
         json = nil
@@ -322,7 +349,8 @@ module Heroku
 
         payload = {
           :heroku_id => APPID,
-          :plan => "Basic",
+          :appname => APPNAME,
+          :plan => @data['plans'].first['id'],
           :callback_url => callback
         }
 
@@ -383,9 +411,9 @@ module Heroku
           true
         end
 
-        data[:create_response] = response
+        data[:provision_response] = response
 
-        run CreateResponseCheck, data
+        run ProvisionResponseCheck, data
       end
 
     ensure
@@ -394,7 +422,7 @@ module Heroku
     end
 
 
-    class DeleteCheck < ApiCheck
+    class DeprovisionCheck < ApiCheck
       include HTTP
 
       def call!
@@ -492,9 +520,9 @@ module Heroku
 
       def call!
         args = data[:args]
-        run CreateCheck, data
+        run ProvisionCheck, data
 
-        response = data[:create_response]
+        response = data[:provision_response]
         data.merge!(:id => response["id"])
         config = response["config"] || Hash.new
 
@@ -509,8 +537,7 @@ module Heroku
           screen.message "End of #{args.first}"
         end
 
-        run SsoCheck, data
-        run DeleteCheck, data
+        run DeprovisionCheck, data
       end
 
       def run_in_env(env)

data/samorau.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{samorau}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Mizerany", "Pedro Belo", "Adam Wiggins"]
-  s.date = %q{2010-03-04}
+  s.date = %q{2010-03-17}
   s.default_executable = %q{samorau}
   s.description = %q{}
   s.email = %q{pedro@heroku.com}
@@ -28,11 +28,11 @@ Gem::Specification.new do |s|
      "samorau.gemspec",
      "server.rb",
      "set-env.sh",
-     "test/create_check_test.rb",
-     "test/create_response_check_test.rb",
-     "test/delete_check.rb",
+     "test/deprovision_check.rb",
      "test/helper.rb",
      "test/manifest_check_test.rb",
+     "test/provision_check_test.rb",
+     "test/provision_response_check_test.rb",
      "test/sso_check_test.rb"
   ]
   s.homepage = %q{http://heroku.com}
@@ -41,11 +41,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{}
   s.test_files = [
-    "test/create_check_test.rb",
-     "test/create_response_check_test.rb",
-     "test/delete_check.rb",
+    "test/deprovision_check.rb",
      "test/helper.rb",
      "test/manifest_check_test.rb",
+     "test/provision_check_test.rb",
+     "test/provision_response_check_test.rb",
      "test/sso_check_test.rb"
   ]
 

data/test/{delete_check.rb → deprovision_check.rb}

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + "/helper"
 require "heroku/samorau"
 
-class DeleteCheckTest < Test::Unit::TestCase
+class DeprovisionCheckTest < Test::Unit::TestCase
   include Heroku::Samorau
 
   setup do
@@ -12,7 +12,7 @@ class DeleteCheckTest < Test::Unit::TestCase
     ]
   end
 
-  def check ; DeleteCheck ; end
+  def check ; DeprovisionCheck ; end
 
   test "valid on 200" do
     assert_valid do |check|

data/test/manifest_check_test.rb

@@ -8,12 +8,23 @@ class ManifestCheckTest < Test::Unit::TestCase
 
   setup do
     @data = Manifest.skeleton
+    @data["plans"] << {
+      "id" => "advanced",
+      "name" => "Advanced",
+      "price" => "100",
+      "price_unit" => "month"
+    }
   end
 
   test "is valid if no errors" do
     assert_valid
   end
 
+  test "has an id" do
+    @data.delete("id")
+    assert_invalid
+  end
+
   test "has a name" do
     @data.delete("name")
     assert_invalid
@@ -89,13 +100,23 @@ class ManifestCheckTest < Test::Unit::TestCase
     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
+
   test "all plans have a name" do
     @data["plans"].first.delete("name")
     assert_invalid
   end
 
   test "all plans have a unique name" do
-    @data["plans"] << @data["plans"].first.dup
+    @data["plans"].first["name"] = @data["plans"].last["name"]
     assert_invalid
   end
 

data/test/{create_check_test.rb → provision_check_test.rb}

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + "/helper"
 require "heroku/samorau"
 
-class CreateCheckTest < Test::Unit::TestCase
+class ProvisionCheckTest < Test::Unit::TestCase
   include Heroku::Samorau
 
   setup do
@@ -12,7 +12,7 @@ class CreateCheckTest < Test::Unit::TestCase
     ]
   end
 
-  def check ; CreateCheck ; end
+  def check ; ProvisionCheck ; end
 
   test "valid on 200 for the regular check, and 401 for the auth check" do
     assert_valid do |check|
@@ -34,7 +34,7 @@ class CreateCheckTest < Test::Unit::TestCase
     end
   end
 
-  test "runs create response check" do
+  test "runs provision response check" do
     @responses[0] = [200, to_json({ :noid => 456 })]
     assert_invalid do |check|
       stub :post, check, @responses

data/test/{create_response_check_test.rb → provision_response_check_test.rb}

@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + "/helper"
 require 'heroku/samorau'
 
-class CreateResponseCheckTest < Test::Unit::TestCase
+class ProvisionResponseCheckTest < Test::Unit::TestCase
   include Heroku::Samorau
 
-  def check ; CreateResponseCheck ; end
+  def check ; ProvisionResponseCheck ; end
 
   setup do
     @response = { "id" => "123" }
-    @data = Manifest.skeleton.merge(:create_response => @response)
+    @data = Manifest.skeleton.merge(:provision_response => @response)
   end
 
   test "is valid if no errors" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -08:00
+date: 2010-03-17 00:00:00 -07:00
 default_executable: samorau
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,11 +129,11 @@ files:
 - samorau.gemspec
 - server.rb
 - set-env.sh
-- test/create_check_test.rb
-- test/create_response_check_test.rb
-- test/delete_check.rb
+- test/deprovision_check.rb
 - test/helper.rb
 - test/manifest_check_test.rb
+- test/provision_check_test.rb
+- test/provision_response_check_test.rb
 - test/sso_check_test.rb
 has_rdoc: true
 homepage: http://heroku.com
@@ -166,9 +166,9 @@ signing_key:
 specification_version: 3
 summary: ""
 test_files: 
-- test/create_check_test.rb
-- test/create_response_check_test.rb
-- test/delete_check.rb
+- test/deprovision_check.rb
 - test/helper.rb
 - test/manifest_check_test.rb
+- test/provision_check_test.rb
+- test/provision_response_check_test.rb
 - test/sso_check_test.rb