repack 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6cc32e50e25193457caa1c04ebad9eff3babb30
-  data.tar.gz: c3e31151edab8cac06cbdec1996e6f0892d18072
+  metadata.gz: 10d12948ef43c30268284738b43e2c56d3aaa094
+  data.tar.gz: 0f7e1753c40194e20ecd04286adc8786ba61d2b1
 SHA512:
-  metadata.gz: 4911d530de15d6002f23cae6c936930faa0ecccdd69341d1bfdcf929b4138d7f2ba7040d22e405a7c0a229fe97ad2481ee7376f9cc5a81d4c95dec55b67a68c0
-  data.tar.gz: 54c3b592dc7b6c4f9b4a71b1267744783a30967a829fcbdde072454956f669d5bd130747978d53ee4473e6122192eaf2bab0d0610415b2cdb8fdd8b9153d67da
+  metadata.gz: 31d08660d630e16d6444d6047e9f0f197383bd536a2cd5de14029752fbbca8660a773a8cdba27224265f9b1e44e6637c6afe4925bbaf0d89158ee5bf7967dad6
+  data.tar.gz: b42d6137c4d5fb5430fe8db4d88bb30f72dfac6cc82f2d8b9e2ae7af1fad3cb567adba0af93d0225cf8aa8a044bad4cce8d266f32cf5651fc5a1c6cacc64d30d

data/lib/generators/repack/install_generator.rb

@@ -1,6 +1,7 @@
 module Repack
   # :nodoc:
   class InstallGenerator < ::Rails::Generators::Base
+    @yarn_installed = false
     source_root File.expand_path("../../../../example", __FILE__)
     desc "Install everything you need for a basic repack integration"
     class_option :router, type: :boolean, default: false, description: 'Add React Router'
@@ -33,7 +34,11 @@ module Repack
     end
     def copy_webpack_conf
       copy_file "webpack.config.js", "config/webpack.config.js"
-      copy_file "webpack.config.heroku.js", "config/webpack.config.heroku.js"
+      puts 'Are you going to be deploying to heroku? (yes \ no)'
+      if gets.strip.downcase =~ /y(es)?/
+        puts 'copying heroku webpack config!'
+        copy_file "webpack.config.heroku.js", "config/webpack.config.heroku.js"
+      end
     end
     def create_webpack_application_js
       empty_directory "client"
@@ -62,28 +67,57 @@ module Repack
         copy_file "boilerplate/application.js", "client/application.js"
         copy_file "boilerplate/App.js", "client/containers/App.js"
       end
-      application_view = 'app/views/layouts/application.html.erb'
-      if File.exists? application_view
-        insert_into_file 'app/views/layouts/application.html.erb', before: /<\/body>/ do
-            <<-'RUBY'
-    <%= javascript_include_tag *webpack_asset_paths('application') %>
-            RUBY
+
+      haml_installed = Gem.loaded_specs.has_key? 'haml-rails'
+      layouts_dir = 'app/views/layouts'
+           haml_installed = Gem.loaded_specs.has_key? 'haml-rails'
+      layouts_dir = 'app/views/layouts'
+
+      application_view = haml_installed ? "#{layouts_dir}/application.html.haml" : "#{layouts_dir}/application.html.erb"
+
+      if haml_installed
+        puts 'Convert all existing ERB views into HAML? (yes / no)'
+        if gets.strip.downcase =~ /y(es)?/
+          begin
+            require 'html2haml'
+          rescue LoadError
+            `gem install html2haml`
+          end
+          `find . -name \*.erb -print | sed 'p;s/.erb$/.haml/' | xargs -n2 html2haml`
+          `rm #{layouts_dir}/application.html.erb`
         end
-        insert_into_file 'app/views/layouts/application.html.erb', before: /<\/head>/ do
+
+        insert_into_file application_view, before: /%body/ do
+          <<-'RUBY'
+    - if Rails.env.development?
+      %script{:src => "http://localhost:3808/webpack-dev-server.js"}
+          RUBY
+        end
+
+        insert_into_file application_view, after: /= yield/ do
             <<-'RUBY'
-    <% if Rails.env.development? %>
-      <script src="http://localhost:3808/webpack-dev-server.js"></script>
-    <% end %>
+
+    = javascript_include_tag *webpack_asset_paths('application')
             RUBY
         end
       else
-        puts "\n\n***WARNING*** HAML NOT SUPPORTED YET additional steps required\n\n"
+        insert_into_file application_view, before: /<\/head>/ do
+          <<-'RUBY'
+<% if Rails.env.development? %>
+  <script src="http://localhost:3808/webpack-dev-server.js"></script>
+<% end %>
+          RUBY
+        end
+        insert_into_file application_view, before: /<\/body>/ do
+          <<-'RUBY'
+<%= javascript_include_tag *webpack_asset_paths('application') %>
+          RUBY
+        end
       end
     end
     def add_to_gitignore
       append_to_file ".gitignore" do
         <<-EOF.strip_heredoc
-        # Added by repack
         /node_modules
         /public/webpack
         EOF
@@ -91,11 +125,19 @@ module Repack
     end
 
     def install_yarn
-      run "npm install yarn --save-dev"
+      puts 'Do you want to install and use yarn as your package manager? (yes / no)'
+      if gets.strip.downcase =~ /y(es)?/
+        @yarn_installed = true
+        run "npm install yarn --save-dev"
+      end
     end
 
-    def run_yarn_install
-      run "yarn install" if yes?("Would you like us to run 'yarn install' for you?")
+    def run_package_manager_install
+      if @yarn_installed
+        run "yarn install" if yes?("Would you like us to run 'yarn install' for you?")
+      else
+        run "npm install" if yes?("Would you like us to run 'npm install' for you?")
+      end
     end
 
     def whats_next

data/lib/repack/version.rb

@@ -1,3 +1,3 @@
 module Repack
-  VERSION = "2.0.5"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repack
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Dave Jungst
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails