gnarails 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cd31f307743b9ca75ae90e5a5b19c09bd2f0c51e854bc19697af8631ee0b346
-  data.tar.gz: 254ade5f49759aeec972194a50449b07befe517274816ffba42a031ef9cbafab
+  metadata.gz: 508e16eb10983b1d39462ab123c09081019afc3c638eee01ed6bc6e31f64caaf
+  data.tar.gz: fa1b674fa47b13c9048b87e82d8cbc27b0f4cff2ace07472d4ff8f16c0aad8b9
 SHA512:
-  metadata.gz: 7e363ad5ea9e486580e4847fd4e94b47d645e5ed2058e40203c9e253057acfcd5d774be2af6a989edaa0000bb0b4380cc66c29791aa9cfc903de96a481440279
-  data.tar.gz: 020a851839405931ce811221cd641bb30f348605f621821e340f6c655009a531dde0538b1b99b64c664771e4972f6cd5b154d5c30023e6a4405db27b336ca852
+  metadata.gz: 194b76bfabcafdd8920f048614c5ae51e15043d80b3e3adf23e71b1ff7549e593692b365da89853593c23591e72badb6d9c0ae5cc1d2554fa0dae5de6731f5fc
+  data.tar.gz: f09a6420fb5f2028c1b7057c1ca5fc50a25f1f75ceacf15fe8853ddb146e28130e0b10cac049573ba72cdab6c80277ec1ed65d60386bec5be5ffee748e2fbdeb

data/.circleci/config.yml

@@ -6,17 +6,12 @@ version: 2
 jobs:
   unit_test:
     docker:
-      - image: circleci/ruby:2.5.0-stretch-node-browsers
+      - image: circleci/ruby:2.6.1-stretch-node-browsers
         environment:
           RAILS_ENV: test
     steps:
       - checkout
 
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - gnarails-{{ checksum "gnarails.gemspec" }}
-
       # cmake is required by Rugged, a dependency of Pronto
       - run:
           name: Install cmake
@@ -25,13 +20,7 @@ jobs:
       # Bundle install dependencies
       - run:
           name: install dependencies
-          command: bundle install --path vendor/bundle
-
-      # Store bundle cache
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: gnarails-{{ checksum "gnarails.gemspec" }}
+          command: bundle install
 
       # Tests
       - run:
@@ -45,99 +34,55 @@ jobs:
 
   build-rails:
     docker:
-      - image: ruby:2.5.0
+      - image: circleci/ruby:2.6.1-stretch-node-browsers
 
     steps:
       - checkout
 
-      # Restore bundle cache
-      - restore_cache:
-          keys:
-          - gnarails-build-rails-{{ checksum "gnarails.gemspec" }}
-          # fallback to using the latest cache if no exact match is found
-          - gnarails-build-rails-
-
       # cmake is required by Rugged, a dependency of Pronto
       - run:
           name: Install cmake
-          command: apt-get -y -qq update && apt-get -y -qq install cmake
-
-      # Bundle install dependencies
-      - run:
-          name: Install Dependencies
-          command: bundle install --path vendor/bundle
-
-      # Store bundle cache
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: gnarails-build-rails-{{ checksum "gnarails.gemspec" }}
+          command: sudo apt-get -y -qq update && sudo apt-get -y -qq install cmake
 
-      # Generate test app
+      # Remove bundler 2
       - run:
-          name: Generate Test App
-          command: sh ./bin/generate-test-app.sh
+          name: Uninstall bundler
+          command: sudo gem uninstall bundler
 
-      # Move test app
+      # Install specific version of bundler
       - run:
-          name: Move Test App
-          command: mkdir rails-app && cp -r ~/project/rails-test-app ~/project/rails-app/
-
-      # Save to shared workspace
-      - persist_to_workspace:
-          root: rails-app
-          paths:
-            - rails-test-app
-
-  build-rails-react:
-    docker:
-      - image: starefossen/ruby-node:2-8
+          name: Install bundler 1.17.2
+          command: sudo gem install bundler -v 1.17.2
 
