apiaryio 0.11.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1417d99a9e588c993ef580607fcc2025e0d61c70
-  data.tar.gz: 1985f7eef3dab74baaeadf733a12d2292c0727c4
+SHA256:
+  metadata.gz: 9d82d5213c6cf1b9ec2f14c30c6668d0477de794338df8387087805bbe1fa966
+  data.tar.gz: f3302452ee5dea3f53b70cfba39d94aab3eb99ae2c554c7e822ec7f6351e6e8c
 SHA512:
-  metadata.gz: 11fa8c0d486ee15f901a63940578954090bd68bf2fe7357acc26f68d43b767929f62bfe9d605abfde97e608dc1a380912eae6b7081ef2d9c02e5aff28bc89897
-  data.tar.gz: 6337d8bf20fc985c68d5c73725d15a88053463135c5db62d38176090026eb04b810b84574730de8cdf244aa364f48693ac37fa8ee39c9b6a9b7cd59a109c338f
+  metadata.gz: ad32626008932bf5e4b756d226e2cb393960de6972a41b320fa587374d54859091886732a0dfddb5d1b55a82c50b5c139d8f54b53a124c17fc298aaf888afc19
+  data.tar.gz: 995a9747c582fba4207bbd18b48319d9fc12a25973fc55b39daadbc04be364b1f893b40e496013ed4d4ab4328e870dc5924b7cb9f4b85a1d643956207c9f0c37

data/.circleci/config.yml

@@ -0,0 +1,52 @@
+version: 2
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test-2.4
+      - test-2.5
+      - test-2.6
+      - test-2.7
+      - test-3.0
+jobs:
+  test-2.4: &test-template
+    docker:
+      - image: circleci/ruby:2.4-browsers
+    steps:
+      - checkout
+      - run:
+          name: Install bundler
+          command: |
+            gem install bundler
+      - run:
+          name: Install deps
+          command: |
+            bundle install
+      - run:
+          name: Run rubocop
+          command: |
+            bundle exec rubocop --config .rubocop_todo.yml
+      - run:
+          name: Run rspec
+          command: |
+            bundle exec rspec spec
+      - run:
+          name: Run cucumber
+          command: |
+            bundle exec cucumber
+  test-2.5:
+    <<: *test-template
+    docker:
+      - image: circleci/ruby:2.5-browsers
+  test-2.6:
+    <<: *test-template
+    docker:
+      - image: circleci/ruby:2.6-browsers
+  test-2.7:
+    <<: *test-template
+    docker:
+      - image: circleci/ruby:2.7-browsers
+  test-3.0:
+    <<: *test-template
+    docker:
+      - image: circleci/ruby:3.0-browsers

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+name: release
+on:
+  push:
+    tags: [v*]
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Login to docker
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Get the version
+        id: version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
+      - name: Docker Build and Release
+        run: |
+          docker build . -t apiaryio/client
+          docker tag apiaryio/client apiaryio/client:${{ steps.version.outputs.VERSION }}
+          docker push apiaryio/client
+          docker push apiaryio/client:${{ steps.version.outputs.VERSION }}

data/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: test
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+    types: [opened, reopened, synchronize]
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ["windows-latest", "ubuntu-latest"]
+        ruby: ["3.0.x", "2.7.x", "2.6.x", "2.5.x"]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Set up Bundler
+        run: gem install bundler --no-document
+      - name: Install dependencies
+        run: bundle install
+      - name: Run test
+        run: bundle exec rspec spec
+      - name: Run cucumber tests
+        if: matrix.os != 'windows-latest'
+        run: bundle exec cucumber

data/.gitignore

@@ -9,6 +9,7 @@
 /test/version_tmp/
 /tmp/
 /vendor
+pmip.rb
 
 ## Specific to RubyMotion:
 .dat*
@@ -36,3 +37,11 @@ Gemfile.lock
 
 # testing
 spec/fixtures/test.html
