make_it_so 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51d0207bac62321e5b90ec81fbfb797d6ae10e0f
-  data.tar.gz: 9356e6bb0f37c5cb64268e4091c45a75efd20d14
+  metadata.gz: 2949e19df667dfb5b466b4682c63633c0cab41de
+  data.tar.gz: bf129b7bad56e0f721cf7c79f45f536604e85d8f
 SHA512:
-  metadata.gz: 37189a870a810b0acd28d3900a6ded2cfc4f61bcc6ea5756bb900ff5dcb0604b18979d3f3fba9d61befc44fb0b785e8a9178bf6c6601d014edd3d59f2dd17a56
-  data.tar.gz: 9ce5bb339871e6604833ab9c155733ee0befbfdb334024535e01b8fcd57468ad1b2b5be17f0431c30c492c72f0ca52b6c71f7ae657d364bf9c1cbf177b00a7f1
+  metadata.gz: 6985de89cbef91d51317120496a9c94637ddaf38360e5b0f1f8521a66fa093711d9fdf9a583e8396306441aa25d1dec93b8354eb4691ec65c030aa556060b069
+  data.tar.gz: 30113acdcaed93546ac82518f6940a03251d0e46a4d215bf932b2229ede60736c7cde8e7a506596b6df6d4583d73d7b6571bd6e5a36956eb5a22333cd76e6414

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+ruby '2.4.2'
+
 # Specify your gem's dependencies in make_it_so.gemspec
 gemspec
 

data/lib/generators/gosu_app_generator.rb

@@ -28,8 +28,9 @@ module MakeItSo
     end
 
     def readme
-      file_path = 'README.md'
-      template(file_path, File.join(app_path, file_path))
+      inside app_path do
+        create_file "README.md", "# README\n\n"
+      end
     end
 
     def lib

data/lib/generators/rails_app_generator.rb

@@ -106,6 +106,10 @@ module MakeItSo
       elsif options[:karma]
         build 'karma'
       end
+
+      if options[:react] || options[:jest] || options[:karma]
+        build 'yarn_install'
+      end
     end
 
     protected

data/lib/make_it_so/rails/app_builder.rb

@@ -17,7 +17,7 @@ module MakeItSo
       end
 
       def base_javascripts
-        self.gem 'jquery-rails'
+        @generator.gem 'jquery-rails'
         inside 'app/assets/javascripts' do
           template 'application.js'
           jquery_files = "//= require jquery\n" +
@@ -33,7 +33,7 @@ module MakeItSo
       end
 
       def pry_rails_dependency
-        self.gem 'pry-rails', group: [:development, :test]
+        @generator.gem 'pry-rails', group: [:development, :test]
       end
 
       def fix_generators
@@ -48,26 +48,29 @@ module MakeItSo
       end
 
       def react
-        self.gem 'webpacker', '~> 3.3'
+        @generator.gem 'webpacker', '~> 3.3'
 
-        after_bundle do
-          rake 'webpacker:install'
-          rake 'webpacker:install:react'
-
-          unparsed_json = snippet('react_dependencies.json')
-          parsed_json = JSON.parse(unparsed_json)
+        rake 'webpacker:install'
+        rake 'webpacker:install:react'
+        remove_file 'app/javascript/packs/application.js'
+        remove_file 'app/javascript/packs/hello_react.jsx'
 
-          modify_json(package_json_file) do |json|
-            ["dependencies", "devDependencies"].each do |key|
-              json[key] ||= {}
-              json[key].merge!(parsed_json[key])
-            end
+        unparsed_json = snippet('react_dependencies.json')
+        parsed_json = JSON.parse(unparsed_json)
 
-            json["scripts"] ||= {}
-            json["scripts"]["start"] = "./bin/webpack-dev-server"
+        modify_json(package_json_file) do |json|
+          ["dependencies", "devDependencies"].each do |key|
+            json[key] ||= {}
+            json[key].merge!(parsed_json[key])
           end
 
-          rake 'yarn:install'
+          json["scripts"] ||= {}
+          json["scripts"]["start"] = "./bin/webpack-dev-server"
+        end
+
+        inside 'app/javascript/packs' do
+          copy_file 'new_application.js', 'application.js'
+          remove_file 'new_application.js'
         end
       end
 