-    steps:
-      - checkout
-
-      # Restore bundle cache
-      - restore_cache:
-          keys:
-          - gnarails-build-rails-react-{{ checksum "gnarails.gemspec" }}
-          # fallback to using the latest cache if no exact match is found
-          - gnarails-build-rails-react-
-
-      # cmake is required by Rugged, a dependency of Pronto
+      # Install rake after installing specific version of bundler
       - run:
-          name: Install cmake
-          command: apt-get -y -qq update && apt-get -y -qq install cmake
+          name: Install rake
+          command: gem install rake
 
       # Bundle install dependencies
       - run:
           name: Install Dependencies
-          command: bundle install --path vendor/bundle
-
-      # Store bundle cache
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: gnarails-build-rails-react-{{ checksum "gnarails.gemspec" }}
+          command: bundle install
 
       # Generate test app
       - run:
           name: Generate Test App
-          command: sh ./bin/generate-react-test-app.sh
+          command: sh ./bin/generate-test-app.sh
 
       # Move test app
       - run:
           name: Move Test App
-          command: mkdir rails-app && cp -r ~/project/rails-react-test-app ~/project/rails-app/
+          command: mkdir rails-app && cp -r ~/project/rails-test-app ~/project/rails-app/
 
       # Save to shared workspace
       - persist_to_workspace:
           root: rails-app
           paths:
-            - rails-react-test-app
+            - rails-test-app
 
   test-rails-app:
     docker:
-      - image: circleci/ruby:2.5.0-stretch-node-browsers
+      - image: circleci/ruby:2.6.1-stretch-node-browsers
         environment:
           RAILS_ENV: test
           PG_HOST: localhost
