bump-cli 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00a05336bed7f3a4f81e5b59a102950d067acb25cfe6d4bbdb057c0bf83f2265
-  data.tar.gz: 2f08c89b6ec3fbad5a85e1325309cf85da94cd7ded892ae06615c440c4623df5
+  metadata.gz: 165f19120b51a189b1f7428e00901fed5ea5b91bfb5f21bc2f9fe983adc3cc31
+  data.tar.gz: 724ec534aff1c7d264b185ca8c9d6bf46db552d8149d39fe2a2cf3c2185a341d
 SHA512:
-  metadata.gz: c4686dc55a271061d849af7a4aa778c7e6f4a93a3c7bfd38667f0f72dab7dc137e050aa73fe3ba1062c838193accc0613bbc5452ab55e949bf85a99aa8258b60
-  data.tar.gz: 34c42d4756f1dc1199af1a16d706298f07f8dc01723988322f58131d4312b8ffd624b25464152e294a999f870f9bea7499aa19f494b72f957fde9c098f41f857
+  metadata.gz: 5a5df45b5a14cb7e79063504ce1a5dc5e5342088840de2dcf6eca79928712b46115ed590765e4a516c497e461eb12cdeaa65ce052f217decfb5eb5e9075bfc7a
+  data.tar.gz: 3c3ab329ab7c5bd4d0bada3147cd4fdb8c61131fcc32efb3e980811e48bdecef868d1d99823e099b7b612b4b18755c1b7706cc71adb129e717dc2ddfa265e43c

data/.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build-latest: &common-build
     working_directory: ~/bump-cli
     docker:
-      - image: circleci/ruby:2.5.0-node
+      - image: circleci/ruby:latest
     steps:
       - checkout
       - run:
@@ -29,20 +29,30 @@ jobs:
 
       - run:
           name: Run tests
-          command: rake
+          command: bundle exec rspec
+  build-2-6:
+    <<: *common-build
+    docker:
+      - image: circleci/ruby:2.6
+  build-2-5:
+    <<: *common-build
+    docker:
+      - image: circleci/ruby:2.5
   build-2-4:
     <<: *common-build
     docker:
-      - image: circleci/ruby:2.4.3-node
+      - image: circleci/ruby:2.4
   build-2-3:
     <<: *common-build
     docker:
-      - image: circleci/ruby:2.3.6-node
+      - image: circleci/ruby:2.3
 
 workflows:
   version: 2
   build:
     jobs:
       - build-latest
+      - build-2-6
+      - build-2-5
       - build-2-4
       - build-2-3

data/.gitignore

@@ -1,4 +1,5 @@
 .byebug_history
+.ruby-version
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/README.md

@@ -29,25 +29,31 @@ Bump tries to identify your file specification and format automatically. You can
 * `asyncapi/v2/json`
 * `asyncapi/v2/yaml`
 
-The doc `id` and `token` options used below can be found in your documentation settings page on https://bump.sh. Note that you can replace these options by environments variables: `--id` can be replaced by `BUMP_ID`, and `--token` can by replaced by `BUMP_TOKEN`. This is useful to keep your private token secret.
+`doc` and `token` options used below can be found in your documentation settings page on https://bump.sh. Note that you can replace the token option by an environment variable, to keep it secret: `--token` can by replaced by `BUMP_TOKEN`.
 
 ### Preview
 
 You can preview your documentation by calling the `preview` command. A temporary preview will be created, with a unique URL. This preview will be available for 30 minutes. You don't need any credentials to use this command.
 
+Preview a documentation:
+
     $ bundle exec bump preview path/to/your/file.yml
 
 ### Validate
 
-Validate your file against its specification.
+Validate your file against its specification:
 
-    $ bundle exec bump validate path/to/your/file.yml --id DOC_ID --token DOC_TOKEN
+    $ bundle exec bump validate path/to/your/file.yml --doc DOC_ID_OR_SLUG --token DOC_TOKEN
 
 ### Deploy
 
-Deploy the file as the current version of the documentation.
+Deploy the file as the current version of the documentation:
+
+    $ bundle exec bump deploy path/to/your/file.yml --doc DOC_ID_OR_SLUG --token DOC_TOKEN
+
+Automatically create a documentation inside a hub and deploy it:
 
-    $ bundle exec bump deploy path/to/your/file.yml --id DOC_ID --token DOC_TOKEN
+    $ bundle exec bump deploy path/to/your/file.yml --auto-create --doc DOC_SLUG --hub HUB_ID_OR_SLUG --token HUB_TOKEN
 
 ## Development
 

