kensa 1.4.0 → 1.4.1

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.8.7 
   - 1.9.2
+  - 1.9.3
 notifications:
   email: 
     - csquared@heroku.com

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kensa (1.3.0)
+    kensa (1.4.1)
       launchy (>= 0.3.2)
       mechanize (~> 1.0.0)
       rest-client (>= 1.4.0, < 1.7.0)

data/lib/heroku/kensa.rb

@@ -7,3 +7,4 @@ require 'heroku/kensa/post_proxy'
 require 'heroku/kensa/screen'
 require 'heroku/kensa/git'
 require 'heroku/kensa/okjson'
+require 'heroku/kensa/okjson-support'

data/lib/heroku/kensa/check.rb

@@ -301,6 +301,8 @@ module Heroku
             response = OkJson.decode(json)
           rescue OkJson::Error => boom
             error boom.message
+          rescue NoMethodError => boom
+            error "error parsing JSON"
           end
           true
         end

data/lib/heroku/kensa/client.rb

@@ -78,7 +78,7 @@ module Heroku
       def sso
         id = @args.shift || abort("! no id specified; see usage")
         data = decoded_manifest
-        sso = Sso.new(data.merge(@options)).start
+        sso = Sso.new(data.merge(@options).merge(:id => id)).start
         puts sso.message
         Launchy.open sso.sso_url
       end

data/lib/heroku/kensa/okjson-support.rb

@@ -0,0 +1,24 @@
+class Hash
+  def stringify_keys
+    new_hash = {}
+    each do |key, value|
+      case value
+      when Hash
+        value = value.stringify_keys 
+      when Array
+        value = value.map { |v| v.stringify_keys if v.is_a? Hash } 
+      end
+
+      new_hash[key.to_s] = value
+    end
+    new_hash
+  end
+end
+
+module OkJson
+  alias encode_without_stringify encode
+
+  def encode(x)
+    encode_without_stringify(x.stringify_keys)
+  end  
+end

data/lib/heroku/kensa/okjson.rb

@@ -1,4 +1,6 @@
-# Copyright 2011 Keith Rarick
+# encoding: UTF-8
+#
+# Copyright 2011, 2012 Keith Rarick
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -260,6 +262,12 @@ module OkJson
   def unquote(q)
     q = q[1...-1]
     a = q.dup # allocate a big enough string
+    rubydoesenc = false
+    # In ruby >= 1.9, a[w] is a codepoint, not a byte.
+    if a.class.method_defined?(:force_encoding)
+      a.force_encoding('UTF-8')
+      rubydoesenc = true
+    end
     r, w = 0, 0
     while r < q.length
       c = q[r]
@@ -297,7 +305,12 @@ module OkJson
               end
             end
           end
-          w += ucharenc(a, w, uchar)
+          if rubydoesenc
+            a[w] = '' << uchar
+            w += 1
+          else
+            w += ucharenc(a, w, uchar)
+          end
         else
           raise Error, "invalid escape char #{q[r]} in \"#{q}\""
         end
@@ -307,6 +320,8 @@ module OkJson
         # Copy anything else byte-for-byte.
         # Valid UTF-8 will remain valid UTF-8.
         # Invalid UTF-8 will remain invalid UTF-8.
+        # In ruby >= 1.9, c is a codepoint, not a byte,
+        # in which case this is still what we want.
         a[w] = c
         r += 1
         w += 1