+rules.json
+functions.js
+
+# idea ide
+/.idea
+
+# netbeans IDE
+/nbproject

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+## 0.15.0
+* fix: change domain from docs.<subdomain>.apiary.io to <subdomain>.docs.apiary.io
+* fix(security): [CVE-2020-10663](https://www.ruby-lang.org/en/news/2020/03/19/json-dos-cve-2020-10663/) and [CVE-2020-8184](https://nvd.nist.gov/vuln/detail/CVE-2020-8184)
+## 0.14.1
+* fix: [update rack to 2.1.4](https://github.com/advisories/GHSA-j6w9-fv6q-3q52)
+
+## 0.14.0
+
+### Breaking
+* Remove support for ruby 2.3

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM coopermaa/alpine-ruby:2.2
+FROM ruby:2.4-alpine
 RUN apk add --update build-base && rm /var/cache/apk/*
 RUN gem install apiaryio
 ENTRYPOINT ["apiary"]

data/README.md

@@ -8,12 +8,12 @@ Apiary CLI Client
 ## Description
 
 The Apiary CLI Client gem is a command line tool for developing and previewing
-[API Blueprint](http://apiblueprint.org) documents locally. It can also be
+[API Blueprint](https://apiblueprint.org) documents locally. It can also be
 used for pushing updated documents to and fetching existing documents from
-[Apiary](http://apiary.io).
+[Apiary](https://apiary.io).
 
 
-Please see the `apiary help` command and the [full documentation](http://client.apiary.io) for an in-depth look in how to use this tool.
+Please see the `apiary help` command and the [full documentation](https://client.apiary.io) for an in-depth look in how to use this tool.
 
 For instructions on making your  own changes, see [Hacking Apiary CLI Client](#hacking-apiary-cli-client), below.
 
@@ -45,7 +45,7 @@ docker build -t "apiaryio/client" .
 *Required only for publish and fetch commands.*
 
 
-1. Make sure you are a registered user of [Apiary](http://apiary.io).
+1. Make sure you are a registered user of [Apiary](https://apiary.io).
 2. Retrieve API key (token) on [this page](https://login.apiary.io/tokens).
 3. Export it as an environment variable:
 
@@ -57,10 +57,10 @@ export APIARY_API_KEY=<your_token>
 ```
 $ apiary help
 Commands:
-  apiary fetch --api-name=API_NAME    # Fetch API Description Document from API_NAME.apiary.io
+  apiary fetch --api-name=API_NAME    # Fetch API Description Document from API_NAME.docs.apiary.io
   apiary help [COMMAND]               # Describe available commands or one specific command
   apiary preview                      # Show API documentation in browser or write it to file
-  apiary publish --api-name=API_NAME  # Publish API Description Document on docs.API_NAME.apiary.io (API Description must exist on apiary.io)
+  apiary publish --api-name=API_NAME  # Publish API Description Document on API_NAME.docs.apiary.io (API Description must exist on apiary.io)
   apiary styleguide                   # Check API Description Document against styleguide rules (Apiary.io pro plan is required - https://apiary.io/plans )
   apiary version                      # Show version
 
@@ -79,7 +79,7 @@ Options:
   --api-name=API_NAME  
   [--output=FILE]      # Write API Description Document into specified file
 
-Fetch API Description Document from API_NAME.apiary.io
+Fetch API Description Document from API_NAME.docs.apiary.io
 ```
 
 #### preview
@@ -117,7 +117,7 @@ Options:
                               # Default: true
   --api-name=API_NAME         
 
-Publish API Description Document on docs.API_NAME.apiary.io (API Description must exist on apiary.io)
+Publish API Description Document on API_NAME.docs.apiary.io (API Description must exist on apiary.io)
 ```
 
 #### styleguide
@@ -192,9 +192,14 @@ Use `bundle install` to install your changes locally, for manual and ad-hock tes
 
 Only gem owners `gem owner apiaryio` can publish new gem into [RubyGems](https://rubygems.org/gems/apiaryio).
 
-```sh
-$ rake release
-```
+1. bump version in `lib/apiary/version.rb`
+2. update `CHANGELOG.md`
+3. prepare Github Release with text in `CHANGELOG`
+4. make gem release:
+
+    ```sh
+    $ rake release
+    ```
 
 
 ## License

data/apiary.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'apiary/version'
 
 Gem::Specification.new do |gem|
-  gem.required_ruby_version = '>= 2.2.0'
+  gem.required_ruby_version = '>= 2.3.0'
 
   gem.name          = 'apiaryio'
   gem.version       = Apiary::VERSION
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.description   = 'Apiary.io CLI'
   gem.summary       = 'Apiary.io CLI'
-  gem.homepage      = 'http://apiary.io'
+  gem.homepage      = 'https://apiary.io'
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
@@ -24,14 +24,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency 'rest-client', '~> 2.0'
-  gem.add_runtime_dependency 'rack', '~> 2.0.0'
-  gem.add_runtime_dependency 'thor', '~> 0.19.1'
-  gem.add_runtime_dependency 'json', '~> 1.8'
+  gem.add_runtime_dependency 'rack', '>= 2.2.3'
+  gem.add_runtime_dependency 'thor', '~> 0.20.3'
+  gem.add_runtime_dependency 'json', '>= 2.3.0'
   gem.add_runtime_dependency 'launchy', '~> 2.4'
-  gem.add_runtime_dependency 'listen', '~> 2.0'
+  gem.add_runtime_dependency 'listen', '~> 3.0'
 
-  gem.add_development_dependency 'bundler', '~> 1.12'
-  gem.add_development_dependency 'rake', '~> 10.0'
+  gem.add_development_dependency 'bundler', '~> 2.0'
+  gem.add_development_dependency 'rake', '>= 12.3.3'
   gem.add_development_dependency 'rspec', '~> 3.4'
   gem.add_development_dependency 'webmock', '>= 2.2.0'
   gem.add_development_dependency 'aruba', '~> 0.14'

data/features/publish.feature

@@ -1,8 +1,8 @@
-Feature: Publish apiary.apib on docs.API_NAME.apiary.io
+Feature: Publish apiary.apib on API_NAME.docs.apiary.io
 
   # This is integration testing you have to set APIARY_API_KEY
   @needs_apiary_api_key
-  Scenario: Publish apiary.apib on docs.API_NAME.apiary.io
+  Scenario: Publish apiary.apib on API_NAME.docs.apiary.io
 
     # expected to fail
     When I run `apiary publish --path=apiary.apib --api-name 1111apiaryclienttest`

data/features/styleguide.feature

@@ -1,4 +1,4 @@
-Feature: Styleguide apiary.apib on docs.API_NAME.apiary.io
+Feature: Styleguide apiary.apib on API_NAME.docs.apiary.io
 
   # This is integration testing you have to set APIARY_API_KEY
   @needs_apiary_api_key

data/lib/apiary/cli.rb

@@ -8,7 +8,7 @@ require 'apiary/command/styleguide'
 
 module Apiary
   class CLI < Thor
-    desc 'fetch', 'Fetch API Description Document from API_NAME.apiary.io'
+    desc 'fetch', 'Fetch API Description Document from API_NAME.docs.apiary.io'
     method_option :api_name, type: :string, required: true
     method_option :api_host, type: :string, banner: 'HOST', desc: 'Specify apiary host', hide: true
     method_option :output, type: :string, banner: 'FILE', desc: 'Write API Description Document into specified file'
@@ -34,7 +34,7 @@ module Apiary
       cmd.execute
     end
 
-    desc 'publish', 'Publish API Description Document on docs.API_NAME.apiary.io (API Description must exist on apiary.io)'
+    desc 'publish', 'Publish API Description Document on API_NAME.docs.apiary.io (API Description must exist on apiary.io)'
     method_option :message, type: :string, banner: 'COMMIT_MESSAGE', desc: 'Publish with custom commit message'
     method_option :path, type: :string, desc: 'Specify path to API Description Document. When given a directory, it will look for `apiary.apib` and `swagger.yaml` file'
     method_option :json, type: :boolean, desc: 'Specify that Swagger API Description Document is in json format. Document will be converted to yaml before processing'

data/lib/apiary/command/fetch.rb

@@ -32,7 +32,7 @@ module Apiary::Command
 
     def fetch_from_apiary
       unless @options.api_name
-        abort 'Please provide an api-name option (subdomain part from your http://docs.<api-name>.apiary.io/)'
+        abort 'Please provide an api-name option (subdomain part from your https://<api-name>.docs.apiary.io/)'
       end
 
       unless @options.api_key

data/lib/apiary/command/publish.rb

@@ -42,7 +42,7 @@ module Apiary::Command
 
     def publish_on_apiary
       unless @options.api_name
-        abort 'Please provide an api-name option (subdomain part from your http://docs.<api-name>.apiary.io/)'
+        abort 'Please provide an api-name option (subdomain part from your https://<api-name>.docs.apiary.io/)'
       end
 
       unless @options.api_key
@@ -58,11 +58,8 @@ module Apiary::Command
 
       return if source.nil?
 
-      begin
-        JSON.parse(source)
-        abort('Did you forget the --json flag?') unless @options.json
-      rescue; end
       source = convert_from_json(source) if @options.json
+
       data = {
         code: source,
         messageToSave: @options.message,

data/lib/apiary/command/styleguide.rb

@@ -22,7 +22,7 @@ module Apiary::Command
       @options.api_key      ||= ENV['APIARY_API_KEY']
       @options.proxy        ||= ENV['http_proxy']
       @options.api_host     ||= 'api.apiary.io'
-      @options.vk_url       ||= 'https://voight-kampff-aws.apiary-services.com/production/validate'
+      @options.vk_url       ||= 'https://voight-kampff.apiary-services.com'
       @options.headers      ||= {
         content_type: :json,
         accept: :json,

data/lib/apiary/version.rb

@@ -1,3 +1,3 @@
 module Apiary
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.15.0'.freeze
 end

data/spec/apiary/command/fetch_spec.rb

@@ -4,7 +4,7 @@ describe Apiary::Command::Fetch do
   it 'pass command without params' do
     opts = {}
     command = Apiary::Command::Fetch.new(opts)
-    expect { command.fetch_from_apiary }.to raise_error('Please provide an api-name option (subdomain part from your http://docs.<api-name>.apiary.io/)')
+    expect { command.fetch_from_apiary }.to raise_error('Please provide an api-name option (subdomain part from your https://<api-name>.docs.apiary.io/)')
   end
 
   it 'pass command only with api_name', api_key: true do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiaryio
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Apiary Ltd.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,44 +28,44 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -200,19 +200,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop_todo.yml"
-- ".travis.yml"
+- CHANGELOG.md
 - Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - apiary.gemspec
-- appveyor.yml
 - bin/apiary
-- circle.yml
 - features/fetch.feature
 - features/preview.feature
 - features/publish.feature
@@ -255,11 +256,11 @@ files:
 - spec/spec_helper.rb
 - spec/support/aruba.rb
 - spec/support/webmock.rb
-homepage: http://apiary.io
+homepage: https://apiary.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -267,16 +268,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Apiary.io CLI
 test_files:

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - "ruby-2.2.2"
-  - "ruby-2.3.1"
-  - "ruby-2.4.0"
-  - "ruby-2.5.0"
-  - "jruby-9.0.0.0"
-
-matrix:
-  allow_failures:
-    - rvm: rbx-2
-cache: bundler
-before_install:
-  - gem update --system
-  - gem update bundler
-script:
-  - bundle exec rspec spec
-  - bundle exec cucumber

data/appveyor.yml

@@ -1,32 +0,0 @@
----
-version: "{branch}-{build}"
-
-clone_depth: 10
-
-build: off
-
-install:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - gem install bundler -f
-  - bundle config --local path vendor/bundle
-  - bundle install
-
-before_test:
-  - ruby --version
-  - gem --version
-  - bundler --version
-
-test_script:
-  - bundle exec rspec spec
-
-artifacts:
-  - path: pkg\*.gem
-
-cache:
-  - vendor/bundle
-
-environment:
-  matrix:
-    - ruby_version: 22
-    - ruby_version: 23
-    - ruby_version: 24

data/circle.yml

@@ -1,16 +0,0 @@
-machine:
-  environment:
-    RUBY_VERSIONS: 2.2.2,2.3.1,2.4.0,2.5.0
-
-dependencies:
-  override:
-    - rvm get head
-    - rvm install $RUBY_VERSIONS
-    - rvm $RUBY_VERSIONS --verbose do gem install bundler
-    - rvm $RUBY_VERSIONS --verbose do bundle install
-
-test:
-  override:
-    - rvm $RUBY_VERSIONS --verbose do bundle exec rubocop --config .rubocop_todo.yml
-    - rvm $RUBY_VERSIONS --verbose do bundle exec rspec spec
-    - rvm $RUBY_VERSIONS --verbose do bundle exec cucumber