mvcli 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b724357af63c1eccdda3de7f4c73d1f4d8dc2355
-  data.tar.gz: 9a0e068f92f544c184bd2fb72fe4cbdf908c9583
+  metadata.gz: f3899bbf5f7652090fcc016d3f09850b2012745a
+  data.tar.gz: ae467b67ff7b3f4a3c3a452b1173d4a6bb37fbd5
 SHA512:
-  metadata.gz: 83bbc6c3c668363569cf81c3de98b219212ab96bd9e4b25b609c403aa28e2fd200170df986ce7dcc29d0731a2bc50730af9432d3c39eed3ea3efd4ca20b4bc39
-  data.tar.gz: 833e8aa8e762de423b8bf8287667040c245481cbd5d02995d1def13b57c13e027578d30176715b89ed70407e8c3092cb18f062ad608533df154f67595425e39f
+  metadata.gz: cc657dac474ae27bdaf9145da35b8355b03be14896424fd1b3eefcb1548780b6ef72057f31ad9cc8957d521eb590dd12dee70c41c1136346d8fd9346ae7165cd
+  data.tar.gz: fd93d3d430ecdb9c386ffa76a7fce15276ea81c62bae0548a558164761d8c04433dc62be293171a2e35d2f765e4a747f05ee8a5170805feb836811b8b92f52b8

data/lib/mvcli/app.rb

@@ -16,6 +16,8 @@ module MVCLI
         ActiveSupport::Dependencies.autoload_paths << root.join('app', path.to_s)
       end
       @middleware = Middleware.new
+      @middleware << MVCLI::Middleware::ExitStatus.new
+      @middleware << MVCLI::Middleware::ExceptionLogger.new
       @middleware << Provisioning::Middleware.new
       @middleware << @router
     end

data/lib/mvcli/middleware/exception_logger/validation_summary.rb

@@ -1,21 +1,40 @@
 module MVCLI
   class Middleware
     class ExceptionLogger
-      class ValidationSummary
+      class ValidationSummary < Enumerator
         def initialize(validation)
+          super &method(:yield)
           @validation = validation
         end
 
-        def keys
-          @validation.violations.keys
+        def yield(output)
+          @validation.violations.each do |key, messages|
+            output << [key, messages]
+          end
+          @validation.errors.each do |key, exceptions|
+            output << [key, exceptions.map {|ex| "#{ex.class}: #{ex.message}"}]
+          end
+          @validation.each do |name, child|
+            if child.length > 1
+              child.each_with_index do |c, i|
+                ValidationSummary.new(c).each do |key, messages|
+                  output << ["#{name}[#{i}].#{key}", messages]
+                end
+              end
+            elsif first = child.first
+              ValidationSummary.new(first).each do |key, messages|
+                output << ["#{name}.#{key}", messages]
+              end
+            end
+          end
         end
 
-        def values
-          @validation.violations.values
-        end
-
-        def write
-          #Write object to a stream
+        def write(stream)
+          each do |key, messages|
+            messages.each do |msg|
+              stream.puts "#{key}: #{msg}"
+            end
+          end
         end
       end
     end

data/lib/mvcli/middleware/exception_logger.rb

@@ -1,4 +1,5 @@
 require "mvcli/erb"
+require "mvcli/validatable"
 require "mvcli/middleware/exception_logger/validation_summary"
 
 module MVCLI
@@ -7,9 +8,11 @@ module MVCLI
       def call(command)
         yield command
       rescue MVCLI::Validatable::ValidationError => e
-        ValidationSummary.new(e).write command.log
+        ValidationSummary.new(e.validation).write command.log
+        raise e
       rescue Exception => e
-        command.log << e.message + "\n"
+        command.log << "#{e.class}: #{e.message}\n"
+        command.log << "\n#{e.backtrace.join("\n")}\n" if ENV['backtrace']
         raise e
       end
     end

data/lib/mvcli/middleware/exit_status.rb

@@ -1,10 +1,91 @@
-class MVCLI::Middleware
-  EX_SOFTWARE = 70
+require "mvcli/router"
+require "mvcli/validatable"
 
+class MVCLI::Middleware
   class ExitStatus
