thredded_create_app 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: da9747ede4192d5f9a16f5d55340dc789a3e4069
-  data.tar.gz: 894f72a7ed010797f0943261203e52fbafcf25d2
+SHA256:
+  metadata.gz: c12dd584a928b7cc88c5bbbf4c043dcef538409afbb9436c24d5eb5b02763cf1
+  data.tar.gz: 8d3247f7baffe0d92c9f1647fe3547195b207954bafaf493d55c9fbf7f4c0ae7
 SHA512:
-  metadata.gz: 5185798eec1547fd77e09fbc629fa81ccd1dc703acc5973ea9acba5e67e231eb8741dcbc240a9d6c5e0b4c231e284e7c9028a043d195609c16b8e3a409e0d691
-  data.tar.gz: 87fa36be45ec8e3ab12a07ac06340e9ee29745c6aeba0a71b72ababe573866558bf22a0838750f01b7a2050ba66d00fd82cf9e2f71867dd533a008f4c6de8447
+  metadata.gz: e87c69ec96e1786b6d3245812770d4a21e2f4f5e01cd6ca2993aeb38d8e3c9907d9889a442dda49f6c593eb16816e2baa7572c48442a861e2982ca43dd3d0cd9
+  data.tar.gz: eb04d5227750e269ee78047189e6eef3907b2fe4c14b63836f28e5f8a3762e84081f028016f823262e171d4ba81d56a53fb95450ca5850f36b673331df7e38a6

data/lib/thredded_create_app/cli.rb

@@ -57,7 +57,7 @@ module ThreddedCreateApp
       log_info generator.summary
       exit unless options[:auto_confirm] || agree?
       generator.generate
-      log_stderr Term::ANSIColor.bold Term::ANSIColor.bright_green <<~TEXT
+      log_stderr Rainbow(<<~TEXT).green.bright
         All done! 🌟
       TEXT
       generator.run_tests!
@@ -82,7 +82,7 @@ module ThreddedCreateApp
       argv << '--help' if argv.empty?
       options = DEFAULTS.dup
       positional_args = OptionParser.new(
-        "Usage: #{program_name} #{Term::ANSIColor.bold 'APP_PATH'}", 37
+        "Usage: #{program_name} #{Rainbow('APP_PATH').bright}", 37
       ) do |op|
         flags = Flags.new(op, options)
 
@@ -117,7 +117,7 @@ module ThreddedCreateApp
           STDERR.puts op
           exit
         end
-        op.separator Term::ANSIColor.bright_blue <<~TEXT
+        op.separator Rainbow(<<~TEXT).blue.bright
                  For more information, see the readme at:
           #{File.expand_path('../../README.md', File.dirname(__FILE__))}
           https://github.com/thredded/thredded_create_app
@@ -130,7 +130,7 @@ TEXT
       options.update(app_path: argv[0])
       options
     end
-    # rubocop:enable Metrics/AbcSize,Metrics/MethodLength,Metrics/BlockLength
+    # rubocop:enable Metrics/AbcSize,Metrics/MethodLength
 
     class Flags
       def initialize(op, options)
@@ -163,20 +163,17 @@ TEXT
     end
 
     def auto_output_coloring(coloring = STDOUT.isatty)
-      coloring_was             = Term::ANSIColor.coloring?
-      Term::ANSIColor.coloring = coloring
-      HighLine.use_color       = coloring
+      coloring_was = Rainbow.enabled
+      Rainbow.enabled = coloring
+      HighLine.use_color = coloring
       yield
     ensure
-      HighLine.use_color       = coloring_was
-      Term::ANSIColor.coloring = coloring_was
+      HighLine.use_color = coloring_was
+      Rainbow.enabled = coloring_was
     end
 
     def agree?
-      ::HighLine.new.agree(
-        Term::ANSIColor.bold(Term::ANSIColor.bright_yellow('Proceed? [y/n]')),
-        true
-      )
+      ::HighLine.new.agree(Rainbow('Proceed? [y/n]').yellow.bright, true)
     end
 
     def verbose?

data/lib/thredded_create_app/logging.rb

@@ -1,29 +1,27 @@
 # frozen_string_literal: true
 
-require 'term/ansicolor'
+require 'rainbow'
 module ThreddedCreateApp
   module Logging
     def log_verbose(message = nil)
       return unless verbose?
-      log_stderr Term::ANSIColor.bright_magenta(message || yield)
+      log_stderr Rainbow(message || yield).magenta.bright
     end
 
     def log_command(message)
-      log_stderr Term::ANSIColor.bold message
+      log_stderr Rainbow(message).bright
     end
 
     def log_info(message)
-      log_stderr Term::ANSIColor.bright_blue message
+      log_stderr Rainbow(message).blue.bright
     end
 
     def log_warn(message)
-      log_stderr Term::ANSIColor.yellow("#{program_name}: [WARN] #{message}")
+      log_stderr Rainbow("#{program_name}: [WARN] #{message}").yellow
     end
 
     def log_error(message)
-      log_stderr Term::ANSIColor.red Term::ANSIColor.bold(
-        "#{program_name}: #{message}"
-      )
+      log_stderr Rainbow("#{program_name}: #{message}").red.bold
     end
 
     def log_stderr(*args)

data/lib/thredded_create_app/tasks/add_devise.rb

@@ -31,7 +31,7 @@ module ThreddedCreateApp
 
       def setup_after_sign_in_behaviour
         inject_into_file 'app/controllers/application_controller.rb',
-                         after:   /protect_from_forgery.*\n/,
+                         after:   /::Base\n(  protect_from_forgery.*\n)?/,
                          content: <<-'RUBY'
 
   before_action :store_current_location, unless: :devise_controller?

data/lib/thredded_create_app/tasks/add_display_name_to_users.rb

@@ -37,7 +37,7 @@ module ThreddedCreateApp
 
       def configure_devise
         inject_into_file 'app/controllers/application_controller.rb',
-                         after:   /protect_from_forgery.*\n/,
+                         after:   /::Base\n(  protect_from_forgery.*\n)?/,
                          content: devise_permitted_params_rb
         %w[app/views/devise/registrations/new.html.erb
            app/views/devise/registrations/edit.html.erb].each do |path|

data/lib/thredded_create_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ThreddedCreateApp
-  VERSION = '0.1.22'
+  VERSION = '0.1.23'
 end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,49 +59,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: 0.53.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -206,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails app generator for Thredded.