@@ -157,13 +102,6 @@ jobs:
           name: Copy Test App
           command: cp -r /tmp/rails-test-app/rails-test-app/* ~/project
 
-      # Restore bundle cache
-      - restore_cache:
-          keys:
-          - gnarails-test-rails-app-{{ checksum "Gemfile.lock" }}
-          # fallback to using the latest cache if no exact match is found
-          - gnarails-test-rails-app-
-
       # cmake is required by Rugged, a dependency of Pronto
       - run:
           name: Install cmake
@@ -172,13 +110,7 @@ jobs:
       # Bundle install dependencies
       - run:
           name: install dependencies
-          command: bundle install --path vendor/bundle
-
-      # Store bundle cache
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: gnarails-test-rails-app-{{ checksum "Gemfile.lock" }}
+          command: bundle install
 
       # Database setup
       - run:
@@ -196,12 +128,12 @@ jobs:
           command: bundle exec bundle-audit update && bundle exec bundle-audit check
       - run:
           name: Brakeman
-          command: ./script/brakeman
+          command: ./bin/brakeman
 
       # Pronto
       - run:
           name: Pronto
-          command: ./script/ci_pronto
+          command: ./bin/ci_pronto
 
       # Save Brakeman
       - store_artifacts:
@@ -219,7 +151,6 @@ workflows:
     jobs:
       - unit_test
       - build-rails
-      - build-rails-react
       - test-rails-app:
           requires:
             - build-rails

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.6.1

data/CHANGELOG.md

@@ -1,5 +1,55 @@
 ## Current release (in development)
 
+## 2.0.0 - 2019-03-01
+
+* Support Ruby 2.6.1 [#134](https://github.com/TheGnarCo/gnarails/pull/134)
+
+  [Kevin Murphy](https://github.com/kevin-j-m)
+
+* Install brakeman without `--rdoc` or `--ri` [#130](https://github.com/TheGnarCo/gnarails/pull/130)
+
+  [Kevin Murphy](https://github.com/kevin-j-m)
+
+* Add Starting Procfile [#129](https://github.com/TheGnarCo/gnarails/pull/129)
+
+  [Blake Williams](https://github.com/BlakeWilliams)
+
+* Set Pronto to report on Github PRs with the Review Formatter [#126](https://github.com/TheGnarCo/gnarails/pull/126)
+
+  [Kevin Murphy](https://github.com/kevin-j-m)
+
+* Store Capybara screenshot failures as Circle CI Artifact [#123](https://github.com/TheGnarCo/gnarails/pull/123)
+
+  [Kevin Murphy](https://github.com/kevin-j-m)
+
+* Support Ruby 2.5.1 [#122](https://github.com/TheGnarCo/gnarails/pull/122)
+
+  [Blake Williams](https://github.com/BlakeWilliams)
+
+* Rename `/script` directory to instead use `/bin` for scripts [#121](https://github.com/TheGnarCo/gnarails/pull/121), [#125](https://github.com/TheGnarCo/gnarails/pull/125)
+
+  [Blake Williams](https://github.com/BlakeWilliams)
+
+* Ensure use of created application's Gemfile [#120](https://github.com/TheGnarCo/gnarails/pull/120)
+
+  [Blake Williams](https://github.com/BlakeWilliams)
+
+* Support Rails 5.2.1 [#118](https://github.com/TheGnarCo/gnarails/pull/118)
+
+  [Blake Williams](https://github.com/BlakeWilliams)
+
+* Remove React Support [#117](https://github.com/TheGnarCo/gnarails/pull/117)
+
+  [Blake Williams](https://github.com/BlakeWilliams)
+
+* Use ruby's RUBY_VERSION [#115](https://github.com/TheGnarCo/gnarails/pull/115)
+
+  [Blake Williams](https://github.com/BlakeWilliams)
+
+* Format ruby code with rubocop's auto-formatter [#112](https://github.com/TheGnarCo/gnarails/pull/112)
+
+  [Taylor Kearns](https://github.com/taylorkearns)
+
 ## 1.0.0 - 2018-03-28
 
 ## 0.9.3 - 2018-03-28

data/README.md

@@ -28,23 +28,6 @@ $ rails new <APP_NAME> -m path/to/gnarly.rb --skip-test-unit --database=postgres
 
 A`.railsrc` is provided. If you'd like to symlink it to your home directory, it'll run `rails new` with the options to run with postgres and not including test-unit. This `.railsrc` can be personalized to include the `--template=path/to/gnarly.rb` option depending on where you locally store this repo if you'd like to use this template every time.
 
-## Usage with React
-
-### Using the CLI
-
-```sh
-$ gem install gnarails
-$ gnarails new <APP_NAME> --webpack=react
-```
-
-### Using the template
-
-```sh
-$ git clone https://github.com/TheGnarCo/gnarails.git
-$ cd where/app/will/go
-$ rails new <APP_NAME> -m path/to/gnarly.rb --skip-test-unit --database=postgresql --webpack=react
-```
-
 ## Post-Install
 
 ```sh
@@ -54,13 +37,6 @@ $ bin/rails db:create
 $ bin/rails db:migrate
 ```
 
-_For React Apps_
-
-```sh
-$ bin/yarn
-$ bin/yarn test
-```
-
 ### Setting up pronto on CI
 
 Pronto can be used to comment on pull requests for various automated checks of
@@ -83,8 +59,7 @@ every PR, and update the following:
 
 ## Usage with Docker
 
-A `Dockerfile` and `docker-compose.yml` file are created by default. When run with `--webpack=react`,
-there are two `Dockerfile`s: one for the Rails server and one for the assets server.
+A `Dockerfile` and `docker-compose.yml` file are created by default.
 
 To use Docker, run:
 
@@ -120,14 +95,6 @@ end
 $ bin/rails s
 ```
 
-_For React Apps_
-
-In a separate terminal window/tab
-
-```sh
-$ bin/yarn start
-```
-
 Visit `localhost:3000` in your browser
 
 ## About The Gnar Company

data/bin/ci_pronto

@@ -3,4 +3,4 @@
 # Script for running pronto on CI
 export PRONTO_PULL_REQUEST_ID=${CI_PULL_REQUEST##*/}
 
-bundle exec pronto run -f text github_pr github_status -c origin/master
+bundle exec pronto run -f text github_pr_review github_status -c origin/master

data/gnarails.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
-  spec.add_dependency "rails", "~> 5.1.5"
-  spec.add_dependency "rspec-rails"
+  spec.add_dependency "rails", "~> 5.2.1"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.16"

data/gnarly.rb

@@ -5,56 +5,32 @@ def source_paths
     [File.expand_path(File.dirname(__FILE__))]
 end
 
