kensa 1.4.5 → 1.4.6

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
+
 gemspec
-gem 'rake'
-group :development do 
-  gem 'ruby-debug',   :platforms => [:ruby_18]
-  gem 'ruby-debug19', :platforms => [:ruby_19]
-end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kensa (1.4.5)
+    kensa (1.4.6)
       launchy (>= 0.3.2)
       mechanize (~> 2.6.0)
       rest-client (>= 1.4.0, < 1.7.0)
@@ -11,11 +11,10 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.3)
-    archive-tar-minitar (0.5.2)
     artifice (0.6)
       rack-test
+    coderay (1.0.8)
     colorize (0.5.8)
-    columnize (0.3.6)
     contest (0.1.3)
     coveralls (0.6.7)
       colorize
@@ -30,10 +29,6 @@ GEM
       tilt
     launchy (2.2.0)
       addressable (~> 2.3)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     mechanize (2.6.0)
       domain_name (~> 0.5, >= 0.5.1)
       mime-types (~> 1.17, >= 1.17.2)
@@ -42,37 +37,26 @@ GEM
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
+    method_source (0.8.1)
     mime-types (1.21)
     multi_json (1.7.3)
     net-http-digest_auth (1.2.1)
     net-http-persistent (2.8)
     nokogiri (1.5.9)
     ntlm-http (0.1.1)
+    pry (0.9.11.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.0.4)
-    rbx-require-relative (0.0.9)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rr (1.0.4)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -81,6 +65,7 @@ GEM
       rack (~> 1.5, >= 1.5.2)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
+    slop (3.4.3)
     term-ansicolor (1.1.3)
     thor (0.18.1)
     tilt (1.3.6)
@@ -100,9 +85,8 @@ DEPENDENCIES
   fakefs
   haml
   kensa!
+  pry
   rake
   rr
-  ruby-debug
-  ruby-debug19
   sinatra (>= 0.9)
   timecop (>= 0.3.5)

data/kensa.gemspec

@@ -31,9 +31,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<coveralls>)
   s.add_development_dependency(%q<fakefs>, [">= 0"])
   s.add_development_dependency(%q<haml>, [">= 0"])
+  s.add_development_dependency(%q<rake>)
   s.add_development_dependency(%q<rr>, [">= 0"])
   s.add_development_dependency(%q<sinatra>, [">= 0.9"])
   s.add_development_dependency(%q<timecop>, [">= 0.3.5"])
+  s.add_development_dependency(%q<pry>)
   s.add_runtime_dependency(%q<launchy>, [">= 0.3.2"])
   s.add_runtime_dependency(%q<mechanize>, ["~> 2.6.0"])
   s.add_runtime_dependency(%q<rest-client>, ["< 1.7.0", ">= 1.4.0"])

data/lib/heroku/kensa/check.rb

@@ -221,6 +221,24 @@ module Heroku
             end
           end
 
+          check "syslog_drain_url is returned if required" do
+            return true unless data.has_key?("requires") && data["requires"].include?("syslog_drain")
+
+            drain_url = response['syslog_drain_url']
+
+            if !drain_url || drain_url.empty?
+              error "must return a syslog_drain_url"
+            else
+              true
+            end
+
+            unless drain_url =~ /\A(https|syslog):\/\/[\S]+\Z/
+              error "must return a syslog_drain_url like syslog://log.example.com:9999"
+            else
+              true
+            end
+          end
+
         end
       end
 

data/lib/heroku/kensa/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Kensa
-    VERSION = '1.4.5'
+    VERSION = '1.4.6'
   end
 end

data/test/provision_response_check_test.rb

@@ -76,6 +76,27 @@ class ProvisionResponseCheckTest < Test::Unit::TestCase
       @response["config"]["MYADDON_URL"] = "http://localhost/abc" 
       assert_valid
     end
+
+    describe "when syslog drain is required" do
+      setup do
+        @data["requires"] = ["syslog_drain"]
+      end
+
+      test "response is invalid without a syslog_drain_url" do
+        @response['syslog_drain_url'] = ''
+        assert_invalid
+      end
+
+      test "response is invalid if syslog_drain_url is invalid" do
+        @response['syslog_drain_url'] = 'ftp://host.example.com'
+        assert_invalid
+      end
+
+      test "response is valid with a syslog_drain_url" do
+        @response['syslog_drain_url'] = 'syslog://log.example.com:9999'
+        assert_valid
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kensa
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artifice
@@ -112,6 +112,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +176,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.5
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +322,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 887835306524825630
+      hash: -1941356029524696932
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -299,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 887835306524825630
+      hash: -1941356029524696932
 requirements: []
 rubyforge_project: kensa
 rubygems_version: 1.8.23