r2-oas 0.1.2 → 0.3.2

data/lib/r2-oas/tasks/tool.rake

@@ -8,19 +8,24 @@ load File.expand_path('common.rake', __dir__)
 
 namespace :routes do
   namespace :oas do
-    desc 'Deploy Swagger UI'
+    desc 'Deploy OAS Document'
     task deploy: [:common] do
-      logger.info '[R2-OAS] start'
-
-      generator_options = { unit_paths_file_path: unit_paths_file_path, skip_generate_docs: true }
-      generator = R2OAS::Schema::Generator.new(generator_options)
-      generator.generate_docs
-
-      client_options = {}
-      client = R2OAS::Deploy::Client.new(client_options)
-      client.deploy
-
-      logger.info '[R2-OAS] end'
+      start do
+        client_options = {}
+        client = R2OAS::Deploy::Client.new(client_options)
+
+        download_dist_th = Thread.new do
+          puts 'Download swagger-api/swagger-ui/dist ... (async)'
+          client.download_swagger_ui_dist
+        end
+
+        builder_options = { unit_paths_file_path: unit_paths_file_path }
+        builder = R2OAS::Schema::Builder.new(builder_options)
+        builder.build_docs
+
+        download_dist_th.join
+        client.deploy
+      end
     end
 
     desc 'Display paths list'
@@ -28,14 +33,14 @@ namespace :routes do
       fd = IO.sysopen('/dev/null', 'w+')
       $stdout = IO.new(fd)
       logger.level = :null
-      logger.info '[R2-OAS] start'
-      $stdout = StringIO.new
 
-      paths_ls_options = {}
-      paths_ls = R2OAS::Tool::Paths::Ls.new(paths_ls_options)
-      paths_ls.print
+      start do
+        $stdout = StringIO.new
 
-      logger.info '[R2-OAS] end'
+        paths_ls_options = {}
+        paths_ls = R2OAS::Tool::Paths::Ls.new(paths_ls_options)
+        paths_ls.print
+      end
 
       result = $stdout.string
       $stdout = STDOUT
@@ -48,18 +53,17 @@ namespace :routes do
       $stdout = IO.new(fd)
       logger.level = :null
 
-      logger.info '[R2-OAS] start'
-      generator_options = { skip_generate_docs: true, skip_load_dot_paths: true }
-      generator = R2OAS::Schema::Generator.new(generator_options)
-      generator.generate_docs
-
-      $stdout = StringIO.new
+      start do
+        builder_options = { skip_load_dot_paths: true }
+        builder = R2OAS::Schema::Builder.new(builder_options)
+        builder.build_docs
 
-      paths_log_options = {}
-      paths_log = R2OAS::Tool::Paths::Stats.new(paths_log_options)
-      paths_log.print
+        $stdout = StringIO.new
 
-      logger.info '[R2-OAS] end'
+        paths_log_options = {}
+        paths_log = R2OAS::Tool::Paths::Stats.new(paths_log_options)
+        paths_log.print
+      end
 
       result = $stdout.string
       $stdout = STDOUT

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.3.2'
 end

data/r2-oas.gemspec

@@ -11,32 +11,41 @@ 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   = %Q{== Let's intuitively write API documentation with Swagger Editor in your Rails Project! 😊\n#{IO.read('GEMSPEC.md')}}
 
-  spec.homepage      = 'https://yukihirop.github.io/r2-oas'
+  spec.homepage      = 'https://github.com/yukihirop/r2-oas'
   spec.license       = 'MIT'
+  spec.metadata = {
+    "bug_tracker_uri"   => "https://github.com/yukihirop/r2-oas/issues",
+    "changelog_uri"     => "https://github.com/yukihirop/r2-oas/blob/v#{spec.version}/CHANGELOG.md",
+    "documentation_uri" => "https://yukihirop.github.io/r2-oas",
+    "source_code_uri"   => "https://github.com/yukihirop/r2-oas/tree/v#{spec.version}"
+  }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin|.github|devscript|docs|gemfiles)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   spec.required_ruby_version = Gem::Requirement.new('>= 2.3.3p222')
 
