r2-oas 0.1.2 → 0.1.3

data/lib/r2-oas/schema/v3/generator/doc_generator.rb

@@ -29,9 +29,10 @@ module R2OAS
 
         def generate_docs_from_schema_files
           result_before_squeeze = schema_files_paths.each_with_object({}) do |path, data|
+            file_manager = FileManager.new(path)
             yaml = YAML.load_file(path)
             data.deep_merge!(yaml)
-            logger.info " Use schema file: \t#{path}"
+            logger.info " Use schema file: \t#{file_manager.save_file_path(type: :relative)}"
           end
 
           result = if many_paths_file_paths.present?

data/lib/r2-oas/schema/v3/generator/path_generator.rb

@@ -51,7 +51,7 @@ module R2OAS
 
             path_item_file_manager.save(result.to_yaml) unless path_item_file_manager.skip_save?
 
-            yield path_item_file_manager.save_file_path if block_given?
+            yield path_item_file_manager.save_file_path(type: :relative) if block_given?
           end
         end
 

data/lib/r2-oas/schema/v3/generator/schema_generator.rb

@@ -68,7 +68,7 @@ module R2OAS
               file_manager = FileManager.new(field_name, :relative)
               file_manager.save(result.to_yaml)
 
-              yield file_manager.save_file_path if block_given?
+              yield file_manager.save_file_path(type: :relative) if block_given?
             end
           end
         end

data/lib/r2-oas/schema/v3/manager/file/base_file_manager.rb

@@ -31,11 +31,18 @@ module R2OAS
           save(result.to_yaml)
         end
 
-        def save_file_path
-          File.expand_path(@relative_save_file_path).tap do |abs_path|
+        def save_file_path(type: :full)
+          file_path = File.expand_path(@relative_save_file_path).tap do |abs_path|
             abs_dir = File.dirname(abs_path)
             FileUtils.mkdir_p(abs_dir) unless FileTest.exists?(abs_dir)
           end
+
+          case type
+          when :relative
+            file_path.sub(%r{^#{Dir.getwd}/?}, '')
+          else
+            file_path
+          end
         end
 
         def load_data

data/lib/r2-oas/tool/paths/ls.rb

@@ -6,7 +6,7 @@ module R2OAS
       class Ls < Base
         def print
           Dir.glob("#{schema_save_dir_path}/paths/**/**.yml").each do |path|
-            puts path
+            puts path.sub(%r{^#{Dir.getwd}/?}, '')
           end
         end
       end

data/lib/r2-oas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module R2OAS
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/r2-oas.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['te108186@gmail.com']
 
   spec.summary       = 'Provide rake tasks to management API Docment (OpenAPI)'
-  spec.description   = "Let's intuitively write API documentation with Swagger Editor in your Rails Project! 😊"
+  spec.description   = "Let's intuitively write API documentation with Swagger Editor in your Rails Project! 😊 Provide rake tasks to management API Docment (OpenAPI) 🎉"
 
   spec.homepage      = 'https://yukihirop.github.io/r2-oas'
   spec.license       = 'MIT'
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'paint'
   spec.add_runtime_dependency 'rails', '>= 4.2.5'
   spec.add_runtime_dependency 'terminal-table', '~> 1.6.0'
-  spec.add_runtime_dependency 'watir', '~> 6.0'
+  spec.add_runtime_dependency 'watir', '~> 6.16.5'
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r2-oas
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - yukihirop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.16.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.16.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: "Let's intuitively write API documentation with Swagger Editor in your
-  Rails Project! \U0001F60A"
+  Rails Project! \U0001F60A Provide rake tasks to management API Docment (OpenAPI)
+  \U0001F389"
 email:
 - te108186@gmail.com
 executables: []
@@ -220,6 +221,7 @@ files:
 - docs/.nojekyll
 - docs/README.md
 - docs/_sidebar.md
+- docs/attention/if_clash.md
 - docs/index.html
 - docs/schema/3.0.0.md
 - docs/setting/COC.md