bullet_train-themes-light 1.0.44 → 1.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20c969201f79403cce0cba8cb5a2d640f69ee2eac4a3b9c7194b6115d090ee66
-  data.tar.gz: 8bacfd8bdc9af51ae1d5c9d4f7a7c9150caa015b34bd6235d82fd69af6a29495
+  metadata.gz: c253f5dd719876aebed5b2e12920b2bfe180848305a77cfc8a7ebe44d6d7f0c2
+  data.tar.gz: ea57904da051edeb079bbc2bd3fd3afca0c422b5eaaa5925e8ac2665ff716db1
 SHA512:
-  metadata.gz: d682d968c52407f0ce55c5364653cf28e33aeb2c38b0f6f487c0362e9eaa02dac8c4a20a06a0d4970c7e0ca13bb2cb2cec35312d9e75b48b6e6473f316d64bfd
-  data.tar.gz: 3c5c2681752f776e9af8a373c8d3b581395e8b373c076175ff15a307b8a47c97d1328b81f63fb10e938c9c8c067c98ff926199243349001cc0f6b07c9f291dd5
+  metadata.gz: a51ee5dfb6568b0a02d65852993609e76e36dd027dae87109eae5d7e32763969cdcf7710b241aeae112e062c8bb83a1432447ed4921c8801a68787cd9b730711
+  data.tar.gz: 31340a496d57fece4a5125277f5edbe534bc683cbde4da17a933856e75a58853b80344c9747e03aa091a43a133f6506b3d786d2fc95eb2d26e9e9ac51dff946b

data/app/assets/stylesheets/light/tailwind/dark-mode.css

@@ -8,11 +8,10 @@
       background-color: rgba(0, 0, 0, 0.15);
     }
 