-  spec.add_runtime_dependency 'docker-api', '~> 1.34.2'
-  spec.add_runtime_dependency 'easy_diff', '~> 1.0.0'
-  spec.add_runtime_dependency 'eventmachine', '~> 1.2.0'
+  spec.add_runtime_dependency 'docker-api', '>= 1.34.2'
+  spec.add_runtime_dependency 'easy_diff', '>= 1.0.0'
+  spec.add_runtime_dependency 'eventmachine', '>= 1.2.0'
+  spec.add_runtime_dependency 'key_flatten', '>= 1.0.0'
   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_development_dependency 'bundler', '~> 1.17'
+  spec.add_runtime_dependency 'railties', '>= 4.2.5'
+  spec.add_runtime_dependency 'terminal-table', '>= 1.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'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'activerecord', '>= 4.2.5'
 end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: r2-oas
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.2
 platform: ruby
 authors:
 - yukihirop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.34.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.34.2
 - !ruby/object:Gem::Dependency
   name: easy_diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: key_flatten
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,42 +98,42 @@ dependencies:
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
     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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
@@ -192,52 +206,65 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "Let's intuitively write API documentation with Swagger Editor in your
-  Rails Project! \U0001F60A"
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.5
+description: "== Let's intuitively write API documentation with Swagger Editor in
+  your Rails Project! \U0001F60A\nConfigureless and no DSL. \U0001F44D But you can
+  also configure.  \nManage with yaml file instead of Ruby code.  \nLoosely coupled
+  to your Rails project. \U0001F44D  \nSo if you want to use another tool, you can
+  port it right away. \U0001F622  \nGenerate api docment(OpenAPI) side only from `Rails`
+  routing.  \n  \nProvide rake tasks to management API Docment (OpenAPI) \U0001F389
+  \ \n  \n\n    $ bundle exec rake routes:oas:docs\n    $ bundle exec rake routes:oas:ui\n
+  \   $ bundle exec rake routes:oas:editor\n    $ bundle exec rake routes:oas:monitor\n
+  \   $ bundle exec rake routes:oas:dist\n    $ bundle exec rake routes:oas:clean\n
+  \   $ bundle exec rake routes:oas:analyze\n    $ bundle exec rake routes:oas:deploy\n\n
+  \ \nHappy Coding ❗️\n"
 email:
 - te108186@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- GEMSPEC.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.ja.md
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
-- docs/.nojekyll
-- docs/README.md
-- docs/_sidebar.md
-- docs/index.html
-- docs/schema/3.0.0.md
-- docs/setting/COC.md
-- docs/setting/CORS.md
-- docs/setting/configure.md
-- docs/usage/analyze_docs.md
-- docs/usage/clean_docs.md
-- docs/usage/deploy_docs.md
-- docs/usage/display_paths_list.md
-- docs/usage/display_paths_stats.md
-- docs/usage/edit_docs.md
-- docs/usage/generate_docs.md
-- docs/usage/monitor_docs.md
-- docs/usage/use_hook_methods.md
-- docs/usage/use_hook_to_generate_docs.md
-- docs/usage/use_schema_namespace.md
-- docs/usage/use_tag_namespace.md
-- docs/usage/view_docs.md
 - lib/r2-oas.rb
 - lib/r2-oas/app_configuration.rb
 - lib/r2-oas/app_configuration/server.rb
@@ -250,22 +277,14 @@ files:
 - lib/r2-oas/configuration.rb
 - lib/r2-oas/configuration/paths_config.rb
 - lib/r2-oas/deploy/client.rb
