make_it_so 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d11db83714ffc877a24b18039f1ae6ee4c6b598
-  data.tar.gz: c0c0565288822a9d379d606883938ca0cd5eb2a5
+  metadata.gz: 949efd8fd6f8be81fbd78b38d2db7aa56aa1c427
+  data.tar.gz: eb3c702c131873e182246d57368836423e3ed9bb
 SHA512:
-  metadata.gz: c6db1f9a010e09e1e9dbe80fe531a39106c31adf2ed935529859885909e3df03bf5cdbd9f6077c585a9c8d0d410afc98a0372b35033f8798fd9071f8286a5387
-  data.tar.gz: 4e18ed989c521517f8f2d290fb7ae87d9793e8803cc2ba0bdb6055d343d73ee9338531d17f07737405c8f53206b8e65923753ba37aa69757dea16d2b57a554dc
+  metadata.gz: 445f44e631fb2f8a7af9f5d4bb6b92c8952ade88ccc99712a751059bfe8fae71f472c9ce65422baffff8d0c95c53f4dcff7c0af4b7566c468e24f7781f12d402
+  data.tar.gz: 47503825241b5a8c3f032b993541ba7771c7c3b2cbf483fb6488359484b30aa96e7fc14032cbf3ec319db9ee82a39cef461d312aaa5e6a827e4f3c25a6dd2543

data/README.md

@@ -3,19 +3,21 @@
 ![Make It So](http://images.simplysyndicated.com/wp-content/uploads/2014/07/make-it-so-captain.jpg)
 
 Make It So is a command line utility that makes it easy to create starting points
-for all apps Ruby. Right now, it only supports Rails, but support for Sinatra,
-Gosu, and other paradigms are in progress.
+for all apps Ruby.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
 Install it yourself as:
 
     $ gem install make_it_so
 
 ## Usage
 
+Make It So has multiple options to help you get started.  You can get up and running with Rails, Sinatra, or Gosu without configuration issues.  If you would like to see a list of options:
+
+```no-highlight
+make_it_so
+```
 
 ### Rails
 
@@ -32,18 +34,27 @@ rake db:create
 rake db:migrate
 ```
 
-## Extra Footer in Views
+By default, the generator will create a Rails app with the following options activated:
+
+- RSpec
+- Devise
+- Postgres
+- Foundation
+- React
+- Karma
 
-Inject javascript at the end of the body tag. Javascript should always be the last thing loaded on the page. In view logic you can do the following:
+To take advantage of view-specific javascript, inject a script tag at the end of the body tag. Javascript should always be the last thing loaded on the page. In view logic you can do the following:
 
 ```erb
 <%= content_for :extra_footer do %>
-  <script type="text/javascript">
-    var widget = new Something.Widget('foo');
-  </script>
+<script type="text/javascript">
+var widget = new Something.Widget('foo');
+</script>
 <% end %>
 ```
 
+There is experimental support for a `--jest` flag that will use Jest for client side testing instead of karma/jasmine.
+
 ### Sinatra
 
 In the terminal, run:
@@ -52,7 +63,7 @@ In the terminal, run:
 make_it_so sinatra <app_name>
 ```
 
-By default, the generator, will create a sinatra root complete with an RSpec configuration.
+By default, the generator will create a sinatra root complete with an RSpec configuration.
 
 ### Gosu
 
@@ -61,7 +72,7 @@ In the terminal, run:
 make_it_so gosu <app_name>
 ```
 
-By default, the generator, will create a gosu template complete with an RSpec configuration.
+By default, the generator will create a gosu template complete with an RSpec configuration.
 
 The tree structure looks like:  
 

data/lib/make_it_so/rails/app_builder.rb

@@ -100,23 +100,17 @@ module MakeItSo
 
       def jest
         after_bundle do
-          deps = [
-            'jest',
-            'babel-jest',
-            'enzyme',
-            'enzyme-adapter-react-15.4',
-            'react-addons-test-utils',
-            'jest-fetch-mock'
-          ]
-          run "yarn add #{deps.join(' ')} --dev"
+          unparsed_json = snippet('js_jest_testing_deps.json')
+          parsed_json = JSON.parse(unparsed_json)
 
           run 'mkdir -p spec/javascript/support'
           inside 'spec/javascript/support' do
             template 'enzyme.js'
-            template 'jest-fetch-mock.js'
           end
 
           modify_json(package_json_file) do |json|
+            json["devDependencies"] ||= {}
+            json["devDependencies"].merge!(parsed_json["devDependencies"])
             json["scripts"] ||= {}
             json["scripts"]["test"] = "node_modules/.bin/jest"
             json["scripts"]["test:dev"] = "node_modules/.bin/jest --notify --watch"
@@ -131,9 +125,9 @@ module MakeItSo
                 "app/javascript"
               ],
               "setupFiles": [
-                "./spec/javascript/support/enzyme.js",
-                "./spec/javascript/support/jest-fetch-mock.js"
-              ]
+                "./spec/javascript/support/enzyme.js"
+              ],
+              "testURL": "http://localhost/"
             })
           end
 

data/lib/make_it_so/version.rb

@@ -1,3 +1,3 @@
 module MakeItSo
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/snippets/rails/js_jest_testing_deps.json

@@ -0,0 +1,10 @@
+{
+  "devDependencies": {
+    "babel-jest": "~23.4.0",
+    "enzyme": "~3.3.0",
+    "enzyme-adapter-react-15.4": "~1.0.6",
+    "fetch-mock": "~5.13.1",
+    "jest": "~23.4.1",
+    "react-addons-test-utils": "~15.6.2"
+  }
+}

data/spec/features/user_generates_rails_spec.rb

@@ -295,6 +295,12 @@ feature 'jest' do
     end
   end
 
+  scenario 'adds fetch-mock as a dependency' do
+    in_package_json?(package_json_path) do |json|
+      expect(json["devDependencies"]["fetch-mock"]).to_not be_nil
+    end
+  end
+
   scenario 'adds jest as the test script in package.json' do
     in_package_json?(package_json_path) do |json|
       expect(json["scripts"]["test"]).to include("jest")
@@ -324,6 +330,14 @@ feature 'jest' do
     end
   end
 
+  scenario 'adds testURL to jest configuration' do
+    in_package_json?(package_json_path) do |json|
+      expect(json["jest"]).to_not be_nil
+      expect(json["jest"]["testURL"]).to_not be_nil
+      expect(json["jest"]["testURL"]).to eq("http://localhost/")
+    end
+  end
+
   scenario 'adds a spec/javascript/support/enzyme.js file' do
     support_file = File.join(app_path, 'spec/javascript/support/enzyme.js')
     expect(FileTest.exists?(support_file)).to eq(true)
@@ -335,11 +349,4 @@ feature 'jest' do
       expect(json["jest"]["setupFiles"]).to include('./spec/javascript/support/enzyme.js')
     end
   end
-
-  scenario 'adds spec/javascript/support/jest-fetch-mock.js to setup' do
-    in_package_json?(package_json_path) do |json|
-      expect(json["jest"]).to_not be_nil
-      expect(json["jest"]["setupFiles"]).to include('./spec/javascript/support/jest-fetch-mock.js')
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_it_so
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Dan Pickett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -168,6 +168,7 @@ files:
 - lib/make_it_so/version.rb
 - make_it_so.gemspec
 - snippets/rails/application_generator.rb
+- snippets/rails/js_jest_testing_deps.json
 - snippets/rails/js_testing_deps.json
 - snippets/rails/react_dependencies.json
 - snippets/rails/user_factory.rb