prmd 0.11.10 → 0.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e6a8c0142506698e1bf725a68e5a6c3f0328fa
-  data.tar.gz: 3690e76c5ed4a6b6c554b4abf7d0c56d122fb6d0
+  metadata.gz: 360cb547141b8b6cb7530276cee8937fc3d67eeb
+  data.tar.gz: e5258d2ab83ccf065bed3c366ce915ad3b499f22
 SHA512:
-  metadata.gz: b379370f8a533d69fa872c1224726eebce304ffc643b03826d451ba252486fca6e287c4db79c8109a0550a8d34f1024d869bc5f9ac33006bf705dd66c9c382d7
-  data.tar.gz: 83d8bde56db5cbe2c6de78c6eefe368b992e91d04d9d5c852608d490db27b34c93d0e2eef111acab684c7ec7aaa19c48c97f1740cb9f5bf4828643c9b4e6b250
+  metadata.gz: 05fe9b1d724b0fa2290b1fbd93338eda26819e6bfe2ebaaf27fae5b49a9c8c3fb1eac37377be484280ccf713ac10db897605195337146fe7c8285a2ff066b60a
+  data.tar.gz: 729a5aa7351f1ffd3777194370bb5a6beb59eed6407c00506baa1a0312eccdfd424d679552a91f555935080faf564a754c8305449c1bc1d3c4c42914d2c69dc9

data/lib/prmd.rb

@@ -3,6 +3,7 @@ require_relative 'prmd/load_schema_file'
 require_relative 'prmd/commands'
 require_relative 'prmd/schema'
 require_relative 'prmd/link'
+require_relative 'prmd/utils'
 require_relative 'prmd/template'
 require_relative 'prmd/url_generator'
 require_relative 'prmd/hash_helpers'

data/lib/prmd/cli/base.rb

@@ -33,8 +33,8 @@ module Prmd
       # @param [Array<String>] argv
       # @return [Array<String>] remaining arguments
       # @private
-      def execute_parser(parser, argv)
-        parser.parse(argv)
+      def execute_parser(argv)
+        @parser.parse(argv)
       end
 
       # Set the given key and value in the given options Hash.
@@ -66,10 +66,10 @@ module Prmd
       # @return [Hash<Symbol, Object>] parsed options
       def parse_options(argv, options = {})
         opts = {}
-        parser = make_parser(options) do |key, value|
+        @parser = make_parser(options) do |key, value|
           set_option(opts, key, value)
         end
-        argv = execute_parser(parser, argv)
+        argv = execute_parser(argv)
         opts[:argv] = argv
         opts
       end

data/lib/prmd/cli/generate.rb

@@ -1,5 +1,6 @@
 require_relative 'base'
 require_relative '../commands/init'
+require_relative '../utils'
 
 module Prmd
   module CLI
@@ -40,7 +41,11 @@ module Prmd
       # @return (see Prmd::CLI::Base#execute)
       def self.execute(options = {})
         name = options.fetch(:argv).first
-        write_result Prmd.init(name, options), options
+        if Prmd::Utils.blank?(name)
+          abort @parser
+        else
+          write_result Prmd.init(name, options), options
+        end
       end
     end
   end

data/lib/prmd/templates/schemata/helper.erb

@@ -81,7 +81,8 @@
 
   def extract_schemata_refs(schema, properties)
     ret = []
-    properties.each do |_, value|
+    properties.keys.sort.each do |key|
+      value = properties[key]
       ref, value = schema.dereference(value)
       if value['properties']
         refs = extract_schemata_refs(schema, value['properties'])

data/lib/prmd/utils.rb

@@ -0,0 +1,19 @@
+module Prmd
+  # For any tid bits, or core extension methods, without the "core" extension
+  module Utils
+    # For checking if the string contains only spaces
+    BLANK_REGEX = /\A\s+\z/
+
+    def self.blank?(obj)
+      if obj.nil?
+        true
+      elsif obj.is_a?(String)
+        obj.empty? || !!(obj =~ BLANK_REGEX)
+      elsif obj.respond_to?(:empty?)
+        obj.empty?
+      else
+        false
+      end
+    end
+  end
+end