+    # <b>:ok,</b> <b>:success</b> - Successful termination
+    EX_OK          = 0
+
+    # <b>:_base</b> - The base value for sysexit codes
+    EX__BASE       = 64
+
+    # <b>:usage</b> - The command was used incorrectly, e.g., with the wrong
+    # number of arguments, a bad flag, a bad syntax in a parameter, or whatever.
+    EX_USAGE       = 64
+
+    # <b>:dataerr,</b> <b>:data_error</b> - The input data was incorrect in
+    # some way. This should only be used for user data, not system files.
+    EX_DATAERR     = 65
+
+    # <b>:noinput,</b> <b>:input_missing</b> - An input file (not a system
+    # file) did not exist or was not readable. This could also include errors
+    # like "No message" to a mailer (if it cared to catch it).
+    EX_NOINPUT     = 66
+
+    # <b>:nouser,</b> <b>:no_such_user</b> - The user specified did not exist.
+    # This might be used for mail addresses or remote logins.
+    EX_NOUSER      = 67
+
+    # <b>:nohost,</b> <b>:no_such_host</b> - The host specified did not exist.
+    # This is used in mail addresses or network requests.
+    EX_NOHOST      = 68
+
+    # <b>:unavailable,</b> <b>:service_unavailable</b> - A service is
+    # unavailable.  This can occur if a support program or file does not exist.
+    # This can also be used as a catchall message when something you wanted to
+    # do doesn't work, but you don't know why.
+    EX_UNAVAILABLE = 69
+
+    # <b>:software,</b> <b>:software_error</b> - An internal software error has
+    # been detected. This should be limited to non-operating system related
+    # errors.
+    EX_SOFTWARE    = 70
+
+    # <b>:oserr,</b> <b>:operating_system_error</b> - An operating system error
+    # has been detected.  This is intended to be used for such things as
+    # "cannot fork", "cannot create pipe", or the like.  It includes things
+    # like getuid returning a user that does not exist in the passwd file.
+    EX_OSERR       = 71
+
+    # <b>:osfile,</b> <b>:operating_system_file_error</b> - Some system file
+    # (e.g., /etc/passwd, /etc/utmp, etc.) does not exist, cannot be opened, or
+    # has some sort of error (e.g., syntax error).
+    EX_OSFILE      = 72
+
+    # <b>:cantcreat,</b> <b>:cant_create_output</b> - A (user specified) output
+    # file cannot be created.
+    EX_CANTCREAT   = 73
+
+    # <b>:ioerr</b> - An error occurred while doing I/O on a file.
+    EX_IOERR       = 74
+
+    # <b>:tempfail,</b> <b>:temporary_failure,</b> <b>:try_again</b> - Temporary
+    # failure, indicating something that is not really a serious error.  In
+    # sendmail, this means that a mailer (e.g.) could not create a connection,
+    # and the request should be reattempted later.
+    EX_TEMPFAIL    = 75
+
+    # <b>:protocol,</b> <b>:protocol_error</b> - The remote system returned
+    # something that was "not possible" during a protocol exchange.
+    EX_PROTOCOL    = 76
+
+    # <b>:noperm,</b> <b>:permission_denied</b> - You did not have sufficient
+    # permission to perform the operation. This is not intended for file
+    # system problems, which should use NOINPUT or CANTCREAT, but rather
+    # for higher level permissions.
+    EX_NOPERM      = 77
+
+    # <b>:config,</b> <b>:config_error</b> - There was an error in a
+    # user-specified configuration value.
+    EX_CONFIG      = 78
+
     def call(command)
       result = yield command
-      result.is_a?(Integer) ? result : 0
+      result.is_a?(Integer) ? result : EX_OK
+    rescue MVCLI::Validatable::ValidationError
+      return EX_DATAERR
+    rescue MVCLI::Router::RoutingError => e
+      return EX_USAGE
     rescue Exception => e
       return EX_SOFTWARE
     end

data/lib/mvcli/version.rb

@@ -1,3 +1,3 @@
 module MVCLI
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/mvcli/middleware/exception_logger/validation_summary_spec.rb

@@ -8,16 +8,39 @@ describe "ValidationSummary" do
   Given(:object) { Object.new }
   Given(:validation) { validator.validate object }
   Given(:summary) { MVCLI::Middleware::ExceptionLogger::ValidationSummary.new validation }
-  context "With a simple validation" do
+  Given(:rollup) { summary.each }
+
+  context "with a simple validation" do
     Given do
       validator.validates(:foo, "You dun goofed", nil: true) {|foo| foo != nil}
       validator.validate object
     end
 
-    context "When validation fails" do
+    context "when validation fails" do
       When { object.stub(:foo) }
-      Then { summary.keys.first == "foo" }
-      And { summary.values.first == ["You dun goofed"] }
+      Then { rollup.first == ["foo", ["You dun goofed"]] }
+    end
+    context "when there is an access error" do
+      When { object.stub(:foo) {fail "bad access"}}
+      Then { rollup.first == ["foo", ["RuntimeError: bad access"]] }
+    end
+    context "when the validation fails on an array property" do
+      When {object.stub(:foo) {[nil]}}
+      Then {rollup.first == ["foo[0]", ["You dun goofed"]]}
+    end
+  end
+  context "with a nested validation" do
+    Given(:child) { double(:Child) }
+    Given(:child_validator) { MVCLI::Validatable::Validator.new }
+    Given do
+      object.stub(:bars) {[child, child]}
+      validator.validates_child :bars
+      child_validator.validates(:bazzes, "bad baz") {|baz| not baz.nil? }
+      child.stub(:validation) {child_validator.validate child}
+    end
+    context "with an invalid nested associtaion" do
+      When { child.stub(:bazzes) {['valid', nil, 'valid']} }
+      Then { rollup.first == ["bars[0].bazzes[1]", ["bad baz"]] }
     end
   end
 end

data/spec/mvcli/middleware/exception_logger_spec.rb

@@ -11,8 +11,9 @@ describe "MVCLI::Middleware::ExceptionLogger" do
     Then {result == 0}
   end
   context "with an app that raises an exception" do
-    When(:result) {logger.call(command) {fail "boom!"}}
-    Then {command.log == "boom!\n"}
-    And {result.should have_failed StandardError, "boom!"}
+    When(:result) { logger.call(command) { fail "boom!" } }
+    Then { result.should have_failed StandardError, "boom!" }
+    And { command.log =~ /boom!/ }
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvcli
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Charles Lowell
@@ -29,7 +29,7 @@ cert_chain:
   UgImJlChAzCoDP9zi9tdm6jAr7ttF25R9PPYr11ILb7dYe3qUzlNlM6zJx/nb31b
   IhdyRVup4qLcqYSTPsm6u7VA
   -----END CERTIFICATE-----
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map