yaml_ref_resolver 0.4.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a8c3702edf8837b2b6d415b1da4b54506bbbf6ff
-  data.tar.gz: a0317ddb4912fb69e677afa249270c5f87655cdf
+SHA256:
+  metadata.gz: 77d630a6c489e9eefe3255e97dbb34628afb551457d94343baeb96df67b806db
+  data.tar.gz: b1e197753ba5083a2121b7148aadbe546a271b1ec609154dd648d4b147abd50a
 SHA512:
-  metadata.gz: 2041bdf6ce0905f53a7f8531c8350d99c4d450228b69fbe4cf8cb30762bc5b11af40f156e551aa703996f4f09d1d7732e9006432c3b406f3a857062e822b6179
-  data.tar.gz: 2d89cd913188b2a1b83dc128724aa792692755708f376997e2d6198e1e955359bbd79922af0606e55e01bcc262341d3f4f99302a1fffe5d255de750051a5c71c
+  metadata.gz: d62b6b61321da6ae2f59b11aa71ea561d3f61e4eaa522df8dbee2c37543592c1ea12b3c8e84a5493dd722b371217de126aa53f0ba269c5c5cc2a5ce178649469
+  data.tar.gz: a3b0ea2d39d406f66c11a163258c800b9b76a8b4b85ff8deb125597e9dc6a3345ccc3da171f5897a3183009351a92e51399b167bb3f959c50cc84646f0089b46

data/.github/workflows/test.yml

@@ -0,0 +1,16 @@
+name: Run rake test
+on: pull_request
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6, 2.7]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle install
+      - run: bundle exec rake test

data/README.md

@@ -1,7 +1,7 @@
 # YamlRefResolver
 
 [![Gem Version](https://badge.fury.io/rb/yaml_ref_resolver.svg)](https://badge.fury.io/rb/yaml_ref_resolver)
-[![Build Status](https://travis-ci.org/Joe-noh/yaml_ref_resolver.svg?branch=master)](https://travis-ci.org/Joe-noh/yaml_ref_resolver)
+![Test](https://github.com/Joe-noh/yaml_ref_resolver/workflows/Run%20rake%20test/badge.svg)
 
 This is a gem that resolves and expands `$ref` references to other YAML files.
 

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
@@ -79,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
 
@@ -94,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
@@ -18,7 +18,13 @@ class YamlRefResolver::Ref
   end
 
   def target_keys
-    @target_level.split("/").reject {|s| s == "" }
+    @target_level
+      .split("/")
+      .reject {|s| s == "" }
+      .each do |o|
+        o.gsub!("~1", "/")
+        o.gsub!("~0", "~")
+      end
   end
 end
 

data/lib/yaml_ref_resolver/version.rb

@@ -1,3 +1,3 @@
 class YamlRefResolver
-  VERSION = "0.4.6"
+  VERSION = "0.7.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.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Joe-noh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2021-12-21 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
@@ -88,8 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -123,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Resolves referencing to other YAML files.

data/.travis.yml

@@ -1,9 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.2.0
-  - 2.3.0
-  - 2.4.0
-before_install: gem install bundler -v 1.14.2
-notifications:
-  email: false