react-rails-api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d500f5dea293c6b19ed33b91ec10fa0d13ca81f4707c3b1cc4156936a59bc3ab
-  data.tar.gz: 7a76b3afd69d353d2cbb55f3e369ccb74944a3a9028042d59e65fd83b131e205
+  metadata.gz: 4e5a9f24471e54d7e380dbc368e23e2b274fabb05846966b178a793da99dde96
+  data.tar.gz: 3afb77d6f33dca816aeb0d20503721f7d84ddeb884ede10f122cf7d4f388293e
 SHA512:
-  metadata.gz: 6085938a699828539279ce9eee4a83524abc2179c392477ee32ac87e05ae9988164571639a9d76662e18cf01dc844bd477e0578cb57073df95fedd63ff674f64
-  data.tar.gz: 8b658ab9cbbc91530c7567a6a0005538489594efb73a485796a03ec2e3ab47febabfe60cbd8e8bcddfc75e0f52e3d54102fac65ba8a29278731afecdb2055e62
+  metadata.gz: dcf69f0e4295aed11496fc64d65c80b9d8330810135bed47740f078e7f78dcd45f4f95bbda79cc87b6728da09a55e4927dcf716a2d77bd970c4377440954cbc4
+  data.tar.gz: 5086f45d6649ff1c70d55581aa7a3118ac3fe009d9406ffcd226710e6fd49ed2479c626767f07a1ea1f5c7ac111c7c849d906c738f08a544025fa384c7b6f1ec

data/README.md

@@ -17,8 +17,8 @@ This is an easy-to-use generator to implement the modern web application stack d
 
 - [**Ruby**](https://www.ruby-lang.org/en/) `~> 2.5`
 - [**Rails**](https://rubyonrails.org/) `~> 5.2`
-- [**Node**](https://nodejs.org/en/) `11.11.0`: *Recommend installing this with [NVM](https://github.com/creationix/nvm).*
-- [**Yarn**](https://yarnpkg.com/en/) `1.13.0`: *Recommend installing Node separately from this, rather than as a dependency.*
+- [**Node**](https://nodejs.org/en/) `^11`: *Recommend installing this with [NVM](https://github.com/creationix/nvm).*
+- [**Yarn**](https://yarnpkg.com/en/) `^1.13`: *Recommend installing Node separately from this, rather than as a dependency.*
 
 ## Installation
 

data/lib/react-rails-api/template.rb

@@ -1,8 +1,18 @@
+require 'react-rails-api/version'
+require 'json'
+
 # Loads a template from ./templates
 def template(name)
   File.open(File.join __dir__, 'templates', name).read
 end
 
+# Allows for modification of JSON files
+def modify_json(file)
+  hash = JSON.parse File.read(file), symbolize_names: true
+  yield hash if block_given?
+  File.open(file, ?w) {|f| f.write JSON.pretty_generate(hash)}
+end
+
 database = !ARGV.include?('--skip-active-record')
 active_admin = database ? yes?("\nUse ActiveAdmin? (Y/n):") : false
 puts if database
@@ -61,7 +71,7 @@ after_bundle do
 
   inside 'config' do
     # Include the railtie for sprockets
-    uncomment_lines 'application.rb', /require \"sprockets\/railtie\"/
+    uncomment_lines 'application.rb', "require \"sprockets/railtie\""
 
     # Add ActiveAdmin configuration on config/application.rb
     inject_into_file 'application.rb', template('application.rb.tt'), before: /^  end/ if active_admin
@@ -74,10 +84,12 @@ after_bundle do
   end
 
   if database
+    rails_command 'db:create'
+
     if active_admin
       # Integrate ActiveAdmin and Devise CMS into the application
+      run 'spring stop'
       generate 'active_admin:install'
-      generate 'devise:views'
     end
 
     # Run a database migration and seed the database
@@ -98,14 +110,26 @@ after_bundle do
   end
 
   # Create a top-level package.json that tells Heroku how to compile the Create React App
-  file 'package.json', template('package.json.tt'), force: true
+  modify_json 'package.json' do |json|
+    json[:name] = 'api'
+    json[:license] = 'MIT'
+    json[:engines] = {
+      node: ReactRailsAPI::ENGINE_VERSIONS[:node],
+      yarn: ReactRailsAPI::ENGINE_VERSIONS[:yarn]
+    }
+    json[:scripts] = {
+      build: "yarn --cwd client install && yarn --cwd client build",
+      deploy: "cp -a client/build/. public/",
+      postinstall: "yarn build && yarn deploy"
+    }
+  end
 
   # Create the React application (client)
   run 'yarn create react-app client'
 
   inside 'client' do
     # Add a proxy for the Rails API server (on the client)
-    inject_into_file 'package.json', "  \"proxy\": \"http://localhost:3001\",\n", after: "\"version\": \"0.1.0\",\n"
+    modify_json('package.json') {|json| json[:proxy] = 'http://localhost:3001'}
     # Add environment variable for skipping preflight checks (client-level)
     file '.env', template('.env.tt')
   end

data/lib/react-rails-api/version.rb

@@ -2,7 +2,12 @@ module ReactRailsAPI
   VERSION = {
     major: 0,
     minor: 1,
-    patch: 2,
+    patch: 3,
     meta: nil
   }.values.reject(&:nil?).map(&:to_s)*?.
+
+  ENGINE_VERSIONS = {
+    node: '^11',
+    yarn: '^1.13'
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-rails-api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Edwin Onuonga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -87,7 +87,6 @@ files:
 - lib/react-rails-api/templates/application.rb.tt
 - lib/react-rails-api/templates/application_controller.rb.tt
 - lib/react-rails-api/templates/database.yml.tt
-- lib/react-rails-api/templates/package.json.tt
 - lib/react-rails-api/templates/routes.rb.tt
 - lib/react-rails-api/templates/start.rake.tt
 - lib/react-rails-api/version.rb

data/lib/react-rails-api/templates/package.json.tt

@@ -1,13 +0,0 @@
-{
-  "name": "api",
-  "license": "MIT",
-  "engines": {
-    "node": "11.11.0",
-    "yarn": "1.13.0"
-  },
-  "scripts": {
-    "build": "yarn --cwd client install && yarn --cwd client build",
-    "deploy": "cp -a client/build/. public/",
-    "postinstall": "yarn build && yarn deploy"
-  }
-}