data/bump-cli.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency "hanami-cli", '~> 0'
+  spec.add_dependency "dry-cli", '~> 0'
   spec.add_dependency "http", '>= 3'
 
-  spec.add_development_dependency "bundler", "~> 1"
+  spec.add_development_dependency "bundler", ">= 1", "< 3"
   spec.add_development_dependency "byebug", "~> 11"
   spec.add_development_dependency "climate_control", '~> 0'
   spec.add_development_dependency "rake", "~> 13"

data/lib/bump/cli.rb

@@ -1,5 +1,5 @@
 require "bump/cli/version"
-require "hanami/cli"
+require "dry/cli"
 require "http"
 
 module Bump
@@ -9,11 +9,11 @@ module Bump
     API_URL = ROOT_URL + API_PATH
 
     def call(*args)
-      Hanami::CLI.new(Commands).call(*args)
+      Dry::CLI.new(Commands).call(*args)
     end
 
     module Commands
-      extend Hanami::CLI::Registry
+      extend Dry::CLI::Registry
     end
   end
 end

data/lib/bump/cli/commands/base.rb

@@ -1,9 +1,10 @@
-require 'open-uri'
+require 'bump/cli/definition'
+require 'bump/cli/uuid'
 
 module Bump
   class CLI
     module Commands
-      class Base < Hanami::CLI::Command
+      class Base < Dry::CLI::Command
         USER_AGENT = "bump-cli/#{VERSION}".freeze
 
         private
@@ -14,11 +15,64 @@ module Bump
             .post(url, body: body)
         end
 
-        def body(file, specification)
-          {
-            definition: open(file).read,
-            specification: specification
-          }
+        def body(file, **options)
+          deprecation_warning(options)
+
+          compact(
+            {
+              definition: prepare_file(file, options),
+              specification: options[:specification],
+              validation: options[:validation],
+              auto_create_documentation: options[:'auto-create']
+            }.merge(documentation_or_hub(options))
+          )
+        end
+
+        def prepare_file(file, options)
+          Definition.new(file, import_external_references: options[:'import-external-references']).prepare
+        end
+
+        def deprecation_warning(options)
+          if present?(options[:id])
+            puts "[DEPRECATION WARNING] --id option is deprecated. Please use --doc instead."
+          end
+        end
+
+        def present?(string)
+          !string.nil? && string != ''
+        end
+
+        def compact(hash)
+          hash.delete_if { |key, value| value.nil? }
+        end
+
+        def documentation_or_hub(options)
+          result = {}
+
+          result[:documentation_id] = options[:id]
+          result[:documentation_id] = options[:doc] if documentation_uuid?(options)
+          result[:documentation_slug] = options[:doc] if documentation_slug?(options)
+          result[:documentation_name] = options[:'doc-name']
+          result[:hub_id] = options[:hub] if hub_uuid?(options)
+          result[:hub_slug] = options[:hub] if hub_slug?(options)
+
+          compact(result)
+        end
+
+        def documentation_uuid?(options)
+          Bump::CLI::UUID.valid?(options[:doc])
+        end
+
+        def documentation_slug?(options)
+          !options[:doc].nil? && !documentation_uuid?(options)
+        end
+
+        def hub_uuid?(options)
+          Bump::CLI::UUID.valid?(options[:hub])
+        end
+
+        def hub_slug?(options)
+          !options[:hub].nil? && !hub_uuid?(options)
         end
 
         def with_errors_rescued

data/lib/bump/cli/commands/deploy.rb

@@ -6,22 +6,28 @@ module Bump
       class Deploy < Base
         desc "Create a new version"
         argument :file, required: true, desc: "Path or URL to your API documentation file. OpenAPI (2.0 to 3.0.2) and AsyncAPI (2.0) specifications are currently supported."
-        option :id, default: ENV.fetch("BUMP_ID", ""), desc: "Documentation public id"
-        option :token, default: ENV.fetch("BUMP_TOKEN", ""), desc: "Documentation private token"
+        option :id, default: ENV.fetch("BUMP_ID", ""), desc: "[DEPRECATED] Documentation id. Use `documentation` option instead"
+        option :doc, default: ENV.fetch("BUMP_ID", ""), desc: "Documentation id or slug"
+        option :'doc-name', desc: "Documentation name. Used with --auto-create flag."
+        option :hub, default: ENV.fetch("BUMP_HUB_ID", ""), desc: "Hub id or slug"
+        option :token, default: ENV.fetch("BUMP_TOKEN", ""), desc: "Documentation or Hub token"
         option :specification, desc: "Specification of the definition"
