yaml_ref_resolver 0.4.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 11b5ee504e3aa03e93bc04e602b2ef9f8dfafb25
-  data.tar.gz: 504177fda0c4e4b5d0c224780112bf5720a85c22
+SHA256:
+  metadata.gz: 98c515c1a29e9e89dbf397c4fa444d2f057ed60d9baee99564a3a95e9f65637d
+  data.tar.gz: f27b553b4e53b72457ee85e033094765559025de82ada790c89d0dc39c91bf6a
 SHA512:
-  metadata.gz: 78c18f5058db6dfdd47ff70ed19c994d9a280188cb012f9a26bf18b15faeb00c000419d2ce5f57486e07db5939653cc39f6259abf5b7d9493de4ef711c8b7d18
-  data.tar.gz: ec9c2cb5b4c1a1d560ddaf6464168928fa5524095bb6f53582cb0e331e3b9456c3280bf402296750b975e6fe8bc9a5124b51546db53b871fb5e412c2e1a094c0
+  metadata.gz: 30e068d2d50b501fe98c9130ada71505db04a04031aab065ce425dc64cd42f6606d4d9a57e941cb6822d1692f15a5b024843fd74f46a6637fc743c5d4c9ca4bd
+  data.tar.gz: 5b197d808598723b1cec2ed54df5e55c898e0f35e9e1478dda6888c16270ec0f733256013cf1f065937bf35647223dd55b49b3eb48a5d1132f1cc39a31d4fe82

data/.travis.yml

@@ -1,7 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.0
-before_install: gem install bundler -v 1.14.2
+  - 2.5.0
+  - 2.6.5
+  - 2.7.0
+before_install: gem install bundler
 notifications:
   email: false

data/lib/yaml_ref_resolver.rb

@@ -62,7 +62,7 @@ class YamlRefResolver
         if target_keys.size == 0
           resolve_refs(@map[ref_path].content, ref_path)
         else
-          resolve_refs(@map[ref_path].content.dig(*target_keys), ref_path)
+          resolve_refs(dig(@map[ref_path].content, target_keys), ref_path)
         end
       else
         Hash[key, resolve_refs(val, referrer)]
@@ -75,4 +75,10 @@ class YamlRefResolver
   def resolve_array(array, referrer)
     array.map {|e| resolve_refs(e, referrer) }
   end
+
+  def dig(hash, keys)
+    keys.inject(hash) do |digged, key|
+      digged[key] or return nil
+    end
+  end
 end

data/lib/yaml_ref_resolver/cli.rb

@@ -1,7 +1,11 @@
 require "yaml_ref_resolver"
 require "json"
 require "optparse"
-require "filewatcher"
+
+begin
+  require "filewatcher"
+rescue => LoadError
+end
 
 class YamlRefResolver
   class CLI
@@ -19,12 +23,13 @@ class YamlRefResolver
       @opt.parse!(argv)
       validate_input_path
 
-      resolve_and_dump
-
       if @watch
+        resolve_and_dump
         FileWatcher.new(resolver.files).watch do |filename|
           resolve_and_dump(File.expand_path filename)
         end
+      else
+        exit(1) unless resolve_and_dump
       end
     end
 
@@ -41,8 +46,11 @@ class YamlRefResolver
       else
         $stdout.write resolved_yaml_or_json!
       end
+
+      return true
     rescue => e
       log e.message
+      return false
     end
 
     def resolved_yaml_or_json!
@@ -75,7 +83,11 @@ class YamlRefResolver
         @key = key
       end
 
-      @opt.on('-w', '--watch', 'glob pattern to watch cahnges') do
+      @opt.on('-w', '--watch', 'glob pattern to watch changes (needs filewatcher rubygem)') do
+        unless defined? FileWatcher
+          puts 'you need the `filewatcher` rubygem to watch for changes. You can run `gem install filewatcher` to install it.'
+          exit 1
+        end
         @watch = true
       end
 
@@ -90,7 +102,7 @@ class YamlRefResolver
         exit 1
       end
 
-      unless File.exists?(@input)
+      unless File.exist?(@input)
         puts "#{@input} not found"
         exit 1
       end

data/lib/yaml_ref_resolver/ref.rb

@@ -3,7 +3,7 @@ class YamlRefResolver::Ref
     @base_dir = File.dirname(base_path)
 
     if target.start_with?("#")
-      @target_file = nil
+      @target_file = base_path
       @target_level = target.sub("#", "")
     elsif !target.include?("#")
       @target_file = target

data/lib/yaml_ref_resolver/version.rb

@@ -1,3 +1,3 @@
 class YamlRefResolver
-  VERSION = "0.4.3"
+  VERSION = "0.6.0"
 end

data/lib/yaml_ref_resolver/yaml.rb

@@ -4,7 +4,7 @@ class YamlRefResolver::Yaml
   attr_reader :content
 
   def self.load!(path:, key: '$ref')
-    if File.exists?(path)
+    if File.exist?(path)
       begin
         self.new(path, YAML.load_file(path), key)
       rescue Psych::SyntaxError => e

data/yaml_ref_resolver.gemspec

@@ -22,10 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency "filewatcher", "~> 0.5"
-
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry", "~> 0.10"
 end

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: yaml_ref_resolver
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Joe-noh
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: filewatcher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: 
+description:
 email:
 - goflb.jh@gmail.com
 executables:
@@ -108,7 +94,7 @@ homepage: https://github.com/Joe-noh/yaml_ref_resolver
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Resolves referencing to other YAML files.
 test_files: []