-    .bg-dark-gradient {
+    .bg-light-gradient {
       &:before {
         background: linear-gradient(to bottom right, var(--dark-gradient-from), var(--dark-gradient-to) 100%);
       }
-      background: linear-gradient(to bottom right, var(--dark-gradient-from), var(--dark-gradient-to) 100%);
     }
 
     /**

data/app/views/themes/light/_alert.html.erb

@@ -1,7 +1,7 @@
 <% color ||= 'yellow' %>
 
 <div class="rounded-md bg-<%= color %>-400 border border-<%= color %>-500 py-4 px-5 mb-3">
-  <h3 class="text-sm text-<%= color %>-600 text-<%= color %>-600 font-light">
+  <h3 class="text-sm text-<%= color %>-900 font-light">
     <%= yield %>
   </h3>
 </div>

data/app/views/themes/light/_box.html.erb

@@ -38,7 +38,7 @@
       </div>
     <% end %>
 
-    <% if p.content_for? :actions || pagy %>
+    <% if p.content_for?(:actions) || pagy %>
       <div class="pb-7 px-8 space-y-7">
         <div class="sm:flex">
           <div class="flex-1 space-x">

data/lib/bullet_train/themes/light/custom_theme_file_replacer.rb

@@ -0,0 +1,228 @@
+module BulletTrain
+  module Themes
+    module Light
+      class CustomThemeFileReplacer
+        mattr_accessor :repo_path
+
+        include BulletTrain::Themes::Light::FileReplacer
+
+        def initialize(custom_theme)
+          @repo_path = "./local/bullet_train-themes-#{custom_theme}"
+        end
+
+        def replace_theme(original_theme, custom_theme)
+          # Rename the directories
+          [
+            "/app/assets/stylesheets/bullet_train/themes/#{original_theme}/",
+            "/app/assets/stylesheets/#{original_theme}/",
+            "/app/views/themes/#{original_theme}/",
+            "/lib/bullet_train/themes/#{original_theme}/"
+          ].map { |file| @repo_path + file }.each do |original_directory|
+            custom_directory = original_directory.gsub(/(.*)(#{original_theme})(\/$)/, '\1' + custom_theme + '\3')
+            FileUtils.mv(original_directory, custom_directory)
+          end
+
+          # Only compare ejected files.
+          files_to_replace =
+            ejected_files_to_replace(original_theme, custom_theme).map { |file| {file_name: file, must_compare: true} } +
+            default_files_to_replace(original_theme).map { |file| {file_name: file, must_compare: false} }
+
+          # Replace the file contents and rename the files.
+          files_to_replace.each do |custom_gem_file|
+            # All of the files we want to compare against the fresh gem are in the main app.
+            main_app_file = build_main_app_file_name(original_theme, custom_theme, custom_gem_file[:file_name].gsub(@repo_path, "."))
+            custom_gem_file[:file_name] = adjust_directory_hierarchy(custom_gem_file[:file_name], original_theme)
+
+            # The content in the main app should replace the cloned gem files.
+            if custom_gem_file[:must_compare] && !BulletTrain::Themes::Light::FileReplacer.files_have_same_content?(custom_gem_file[:file_name], main_app_file)
+              BulletTrain::Themes::Light::FileReplacer.replace_content(old: custom_gem_file[:file_name], new: main_app_file)
+            end
+
+            # Only rename file names that still have the original theme in them, i.e. - ./tailwind.config.light.js
+            if File.basename(custom_gem_file[:file_name]).match?(original_theme)
+              main_app_file = adjust_directory_hierarchy(main_app_file, custom_theme)
+              new_file_name = main_app_file.gsub(/^\./, @repo_path).gsub(original_theme, custom_theme)
+              File.rename(custom_gem_file[:file_name], new_file_name)
+            end
+          end
+
+          # Change the content of specific files that contain the orignal theme's string.
+          # i.e. - `module Light` and `tailwind.light.config`.
+          constantized_original = constantize_from_snake_case(original_theme)
+          constantized_custom = constantize_from_snake_case(custom_theme)
+          files_whose_contents_need_to_be_replaced(custom_theme).each do |file|
+            new_lines = []
+            File.open(file, "r") do |f|
+              new_lines = f.readlines
+              new_lines = new_lines.map do |line|
+                # We want the original theme it's being edited from when creating a new theme.
+                # We also remove mattr_accessor in the eject task, so we need to add it back here.
+                if f.path == "#{@repo_path}/lib/bullet_train/themes/#{custom_theme}.rb" && line.match?("class Theme < BulletTrain::Themes::")
+                  line = "      mattr_accessor :color, default: :blue\n      class Theme < BulletTrain::Themes::#{constantize_from_snake_case(original_theme)}::Theme\n"
+                else
+                  # `_account.html.erb` and `_devise.html.erb` have tailwind classes that contain `light`.
+                  # We shouldn't be replacing the classes with the custom theme string, so we skip it here.
+                  # TODO: We should change this Regexp to check if the original theme is prefixed with `-`.
+                  # If it is, we ignore the string if it's not prefixed with `bullet_train-themes-`,
+                  line.gsub!(original_theme, custom_theme) unless line.match?("bg-light-gradient")
+                  line.gsub!(constantized_original, constantized_custom)
+                end
+                line
+              end
+            end
+
+            File.open(file, "w") do |f|
+              f.puts new_lines.join
+            end
+          end
+
+          # The contents in this specific main app file don't have the require statements which the gem
+          # originally has, so we add those back after moving the main app file contents to the gem.
+          new_lines = nil
+          File.open("#{@repo_path}/lib/bullet_train/themes/#{custom_theme}.rb", "r") do |file|
+            new_lines = file.readlines
+            require_lines =
+              <<~RUBY
+                require "bullet_train/themes/#{custom_theme}/version"
+                require "bullet_train/themes/#{custom_theme}/engine"
+                require "bullet_train/themes/#{original_theme}"
+
+              RUBY
+            new_lines.unshift(require_lines)
+          end
+          File.open("#{@repo_path}/lib/bullet_train/themes/#{custom_theme}.rb", "w") do |file|
+            file.puts new_lines.flatten.join
+          end
+
+          # Since we're generating a new gem, it should be version 1.0
+          File.open("#{@repo_path}/lib/bullet_train/themes/#{custom_theme}/version.rb", "r") do |file|
+            new_lines = file.readlines
+            new_lines = new_lines.map { |line| line.match?("VERSION") ? "      VERSION = \"1.0\"\n" : line }
+          end
+          File.open("#{@repo_path}/lib/bullet_train/themes/#{custom_theme}/version.rb", "w") do |file|
+            file.puts new_lines.join
+          end
+
+          # Remove files and directories from the main application.
+          files_to_remove_from_main_app(custom_theme).each { |file| File.delete(file) }
+          directories_to_remove_from_main_app(custom_theme).each do |directory|
+            FileUtils.rm_rf(directory) unless directory.nil?
+          end
+
+          # Update the author and email.
+          # If the developer hasn't set these yet, this should simply return empty strings.
+          author = `git config --global user.name`.chomp
+          email = `git config --global user.email`.chomp
+          File.open("#{@repo_path}/bullet_train-themes-#{custom_theme}.gemspec", "r") do |file|
+            new_lines = file.readlines
+            new_lines = new_lines.map do |line|
+              if line.match?("spec.authors")
+                "  spec.authors = [\"#{author}\"]\n"
+              elsif line.match?("spec.email")
+                "  spec.email = [\"#{email}\"]\n"
+              else
+                line
+              end
+            end
+          end
+          File.open("#{@repo_path}/bullet_train-themes-#{custom_theme}.gemspec", "w") do |file|
+            file.puts new_lines.join
+          end
+        end
+
+        # By the time we call this method we have already updated the new gem's directories with
+        # the custom theme name, but the FILE names are still the same from when they were cloned,
+        # so we use `original_theme` for specific file names below.
+        def ejected_files_to_replace(original_theme, custom_theme)
+          [
+            Dir.glob("#{@repo_path}/app/assets/stylesheets/#{custom_theme}/**/*.css"),
+            Dir.glob("#{@repo_path}/app/assets/stylesheets/#{custom_theme}/**/*.scss"),
+            Dir.glob("#{@repo_path}/app/views/themes/#{custom_theme}/**/*.html.erb"),
+            "/app/javascript/application.#{original_theme}.js",
+            "/tailwind.#{original_theme}.config.js",
+            "/app/lib/bullet_train/themes/#{original_theme}.rb",
+            # The Glob up top doesn't grab the #{original_theme}.tailwind.css file, so we set that here.
+            "/app/assets/stylesheets/#{original_theme}.tailwind.css",
+            "/tailwind.mailer.#{original_theme}.config.js"
+          ].flatten.map { |file| file.match?(/^#{@repo_path}/) ? file : @repo_path + file }
+        end
+
+        # These files represent ones such as "./lib/bullet_train/themes/light.rb" which
+        # aren't ejected to the developer's main app, but still need to be changed.
+        def default_files_to_replace(original_theme)
+          # TODO: Add this file and the FileReplacer module once they're added to the main branch.
+          [
+            "/bullet_train-themes-#{original_theme}.gemspec",
+            "/app/assets/config/bullet_train_themes_#{original_theme}_manifest.js",
+            "/lib/tasks/bullet_train/themes/#{original_theme}_tasks.rake",
+            "/test/bullet_train/themes/#{original_theme}_test.rb"
+          ].map { |file| @repo_path + file }
+        end
+
+        def files_to_remove_from_main_app(custom_theme)
+          [
+            Dir.glob("./app/assets/stylesheets/#{custom_theme}/**/*.css"),
+            Dir.glob("./app/assets/stylesheets/#{custom_theme}/**/*.scss"),
+            "./app/assets/stylesheets/#{custom_theme}.tailwind.css",
+            "./app/javascript/application.#{custom_theme}.js",
+            "./app/lib/bullet_train/themes/#{custom_theme}.rb",
+            Dir.glob("./app/views/themes/#{custom_theme}/**/*.html.erb")
+          ].flatten
+        end
+
+        def files_whose_contents_need_to_be_replaced(custom_theme)
+          [
+            "/app/assets/stylesheets/#{custom_theme}.tailwind.css",
+            "/app/views/themes/#{custom_theme}/layouts/_account.html.erb",
+            "/app/views/themes/#{custom_theme}/layouts/_devise.html.erb",
+            "/bin/rails",
+            "/lib/bullet_train/themes/#{custom_theme}/engine.rb",
+            "/lib/bullet_train/themes/#{custom_theme}/version.rb",
+            "/lib/bullet_train/themes/#{custom_theme}.rb",
+            "/lib/tasks/bullet_train/themes/#{custom_theme}_tasks.rake",
+            "/test/bullet_train/themes/#{custom_theme}_test.rb",
+            "/test/dummy/app/views/layouts/mailer.html.erb",
+            "/test/dummy/config/application.rb",
+            "/bullet_train-themes-#{custom_theme}.gemspec",
+            "/Gemfile",
+            "/README.md"
+          ].map { |file| @repo_path + file }
+        end
+
+        def directories_to_remove_from_main_app(custom_theme)
+          [
+            "./app/assets/stylesheets/#{custom_theme}/",
+            "./app/views/themes/#{custom_theme}/",
+            "./app/lib/"
+          ].map { |directory| directory unless directory == "./app/lib/" && Dir.empty?(directory) }
+        end
+
+        # Since we're cloning a fresh gem, file names that contain the original
+        # theme stay the same, i.e. - tailwind.light.config.js. However, the names have
+        # already been changed in the main app when the original theme was ejected.
+        # Here, we build the correct string that is in the main app to compare the
+        # files' contents. Then later on we actually rename the new gem's file names.
+        def build_main_app_file_name(original_theme, custom_theme, custom_gem_file)
+          main_app_file = custom_gem_file
+          custom_gem_file_hierarchy = custom_gem_file.split("/")
+          if custom_gem_file_hierarchy.last.match?(original_theme)
+            custom_gem_file_hierarchy.last.gsub!(original_theme, custom_theme)
+            main_app_file = custom_gem_file_hierarchy.join("/")
+          end
+          main_app_file
+        end
+
+        # This addresses one specific file where the hierarchy is
+        # different after the file is ejected into the main application.
+        def adjust_directory_hierarchy(file_name, theme_name)
+          file_name.match?("lib/bullet_train/themes/#{theme_name}") ? file_name.gsub(/\/app/, "") : file_name
+        end
+
+        # i.e. - foo_bar or foo-bar to FooBar
+        def constantize_from_snake_case(str)
+          str.split(/[_|-]/).map(&:capitalize).join
+        end
+      end
+    end
+  end
+end

data/lib/bullet_train/themes/light/file_replacer.rb

@@ -0,0 +1,18 @@
+# TODO: We overwrite/edit/create files a lot in Bullet Train,
+# so I feel like this and a lot of similar content could go inside its own gem.
+module BulletTrain
+  module Themes
+    module Light
+      module FileReplacer
+        def self.files_have_same_content?(first_file_name, second_file_name)
+          File.open(first_file_name).readlines == File.open(second_file_name).readlines
+        end
+
+        # Replaces the old content with a brand new file.
+        def self.replace_content(old:, new:)
+          File.write(old, File.open(new).readlines.join(""))
+        end
+      end
+    end
+  end
+end

data/lib/bullet_train/themes/light/version.rb

@@ -1,7 +1,7 @@
 module BulletTrain
   module Themes
     module Light
-      VERSION = "1.0.44"
+      VERSION = "1.0.47"
     end
   end
 end

data/lib/bullet_train/themes/light.rb

@@ -1,6 +1,8 @@
 require "bullet_train/themes/light/version"
 require "bullet_train/themes/light/engine"
 require "bullet_train/themes/tailwind_css"
+require "bullet_train/themes/light/file_replacer"
+require "bullet_train/themes/light/custom_theme_file_replacer"
 
 module BulletTrain
   module Themes

data/lib/tasks/bullet_train/themes/light_tasks.rake

@@ -52,6 +52,110 @@ namespace :bullet_train do
 
         puts "You must restart `bin/dev` at this point, because of the changes to `Procfile.dev` and `package.json`."
       end
+
+      desc "Publish your custom theme theme as a Ruby gem."
+      task :release, [:theme_name] => :environment do |task, args|
+        puts "Preparing to release your custom theme: ".blue + args[:theme_name]
+        puts ""
+        puts "Before we make a new Ruby gem for your theme, you'll have to set up a GitHub repository first.".blue
+        puts "Hit <Return> and we'll open a browser to GitHub where you can create a new repository.".blue
+        puts "Make sure you name the repository ".blue + "bullet_train-themes-#{args[:theme_name]}"
+        puts ""
+        puts "When you're done, copy the SSH path from the new repository and return here.".blue
+        ask "We'll ask you to paste it to us in the next step."
+        `#{Gem::Platform.local.os == "linux" ? "xdg-open" : "open"} https://github.com/new`
+
+        ssh_path = ask "OK, what was the SSH path? (It should look like `git@github.com:your-account/your-new-repo.git`.)"
+        puts ""
+        puts "Great, you're all set.".blue
+        puts "We'll take it from here, so sit back and enjoy the ride 🚄️".blue
+        puts ""
+        puts "Creating a Ruby gem for ".blue + "#{args[:theme_name]}..."
+
+        Dir.mkdir("local") unless Dir.exist?("./local")
+        if Dir.exist?("./local/bullet_train-themes-#{args[:theme_name]}")
+          raise "You already have a repository named `bullet_train-themes-#{args[:theme_name]}` in `./local`.\n" \
+            "Make sure you delete it first to create an entirely new gem."
+        end
+        `git clone git@github.com:bullet-train-co/bullet_train-themes-light.git ./local/bullet_train-themes-#{args[:theme_name]}`
+
+        custom_file_replacer = BulletTrain::Themes::Light::CustomThemeFileReplacer.new(args[:theme_name])
+        custom_file_replacer.replace_theme("light", args[:theme_name])
+
+        work_tree_flag = "--work-tree=local/bullet_train-themes-#{args[:theme_name]}"
+        git_dir_flag = "--git-dir=local/bullet_train-themes-#{args[:theme_name]}/.git"
+        path = "./local/bullet_train-themes-#{args[:theme_name]}"
+
+        # Set up the proper remote.
+        `git #{work_tree_flag} #{git_dir_flag} remote set-url origin #{ssh_path}`
+        `git #{work_tree_flag} #{git_dir_flag} add .`
+        `git #{work_tree_flag} #{git_dir_flag} commit -m "Add initial files"`
+
+        # Build the gem.
+        `(cd #{path} && gem build bullet_train-themes-#{args[:theme_name]}.gemspec)`
+        `git #{work_tree_flag} #{git_dir_flag} add .`
+        `git #{work_tree_flag} #{git_dir_flag} commit -m "Build gem"`
+
+        # Commit the deleted files on the main application.
+        `git add .`
+        `git commit -m "Remove #{args[:theme_name]} files from application"`
+
+        # Push the gem's source code, but not the last commit in the main application.
+        `git #{work_tree_flag} #{git_dir_flag} push -u origin main`
+
+        puts ""
+        puts ""
+        puts "You're all set! Copy and paste the following commands to publish your gem:".blue
+        puts "cd ./local/bullet_train-themes-#{args[:theme_name]}"
+        puts "gem push bullet_train-themes-#{args[:theme_name]}-1.0.gem && cd ../../"
+        puts ""
+        puts "You may have to wait for some time until the gem can be downloaded via the Gemfile.".blue
+        puts "After a few minutes, run the following command in your main application:".blue
+        puts "bundle add bullet_train-themes-#{args[:theme_name]}"
+        puts ""
+        puts "Then you'll be ready to use your custom gem in your Bullet Train application.".blue
+      end
+
+      desc "Install this theme to your main application."
+      task :install do |rake_task|
+        # Grab the theme name from the rake task, bullet_train:theme:light:install
+        theme_name = rake_task.name.split(":")[2]
+
+        # Grabs the current theme from
+        # def current_theme
+        #   :theme_name
+        # end
+        current_theme_regexp = /(^    :)(.*)/
+        current_theme = nil
+
+        new_lines = []
+        [
+          "./app/helpers/application_helper.rb",
+          "./Procfile.dev",
+          "./package.json"
+        ].each do |file|
+          File.open(file, "r") do |f|
+            new_lines = f.readlines
+            new_lines = new_lines.map do |line|
+              # Make sure we get the current theme before trying to replace it in any of the files.
+              # We grab it from the first file in the array above.
+              current_theme = line.scan(current_theme_regexp).flatten.last if line.match?(current_theme_regexp)
+
+              line.gsub!(/#{current_theme}/, theme_name) unless current_theme.nil?
+              line
+            end
+          end
+
+          File.open(file, "w") do |f|
+            f.puts new_lines.join
+          end
+        end
+      end
+
+      def ask(string)
+        puts string.blue
+        $stdin.gets.strip
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-themes-light
 version: !ruby/object:Gem::Version
-  version: 1.0.44
+  version: 1.0.47
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -124,7 +124,9 @@ files:
 - app/views/themes/light/workflow/_box.html.erb
 - config/routes.rb
 - lib/bullet_train/themes/light.rb
+- lib/bullet_train/themes/light/custom_theme_file_replacer.rb
 - lib/bullet_train/themes/light/engine.rb
+- lib/bullet_train/themes/light/file_replacer.rb
 - lib/bullet_train/themes/light/version.rb
 - lib/tasks/bullet_train/themes/light_tasks.rake
 - tailwind.light.config.js