kensa 1.2.0rc3 → 1.2.0rc4

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    kensa (1.2.0rc2)
+    kensa (1.2.0rc4)
+      artifice (~> 0.6.0)
       launchy (~> 2.0.5)
       mechanize (~> 1.0.0)
       rest-client (~> 1.6.7)

data/bin/kensa

@@ -24,7 +24,6 @@ ARGV.options do |o|
   o.on("-h", "--help") { command = "help" }
   o.on("-p plan", "--plan") { |plan| options[:plan] = plan }
   o.on("-v", "--version") { options[:command] = "version" }
-  o.on("-t template", "--template")  { |t| options[:template] = t }
   o.parse!
 end
 
@@ -34,8 +33,6 @@ begin
   args = ARGV.dup
   ARGV.clear
   Client.new(args, options).run!
-rescue Client::CommandFailed => e
-  puts "We're sorry, but #{e.message} "
 rescue Client::CommandInvalid
   abort File.read(__FILE__).split('__END__').last
 end
@@ -66,17 +63,10 @@ OPTIONS
   --post
     Use HTTP POST for single sign-on instead of GET
 
-  -t, --template name    
-    Desired template to clone for create command from:
-    git://github.com/heroku/kensa-template-<name>
-    try sinatra, clojure, or node 
-
 COMMANDS
 
   init            Creates a skeleton manifest
 
-  create <name>   Creates a skeleton application from --template
-
   test <type>     Simulate call from Heroku (provision or deprovision)
 
   run <command>   Provisions a resource and runs command in returned ENV
@@ -103,3 +93,4 @@ TEST TYPES
 
   manifest
     Confirm that the manifest is valid.  Automatically runs before all tests.
+

data/kensa.gemspec

@@ -17,16 +17,17 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency(%q<json>, [">= 0"])
-  s.add_development_dependency(%q<sinatra>, ["~> 1.2.6"])
-  s.add_development_dependency(%q<timecop>, ["~> 0.3.5"])
-  s.add_development_dependency(%q<rr>, ["~> 1.0.4"])
-  s.add_development_dependency(%q<artifice>, ["~> 0.6"])
-  s.add_development_dependency(%q<haml>, ["~> 3.1.3"])
-  s.add_runtime_dependency(%q<test-unit>, ["~> 1.2.3"])
-  s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
-  s.add_runtime_dependency(%q<yajl-ruby>, ["~> 0.8.3"])
-  s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0.6"])
-  s.add_runtime_dependency(%q<launchy>, ["~> 2.0.5"])
-  s.add_runtime_dependency(%q<mechanize>, ["~> 1.0.0"])
+  s.add_development_dependency('json', [">= 0"])
+  s.add_development_dependency('sinatra', ["~> 1.2.6"])
+  s.add_development_dependency('timecop', ["~> 0.3.5"])
+  s.add_development_dependency('rr', ["~> 1.0.4"])
+  s.add_development_dependency('artifice', ["~> 0.6"])
+  s.add_development_dependency('haml', ["~> 3.1.3"])
+  s.add_runtime_dependency('test-unit', ["~> 1.2.3"])
+  s.add_runtime_dependency('rest-client', ["~> 1.6.7"])
+  s.add_runtime_dependency('yajl-ruby', ["~> 0.8.3"])
+  s.add_runtime_dependency('term-ansicolor', ["~> 1.0.6"])
+  s.add_runtime_dependency('launchy', ["~> 2.0.5"])
+  s.add_runtime_dependency('mechanize', ["~> 1.0.0"])
+  s.add_runtime_dependency('artifice', ["~> 0.6.0"])
 end

data/lib/heroku/kensa/client.rb

@@ -3,46 +3,9 @@ require 'term/ansicolor'
 require 'launchy'
 
 module Heroku