@@ -88,8 +91,6 @@ module MakeItSo
             template 'exampleTest.js'
             template 'testHelper.js'
           end
-
-          rake 'yarn:install'
         end
       end
 
@@ -131,6 +132,7 @@ module MakeItSo
             })
           end
 
+          run 'touch .babelrc'
           modify_json(File.join(destination_root, '.babelrc')) do |json|
             json["env"] ||= {}
             json["env"]["test"] ||= {}
@@ -142,13 +144,15 @@ module MakeItSo
               }
             })
           end
-
-          rake 'yarn:install'
         end
       end
 
+      def yarn_install
+        run 'yarn install'
+      end
+
       def dotenv
-        self.gem 'dotenv-rails', group: [:development, :test]
+        @generator.gem 'dotenv-rails', group: [:development, :test]
         template '.env'
         template '.env.example'
 
@@ -158,9 +162,9 @@ module MakeItSo
       end
 
       def rspec_dependency
-        self.gem 'rspec-rails', group: [:development, :test]
-        self.gem 'capybara', group: [:development, :test]
-        self.gem 'launchy', group: [:development, :test]
+        @generator.gem 'rspec-rails', group: [:development, :test]
+        @generator.gem 'capybara', group: [:development, :test]
+        @generator.gem 'launchy', group: [:development, :test]
 
         after_bundle do
           #stop spring in case it is running - it will hang
@@ -182,7 +186,7 @@ module MakeItSo
       end
 
       def factory_bot_rspec
-        self.gem 'factory_bot', group: [:development, :test]
+        @generator.gem 'factory_bot', group: [:development, :test]
         after_bundle do
           inside 'spec' do
             uncomment_lines 'rails_helper.rb', /spec\/support\/\*\*\/\*.rb/
@@ -195,7 +199,7 @@ module MakeItSo
       end
 
       def database_cleaner_rspec
-        self.gem 'database_cleaner', group: [:development, :test]
+        @generator.gem 'database_cleaner', group: [:development, :test]
         after_bundle do
           inside 'spec' do
             inside 'support' do
@@ -206,7 +210,7 @@ module MakeItSo
       end
 
       def valid_attribute_rspec
-        self.gem 'valid_attribute', group: [:development, :test]
+        @generator.gem 'valid_attribute', group: [:development, :test]
         after_bundle do
           inside 'spec' do
             insert_into_file 'rails_helper.rb',
@@ -223,7 +227,7 @@ module MakeItSo
       end
 
       def shoulda_rspec
-        self.gem 'shoulda-matchers',
+        @generator.gem 'shoulda-matchers',
           group: [:development, :test],
           require: false
         after_bundle do
@@ -234,13 +238,22 @@ module MakeItSo
       end
 
       def devise_dependency
-        self.gem 'devise'
+        @generator.gem 'devise'
 
         after_bundle do
           generate 'devise:install'
           generate 'devise:views'
           generate 'devise user'
 
+          #note: temporary fix that can be removed once devise progresses #beyond v4.4.3
+          # https://github.com/plataformatec/devise/pull/4869/files
+          inside 'config/initializers' do
+            insert_into_file 'devise.rb', 
+              after: "Devise.setup do |config|" do
+                "  config.secret_key = Rails.application.secret_key_base\n"
+            end
+          end
+
           if options[:rspec]
             inside 'spec' do
               directory 'features'
@@ -262,7 +275,7 @@ module MakeItSo
       end
 
       def foundation_dependency
-        self.gem 'foundation-rails', '~> 5.0'
+        @generator.gem 'foundation-rails', '~> 5.0'
 
         after_bundle do
           generate 'foundation:install foundation'

data/lib/make_it_so/version.rb

@@ -1,3 +1,3 @@
 module MakeItSo
-  VERSION = "0.3.8"
+  VERSION = "0.4.0"
 end

data/lib/make_it_so.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'bundler/setup'
+
 module MakeItSo
   def self.source_root(template_category = nil)
     root = File.join(File.dirname(__FILE__), '../templates')

