kensa 1.0.0.beta1 → 1.0.0.beta2

data/Rakefile

@@ -22,14 +22,14 @@ begin
     gemspec.add_development_dependency(%q<turn>, [">= 0"])
     gemspec.add_development_dependency(%q<contest>, [">= 0"])
     gemspec.add_development_dependency(%q<timecop>, [">= 0.3.5"])
-    gemspec.add_dependency(%q<sinatra>, ["~> 0.9"])
+    gemspec.add_development_dependency(%q<sinatra>, [">= 0.9"])
     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"])
     gemspec.add_dependency(%q<mechanize>, ["~> 1.0.0"])
 
-    gemspec.version = '1.0.0.beta1'
+    gemspec.version = '1.0.0.beta2'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/kensa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kensa}
-  s.version = "1.0.0.beta1"
+  s.version = "1.0.0.beta2"
 
   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-19}
+  s.date = %q{2010-07-28}
   s.default_executable = %q{kensa}
   s.description = %q{}
   s.email = %q{pedro@heroku.com}
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<turn>, [">= 0"])
       s.add_development_dependency(%q<contest>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0.3.5"])
-      s.add_runtime_dependency(%q<sinatra>, ["~> 0.9"])
+      s.add_development_dependency(%q<sinatra>, [">= 0.9"])
       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"])
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<turn>, [">= 0"])
       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<sinatra>, [">= 0.9"])
       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"])
@@ -86,7 +86,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<turn>, [">= 0"])
     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<sinatra>, [">= 0.9"])
     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"])

data/lib/heroku/kensa/check.rb

@@ -258,15 +258,13 @@ module Heroku
         check "response" do
           if data[:async]
             child = fork do
-              Timeout.timeout(10) do
-                reader.close
-                server = TCPServer.open(7779)
-                client = server.accept
-                writer.write(client.readpartial(READLEN))
-                client.write("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")
-                client.close
-                writer.close
-              end
+              reader.close
+              server = TCPServer.open(7779)
+              client = server.accept
+              writer.write(client.readpartial(READLEN))
+              client.write("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")
+              client.close
+              writer.close
             end
             sleep(1)
           end

data/lib/heroku/kensa/client.rb

@@ -69,6 +69,10 @@ module Heroku
         resource = RestClient::Resource.new(host, client.user, client.password)
         resource['provider/addons'].post(resolve_manifest)
         puts "Manifest pushed succesfully"
+      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
 
       private

data/lib/heroku/kensa/sso.rb

@@ -37,9 +37,9 @@ module Heroku
           :addon => 'Your Addon',
           :appname => 'myapp',
           :addons => [
-            { :slug => 'cron', :name => 'Cron'},
-            { :slug => 'custom_domains+wildcard', :name => 'Custom Domains + Wildcard'},
-            { :slug => 'youraddon', :name => 'Your Addon'},
+            { :slug => 'cron', :name => 'Cron' },
+            { :slug => 'custom_domains+wildcard', :name => 'Custom Domains + Wildcard' },
+            { :slug => 'youraddon', :name => 'Your Addon', :current => true },
           ]
         })
         base64_url_variant(json)

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - beta1
-  version: 1.0.0.beta1
+  - beta2
+  version: 1.0.0.beta2
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -07:00
+date: 2010-07-28 00:00:00 -07:00
 default_executable: kensa
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,13 +63,13 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 9
         version: "0.9"
-  type: :runtime
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rest-client