-- lib/r2-oas/deploy/swagger-ui/dist/favicon-16x16.png
-- lib/r2-oas/deploy/swagger-ui/dist/favicon-32x32.png
-- lib/r2-oas/deploy/swagger-ui/dist/oauth2-redirect.html
-- lib/r2-oas/deploy/swagger-ui/dist/swagger-ui-bundle.js
-- lib/r2-oas/deploy/swagger-ui/dist/swagger-ui-bundle.js.map
-- lib/r2-oas/deploy/swagger-ui/dist/swagger-ui-standalone-preset.js
-- lib/r2-oas/deploy/swagger-ui/dist/swagger-ui-standalone-preset.js.map
-- lib/r2-oas/deploy/swagger-ui/dist/swagger-ui.css
-- lib/r2-oas/deploy/swagger-ui/dist/swagger-ui.css.map
-- lib/r2-oas/deploy/swagger-ui/dist/swagger-ui.js
-- lib/r2-oas/deploy/swagger-ui/dist/swagger-ui.js.map
 - lib/r2-oas/deploy/swagger-ui/index.html.erb
 - lib/r2-oas/errors.rb
 - lib/r2-oas/hooks/global_hook.rb
 - lib/r2-oas/hooks/hook.rb
 - lib/r2-oas/hooks/repository.rb
+- lib/r2-oas/lib/core_ext/hash/deep_merge.rb
+- lib/r2-oas/lib/core_ext/object/blank.rb
+- lib/r2-oas/lib/three-way-merge/twm.rb
 - lib/r2-oas/logger/stdout_logger.rb
 - lib/r2-oas/pluggable_configuration.rb
 - lib/r2-oas/plugins/schema/v3/object/hookable_base_object.rb
@@ -279,10 +298,12 @@ files:
 - lib/r2-oas/routing/parser.rb
 - lib/r2-oas/schema/analyzer.rb
 - lib/r2-oas/schema/base.rb
+- lib/r2-oas/schema/builder.rb
 - lib/r2-oas/schema/cleaner.rb
 - lib/r2-oas/schema/editor.rb
 - lib/r2-oas/schema/generator.rb
 - lib/r2-oas/schema/manager/file/path_item_file_manager.rb
+- lib/r2-oas/schema/manager/file_manager.rb
 - lib/r2-oas/schema/monitor.rb
 - lib/r2-oas/schema/squeezer.rb
 - lib/r2-oas/schema/ui.rb
@@ -293,6 +314,9 @@ files:
 - lib/r2-oas/schema/v3/analyzer/path_analyzer.rb
 - lib/r2-oas/schema/v3/analyzer/tag_analyzer.rb
 - lib/r2-oas/schema/v3/base.rb
+- lib/r2-oas/schema/v3/builder.rb
+- lib/r2-oas/schema/v3/builder/base_builder.rb
+- lib/r2-oas/schema/v3/builder/doc_builder.rb
 - lib/r2-oas/schema/v3/cleaner.rb
 - lib/r2-oas/schema/v3/cleaner/base_cleaner.rb
 - lib/r2-oas/schema/v3/cleaner/components_cleaner.rb
@@ -333,6 +357,7 @@ files:
 - lib/r2-oas/schema/v3/squeezer/tag_squeezer.rb
 - lib/r2-oas/shared/all.rb
 - lib/r2-oas/shared/sortable.rb
+- lib/r2-oas/store.rb
 - lib/r2-oas/task.rb
 - lib/r2-oas/task_logging.rb
 - lib/r2-oas/tasks/common.rake
@@ -342,10 +367,14 @@ files:
 - lib/r2-oas/tool/paths/stats.rb
 - lib/r2-oas/version.rb
 - r2-oas.gemspec
-homepage: https://yukihirop.github.io/r2-oas
+homepage: https://github.com/yukihirop/r2-oas
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/yukihirop/r2-oas/issues
+  changelog_uri: https://github.com/yukihirop/r2-oas/blob/v0.3.2/CHANGELOG.md
+  documentation_uri: https://yukihirop.github.io/r2-oas
+  source_code_uri: https://github.com/yukihirop/r2-oas/tree/v0.3.2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -361,8 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Provide rake tasks to management API Docment (OpenAPI)