data/snippets/rails/react_dependencies.json

@@ -3,7 +3,8 @@
     "babel-preset-react": "~6.24.1",
     "prop-types": "~15.6.0",
     "react": "~15.4.2",
-    "react-dom": "~15.4.2"
+    "react-dom": "~15.4.2",
+    "redbox-react": "1.6.0"
   },
   "devDependencies": {
     "webpack-cli": "^2.0.10",

data/spec/features/user_generates_rails_spec.rb

@@ -44,7 +44,7 @@ feature 'user generates rails app' do
   end
 
   scenario 'creates a valid gemfile' do
-    words = ['source', '#', 'gem', 'group', 'end']
+    words = ['source', '#', 'gem', 'group', 'end', 'ruby']
 
     File.readlines('Gemfile').each do |line|
       unless line.strip.empty?
@@ -200,6 +200,12 @@ feature 'user generates rails app' do
       end
     end
 
+    it 'includes redbox-react in package.json' do
+      in_package_json?(File.join(app_path, 'package.json')) do |json|
+        expect(json["dependencies"]["redbox-react"]).to_not be_nil
+      end
+    end
+
     it 'includes react-dom in package.json' do
       in_package_json?(File.join(app_path, 'package.json')) do |json|
         expect(json["dependencies"]["react-dom"]).to_not be_nil

data/spec/support/make_it_so_spec_helpers.rb

@@ -21,7 +21,7 @@ module MakeItSoSpecHelpers
   end
 
   def tmp_path
-    '/tmp/make_it_so'
+    File.join(Dir.tmpdir, 'make_it_so')
   end
 
   def root_path

data/templates/rails/app/javascript/packs/new_application.js

@@ -0,0 +1,23 @@
+
+import React from 'react'
+import { render } from 'react-dom'
+
+import App from '../react/components/app'
+import RedBox from 'redbox-react'
+
+document.addEventListener('DOMContentLoaded', () => {
+  let reactElement = document.getElementById('app')
+
+  if (reactElement) {
+    if(window.railsEnv && window.railsEnv === 'development'){
+      try {
+        render(<App />, reactElement)
+      } catch (e) {
+        render(<RedBox error={e} />, reactElement)
+      }
+    }
+    else {
+      render(<App />, reactElement)
+    }
+  }
+})

data/templates/rails/app/javascript/react/components/app.js

@@ -0,0 +1,7 @@
+import React from 'react'
+
+export const App = (props) => {
+  return (<h1>Make It So React</h1>)
+}
+
+export default App

data/templates/rails/app/views/layouts/application.html.erb.tt

@@ -51,6 +51,14 @@
   <%%= yield %>
 
   <%%= javascript_include_tag 'application' %>
+  <% if options[:react] %>
+  <%%- if Rails.env.development? || Rails.env.test? -%> 
+    <%%= javascript_tag do %>
+      window.railsEnv = '<%%= Rails.env %>'
+    <%%- end -%>
+  <%%- end -%>
+  <%%= javascript_pack_tag 'application' %>
+  <% end %>
   <%%= yield :extra_footer %>
 </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_it_so
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Dan Pickett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-19 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -183,13 +183,14 @@ files:
 - templates/gosu/app.rb
 - templates/gosu/lib/bounding_box.rb
 - templates/gosu/lib/keys.rb
-- templates/gosu/readme.md
 - templates/gosu/spec/spec_helper.rb
 - templates/rails/.env
 - templates/rails/.env.example
 - templates/rails/.gitkeep
 - templates/rails/app/controllers/application_controller.rb
 - templates/rails/app/controllers/homes_controller.rb
+- templates/rails/app/javascript/packs/new_application.js
+- templates/rails/app/javascript/react/components/app.js
 - templates/rails/app/models/application_record.rb
 - templates/rails/app/views/homes/index.html.erb
 - templates/rails/app/views/layouts/application.html.erb.tt

data/templates/gosu/readme.md

@@ -1,3 +0,0 @@
-# Gosu Game
-
-This is a game written in Ruby using the Gosu Framework.