grape-starter 1.2.5 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc328d324baf16a4ca6d533598944cef904a4a23c754cf2dec79a1d38e31f401
-  data.tar.gz: dfb725234b40172de9cc66ac47cac5a5d7ab40e958d70618409fcbe2b5d47a6f
+  metadata.gz: 491977e15c7e7804abb752a2e11669d3c252ff96b75faf29cd1b1bde4c9b6b84
+  data.tar.gz: 501f7c1daf72bec375e4f73d157a4a17aaf915b98645d6780797bf15389b8b6b
 SHA512:
-  metadata.gz: 8a981c268e2591b126090c46d3776f84f1346a6ec25a21d0ff43941b8e4bafb27bd13fc7579de1ce0b48be34b3606bd2f04d641be083480692ec8c2a60e88456
-  data.tar.gz: e19a5b4b46853f692f95c1b067312d2d83470a4c0114f88cadda612b1143f049a4da3f20acb30c3e205ab3c90cef274814814dabe568cba7fa2e10aa78cadc14
+  metadata.gz: '028fd1e821d918f0caf633c1708b71692e20fa28fe6eb44cb232e185580d789fc8227832a59305ae2e9f4bbc68e89e4989872630032306817bc8289b048b5d79'
+  data.tar.gz: a3803b400bd1ad36461d6b374bd179927553e3554677c466f2beaca28172e1db7bd3f82f360b567742c0757cd0db1eaf16063156ae4d0d3ed1a65105950fdcbc

data/.github/dependabot.yml

@@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+      day: "friday"
+    assignees:
+      - "LeFnord"

data/.github/workflows/pipeline.yml

@@ -0,0 +1,38 @@
+name: Pipeline
+on:
+  pull_request:
+    types: [assigned, opened, edited, synchronize, reopened]
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  # pre-spec
+  #
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: Run rubocop
+        run: bundle exec rubocop --parallel --format progress
+
+  rspec:
+    runs-on: ubuntu-latest
+    needs: ['rubocop']
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', head]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run rspec
+      run: bundle exec rspec

data/.gitignore

@@ -9,3 +9,4 @@ tmp/
 pkg/
 template/Gemfile.lock
 grape-starter.md
+tmp

data/.rubocop.yml

@@ -1,15 +1,21 @@
 inherit_from: .rubocop_todo.yml
 
+inherit_mode:
+  merge:
+    - Exclude
+
 AllCops:
   Exclude:
     - '**/bin/**/*'
     - '**/tmp/**/*'
     - '**/script/**/*'
-    # - '**/template/**/*'
     - '**/template/api/**'
     - grape-starter.gemspec
+    - template/spec/spec-helper.rb
   UseCache: true
-  TargetRubyVersion: 2.7
+  NewCops: enable
+  TargetRubyVersion: 3.0
+  SuggestExtensions: false
 
 Layout/IndentationWidth:
   Exclude:
@@ -39,32 +45,3 @@ Style/AsciiComments:
 
 Style/Documentation:
   Enabled: false
-
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/HashEachMethods:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/SlicingWithRange:
-  Enabled: true

data/.travis.yml

@@ -7,13 +7,18 @@ before_install:
 
 rvm:
   - ruby-head
-  - 2.7.0
-  - 2.6.5
-  - 2.5.7
+  - 2.7.2
+  - 2.6.6
+  - 2.5.8
 
 jobs:
   fast_finish: true
+  include:
+    - rvm: truffleruby-head
+      env:
+      script: bundle exec rake spec
 
   allow_failures:
-    - rvm:
-      - ruby-head
+    - rvm: 3.0.0-preview1
+    - rvm: ruby-head
+    - rvm: truffleruby-head

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 ### NEXT
 