data/lib/prmd/version.rb

@@ -2,7 +2,7 @@
 module Prmd
   # Well, duh, its a Version module, what did you expect?
   module Version
-    MAJOR, MINOR, TEENY, PATCH = 0, 11, 10, nil
+    MAJOR, MINOR, TEENY, PATCH = 0, 11, 11, nil
     # version string
     # @return [String]
     STRING = [MAJOR, MINOR, TEENY, PATCH].compact.join('.').freeze

data/test/cli/combine_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers'))
+require_relative '../helpers'
 require 'prmd/cli/combine'
 
 class PrmdCliCombineTest < Minitest::Test

data/test/cli/doc_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers'))
+require_relative '../helpers'
 require 'prmd/cli/doc'
 
 class PrmdCliDocTest < Minitest::Test

data/test/cli/generate_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers'))
+require_relative '../helpers'
 require 'prmd/cli/generate'
 
 class PrmdCliGenerateTest < Minitest::Test

data/test/cli/render_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers'))
+require_relative '../helpers'
 require 'prmd/cli/render'
 
 class PrmdCliRenderTest < Minitest::Test

data/test/cli/verify_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers'))
+require_relative '../helpers'
 require 'prmd/cli/verify'
 
 class PrmdCliVerifyTest < Minitest::Test

data/test/commands/combine_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers'))
+require_relative '../helpers'
 
 require 'json_pointer'
 

data/test/commands/init_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers'))
+require_relative '../helpers'
 
 class PrmdInitTest < Minitest::Test
   def test_init

data/test/commands/render_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers'))
+require_relative '../helpers'
 
 require 'json_pointer'
 
@@ -6,7 +6,7 @@ class InteragentRenderTest < Minitest::Test
   def test_render_for_valid_schema
     markdown = render
 
-    assert_match /An app in our PaaS ecosystem./, markdown
+    assert_match(/An app in our PaaS ecosystem./, markdown)
   end
 
   def test_render_for_schema_with_property_defined_with_anyOf
@@ -21,15 +21,15 @@ class InteragentRenderTest < Minitest::Test
       }
     })
     markdown = render
-    assert_match /version.*v10\.9\.rc1/, markdown
+    assert_match(/version.*v10\.9\.rc1/, markdown)
   end
 
 
   def test_render_for_schema_with_property_defined_with_oneOf
     markdown = render
 
-   assert_match /\*\*options\/\[OPTION1\]\.type\*\*/, markdown
-   assert_match /\*\*options\/\[OPTION2\]\.type\*\*/, markdown
+   assert_match(/\*\*options\/\[OPTION1\]\.type\*\*/, markdown)
+   assert_match(/\*\*options\/\[OPTION2\]\.type\*\*/, markdown)
   end
 
 
@@ -95,37 +95,37 @@ class InteragentRenderTest < Minitest::Test
               'example'     => 'example'
             },
             'option-type1' => {
-              'type' => 'string', 
-              'example' => 'OPTION1', 
-              'enum' => 'OPTION1'                   
+              'type' => 'string',
+              'example' => 'OPTION1',
+              'enum' => 'OPTION1'
             },
             'option-type2' => {
-              'type' => 'string', 
+              'type' => 'string',
               'example' => 'OPTION2',
               'enum' => 'OPTION2'
             },
             'option1' => {
               'properties' => {
                 'type' => {
-                    '$ref' => '#/definitions/config-var/definitions/option-type1'    
+                    '$ref' => '#/definitions/config-var/definitions/option-type1'
                 }
               }
             },
             'option2' => {
               'properties' => {
                 'type' => {
-                    '$ref' => '#/definitions/config-var/definitions/option-type2'    
+                    '$ref' => '#/definitions/config-var/definitions/option-type2'
                 }
               }
             },
