card 1.103.4 → 1.104.0

data/lib/card/view/options.rb

@@ -40,6 +40,7 @@ class Card
         heir: [
           :main,           # format object is page's "main" object (Boolean)
           :home_view,      # view for slot to return to when no view specified
+          :buttons_view,
           :edit_structure, # use a different structure for editing (Array)
           :cql,            # contextual cql alterations for search cards (Hash)
           :action_id,      # a Card::Action id (Integer)
@@ -50,20 +51,21 @@ class Card
           :help,           # cue text when editing
           :structure,      # overrides the content of the card
           :title,          # overrides the name of the card
-          :variant,        # override the canonical version of the name with a different
-          # variant
+          :variant,        # override the standard name with a different variant
           :input_type,     # inline_nests makes a form within standard content (Symbol)
           :type,           # set the default type of new cards
           :size,           # set an image size
-          # (also used for character limit in one_line_content)
-          :params,         # parameters for add button.  deprecated!
+          #                    (also used for character limit in one_line_content)
           :items,          # options for items (Hash)
           :cache,          # change view cache behaviour
           #                    (Symbol<:always, :standard, :never>)
           :edit,           # edit mode
           #                    (Symbol<:inline, :standard, :full>)
           :separator,      # item separator in certain lists
-          :filter
+          :filter,
+
+          # DEPRECATED
+          :params          # parameters for add button
         ],
         none: [
           :skip_perms,     # do not check permissions for this view (Boolean)

data/lib/cardio/cli.rb

@@ -1,4 +1,5 @@
 require "rbconfig"
+require "colorize"
 require "cardio/script_loader"
 
 # If we are inside a Decko application this method performs an exec and thus

data/lib/cardio/commands/custom.rb

@@ -0,0 +1,60 @@
+require "optparse"
+require "cardio/version"
+
+module Cardio
+  class Commands
+    module Custom
+      private
+
+      def run_new
+        if !["-h", "--help"].intersection(args).empty?
+          require "cardio/commands/application"
+        else
+          puts "Can't initialize a new deck within the directory of another, " \
+               "please change to a non-deck directory first.\n"
+          puts "Type '#{gem}' for help."
+          exit 1
+        end
+      end
+
+      def run_version
+        puts "Card #{Version.card_release}".light_cyan
+      end
+
+      def run_rspec
+        require "cardio/commands/rspec_command"
+        RspecCommand.new(args).run
+      end
+
+      # def run_jasmine
+      #   require "cardio/commands/rake_command"
+      #   RakeCommand.new("spec:javascript", envs: "test").run
+      # end
+
+      def run_help
+        puts "Usage:"
+        puts "  #{gem} COMMAND [OPTIONS]".green
+        puts
+        puts "Run commands with -h (or --help) for more info."
+
+        %i[shark monkey].each do |group|
+          puts
+          puts "For " + "#{group}s".yellow + ":"
+          map.each do |command, conf|
+            next unless conf[:group] == group
+            puts command_help(command, conf)
+          end
+          puts
+        end
+      end
+
+      private
+
+      # formats command string for help text
+      def command_help command, conf
+        alt = conf[:alias] ? "(or #{conf[:alias]})" : ""
+        "    " + command.to_s.ljust(12).light_cyan + alt.ljust(10) + conf[:desc]
+      end
+    end
+  end
+end

data/lib/cardio/commands/rake_command/parser.rb

@@ -1,50 +1,51 @@
 # -*- encoding : utf-8 -*-
 
-require "optparse"
-
-module Cardio
-  class Commands
-    class RakeCommand
-      # parse decko/card -specific options for rake
-      class Parser < OptionParser
-        ONS = {
-          production: {
-            desc: "production database (default)"
-          },
-          test: {},
-          development: {},
-          all: {
-            desc: "production, test, and development database",
-            envs: %w[production development test]
-          }
-        }.freeze
-
-        def initialize command, opts
-          super() do |parser|
-            parser.banner = "Usage: decko #{command} [options]\n\n" \
-                            "Run decko:#{command} task on the production "\
-                            " database specified in config/database.yml\n\n"
-            parser_ons parser, command do |env_array|
-              opts[:envs] = env_array
-            end
-          end
-        end
-
-        def parser_ons parser, command
-          ONS.each do |env, vals|
-            parser.on(*parser_on_opts(env, command, vals[:desc])) do
-              yield (vals[:envs] || [env.to_s])
-            end
-          end
-        end
-
-        def parser_on_opts env, command, desc
-          main = "--#{env}"
-          short = "-#{env.to_s[0]}"
-          desc ||= "#{env} database"
-          [main, short, "#{command} #{desc}"]
-        end
-      end
-    end
-  end
-end
+# require "optparse"
+#
+# module Cardio
+#   class Commands
+#     class RakeCommand
+#       # parse decko/card -specific options for rake
+#       class Parser < OptionParser
+#         ONS = {
+#           production: {
+#             desc: "production database (default)"
+#           },
+#           test: {},
+#           development: {},
+#           all: {
+#             desc: "production, test, and development database",
+#             envs: %w[production development test]
+#           }
+#         }.freeze
+#
+#         def initialize command, opts
+#           super() do |parser|
+#             parser.banner =
+#               "Usage:\n" +
+#                 "  #{Commands.gem} #{command} [options]".green +
+#                 "\n\nRuns `rake #{Commands.gem}:#{command}` task."
+#             parser_ons parser, command do |env_array|
+#               opts[:envs] = env_array
+#             end
+#           end
+#         end
+#
+#         def parser_ons parser, command
+#           ONS.each do |env, vals|
+#             parser.on(*parser_on_opts(env, command, vals[:desc])) do
+#               yield (vals[:envs] || [env.to_s])
+#             end
+#           end
+#         end
+#
+#         def parser_on_opts env, command, desc
+#           main = "--#{env}"
+#           short = "-#{env.to_s[0]}"
+#           desc ||= "#{env} database"
+#           [main, short, "#{command} #{desc}"]
+#         end
+#       end
+#     end
+#   end
+# end

data/lib/cardio/commands/rake_command.rb

@@ -1,24 +1,25 @@
 require File.expand_path("command", __dir__)
-# require "pry"
 
 module Cardio
   class Commands
     # enhance standard rake command with some decko/card -specific options
     class RakeCommand < Command
-      def initialize rake_task, args={}
-        @task = rake_task
-        opts = {}
-        if args.is_a? Array
-          Parser.new(rake_task, opts).parse!(args)
-        else
-          opts = args
-        end
-        @envs = Array(opts[:envs])
+      def initialize gem, command, args={}
+        @command = command
+        @task = "#{gem}:#{command}"
+        @args = [args].flatten
+        # opts = {}
+        # if args.is_a? Array
+        #   Parser.new(rake_task, opts).parse!(args)
+        # else
+        #   opts = args
+        # end
+        # @envs = Array(opts[:envs])
       end
 
       def run
         commands.each do |cmd|
-          puts cmd
+          # puts cmd
           # exit_with_child_status cmd
 
           result = `#{cmd}`
@@ -30,14 +31,15 @@ module Cardio
 
       def commands
         task_cmd = "bundle exec rake #{@task}"
+        task_cmd += " -- #{@args.join ' '}" if !@args.empty?
         return [task_cmd] if !@envs || @envs.empty?
 
-        @envs.map do |env|
-          "env RAILS_ENV=#{env} #{task_cmd}"
-        end
+        # @envs.map do |env|
+        #   "env RAILS_ENV=#{env} #{task_cmd}"
+        # end
       end
     end
   end
 end
 
-require File.expand_path("rake_command/parser", __dir__)
+# require File.expand_path("rake_command/parser", __dir__)

data/lib/cardio/commands/rspec_command.rb

@@ -24,6 +24,8 @@ module Cardio
       end
 
       def coverage
+        return if @opts[:simplecov]
+
         # no coverage if rspec was started with file argument
         return unless @opts[:files] || @rspec_args.any?
 

data/lib/cardio/commands.rb

@@ -1,53 +1,59 @@
 require "English"
+require "colorize"
+require "cardio/commands/custom"
 
 module Cardio
-  # manage different types of commands that can be run via bin/card and bin/decko
+  # manage different types of commands that can be run via bin/card (and bin/decko)
   class Commands
+    include Custom
+    
     attr_reader :command, :args
 
-    # class methods for commands
-    # (basically simulates cattr_reader, which isn't available here)
-    module Accessors
-      def aliases
-        @aliases ||= {
-          "rs" => "rspec",
-          "jm" => "jasmine",
-          "g"  => "generate",
-          "d"  => "destroy",
-          "c"  => "console",
-          "db" => "dbconsole",
-          "r"  => "runner",
-          "v"  => "version",
-          "h"  => "help"
-        }
-      end
+    class << self
+      attr_accessor :current
 
-      def commands
-        @commands ||= {
-          rails:  %w[generate destroy plugin benchmarker profiler
-                     console dbconsole application runner],
-          rake:   %w[seed reseed load update],
-          custom: %w[new rspec jasmine version help]
-        }
+      def gem
+        current&.gem
       end
     end
 
-    extend Accessors
+    def map
+      @map ||= {
+        new: { desc: "create a new deck", group: :shark, via: :call },
+        seed: { desc: "populate a database", group: :shark, via: :rake },
+        update: { desc: "run data updates", group: :shark, alias: :u, via: :rake },
+        version: { desc: "#{gem} gem version", group: :shark, alias: :v, via: :call },
+        help: { desc: "show this text", group: :shark, alias: :h, via: :call},
+
+        console: { desc: "start a ruby console", group: :monkey, alias: :c },
+        dbconsole: { desc: "start a database console", group: :monkey, alias: :db },
+        runner: { desc: "run code in app environment", group: :monkey, alias: :r },
+        rspec: { desc: "run rspec tests", group: :monkey, alias: :rs, via: :call },
+        generate: { desc: "generate templated code", group: :monkey, alias: :g },
+        poop: { desc: "export card data to mod yaml", group: :monkey, via: :rake },
+        eat: { desc: "ingest card data from mod yaml", group: :monkey, via: :rake }
+      }
+    end
+
+    # TODO: review the following. see if any work well enough to include
+    #
+    #    application  Generate the Rails application code
+    #    destroy      Undo code generated with "generate" (short-cut alias: "d")
+    #    benchmarker  See how fast a piece of code runs
+    #    profiler     Get profile information from a piece of code
+    #    plugin       Install a plugin
+    #    jasmine
 
     def initialize args
       @args = args
-      @command = self.class.aliases[args.first] || args.first
+      @command = command_for_key args.first&.to_sym
       ENV["PRY_RESCUE_RAILS"] = "1" if rescue?
       @args.shift unless handler == :rails
+      Commands.current = self
     end
 
-    def rescue?
-      args.delete "--rescue"
-    end
-
-    def handler
-      commands = self.class.commands
-      @handler ||= commands.keys.find { |k| commands[k].include? command }
+    def gem
+      "card"
     end
 
     def run
@@ -56,65 +62,59 @@ module Cardio
         run_rails
       when :rake
         run_rake
-      when :custom
+      when :call
         send "run_#{command}"
-      else
-        unrecognized
+      when :unknown
+        unknown_error
       end
       exit 0
     end
 
-    # runs all commands in "rails" list
-    def run_rails
-      require "rails/commands"
-    end
+    private
 
-    # runs all commands in "rake" list
-    def run_rake
-      require "cardio/commands/rake_command"
-      RakeCommand.new("#{rake_prefix}:#{command}", args).run
-    end
+    def command_for_key key
+      return :help unless key
+      return key if map.key? key
 
-    def rake_prefix
-      "card"
+      map.each { |k, v| return k if v[:alias] == key }
+      @unknown = true
+      key
     end
 
-    # ~~~~~~~~~ CUSTOM COMMANDS ~~~~~~~~~~~~ #
+    def rescue?
+      args.delete "--rescue"
+    end
 
-    def run_help
-      puts File.read(File.expand_path("../commands/USAGE", __FILE__))
+    def config
+      map[command]
     end
 
-    def run_new
-      if ["-h", "--help"].include? args.first
-        require "cardio/commands/application"
-      else
-        puts "Can't initialize a new deck within the directory of another, " \
-         "please change to a non-deck directory first.\n"
-        puts "Type 'decko' for help."
-        exit 1
-      end
+    def handler
+      @handler ||= @unknown ? :unknown : (config[:via] || :rails)
     end
 
-    def run_version
-      require "card/version"
-      puts "Decko #{Card::Version.release}"
+    # runs all commands in "rails" list
+    def run_rails
+      require generator_requirement if command == :generate
+      require "rails/commands"
     end
 
-    def run_rspec
-      require "cardio/commands/rspec_command"
-      RspecCommand.new(args).run
+    def generator_requirement
+      "cardio/generators"
     end
 
-    def run_jasmine
+    # runs all commands in "rake" list
+    def run_rake
       require "cardio/commands/rake_command"
-      RakeCommand.new("spec:javascript", envs: "test").run
+      RakeCommand.new(gem, command, args).run
     end
 
     # ~~~~~~~~~~~~~~~~~~~~~ catch-all -------------- #
 
-    def unrecognized
-      puts "Error: Command not recognized: #{command}"
+    def unknown_error
+      puts "----------------------------------------------\n" \
+           "ERROR: Command not recognized: #{command}\n" \
+           "----------------------------------------------\n".red
       run_help
       exit 1
     end

data/lib/cardio/generators.rb

@@ -2,19 +2,72 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require "colorize"
 
 module Cardio
   # for now, this just fulfills zeitwerk expectations. File is here for require calls.
   module Generators
-    # noop
+    # methods shared across Generator bases (which inherit from Rails generator classes)
+    module ClassMethods
+      def source_root path=nil
+        if path
+          @_card_source_root = path
+        else
+          @_card_source_root ||= File.expand_path(
+            "../../generators/#{generator_name}/templates", __FILE__
+          )
+        end
+      end
+
+      # Override Rails default banner (using card/decko for the command name).
+      def banner
+        usage_args = arguments.map(&:usage).join " "
+        text = "\n#{banner_command} generate #{namespace} #{usage_args} [options]".green
+        text.gsub(/\s+/, " ")
+      end
+
+      def banner_command
+        Commands.gem
+      end
+
+      # Override Rails namespace handling so we can put generators in `module Cardio`
+      def namespace name=nil
+        return super if name
+        @namespace ||= super.sub(/cardio:/, "")
+      end
+    end
+    delegate :banner_command, to: :class
   end
 end
 
 module Rails
   # override to hide all the rails generators that don't apply in a card/decko context
   module Generators
-    def self.sorted_groups
-      [["card", %w[mod set migration]]]
+    class << self
+      # TODO: autogenerate
+      def generator_names
+        %i[mod set migration]
+      end
+
+      def help command="generate"
+        caller = Cardio::Commands.gem
+        puts "Usage:"
+        puts "  #{caller} #{command} GENERATOR [args] [options]".green
+        puts
+        puts "General options:"
+        puts "  -h, [--help]     # Print generator's options and usage"
+        puts "  -p, [--pretend]  # Run but do not make any changes"
+        puts "  -f, [--force]    # Overwrite files that already exist"
+        puts "  -s, [--skip]     # Skip files that already exist"
+        puts "  -q, [--quiet]    # Suppress status output"
+        puts
+        puts "Please choose a generator below."
+        puts
+        generator_names.each do |name|
+          puts "  #{name}".light_cyan
+        end
+        puts
+      end
     end
   end
 end

data/lib/cardio/migration/deck_structure.rb

@@ -1,5 +1,7 @@
 # -*- encoding : utf-8 -*-
 
+# ENV["NO_CARD_LOAD"] = "true"
+
 require "cardio/migration"
 
 module Cardio

data/lib/cardio/migration/import/import_data/card_content.rb

@@ -5,7 +5,7 @@ module Cardio
         # handles card content for import
         module CardContent
           def card_content data
-            File.read(content_path(data))
+            File.read content_path(data)
           end
 
           def content_changed? data

data/lib/cardio/migration/import.rb

@@ -64,11 +64,11 @@ module Cardio
       private
 
       def update &block
-        ImportData.update(@data_path, &block)
+        ImportData.update @data_path, &block
       end
 
       def importer
-        @importer ||= ImportData.new(@data_path)
+        @importer ||= ImportData.new @data_path
       end
 
       # Returns an array of hashes with card attributes

data/lib/cardio/migration.rb

@@ -2,7 +2,7 @@
 
 module Cardio
   class Migration < ActiveRecord::Migration[4.2]
-    include Card::Model::SaveHelper
+    include Card::Model::SaveHelper unless ENV["NO_CARD_LOAD"]
     @type = :deck_cards
 
     class << self
@@ -43,12 +43,36 @@ module Cardio
         Schema.assume_migrated_upto_version type
       end
 
+      def assume_current
+        migration_context do |mc|
+          versions = mc.migrations.map(&:version)
+          migrated = mc.get_all_versions
+          mark_as_migrated versions - migrated
+        end
+      end
+
       def data_path filename=nil
         File.join([migration_paths.first, "data", filename].compact)
       end
+
+      private
+
+      def mark_as_migrated versions
+        sql = connection.send :insert_versions_sql, versions
+        connection.execute sql
+      end
+
+      def connection
+        ActiveRecord::Base.connection
+      end
+
+      def migration_context &block
+        Schema.migration_context type, &block
+      end
     end
 
     def contentedly
+      return yield if ENV["NO_CARD_LOAD"]
       Card::Cache.reset_all
       Schema.mode "" do
         Card::Auth.as_bot do
@@ -111,7 +135,7 @@ module Cardio
     end
 
     # Execute this migration in the named direction
-    # copied from ActiveRecord to wrap 'up' in 'contentendly'
+    # copied from ActiveRecord to wrap 'up' in 'contentedly'
     def exec_migration conn, direction
       @connection = conn
       if respond_to?(:change)