+- your contributions
+
+### v1.4.2 / 2021-12-20
+
+- Fixes active-support version to > 6 and < 7. [LeFnord](https://github.com/LeFnord)
+
+### v1.4.1 / 2021-12-17 -> yanked
+
+- Upgrades active-support version. [LeFnord](https://github.com/LeFnord)
+
+### v1.4.0 / 2021-04-08
+
+- Removes `standalone_migration` in favour of AR tasks. [LeFnord](https://github.com/LeFnord)
+- Minor README improvements. [LeFnord](https://github.com/LeFnord)
+- Adds GH actions for rspec and rubocop. [LeFnord](https://github.com/LeFnord)
+
+### v1.3.0 / 2020-09-15
+
+- Fixes migration name. [LeFnord](https://github.com/LeFnord)
+- Fixes rubocop new cops handling. [LeFnord](https://github.com/LeFnord)
+
+### v1.2.4–v1.2.6 / 2020-01-18–2020-08-13
+
+- Prepapre releaase 1.2.6 [LeFnord](https://github.com/LeFnord)
+- Updates used default rails deps versions. [LeFnord](https://github.com/LeFnord)
+- Create dependabot.yml [peter scholz](https://github.com/LeFnord)
+- Prepare release 1.2.5 [LeFnord](https://github.com/LeFnord)
+- Minor improvements. [LeFnord](https://github.com/LeFnord)
+- Lets run GH actions again. [LeFnord](https://github.com/LeFnord)
+- Minor template improvements. [LeFnord](https://github.com/LeFnord)
+- Changes ruby.yml to use 2.7 [LeFnord](https://github.com/LeFnord)
+- Prepare release 1.2.4 [LeFnord](https://github.com/LeFnord)
+- Respects froozen string stuff. [LeFnord](https://github.com/LeFnord)
+- Updates Ruby and deps. (#23) [LeFnord](https://github.com/LeFnord)
+- Create ruby.yml [LeFnord](https://github.com/LeFnord)
+
 - Fixes gems for sequel. [LeFnord](https://github.com/LeFnord)
 - Minor template improvements. [LeFnord](https://github.com/LeFnord)
 

data/Gemfile

@@ -5,12 +5,12 @@ source 'http://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'grape', '~> 1.0'
-  gem 'pry', platforms: [:mri]
-  gem 'pry-byebug', platforms: [:mri]
+  gem 'grape', '~> 1.5'
+  gem 'pry', require: false
+  gem 'pry-byebug', require: false
   gem 'rack-cors', require: false
   gem 'rack-test', require: false
-  gem 'rake', '~> 12.0'
-  gem 'rspec', '~> 3.8'
-  gem 'rspec-command'
+  gem 'rake', '~> 13.0'
+  gem 'rspec', '~> 3.10'
+  gem 'rspec-command', git: 'https://github.com/waltjones/rspec-command'
 end

data/README.md

@@ -1,6 +1,5 @@
-[![Build Status](https://travis-ci.org/LeFnord/grape-starter.svg?branch=master)](https://travis-ci.org/LeFnord/grape-starter)
+[![Pipeline](https://github.com/LeFnord/grape-starter/actions/workflows/pipeline.yml/badge.svg?branch=master)](https://github.com/LeFnord/grape-starter/actions/workflows/pipeline.yml)
 [![Gem Version](https://badge.fury.io/rb/grape-starter.svg)](https://badge.fury.io/rb/grape-starter)
-[![Inline docs](http://inch-ci.org/github/LeFnord/grape-starter.svg?branch=master)](http://inch-ci.org/github/LeFnord/grape-starter)
 
 
 # Grape Starter
@@ -83,7 +82,7 @@ To run it, go into awesome_api folder, start the server
 $ cd awesome_api
 $ ./script/server *port
 ```
-the API is now accessible under: [http://localhost:9292/api/v1/root](http://localhost:9292/api/v1/root)  
+the API is now accessible under: [http://localhost:9292/api/v1/root](http://localhost:9292/api/v1/root)
 the documentation of it under: [http://localhost:9292/doc](http://localhost:9292/doc).
 
 More could be found in [README](template/README.md).

data/grape-starter.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_dependency 'gli', '~> 2.19'
-  spec.add_dependency 'activesupport', '~> 6.0'
-  spec.add_dependency 'rubocop', '~> 0.86'
+  spec.add_dependency 'activesupport', '>= 6', '< 7'
+  spec.add_dependency 'rubocop', '~> 1.12'
   spec.add_dependency 'awesome_print', '~> 1.8'
 end

data/lib/starter/builder/names.rb

@@ -24,9 +24,11 @@ module Starter
       end
     end
 
+    # rubocop:disable Style/StringConcatenation
     def base_file_name
       @resource.tr('/', '-').downcase + '.rb'
     end
+    # rubocop:enable Style/StringConcatenation
 
     def base_spec_name
       base_file_name.gsub(/.rb$/, '_spec.rb')

data/lib/starter/builder/orms.rb

@@ -59,7 +59,7 @@ module Starter
         load_orm
         return if @orm.nil?
 
-        file_name = "#{Time.now.strftime('%Y%m%d%H%m%S')}_Create#{klass_name}.rb"
+        file_name = "#{Time.now.strftime('%Y%m%d%H%m%S')}_create_#{klass_name.downcase}.rb"
         migration_dest = File.join(Dir.pwd, 'db', 'migrate', file_name)
         FileFoo.write_file(migration_dest, migration(klass_name, resource))
       end

data/lib/starter/builder/templates/activerecord.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_record'
+
 module Starter
   module Templates
     module ActiveRecord
@@ -9,6 +11,8 @@ module Starter
 
       def initializer
         <<-FILE.strip_heredoc
+        # frozen_string_literal: true
+
         require 'yaml'
         require 'erb'
         require 'active_record'
@@ -25,7 +29,7 @@ module Starter
                    FileUtils.mkdir(log_dir) unless Dir.exist?(log_dir)
                    Logger.new(File.open(log_file, 'a'))
                  else
-                   Logger.new(STDOUT)
+                   Logger.new($stdout)
                  end
 
         ActiveRecord::Base.logger = logger
@@ -58,27 +62,35 @@ module Starter
 
       def rakefile
         <<-FILE.strip_heredoc
-
         # ActiveRecord migration tasks
-        require 'standalone_migrations'
-        StandaloneMigrations::Tasks.load_tasks
+        require 'active_record'
+        include ActiveRecord::Tasks
+        config_dir = File.expand_path('../config', __FILE__)
+        config_content = File.join(config_dir, 'database.yml')
+        DatabaseTasks.env = ENV['RACK_ENV'] || 'development'
+        DatabaseTasks.database_configuration = YAML.load_file(config_content)
+        DatabaseTasks.db_dir = 'db'
+        DatabaseTasks.migrations_paths = File.join('db', 'migrate')
+
+        ActiveRecord::Base.configurations = DatabaseTasks.database_configuration
+        ActiveRecord::Base.establish_connection DatabaseTasks.env.to_sym
+
+        load 'active_record/railties/databases.rake'
         FILE
       end
 
       def gemfile
         <<-FILE.strip_heredoc
-        # BE stuff
-        gem 'standalone_migrations'
-
         # DB stuff
-        gem 'activerecord', '~> 5.2'
+        gem 'activerecord', '>= 6'
         gem 'pg'
         FILE
       end
 
       def migration(klass_name, resource)
+        version = "#{::ActiveRecord::VERSION::MAJOR}.#{::ActiveRecord::VERSION::MINOR}"
         <<-FILE.strip_heredoc
-        class Create#{klass_name} < ActiveRecord::Migration[5.2]
+        class Create#{klass_name} < ActiveRecord::Migration[#{version}]
           def change
             create_table :#{resource} do |t|
 

data/lib/starter/builder/templates/endpoints.rb

@@ -52,6 +52,7 @@ module Starter
         end"
       end
 
+      # rubocop:disable Style/CombinableLoops
       %w[get put patch delete].each do |verb|
         define_method(:"#{verb}_one") do
           "
@@ -78,6 +79,7 @@ module Starter
           end"
         end
       end
+      # rubocop:enable Style/CombinableLoops
 
       # request specs shared examples
       #

data/lib/starter/rake/grape_tasks.rb

@@ -11,8 +11,7 @@ module Starter
     class GrapeTasks < ::Rake::TaskLib
       include Rack::Test::Methods
 
-      attr_reader :resource
-      attr_reader :api_class
+      attr_reader :resource, :api_class
 
       def initialize(api_class = nil)
         super()

data/lib/starter/rspec/request_specs.rb

@@ -45,7 +45,7 @@ RSpec.shared_examples 'DELETE one' do
   let(:route) { route_from_description }
 
   subject { delete route }
-  specify { expect(subject.status).to eql 204 }
+  specify { expect(subject.status).to eql 200 }
 end
 
 # plural forms
@@ -75,5 +75,5 @@ RSpec.shared_examples 'DELETE specific' do |key: nil|
   let(:specific_route) { "#{route_from_description}/#{key}" }
 
   subject { delete specific_route }
-  specify { expect(subject.status).to eql 204 }
+  specify { expect(subject).to to_have_status 200 }
 end

data/lib/starter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Starter
-  VERSION = '1.2.5'
+  VERSION = '1.4.2'
 end

data/template/.rubocop.yml

@@ -5,7 +5,7 @@ AllCops:
     - Rakefile
     - Gemfile
   UseCache: true
-  TargetRubyVersion: 2.7
+  NewCops: enable
 
 Layout/LineLength:
   Max: 120
@@ -24,32 +24,3 @@ Style/AsciiComments:
 
 Style/Documentation:
   Enabled: false
-
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-Lint/RaiseException:
-  Enabled: true
-Lint/StructNewOverride:
-  Enabled: true
-Style/ExponentialNotation:
-  Enabled: true
-Style/HashEachMethods:
-  Enabled: true
-Style/HashTransformKeys:
-  Enabled: true
-Style/HashTransformValues:
-  Enabled: true
-Style/RedundantFetchBlock:
-  Enabled: true
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-Style/RedundantRegexpEscape:
-  Enabled: true
-Style/SlicingWithRange:
-  Enabled: true

data/template/Dockerfile

@@ -1,19 +1,14 @@
-FROM ruby:2.5
+FROM ruby:3
 
 # stes some Environment variables
-ENV NODE_ENV='production'
-ENV RACK_ENV='production'
-
-
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
+ENV NODE_ENV='development'
+ENV RACK_ENV='development'
 
 ADD . /dummy
 WORKDIR /dummy
 
 COPY Gemfile Gemfile.lock ./
-
-RUN bundle install
+RUN bundle install --path vendor/bundle
 
 COPY . .
 

data/template/Gemfile

@@ -20,5 +20,5 @@ group :development, :test do
   gem 'rack-test'
   gem 'rake'
   gem 'rspec'
-  gem 'rubocop', '~> 0.86'
+  gem 'rubocop'
 end

data/template/spec/spec_helper.rb

@@ -6,8 +6,7 @@ require 'rack/test'
 require File.expand_path('../config/application', __dir__)
 
 grape_starter_gem = Gem::Specification.find_by_name('grape-starter').gem_dir
-
-Dir[grape_starter_gem + '/lib/starter/rspec/**/*.rb'].sort.each { |f| require f }
+Dir["#{grape_starter_gem}/lib/starter/rspec/**/*.rb"].sort.each { |f| require f }
 
 RSpec.configure do |config|
   include Rack::Test::Methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-starter
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.4.2
 platform: ruby
 authors:
 - LeFnord
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -28,30 +28,36 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.86'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.86'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +80,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/pipeline.yml"
 - ".gitignore"
 - ".inch.yml"
 - ".rspec"
@@ -144,14 +151,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Creates a Grape Rack skeleton

data/.github/workflows/ruby.yml

@@ -1,21 +0,0 @@
-name: Ruby
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up Ruby 2.7
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.7.1
-    - name: Build and test with Rake
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rspec
-        bundle exec rubocop