-  class Git
-    class << self
-      def verify_create(app_name, template)
-        raise CommandInvalid.new("template #{clone_url(template)} does not exist") unless template_exists?(template)
-        raise CommandInvalid.new("Need git to clone repository") unless git_installed?
-      end
-
-      def template_exists?(template)
-        true
-      end
-
-      def git_installed?
-        `git` rescue false
-      end
-
-      def clone(app_name, template)
-        verify_create(app_name, template)
-        cmd = "git clone #{clone_url(template)} #{app_name}" 
-        puts cmd
-        `#{cmd}`
-        raise Exception.new("couldn't clone the repository from #{clone_url(template)}") unless File.directory?("#{app_name}")
-        puts "Created #{app_name} from #{template} template"
-      end
-
-      def clone_url(name)
-        prefix = ENV['REPO_PREFIX'] || "heroku"
-        if name.include? "://"  #its a full url
-          return name
-        elsif name.include? "/" #its a non-heroku repo
-          name = "#{prefix}/#{name}" 
-        else                    #its one of ours 
-          name = "#{prefix}/kensa-create-#{name}" 
-        end
-
-        "git://github.com/#{name}"
-      end
-    end
-  end
-
   module Kensa
+    class UserError < RuntimeError; end
+
     class Client
       def initialize(args, options)
         @args    = args
@@ -53,10 +16,7 @@ module Heroku
         @options[:filename]
       end
 
-      #you fucked up
       class CommandInvalid < Exception; end
-      #we fucked up
-      class CommandFailed  < Exception; end
 
       def run!
         command = @args.shift || @options[:command]
@@ -69,23 +29,6 @@ module Heroku
         Screen.new.message "Initialized new addon manifest in #{filename}\n"
       end
 
-      def create
-        app_name = @args.shift
-        template = @options[:template]
-        raise CommandInvalid.new("Need git to supply a template") unless template
-        raise CommandInvalid.new("Need git to supply an application name") unless app_name
-
-        begin
-          Git.clone(app_name, template)
-        rescue Exception => e
-          raise CommandFailed.new("error cloning #{Git.clone_url(template)} into #{app_name}") 
-        end
-
-        Dir.chdir("./#{app_name}")
-        `./after_clone #{app_name}` if File.exist?('./after_clone')
-      end
-
-
       def test
         case check = @args.shift
           when "manifest"

data/lib/heroku/kensa/version.rb

@@ -1,6 +1,6 @@
 module Heroku
   module Kensa
-    VERSION = "1.2.0rc3"
+    VERSION = "1.2.0rc4"
   end
 end
 

data/test/lib/dependencies.rb

@@ -3,6 +3,10 @@ require 'artifice'
 require 'rest-client'
 require 'yajl'
 require 'lib/heroku/kensa/manifest'
-%w{response test_case formatter}.each do |lib|
+%w{response http formatter}.each do |lib|
   require "test/lib/#{lib}"
 end
+
+class Test::Unit::TestCase
+  include Heroku::Kensa::HTTPTest
+end

data/test/lib/formatter.rb

@@ -13,10 +13,9 @@ module Test
 
       private
       def add_error(exception)
-        if exception.class == Errno::ECONNREFUSED
+        if exception.is_a? Heroku::Kensa::UserError
           @test_passed = false
-          message = "Unable to connect to your API."
-          @_result.add_failure(Failure.new(name, filter_backtrace(caller()), message))
+          @_result.add_failure(Failure.new(name, filter_backtrace(caller()), exception.message))
         else
           add_error_with_connection_exception(exception)
         end

data/test/lib/{test_case.rb → http.rb}

@@ -1,4 +1,4 @@
-class Test::Unit::TestCase
+module Heroku::Kensa::HTTPTest
   def make_token(id, salt, timestamp)
     Digest::SHA1.hexdigest([id, salt, timestamp].join(':'))
   end
@@ -19,10 +19,14 @@ class Test::Unit::TestCase
     opts = meth == :get ? { :params => params } : params
     response = RestClient.send(meth, "#{uri.to_s}", opts)
     Response.new(response.code, response.body, response.cookies)
+  rescue Errno::ECONNREFUSED
+    raise UserError.new("Unable to connect to your API.")
   rescue RestClient::Forbidden
     Response.new(403)
   rescue RestClient::Unauthorized
     Response.new(401)
+  rescue RestClient::InternalServerError
+    raise UserError.new("HTTP 500 Internal Server Error")
   end
 
   def get(path, params = {})

data/test/lib/response.rb

@@ -1,5 +1,8 @@
 Response = Struct.new(:code, :body, :cookies) do
   def json_body
