apiaryio 0.11.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5756528c3736e0906c6b0548508705fb4b43c601
-  data.tar.gz: 9910234e8ac83f76eca23712bccc01be7c9e28c1
+SHA256:
+  metadata.gz: ecb88a84bcbd64fc778b76064828f9ee365b0e7037a5d354807821999aba8301
+  data.tar.gz: a4dd2fa6c417a193a6966f6fe9c25cb3c8af44312243b537947b0d97b7a3a619
 SHA512:
-  metadata.gz: edfda0ff24e9ee17001f1ebf3365908e95b76e5308d6af714db4b80de06e97f2dd8b29377a4bdb147882be82f4e46106b5c76143d489ff071cd32ff98d8deee6
-  data.tar.gz: 8460c8eea49d4ef58681e7c1c5d4d52a3265b8353c43eeca82200f6afca7e4000d7fbb636e57c4fa103edf31d54d6e6a282c5e050b82780119c53f889cab1b11
+  metadata.gz: 4f4fc4b653ca1ab334fd6713ecb1cb4c5cd5da2afef220d1d753419efe2782012146ec4ceac3df8251fefc10af88a323e9e6fe9c9ecb7dd1c86e57a95840898b
+  data.tar.gz: 94d0ea2e1d38dfeb4b0b46e348a2912149b8071613f94f0273e95a183d5f1ca65b521fee013556e23e111f0d5ca18fd28aed460e6a0e6ff5904524b247316676

data/.circleci/config.yml

@@ -0,0 +1,47 @@
+version: 2
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test-2.4
+      - test-2.5
+      - test-2.6
+      - test-2.7
+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

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: ["2.7.x", "2.6.x", "2.5.x", "2.4.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,9 @@ Gemfile.lock
 
 # testing
 spec/fixtures/test.html
+
+# idea ide
+/.idea
+
+# netbeans IDE
+/nbproject

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Chaneglog
+
+## Unreleased
+
+## 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

@@ -77,7 +77,6 @@ Usage:
 
 Options:
   --api-name=API_NAME  
-  [--api-host=HOST]    # Specify apiary host
   [--output=FILE]      # Write API Description Document into specified file
 
 Fetch API Description Document from API_NAME.apiary.io
@@ -95,7 +94,6 @@ Options:
   [--output=FILE]            # Write generated HTML into specified file
   [--path=PATH]              # Specify path to API Description Document. When given a directory, it will look for `apiary.apib` and `swagger.yaml` file
   [--json], [--no-json]      # Specify that Swagger API Description Document is in json format. Document will be converted to yaml before processing
-  [--api-host=HOST]          # Specify apiary host
   [--server], [--no-server]  # Start standalone web server on port 8080
   [--port=PORT]              # Set port for --server option
   [--host=HOST]              # Set host for --server option
@@ -115,7 +113,6 @@ Options:
   [--message=COMMIT_MESSAGE]  # Publish with custom commit message
   [--path=PATH]               # Specify path to API Description Document. When given a directory, it will look for `apiary.apib` and `swagger.yaml` file
   [--json], [--no-json]       # Specify that Swagger API Description Document is in json format. Document will be converted to yaml before processing
-  [--api-host=HOST]           # Specify apiary host
   [--push], [--no-push]       # Push API Description to the GitHub when API Project is associated with GitHub repository in Apiary
                               # Default: true
   --api-name=API_NAME         

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
@@ -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.1.4'
+  gem.add_runtime_dependency 'thor', '~> 0.20.3'
+  gem.add_runtime_dependency 'json', '~> 2.1'
   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/lib/apiary/cli.rb

@@ -10,7 +10,7 @@ module Apiary
   class CLI < Thor
     desc 'fetch', 'Fetch API Description Document from API_NAME.apiary.io'
     method_option :api_name, type: :string, required: true
-    method_option :api_host, type: :string, banner: 'HOST', desc: 'Specify apiary host'
+    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'
 
     def fetch
@@ -23,7 +23,7 @@ module Apiary
     method_option :output, type: :string, banner: 'FILE', desc: 'Write generated HTML into specified file'
     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'
-    method_option :api_host, type: :string, banner: 'HOST', desc: 'Specify apiary host'
+    method_option :api_host, type: :string, banner: 'HOST', desc: 'Specify apiary host', hide: true
     method_option :server, type: :boolean, desc: 'Start standalone web server on port 8080'
     method_option :port, type: :numeric, banner: 'PORT', desc: 'Set port for --server option'
     method_option :host, type: :string, desc: 'Set host for --server option'
@@ -38,7 +38,7 @@ module Apiary
     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'
-    method_option :api_host, type: :string, banner: 'HOST', desc: 'Specify apiary host'
+    method_option :api_host, type: :string, banner: 'HOST', desc: 'Specify apiary host', hide: true
     method_option :push, type: :boolean, default: true, desc: 'Push API Description to the GitHub when API Project is associated with GitHub repository in Apiary'
     method_option :api_name, type: :string, required: true
 

data/lib/apiary/command/publish.rb

@@ -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.0'.freeze
+  VERSION = '0.14.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiaryio
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Apiary Ltd.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2020-11-06 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.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.4
 - !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.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
 - !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
@@ -259,7 +260,7 @@ homepage: http://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