kensa 1.3.0 → 1.4.0

data/bin/kensa

@@ -16,8 +16,8 @@ begin
   ARGV.clear
   Client.new(args).run!
 rescue Client::CommandInvalid => e
-  puts e.message unless e.message.empty?
   abort File.read(__FILE__).split('__END__').last
+  puts e.message unless e.message.empty?
 end
 
 __END__

data/lib/heroku/kensa/client.rb

@@ -77,7 +77,7 @@ module Heroku
 
       def sso
         id = @args.shift || abort("! no id specified; see usage")
-        data = OkJson.decode(resolve_manifest).merge(:id => id)
+        data = decoded_manifest
         sso = Sso.new(data.merge(@options)).start
         puts sso.message
         Launchy.open sso.sso_url
@@ -86,7 +86,7 @@ module Heroku
       def push
         user, password = ask_for_credentials
         host     = heroku_host
-        data     = OkJson.decode(resolve_manifest)
+        data     = decoded_manifest
         resource = RestClient::Resource.new(host, user, password)
         resource['provider/addons'].post(resolve_manifest, headers)
         puts "-----> Manifest for \"#{data['id']}\" was pushed successfully"
@@ -148,6 +148,12 @@ module Heroku
           end
         end
 
+        def decoded_manifest
+          OkJson.decode(resolve_manifest)
+        rescue OkJson::Error => e
+          raise CommandInvalid, "#{filename} includes invalid JSON"
+        end
+
         def manifest_exists?
           File.exists?(filename)
         end
@@ -157,7 +163,7 @@ module Heroku
           options = args.pop if args.last.is_a?(Hash)
 
           args.each do |klass|
-            data   = OkJson.decode(resolve_manifest)
+            data   = decoded_manifest
             check  = klass.new(data.merge(@options.merge(options)), screen)
             result = check.call
             screen.finish

data/lib/heroku/kensa/manifest.rb

@@ -3,7 +3,7 @@ module Heroku
     class Manifest
 
       def initialize(options = {})
-        @method   = options.fetch(:method, 'get').to_sym
+        @method   = options.fetch(:method, 'post').to_sym
         @filename = options[:filename]
         @options  = options
       end

data/lib/heroku/kensa/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Kensa
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end

data/test/init_test.rb

@@ -16,17 +16,7 @@ class InitTest < Test::Unit::TestCase
     end
   end
   
-  def test_init_default_so_sso_post
-    kensa "init"
-    manifest = read_json(@filename)
-    %w{test production}.each do |env|
-      assert manifest['api'][env] =~ /^http/
-    end
-    assert !File.exist?('.env')
-  end
-
-=begin
-  def test_init_default_so_sso_post
+  def test_init_defaults_to_sso_post
     kensa "init"
     manifest = read_json(@filename)
     %w{test production}.each do |env|
@@ -36,7 +26,6 @@ class InitTest < Test::Unit::TestCase
     end
     assert !File.exist?('.env')
   end
-=end
 
   def test_init_uses_file_flag
     @filename = 'foo.json'

data/test/manifest_check_test.rb

@@ -5,6 +5,13 @@ class ManifestCheckTest < Test::Unit::TestCase
 
   def check ; ManifestCheck ; end
 
+  test "doesn't barf on OkJson errors" do
+    File.open("addon-manifest.json", 'w') { |f| f << "{,a" }
+    assert_raises Client::CommandInvalid, "addon-manifest.json includes invalid JSON" do
+      kensa "test provision"
+    end
+  end
+
   %w{get post}.each do |method|  
     context "with sso #{method}" do 
       setup { @data = Manifest.new(:method => method).skeleton }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kensa
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -19,10 +19,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 -08:00
+date: 2012-01-27 00:00:00 -08:00
 default_executable: kensa
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: contest
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +35,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: contest
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: timecop
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,10 +51,10 @@ dependencies:
         - 5
         version: 0.3.5
   type: :development
-  name: timecop
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,10 +66,10 @@ dependencies:
         - 9
         version: "0.9"
   type: :development
-  name: sinatra
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: contest
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,10 +80,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: contest
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,10 +94,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: haml
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -106,10 +108,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: rr
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: fakefs
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -120,10 +122,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: fakefs
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: artifice
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -134,10 +136,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: artifice
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,10 +160,10 @@ dependencies:
         - 0
         version: 1.4.0
   type: :runtime
-  name: rest-client
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -173,10 +175,10 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  name: term-ansicolor
-  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -189,10 +191,10 @@ dependencies:
         - 2
         version: 0.3.2
   type: :runtime
-  name: launchy
-  prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
+  name: mechanize
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -205,8 +207,6 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  name: mechanize
-  prerelease: false
   version_requirements: *id012
 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