+    if !self.body || self.body.empty?
+      raise Heroku::Kensa::UserError.new("response body empty")
+    end
     Yajl::Parser.parse(self.body)
   end
 end

data/test/resources/provider_server.rb

@@ -78,5 +78,4 @@ class ProviderServer < Sinatra::Base
     session[:heroku] = true
     haml :index
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kensa
 version: !ruby/object:Gem::Version
-  version: 1.2.0rc3
+  version: 1.2.0rc4
   prerelease: 5
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000Z
+date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70298725075380 !ruby/object:Gem::Requirement
+  requirement: &70143233487380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298725075380
+  version_requirements: *70143233487380
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70298725074800 !ruby/object:Gem::Requirement
+  requirement: &70143233486780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +36,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *70298725074800
+  version_requirements: *70143233486780
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70298725074220 !ruby/object:Gem::Requirement
+  requirement: &70143233486160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70298725074220
+  version_requirements: *70143233486160
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70298725073680 !ruby/object:Gem::Requirement
+  requirement: &70143233485520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -58,10 +58,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70298725073680
+  version_requirements: *70143233485520
 - !ruby/object:Gem::Dependency
   name: artifice
-  requirement: &70298725073100 !ruby/object:Gem::Requirement
+  requirement: &70143233484660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,10 +69,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70298725073100
+  version_requirements: *70143233484660
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70298725072560 !ruby/object:Gem::Requirement
+  requirement: &70143233484140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +80,10 @@ dependencies:
         version: 3.1.3
   type: :development
   prerelease: false
-  version_requirements: *70298725072560
+  version_requirements: *70143233484140
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70298725071980 !ruby/object:Gem::Requirement
+  requirement: &70143233483660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +91,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70298725071980
+  version_requirements: *70143233483660
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70298725071440 !ruby/object:Gem::Requirement
+  requirement: &70143233482980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,10 +102,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70298725071440
+  version_requirements: *70143233482980
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70298725070860 !ruby/object:Gem::Requirement
+  requirement: &70143233482240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -113,10 +113,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70298725070860
+  version_requirements: *70143233482240
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70298725070320 !ruby/object:Gem::Requirement
+  requirement: &70143233481460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -124,10 +124,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70298725070320
+  version_requirements: *70143233481460
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70298725004540 !ruby/object:Gem::Requirement
+  requirement: &70143233476760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -135,10 +135,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70298725004540
+  version_requirements: *70143233476760
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70298725003960 !ruby/object:Gem::Requirement
+  requirement: &70143233476160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -146,7 +146,18 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70298725003960
+  version_requirements: *70143233476160
+- !ruby/object:Gem::Dependency
+  name: artifice
+  requirement: &70143233475540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70143233475540
 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.
@@ -171,14 +182,12 @@ files:
 - lib/heroku/kensa/sso.rb
 - lib/heroku/kensa/version.rb
 - set-env.sh
-- test.rb
-- test/create_test.rb
 - test/deprovision_test.rb
 - test/helper.rb
 - test/lib/dependencies.rb
 - test/lib/formatter.rb
+- test/lib/http.rb
 - test/lib/response.rb
-- test/lib/test_case.rb
 - test/manifest_generation_test.rb
 - test/manifest_test.rb
 - test/plan_change_test.rb
@@ -212,13 +221,12 @@ signing_key:
 specification_version: 3
 summary: Tool to help Heroku add-on providers integrating their services
 test_files:
-- test/create_test.rb
 - test/deprovision_test.rb
 - test/helper.rb
 - test/lib/dependencies.rb
 - test/lib/formatter.rb
+- test/lib/http.rb
 - test/lib/response.rb
-- test/lib/test_case.rb
 - test/manifest_generation_test.rb
 - test/manifest_test.rb
 - test/plan_change_test.rb

data/test.rb

@@ -1 +0,0 @@
-puts ARGV

data/test/create_test.rb

@@ -1,12 +0,0 @@
-$:.unshift(File.expand_path("../..",__FILE__))
-require 'test/lib/dependencies'
-
-class CreateTest < Test::Unit::TestCase
-  def kensa(cmd)
-    `./bin/kensa #{cmd}`
-  end
-
-  def test_create_with_manifest
-    kensa "create"
-  end
-end