-            'options' => {                      
+            'options' => {
               'items' => {
                 'example'=> 'CHOICE1',
                 'oneOf' => [
-                  { 
+                  {
                     '$ref' => '#/definitions/config-var/definitions/option1'
                   },
-                  { 
+                  {
                    '$ref' => '#/definitions/config-var/definitions/option2'
                   }
                 ]

data/test/commands/verify_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers'))
+require_relative '../helpers'
 
 require 'json_pointer'
 

data/test/core/reference_localizer_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helpers', File.dirname(__FILE__))
+require_relative '../helpers'
 
 module Prmd
   class ReferenceLocalizerTest < Minitest::Test

data/test/link_test.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '.', 'helpers'))
+require_relative 'helpers'
+
 module Prmd
   class LinkTest < MiniTest::Test
     include PrmdLinkTestHelpers
@@ -22,7 +23,7 @@ module Prmd
       {
         title: "multiple_nested_required" ,
         optional: {"user:name" => "string"},
-        required: {"user:email" => "string", 
+        required: {"user:email" => "string",
                    "address:street" => "string",
                    "address:zip" => "string"}
       }

data/test/multi_loader/common.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helpers', File.dirname(__FILE__))
+require_relative '../helpers'
 
 module PrmdLoaderTests
   # @abstrac

data/test/multi_loader/json_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('common', File.dirname(__FILE__))
+require_relative 'common'
 require 'prmd/multi_loader/json'
 
 class PrmdMultiLoaderJsonTest < Minitest::Test

data/test/multi_loader/toml_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('common', File.dirname(__FILE__))
+require_relative 'common'
 begin
   require 'prmd/multi_loader/toml'
 rescue LoadError

data/test/multi_loader/yajl_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('common', File.dirname(__FILE__))
+require_relative 'common'
 begin
   require 'prmd/multi_loader/yajl'
 rescue LoadError

data/test/multi_loader/yaml_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('common', File.dirname(__FILE__))
+require_relative 'common'
 require 'prmd/multi_loader/yaml'
 
 class PrmdMultiLoaderYamlTest < Minitest::Test

data/test/rake_tasks/combine_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helpers', File.dirname(__FILE__))
+require_relative '../helpers'
 require 'prmd/rake_tasks/combine'
 require 'rake'
 

data/test/rake_tasks/doc_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helpers', File.dirname(__FILE__))
+require_relative '../helpers'
 require 'prmd/rake_tasks/doc'
 require 'rake'
 

data/test/rake_tasks/verify_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helpers', File.dirname(__FILE__))
+require_relative '../helpers'
 require 'prmd/rake_tasks/verify'
 require 'rake'
 

data/test/schema_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helpers'))
+require_relative 'helpers'
 
 class SchemaTest < Minitest::Test
   def test_dereference_with_ref

data/test/utils_test.rb

@@ -0,0 +1,16 @@
+require_relative 'helpers'
+
+class UtilsTest < Minitest::Test
+  def test_blank?
+    assert_equal true, Prmd::Utils.blank?(nil)
+    assert_equal true, Prmd::Utils.blank?([])
+    assert_equal true, Prmd::Utils.blank?({})
+    assert_equal true, Prmd::Utils.blank?("")
+    assert_equal true, Prmd::Utils.blank?(" ")
+    assert_equal true, Prmd::Utils.blank?("       ")
+    assert_equal false, Prmd::Utils.blank?([nil])
+    assert_equal false, Prmd::Utils.blank?({ a: nil })
+    assert_equal false, Prmd::Utils.blank?("A")
+    assert_equal false, Prmd::Utils.blank?(Object.new)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prmd
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.11
 platform: ruby
 authors:
 - geemus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -152,6 +152,7 @@ files:
 - lib/prmd/url_generator.rb
 - lib/prmd/url_generators/generators/default.rb
 - lib/prmd/url_generators/generators/json.rb
+- lib/prmd/utils.rb
 - lib/prmd/version.rb
 - prmd.gemspec
 - schemas/hyper-schema.json
@@ -189,6 +190,7 @@ files:
 - test/schemata/input/rake_doc.json
 - test/schemata/input/rake_verify.json
 - test/schemata/input/user.json
+- test/utils_test.rb
 homepage: https://github.com/heroku/prmd
 licenses:
 - MIT
@@ -246,3 +248,4 @@ test_files:
 - test/schemata/input/rake_doc.json
 - test/schemata/input/rake_verify.json
 - test/schemata/input/user.json
+- test/utils_test.rb