+        option :validation, desc: "Validation mode", values: %w(basic strict), default: 'basic'
+        option :'auto-create', type: :boolean, default: false, desc: 'Automatically create the documentation if needed (only available with a hub and when specifying a slug for documentation)'
+        option :'import-external-references', type: :boolean, default: false, desc: 'Import external $refs (URI or file system) into the specification before sending it to Bump servers'
 
-        def call(file:, id:, token:, specification: nil)
+        def call(file:, **options)
           with_errors_rescued do
             response = post(
-              url: API_URL + "/docs/#{id}/versions",
-              body: body(file, specification).to_json,
-              token: token
+              url: API_URL + "/versions",
+              body: body(file, **options).to_json,
+              token: options[:token]
             )
 
             if response.code == 201
-              puts "New version has been successfully deployed."
+              puts "The new version is currently being processed."
             elsif response.code == 204
-              puts "Version was already deployed."
+              puts "This version has already been deployed."
             else
               display_error(response)
             end

data/lib/bump/cli/commands/preview.rb

@@ -5,12 +5,14 @@ module Bump
         desc "Create a documentation preview for the given file"
         argument :file, required: true, desc: "Path or URL to your API documentation file. OpenAPI (2.0 to 3.0.2) and AsyncAPI (2.0) specifications are currently supported."
         option :specification, desc: "Specification of the definition"
+        option :validation, desc: "Validation mode", values: %w(basic strict), default: 'basic'
+        option :'import-external-references', type: :boolean, default: false, desc: 'Import external $refs (URI or file system) into the specification before sending it to Bump servers'
 
-        def call(file:, specification: nil)
+        def call(file:, **options)
           with_errors_rescued do
             response = post(
               url: API_URL + "/previews",
-              body: body(file, specification).to_json
+              body: body(file, **options).to_json
             )
 
             if response.code == 201

data/lib/bump/cli/commands/validate.rb

@@ -6,16 +6,22 @@ module Bump
       class Validate < Base
         desc "Validate a given file against its schema definition"
         argument :file, required: true, desc: "Path or URL to your API documentation file. OpenAPI (2.0 to 3.0.2) and AsyncAPI (2.0) specifications are currently supported."
-        option :id, default: ENV.fetch("BUMP_ID", ""), desc: "Documentation public id"
-        option :token, default: ENV.fetch("BUMP_TOKEN", ""), desc: "Documentation private token"
+        option :id, default: ENV.fetch("BUMP_ID", ""), desc: "[DEPRECATED] Documentation id. Use `documentation` option instead"
+        option :doc, default: ENV.fetch("BUMP_ID", ""), desc: "Documentation public id or slug"
+        option :'doc-name', desc: "Documentation name. Used with --auto-create flag."
+        option :hub, desc: "Hub id or slug"
+        option :token, default: ENV.fetch("BUMP_TOKEN", ""), desc: "Documentation or Hub token"
         option :specification, desc: "Specification of the definition"
+        option :validation, desc: "Validation mode", values: %w(basic strict), default: 'basic'
+        option :'auto-create', type: :boolean, default: false, desc: 'Automatically create the documentation if needed (only available with a hub and when specifying a slug for documentation)'
+        option :'import-external-references', type: :boolean, default: false, desc: 'Import external $refs (URI or file system) into the specification before sending it to Bump servers'
 
-        def call(file:, id:, token:, specification: nil)
+        def call(file:, **options)
           with_errors_rescued do
             response = post(
-              url: API_URL + "/docs/#{id}/validations",
-              body: body(file, specification).to_json,
-              token: token
+              url: API_URL + "/validations",
+              body: body(file, **options).to_json,
+              token: options[:token]
             )
 
             if response.code == 200

data/lib/bump/cli/definition.rb

@@ -0,0 +1,43 @@
+require 'open-uri'
+require 'bump/cli/parser'
+require 'bump/cli/references'
+
+module Bump
+  class CLI
+    class Definition
+      def initialize(path, import_external_references: false)
+        @path = path
+        @import_external_references = import_external_references
+      end
+
+      def prepare
+        if !import_external_references
+          read_file
+        else
+          parse_file_and_import_external_references
+        end
+      end
+
+      private
+
+      attr_reader :path, :import_external_references
+
+      def read_file
+        open(path).read
+      end
+
+      def parse_file_and_import_external_references
+        original_format, definition = parser.load(read_file)
+
+        references = References.new(definition, base_path: path)
+        references.import!
+
+        parser.dump(references.definition, original_format)
+      end
+
+      def parser
+        @parser ||= Parser.new
+      end
+    end
+  end
+end