-RUBY_VERSION = "2.5.0".freeze
-
-JS_DEPENDENCIES = [
-  "babel-preset-es2015".freeze,
-  "babel-preset-stage-0".freeze,
-  "classnames".freeze,
-  "es6-object-assign".freeze,
-  "es6-promise".freeze,
-  "history".freeze,
-  "lodash".freeze,
-  "react-entity-getter".freeze,
-  "react-redux".freeze,
-  "react-router".freeze,
-  "react-router-dom".freeze,
-  "react-router-redux@next".freeze,
-  "redux".freeze,
-  "redux-form".freeze,
-  "redux-thunk".freeze,
-  "schlepp".freeze,
-].freeze
-
-JS_DEV_DEPENDENCIES = [
-  "babel-eslint".freeze,
-  "enzyme".freeze,
-  "enzyme-adapter-react-16".freeze,
-  "eslint".freeze,
-  "eslint-config-airbnb".freeze,
-  "eslint-plugin-import".freeze,
-  "eslint-plugin-jsx-a11y@^5.1.1".freeze,
-  "eslint-plugin-react".freeze,
-  "expect".freeze,
-  "jsdom".freeze,
-  "mocha".freeze,
-  "nock".freeze,
-  "react-dom".freeze,
-  "react-test-renderer".freeze,
-  "redux-mock-store".freeze,
-].freeze
-
 def create_gnarly_rails_app
+  # This is a really unfortunate, but necessary, line of code that resets the
+  # cached Gemfile location so the generated application's Gemfile is used
+  # instead of the generators Gemfile.
+  ENV["BUNDLE_GEMFILE"] = nil
+
+  # Prevent spring cache when generating application
+  ENV["DISABLE_SPRING"] = "true"
+
   add_gems
-  setup_database
-  add_ruby_version
-  setup_scss
-  setup_gitignore
-  setup_testing
-  setup_analysis
-  setup_environments
-  setup_readme
-  post_bundle
+
+  run "bundle install"
+
+  after_bundle do
+    setup_testing
+    setup_database
+    setup_scss
+    setup_gitignore
+    setup_analysis
+    setup_environments
+    setup_readme
+    remove_dir "test"
+    git :init
+    format_ruby
+    completion_notification
+  end
 end
 
 def add_gems
@@ -74,7 +50,7 @@ def add_gems
     gem 'pronto-scss', require: false
     gem 'pry-rails'
     gem 'rspec-its'
-    gem 'rspec-rails'
+    gem 'rspec-rails', '~> 3.7'
     gem 'scss_lint', require: false
     gem 'selenium-webdriver'
     gem 'shoulda-matchers'
@@ -90,15 +66,6 @@ def setup_database
   gsub_file "Gemfile", /.*sqlite.*\n/, ""
 end
 
-def add_ruby_version
-  insert_into_file "Gemfile", after: "source 'https://rubygems.org'" do
-    "\nruby \"#{RUBY_VERSION}\""
-  end
-
-  copy_file "templates/.ruby-version", ".ruby-version"
-  gsub_file ".ruby-version", "__ruby_version__", RUBY_VERSION
-end
-
 def setup_scss
   run "mv app/assets/stylesheets/application.css app/assets/stylesheets/application.scss"
 end
@@ -109,7 +76,6 @@ def setup_gitignore
 end
 
 def setup_testing
-  run "bundle install"
   setup_rspec
   setup_factory_bot
   setup_system_tests
@@ -123,7 +89,7 @@ def setup_rspec
   remove_file ".rspec"
   copy_file "templates/.rspec", ".rspec"
   gsub_file "spec/rails_helper.rb",
-    "# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }",
+    /# Dir\[Rails\.root\.join.*/,
     "Dir[Rails.root.join(\"spec/support/**/*.rb\")].each { |f| require f }"
 end
 
@@ -234,13 +200,13 @@ end
 
 def setup_pronto
   copy_file "templates/.pronto.yml", ".pronto.yml"
-  copy_file "templates/script/ci_pronto", "script/ci_pronto"
-  run "chmod +x script/ci_pronto"
+  copy_file "templates/bin/ci_pronto", "bin/ci_pronto"
+  run "chmod +x bin/ci_pronto"
 end
 
 def setup_brakeman
-  copy_file "templates/script/brakeman", "script/brakeman"
-  run "chmod +x script/brakeman"
+  copy_file "templates/bin/brakeman", "bin/brakeman"
+  run "chmod +x bin/brakeman"
 end
 
 def setup_simplecov
