prmd 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmYyYTg0MjRlYWQwZjBlZjFlMGU2OTVjODUyODYyZDQxOTZjMDgyNA==
+    ZGFhZTI3Yjc0OTA3ZWI5Mzc4NzBlNWQzMWY4YmQ5ZmRmNjAzZGIwMg==
   data.tar.gz: !binary |-
-    MjNiZDJhNzdhMDU1M2MyYTNjOTViODgxMGJkZTMyNGY2YTRhODcwMg==
+    MTZlMzFjMDhjMWYyYmRlM2YxZjIyNjNkZjRjOWI0NmZkNDk4ZmU1MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmI5ZDU5ZTBkMGNmODQyYWNkYmY4Y2IxMTJlY2QxMGYwNTgyY2MwZDI0Njg0
-    OTczYTU2ZDI0ODBjZTJkNGIxMTQwYTUwNDdkNzA5ZmMzNjM5ZTgyNzlmYzEy
-    YjI3YmNiYjkxYzVlNmU3NDc1ZDQ1ZTMzZDliODZhZDcyNWI0NGU=
+    MDM1ZTE1MTI1YWNiMDMzZmQ4YmRhYzQ0MDI4Nzc4ZmI1ODM3NTUyODEzYjZm
+    YTY5NGU3Mjk1ZmVhZDQ3Mjg2OTMwZjA2NmRlYzc3OTNkNWEyOWZjYTM4NzI2
+    OWU5OTZjMTU4ZmNiYzUyMTg5NmE4NGM0MTgyN2QxMzFiNzEyMDY=
   data.tar.gz: !binary |-
-    OTEyYTllYzkzODRkYWM3ODQ2NGM0MTA1Y2UyMjRiNDA4ZjMxZDUzMzI3YTRj
-    MjQyYTc1NmMyMWJmZTY4MTMxMDQ0OWYxYjBlZTNkMmVhYjAyNGQ2Yzc1Njg4
-    NjcyZWZiMGM0MTZhODc4Y2U1ZWNjNTIzNjFhOTQ1NzI4ZTZlN2I=
+    NjI0ZWJjOTRjNTA5YTM4MzI4NzI0ZDc2ZTYyZDQyNzRlYmM2MzIwOWQ2MDMy
+    NWVlYmExZDNhNTJiMDkxYmU5ZmRiNzRiZGNhYjA1NDUwZjcwOGQ0NDhhZmY0
+    Yjg4MDMwYmFlOWJkMDY0ZDljOTdiMWRhY2Q0NzA4ZmQ3YWFkMDU=

data/CONTRIBUTORS.md

@@ -1,6 +1,7 @@
 * Brandur <brandur@mutelight.org>
 * Chris Continanza <christopher.continanza@gmail.com>
 * Dane Harrigan <dane.harrigan@gmail.com>
+* Kousuke Ebihara <kousuke@co3k.org>
 * Mark McGranaghan <mmcgrana@gmail.com>
 * Olivier Lance <olance@users.noreply.github.com>
 * Timothée Peignier <timothee.peignier@tryphon.org>

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prmd (0.1.0)
+    prmd (0.2.0)
       erubis (~> 2.7)
 
 GEM

data/bin/prmd

@@ -19,6 +19,9 @@ commands = {
   end,
   init: OptionParser.new do |opts|
     opts.banner = "prmd init [options] <resource name>"
+    opts.on("-y", "--yaml", "Generate YAML") do |y|
+      options[:yaml] = y
+    end
   end,
   verify: OptionParser.new do |opts|
     opts.banner = "prmd verify [options] <combined schema>"

data/lib/prmd.rb

@@ -1,6 +1,7 @@
 require "cgi"
 require "erubis"
 require "json"
+require "yaml"
 
 dir = File.dirname(__FILE__)
 require File.join(dir, 'prmd', 'commands', 'combine')

data/lib/prmd/commands/combine.rb

@@ -1,11 +1,14 @@
 module Prmd
   def self.combine(path, options={})
     files = if File.directory?(path)
-      Dir.glob(File.join(path, '**', '*.json')) - [options[:meta]]
+      Dir.glob(File.join(path, '**', '*.json')) +
+        Dir.glob(File.join(path, '**', '*.yaml')) -
+        [options[:meta]]
     else
       [path]
     end
-    schemas = files.map { |file| JSON.parse(File.read(file)) }
+    # sort for stable loading on any platform
+    schemas = files.sort.map { |file| [file, YAML.load(File.read(file))] }
 
     data = {
       '$schema'     => 'http://json-schema.org/draft-04/hyper-schema',
@@ -14,16 +17,24 @@ module Prmd
       'type'        => ['object']
     }
 
+    # tracks which entities where defined in which file
+    definitions_map = {}
+
     if options[:meta] && File.exists?(options[:meta])
-      data.merge!(JSON.parse(File.read(options[:meta])))
+      data.merge!(YAML.load(File.read(options[:meta])))
     end
 
-    schemas.each do |schema_data|
+    schemas.each do |schema_file, schema_data|
       id = if schema_data['id']
         schema_data['id'].split('/').last
       end
       next if id.nil? || id[0..0] == '_' # FIXME: remove this exception?
 
+      if file = definitions_map[id]
+        $stderr.puts "`#{id}` (from #{schema_file}) was already defined in `#{file}` and will overwrite the first definition"
+      end
+      definitions_map[id] = schema_file
+
       data['definitions'][id] = schema_data
       reference_localizer = lambda do |datum|
         case datum

data/lib/prmd/commands/init.rb

@@ -102,6 +102,10 @@ module Prmd
       }
     end
 
-    schema.to_s
+    if options[:yaml]
+      schema.to_yaml
+    else
+      schema.to_json
+    end
   end
 end

data/lib/prmd/schema.rb

@@ -55,12 +55,20 @@ module Prmd
       end
     end
 
-    def to_s
+    def to_json
       new_json = JSON.pretty_generate(@data)
       # nuke empty lines
       new_json = new_json.split("\n").delete_if {|line| line.empty?}.join("\n") + "\n"
       new_json
     end
 
+    def to_yaml
+      YAML.dump(@data)
+    end
+
+    def to_s
+      to_json
+    end
+
   end
 end

data/lib/prmd/version.rb

@@ -1,3 +1,3 @@
 module Prmd
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prmd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - geemus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis