make_it_so 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92f2d126f14ae04ea599f4b6546931caa8995714
-  data.tar.gz: 0c46ad51239dd794558d13552c964e0087aadc1a
+  metadata.gz: 51d0207bac62321e5b90ec81fbfb797d6ae10e0f
+  data.tar.gz: 9356e6bb0f37c5cb64268e4091c45a75efd20d14
 SHA512:
-  metadata.gz: 6424abdf838af71ab9917e0f77478faf8415e5b59d0cf893cd1ef840eea70378f64beef0c67cbd4377253fd9cae3147f17adf61937805766289039d8a35a37b1
-  data.tar.gz: 5837fdae03041a6c735c326b60dd25a329d9fa76b247e6fc039757d30c22fec5050813744fd884b891ab91b065ef290747a9be241e40f939f29bd234941f96d5
+  metadata.gz: 37189a870a810b0acd28d3900a6ded2cfc4f61bcc6ea5756bb900ff5dcb0604b18979d3f3fba9d61befc44fb0b785e8a9178bf6c6601d014edd3d59f2dd17a56
+  data.tar.gz: 9ce5bb339871e6604833ab9c155733ee0befbfdb334024535e01b8fcd57468ad1b2b5be17f0431c30c492c72f0ca52b6c71f7ae657d364bf9c1cbf177b00a7f1

data/lib/generators/rails_app_generator.rb

@@ -78,6 +78,8 @@ module MakeItSo
 
       build 'application_controller'
       build 'application_record'
+      build 'dotenv'
+
       if options[:rspec]
         build 'rspec_dependency'
         #build 'fix_generators'

data/lib/make_it_so/rails/app_builder.rb

@@ -99,13 +99,15 @@ module MakeItSo
             'jest',
             'babel-jest',
             'enzyme-adapter-react-15.4',
-            'react-addons-test-utils'
+            'react-addons-test-utils',
+            'jest-fetch-mock'
           ]
           run "yarn add #{deps.join(' ')} --dev"
 
           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|
@@ -114,6 +116,7 @@ module MakeItSo
             json["scripts"]["test:dev"] = "node_modules/.bin/jest --notify --watch"
             json["jest"] ||= {}
             json["jest"].merge!({
+              "automock": false,
               "roots": [
                 "spec/javascript"
               ],
@@ -122,7 +125,8 @@ module MakeItSo
                 "app/javascript"
               ],
               "setupFiles": [
-                "./spec/javascript/support/enzyme.js"
+                "./spec/javascript/support/enzyme.js",
+                "./spec/javascript/support/jest-fetch-mock.js"
               ]
             })
           end
@@ -143,6 +147,16 @@ module MakeItSo
         end
       end
 
+      def dotenv
+        self.gem 'dotenv-rails', group: [:development, :test]
+        template '.env'
+        template '.env.example'
+
+        append_to_file '.gitignore' do
+          ".env\n"
+        end
+      end
+
       def rspec_dependency
         self.gem 'rspec-rails', group: [:development, :test]
         self.gem 'capybara', group: [:development, :test]

data/lib/make_it_so/version.rb

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

data/spec/features/user_generates_rails_spec.rb

@@ -237,6 +237,23 @@ feature 'user generates rails app' do
     end
   end
 
+  context 'dotenv' do
+    it 'adds dotenv-rails to Gemfile' do
+      expect(File.read(gemfile_path)).to match(/gem(.*)dotenv-rails/)
+    end
+
+    it 'adds .env to gitignore' do
+      expect(File.read(File.join(app_path, '.gitignore'))).to include(".env\n")
+    end
+
+    it 'creates a .env file' do
+      expect(FileTest.exists?(File.join(app_path, '.env'))).to eq(true)
+    end
+
+    it 'creates a .env.example file' do
+      expect(FileTest.exists?(File.join(app_path, '.env.example'))).to eq(true)
+    end
+  end
 end
 
 feature 'jest' do
@@ -301,4 +318,11 @@ 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

data/templates/rails/.env

@@ -0,0 +1,2 @@
+# put all your secure credentials here as environment variables
+# SUPER_SECRET_KEY="abc123"

data/templates/rails/.env.example

@@ -0,0 +1,2 @@
+# DOCUMENT YOUR REQUIRED ENV VARIABLES HERE
+# SUPER_SECRET_KEY="abc123" 

data/templates/rails/spec/javascript/support/jest-fetch-mock.js

@@ -0,0 +1 @@
+global.fetch = require('jest-fetch-mock')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_it_so
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Dan Pickett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -185,6 +185,8 @@ files:
 - 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
@@ -197,6 +199,7 @@ files:
 - templates/rails/spec/features/user_signs_up_spec.rb
 - templates/rails/spec/javascript/exampleTest.js
 - templates/rails/spec/javascript/support/enzyme.js
+- templates/rails/spec/javascript/support/jest-fetch-mock.js
 - templates/rails/spec/javascript/testHelper.js
 - templates/rails/spec/support/database_cleaner.rb
 - templates/rails/spec/support/devise_controller_spec.rb