@@ -441,6 +456,10 @@ module OkJson
     t = StringIO.new
     t.putc(?")
     r = 0
+
+    # In ruby >= 1.9, s[r] is a codepoint, not a byte.
+    rubydoesenc = s.class.method_defined?(:encoding)
+
     while r < s.length
       case s[r]
       when ?"  then t.print('\\"')
@@ -455,21 +474,13 @@ module OkJson
         case true
         when Spc <= c && c <= ?~
           t.putc(c)
-        when true
+        when rubydoesenc
+          u = c.ord
+          surrenc(t, u)
+        else
           u, size = uchardec(s, r)
           r += size - 1 # we add one more at the bottom of the loop
-          if u < 0x10000
-            t.print('\\u')
-            hexenc4(t, u)
-          else
-            u1, u2 = unsubst(u)
-            t.print('\\u')
-            hexenc4(t, u1)
-            t.print('\\u')
-            hexenc4(t, u2)
-          end
-        else
-          # invalid byte; skip it
+          surrenc(t, u)
         end
       end
       r += 1
@@ -479,6 +490,20 @@ module OkJson
   end
 
 
+  def surrenc(t, u)
+    if u < 0x10000
+      t.print('\\u')
+      hexenc4(t, u)
+    else
+      u1, u2 = unsubst(u)
+      t.print('\\u')
+      hexenc4(t, u1)
+      t.print('\\u')
+      hexenc4(t, u2)
+    end
+  end
+
+
   def hexenc4(t, u)
     t.putc(Hex[(u>>12)&0xf])
     t.putc(Hex[(u>>8)&0xf])
@@ -579,28 +604,3 @@ module OkJson
   Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
   Hex = '0123456789abcdef'
 end
-
-class Hash
-  def stringify_keys
-    new_hash = {}
-    each do |key, value|
-      case value
-      when Hash
-        value = value.stringify_keys 
-      when Array
-        value = value.map { |v| v.stringify_keys if v.is_a? Hash } 
-      end
-
-      new_hash[key.to_s] = value
-    end
-    new_hash
-  end
-end
-
-module OkJson
-  alias encode_without_stringify encode
-
-  def encode(x)
-    encode_without_stringify(x.stringify_keys)
-  end  
-end

data/lib/heroku/kensa/version.rb

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

data/test/provision_check_test.rb

@@ -29,6 +29,12 @@ class ProvisionCheckTest < Test::Unit::TestCase
         assert_valid
       end
 
+      # OkJson doesn't handle short strings correctly
+      test "doesn't choke on foo" do
+        use_provider_endpoint "foo"
+        assert_invalid
+      end
+
       test "detects invalid JSON" do
         use_provider_endpoint "invalid-json"
         assert_invalid

data/test/resources/server.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'sinatra/base'
-require File.expand_path('../../../lib/heroku/kensa/okjson', __FILE__)
 
 class Hash
   def to_json
@@ -68,6 +67,11 @@ post '/cmd-line-options/heroku/resources' do
   { :id => 123 }.to_json
 end
 
+post '/foo/heroku/resources' do
+  heroku_only!
+  'foo'
+end
+
 post '/invalid-json/heroku/resources' do
   heroku_only!
   'invalidjson'

data/test/sso_test.rb

@@ -91,14 +91,29 @@ class SsoTest < Test::Unit::TestCase
   end
 
   context "via POST" do
+    include FsMock
     setup do
       Timecop.freeze Time.utc(2010, 1)
-      @data = Manifest.new(:method => :post).skeleton.merge(:id => 1)
+      @data = Manifest.new(:method => :post).skeleton
       @data['api']['sso_salt'] = 'SSO_SALT'
     end
 
+    test "command line" do
+      any_instance_of(Client) { |c| stub(c).puts }
+      stub(Launchy).open
+      start = Object.new
+      stub(start).message
+      stub(start).sso_url
+      stub(Sso).new.stub!.start.returns(start)
+
+      kensa "init"
+      kensa "sso 1234"
+
+      assert_received(Sso) { |sso| sso.new(hash_including(:id => '1234')) }
+    end
+
     test "it starts the proxy server" do
-      @sso = Sso.new(@data).start
+      @sso = Sso.new(@data.merge(:id => 1)).start
       body = RestClient.get(@sso.sso_url)
 
       assert body.include? @sso.path

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kensa
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -19,12 +19,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 -08:00
+date: 2012-03-08 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: 
@@ -34,11 +32,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: timecop
+  name: contest
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,11 +48,11 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: timecop
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,11 +63,11 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: contest
+  name: sinatra
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,11 +77,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: haml
+  name: contest
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -93,11 +91,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rr
+  name: haml
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -107,11 +105,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fakefs
+  name: rr
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -121,11 +119,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: artifice
+  name: fakefs
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -135,11 +133,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: artifice
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,11 +157,11 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  type: :runtime
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: term-ansicolor
+  name: rest-client
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,11 +172,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: launchy
+  name: term-ansicolor
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -190,11 +188,11 @@ dependencies:
         - 3
         - 2
         version: 0.3.2
-  type: :runtime
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: mechanize
+  name: launchy
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -206,8 +204,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
   version_requirements: *id012
+  name: mechanize
+  prerelease: false
+  type: :runtime
 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
 executables: 
@@ -231,6 +231,7 @@ files:
 - lib/heroku/kensa/git.rb
 - lib/heroku/kensa/http.rb
 - lib/heroku/kensa/manifest.rb
+- lib/heroku/kensa/okjson-support.rb
 - lib/heroku/kensa/okjson.rb
 - lib/heroku/kensa/post_proxy.rb
 - lib/heroku/kensa/screen.rb