data/lib/bump/cli/parser.rb

@@ -0,0 +1,26 @@
+require 'json'
+require 'yaml'
+
+module Bump
+  class CLI
+    class Parser
+      def load(content)
+        [:json, ::JSON.parse(content)]
+      rescue ::JSON::ParserError => e
+        begin
+          [:yaml, ::YAML.safe_load(content, [Date, Time])]
+        rescue ::Psych::SyntaxError
+          [:text, content]
+        end
+      end
+
+      def dump(definition, format)
+        if format == :yaml
+          ::YAML.dump(definition)
+        else
+          ::JSON.dump(definition)
+        end
+      end
+    end
+  end
+end

data/lib/bump/cli/references.rb

@@ -0,0 +1,92 @@
+require 'open-uri'
+require 'pathname'
+
+module Bump
+  class CLI
+    class References
+      attr_reader :definition
+
+      def initialize(definition, base_path: '')
+        @definition = definition
+        @base_path = cleanup(base_path)
+        @processed = false
+        @external_references = {}
+      end
+
+      def import!
+        if !processed
+          @definition = traverse_and_replace_external_references(definition)
+          import_references
+          @processed = true
+        end
+      end
+
+      private
+
+      attr_reader :base_path, :processed, :external_references
+
+      def traverse_and_replace_external_references(current)
+        current.each do |key, value|
+          if key == '$ref'
+            current[key] = replace_external_reference(value)
+          elsif value.is_a?(Hash)
+            traverse_and_replace_external_references(value)
+          elsif value.is_a?(Array)
+            value.each do |array_value|
+              traverse_and_replace_external_references(array_value)
+            end
+          end
+        end
+      end
+
+      def replace_external_reference(reference)
+        if external?(reference)
+          if external_references[reference].nil?
+            @external_references[reference] = "#{external_references.count + 1}"
+          end
+
+          subpath = reference[/#(.*)$/, 1]
+          "#/components/x-imported/#{external_references[reference]}#{ '/' + subpath if !subpath.nil? }"
+        else
+          reference
+        end
+      end
+
+      def import_references
+        if external_references.count > 0
+          @definition['components'] = {} if @definition['components'].nil?
+          @definition['components']['x-imported'] = {} if @definition['components']['x-imported'].nil?
+
+          external_references.each do |key, value|
+            _, @definition['components']['x-imported'][value.to_s] = Parser.new.load(open(prepare_path(key)).read)
+          end
+        end
+      end
+
+      def prepare_path(key)
+        key = key.sub(/#.*/, '')
+        if url?(key) || absolute_path?(key)
+          key
+        else
+          base_path + key
+        end
+      end
+
+      def external?(reference)
+        !reference.start_with?('#')
+      end
+
+      def url?(path)
+        path.start_with?('http')
+      end
+
+      def absolute_path?(path)
+        path.start_with?('/')
+      end
+
+      def cleanup(path)
+        Pathname.new(path).dirname.to_s + Pathname::SEPARATOR_LIST
+      end
+    end
+  end
+end

data/lib/bump/cli/uuid.rb

@@ -0,0 +1,11 @@
+module Bump
+  class CLI
+    class UUID
+      REGEXP = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
+
+      def self.valid?(string)
+        string.to_s =~ REGEXP
+      end
+    end
+  end
+end

data/lib/bump/cli/version.rb

@@ -1,5 +1,5 @@
 module Bump
   class CLI
-    VERSION = "0.4.0"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: bump-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Mehdi Lahmam
 - Sébastien Charrier
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hanami-cli
+  name: dry-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -43,16 +43,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +155,10 @@ files:
 - lib/bump/cli/commands/deploy.rb
 - lib/bump/cli/commands/preview.rb
 - lib/bump/cli/commands/validate.rb
+- lib/bump/cli/definition.rb
+- lib/bump/cli/parser.rb
+- lib/bump/cli/references.rb
+- lib/bump/cli/uuid.rb
 - lib/bump/cli/version.rb
 homepage: https://bump.sh
 licenses:
@@ -156,7 +166,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   source_code_uri: https://github.com/bump-sh/bump-cli
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,9 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Bump.sh CLI
 test_files: []