@@ -264,6 +230,7 @@ def setup_environments
   setup_dotenv
   setup_ci
   setup_docker
+  setup_procfile
 end
 
 def setup_dotenv
@@ -283,11 +250,11 @@ def setup_docker
   copy_file "templates/Dockerfile", "Dockerfile"
   gsub_file "Dockerfile", "__ruby_version__", RUBY_VERSION
 
-  if react?
-    setup_docker_react
-  else
-    setup_docker_standard
-  end
+  setup_docker_standard
+end
+
+def setup_procfile
+  copy_file "templates/Procfile", "Procfile"
 end
 
 def setup_docker_standard
@@ -295,36 +262,12 @@ def setup_docker_standard
   copy_file "templates/docker-compose.yml/docker-compose-standard.yml", "docker-compose.yml"
 end
 
-def setup_docker_react
-  copy_file "templates/Dockerfile-assets", "Dockerfile-assets"
-  gsub_file "Dockerfile-assets", "__ruby_version__", RUBY_VERSION
-  copy_file "templates/.env.docker/.env.docker-webpack", ".env.docker"
-  copy_file "templates/.env.docker-assets", ".env.docker-assets"
-  copy_file "templates/docker-compose.yml/docker-compose-webpack.yml", "docker-compose.yml"
-end
-
 def setup_readme
   remove_file "README.md"
   copy_file "templates/README.md", "README.md"
   gsub_file "README.md", "__application_name__", app_name
 end
 
-def react?
-  options[:webpack] == "react"
-end
-
-def post_bundle
-  after_bundle do
-    setup_react if react?
-    remove_dir "test"
-    git :init
-
-    puts ""
-    ascii_art
-    post_install_instructions
-  end
-end
-
 def ascii_art
   puts "  _____     __        _     ____     ____     "
   puts " / / \\ \\   |  \\      | |   /    \\   |    \\    "
@@ -347,50 +290,14 @@ def post_install_instructions
   puts "  * https://github.com/TheGnarCo/gnarails#post-install"
 end
 
-def setup_react
-  install_js_deps
-  add_js_files
-  modify_js_files
-  modify_npm_scripts
-end
-
-def install_js_deps
-  puts "Installing Gnar react packages"
-  run "yarn add #{JS_DEPENDENCIES.join(' ')}"
-  run "yarn add --dev #{JS_DEV_DEPENDENCIES.join(' ')}"
-end
-
-def add_js_files
-  directory "templates/react/js", "app/javascript"
-  directory "templates/react/views", "app/views"
-  copy_file "templates/react/layout.html.erb", "app/views/layouts/application.html.erb", force: true
-  copy_file "templates/react/rails_routes.rb", "config/routes.rb", force: true
-  copy_file "templates/react/controllers/home_controller.rb", "app/controllers/home_controller.rb"
-  copy_file "templates/react/.babelrc", ".babelrc", force: true
-  copy_file "templates/react/.eslintrc.js", ".eslintrc.js", force: true
-end
-
-def modify_js_files
-  gsub_file "app/views/layouts/application.html.erb",
-    "placeholder_application_title",
-    app_name.tr("-", "_").titleize
-  gsub_file "app/javascript/app_constants/index.js",
-    "  APP_NAME: 'CHANGE_ME',",
-    "  APP_NAME: '#{app_name}',"
-  remove_file "app/javascript/packs/application.js"
-end
-
-def modify_npm_scripts
-  insert_into_file "package.json", before: "  \"dependencies\": {\n" do
-    <<-NPM_SCRIPTS
-  "scripts": {
-    "start": "./bin/webpack-dev-server",
-    "mocha": "NODE_PATH=./app/javascript mocha --compilers js:babel-register --require babel-polyfill --require app/javascript/test/.setup.js --recursive './app/javascript/**/*.tests.js*'",
-    "lint": "eslint app/javascript",
-    "test": "npm run lint && npm run mocha"
-  },
-    NPM_SCRIPTS
-  end
+def format_ruby
+  run "bundle exec rubocop --auto-correct"
+end
+
+def completion_notification
+  puts ""
+  ascii_art
+  post_install_instructions
 end
 
 create_gnarly_rails_app