decko 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c6db755b2db7ac79e35bb2b9d5f2b8b38edaeb528985cd00631c5b0e6f883e2
-  data.tar.gz: 7a6b0e083047509d211e77a8fd68e5c22bc2bc081d40c933f3777ee17e498aa3
+  metadata.gz: 248a2dc0a741869d8f08dac5d37fe27836bf0e1739fb07753718700ede5af334
+  data.tar.gz: cd47e990d0affdc1d4555f18601a9d69a1e8fa1c366f95610c4b1a1774dae563
 SHA512:
-  metadata.gz: 04ad5d539b80b8c5ae27f2c1bcc8d716c6a4a5ec36283410797320896f861a8124e141901bcdd0cc7e45522c46d516840c155e20b0812f6182353cd131c8c50c
-  data.tar.gz: bb637881c97f37183f475c952ee2af0ef71b5cc8089bbd854d729d72a9963c54038ace067b2ec238a9215daab02d97bd41114d1356d1a55c6830af905114ce8a
+  metadata.gz: 8d59e274fdf05490bde9e154b0c9888273575bb0a5d8887e79bd25fc6bdd1db5ba8a10c2eb17398db945e80bdb9cbf0abf36ec7d165671bf689cdc8916f4ac30
+  data.tar.gz: e316371fb24578a2879c1eb5f2d13225175dfe0b2f79cf6ed3a1a69f9a799663c69f2b690aedafb078d078a6d0c9a7c692694a0a11dff6440a0f218de1a505f5

data/config/environments/cucumber.rb

@@ -4,6 +4,7 @@ Decko.application.class.configure do
   # Edit at your own peril - it's recommended to regenerate this file
   # in the future when you upgrade to a newer version of Cucumber.
 
+  config.seed_type = :test
   config.eager_load = false
 
   config.asset_refresh = :never

data/lib/card_controller/rest.rb

@@ -29,7 +29,7 @@ class CardController
     private
 
     def setup
-      Card::Assets.refresh_assets unless params[:explicit_file]
+      Card::Assets.refresh unless params[:explicit_file]
       Card::Cache.renew
       Card::Env.reset self
     end

data/lib/decko/cli.rb

@@ -1,9 +1,10 @@
 require "rbconfig"
-require "decko/script_decko_loader"
+require "cardio/script_loader"
 
+Cardio::ScriptLoader.script_name = "decko"
 # If we are inside a Decko application this method performs an exec and thus
 # the rest of this script is not run.
-Decko::ScriptDeckoLoader.exec!
+Cardio::ScriptLoader.exec!
 
 require "rails/ruby_version_check"
 Signal.trap("INT") { exit(1) }

data/lib/decko/commands/application.rb

@@ -1,10 +1,5 @@
 require "rails/generators"
 require File.expand_path("../../../generators/deck/deck_generator", __FILE__)
+require "cardio/command"
 
-if ARGV.first != "new"
-  ARGV[0] = "--help"
-else
-  ARGV.shift
-end
-
-Cardio::Generators::Deck::DeckGenerator.start
+Cardio::Command.run_non_deck_command ARGV.first, "decko/commands"

data/lib/decko/commands/cucumber_command.rb

@@ -1,11 +1,11 @@
 # load the application so we can look in mods
 require APP_PATH
-require "cardio/commands/command"
+require "cardio/command/command_base"
 require "cardio/mod/dirs"
 
 module Decko
   class Commands
-    class CucumberCommand < Cardio::Commands::Command
+    class CucumberCommand < Cardio::Command::CommandBase
       require "decko/commands/cucumber_command/parser"
 
       def initialize args
@@ -17,7 +17,7 @@ module Decko
       def command
         @cmd ||=
           "#{env_args} #{@opts[:executer] || 'bundle exec'} " \
-          "cucumber #{require_args} #{feature_args}"
+          "cucumber #{require_args} #{feature_args} #{@cucumber_args.shelljoin}"
       end
 
       private
@@ -26,12 +26,9 @@ module Decko
         @opts[:env].join " "
       end
 
+      # use implicit features unless feature made explicit (in FIRST arg!)
       def feature_args
-        if @cucumber_args.empty?
-          feature_paths.join(" ")
-        else
-          @cucumber_args.shelljoin
-        end
+        feature_paths.join(" ") unless @cucumber_args.first&.match?(/^\s*[^-]/)
       end
 
       def require_args

data/lib/decko/commands.rb

@@ -1,9 +1,11 @@
 ENV["CARDIO_COMMANDS"] = "NO_RUN"
 
-require "cardio/commands"
+require "cardio/command"
 
 module Decko
-  class Commands < Cardio::Commands
+  class Commands < Cardio::Command
+    Cardio::Command.bin_name = "decko"
+
     def map
       @map ||= super.merge(
         server: { desc: "start a local web server", group: :shark, alias: :s },

data/lib/decko/mods_spec_helper.rb

@@ -11,7 +11,6 @@ CardSpecLoader.prefork do
     Bundler.require(:test)
     # if simplecov is activated in the Gemfile, it has to be required here
   end
-  #  Cardio::Seed.test_path = File.dirname(__FILE__) + '/../fixtures'
   CardSpecLoader.rspec_config
 end
 

data/lib/decko/swagger/input_yml/layout.yml

@@ -4,7 +4,7 @@ info:
     Decko organizes data into "cards." Decko's API supports retrieval and alteration of card data.
 
     To get the JSON responses as described below, do _any_ of the following:
-      1. Set the http access header to `application/json` in your request
+      1. Set the http Accept header to `application/json` in your request
       2. Add `.json` to the url, or
       3. Add `format=json` to the query params.
 

data/lib/decko/swagger/output.yml

@@ -4,7 +4,7 @@ info:
   description: |-
     Decko organizes data into "cards." Decko's API supports retrieval and alteration of card data.
     To get the JSON responses as described below, do _any_ of the following:
-      1. Set the http access header to `application/json` in your request
+      1. Set the http Accept header to `application/json` in your request
       2. Add `.json` to the url, or
       3. Add `format=json` to the query params.
   version: 0.8.0

data/lib/rake_tasks/decko/benchmark.rake

@@ -3,7 +3,7 @@ require "benchmark"
 
 namespace :decko do
   namespace :benchmark do
-    desc "measure time for script generation"
+    desc "(for platypuses) measure time for script generation"
     task machines: :environment do
       Benchmark.bm do |x|
         regenerate x, :style
@@ -23,10 +23,6 @@ def regenerate benchmarker, all_field
       i_card.expire_machine_cache
     end
 
-    %w[machine_output machine_cache].each do |code|
-      Card.search(right: { codename: code }).each(&:delete)
-    end
-
     Card::Cache.reset_all
 
     benchmarker.report(all_field) do

data/lib/rake_tasks/decko/docs.rake

@@ -1,26 +1,36 @@
 # rake decko:docs:...
 
 # NOTE: for the moment these are Platypus tasks.
-# Until they're more monkey friendly, let's not write descriptions
+# Until they're more monkey friendly, let's not write `desc` descriptions.
+# Without those they won't show up when folks run `rake -T`
 #
 # Make sure: you're:
 #   (A) running in a development environment, and
 #   (B) pointing to a repo gem
 namespace :decko do
   namespace :docs do
-    # trigger tmpsets and then run yardoc
+    # Triggers tmpsets and then runs yardoc
+    #
+    # IMPORTANT: Only works if using source code from github.
     task :update do
-      Rake::Task["decko:tmpsets:trigger"].invoke
+      Cardio.config.load_strategy = :tmp_files
+      Rake::Task["decko:docs:dummy"].invoke
       Rake::Task["decko:docs:yardoc"].invoke
     end
 
-    # run yardoc command, which generates the docs content in the repo root
+    # Runs yardoc command, which generates the docs content in the repo root.
     #
+    # IMPORTANT: Only works if using source code from github.
     # If you run this while using decko as a built gem, you could get some funky docs in
     # your gems directory...
     task :yardoc do
       doc_dir = File.expand_path "..", Decko.gem_root
       system %(cd #{doc_dir}; yardoc)
     end
+
+    # just load environment and trigger Card load (used to generate tmpsets)
+    task dummy: :environment do
+      Card
+    end
   end
 end

data/lib/rake_tasks/decko.rake

@@ -1,147 +1,12 @@
 require "decko/application"
 require_relative "alias"
 
-CARD_TASKS =
-  [
-    :migrate,
-    { migrate: %i[cards structure core_cards deck_cards redo stamp] },
-    :reset_cache
-  ].freeze
+CARD_TASKS = (
+  %i[eat migrate reset_cache reset_tmp seed setup sow update] +
+  [{ assets: %i[refresh code wipe] },
+   { migrate: %i[cards structure core_cards deck_cards redo stamp] },
+   { mod: %i[list symlink missing uninstall install] },
+   { seed: %i[build clean dump plow polish replant update] }]
+).freeze
 
 link_task CARD_TASKS, from: :decko, to: :card
-
-decko_namespace = namespace :decko do
-  desc "create a decko database from scratch, load initial data"
-  task :seed do
-    failing_loudly "decko seed" do
-      seed
-    end
-  end
-
-  desc "create a decko database from scratch, load initial data, don't reset the cache"
-  task :seed_without_reset do
-    # This variant is needed to generate test databases for decks
-    # with custom codenames.
-    # The cache reset loads the environment. That tends to fail
-    # because of missing codenames that are added after the intial decko seed.
-    seed with_cache_reset: false
-  end
-
-  desc "clear and load fixtures with existing tables"
-  task reseed: :environment do
-    ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
-
-    decko_namespace["clear"].invoke
-    decko_namespace["load"].invoke
-  end
-
-  desc "empty the card tables"
-  task :clear do
-    conn = ActiveRecord::Base.connection
-
-    puts "delete all data in bootstrap tables"
-    Cardio::Seed::TABLES.each do |table|
-      conn.delete "delete from #{table}"
-    end
-  end
-
-  desc "Load seed data into database"
-  task :load do
-    decko_namespace["load_without_reset"].invoke
-    puts "reset cache"
-    system "bundle exec rake decko:reset_cache" # needs loaded environment
-  end
-
-  desc "Load seed data into database but don't reset cache"
-  task :load_without_reset do
-    require "decko/engine"
-    # puts "update card_migrations"
-    # decko_namespace["assume_card_migrations"].invoke
-
-    if Rails.env == "test" && !ENV["GENERATE_FIXTURES"]
-      puts "loading test fixtures"
-      Rake::Task["db:fixtures:load"].invoke
-    else
-      puts "loading seed data"
-      # db:seed checks for pending migrations. We don't want that because
-      # as part of the seeding process we update the migration table
-      ActiveRecord::Tasks::DatabaseTasks.load_seed
-      # :Rake::Task["db:seed"].invoke
-    end
-
-    puts "set symlink for assets"
-    decko_namespace["card:mod:symlink"].invoke
-  end
-
-  desc "reset with an empty tmp directory"
-  task :reset_tmp do
-    tmp_dir = Decko.paths["tmp"].first
-    if Decko.paths["tmp"].existent
-      Dir.foreach(tmp_dir) do |filename|
-        next if filename.starts_with? "."
-
-        FileUtils.rm_rf File.join(tmp_dir, filename), secure: true
-      end
-    else
-      Dir.mkdir tmp_dir
-    end
-  end
-
-  desc "update decko gems and database"
-  task :update do
-    failing_loudly "decko update" do
-      ENV["NO_RAILS_CACHE"] = "true"
-      decko_namespace["migrate"].invoke
-      decko_namespace["reset_tmp"].invoke
-      Card::Cache.reset_all
-      Rake::Task["card:mod:uninstall"].invoke
-      Rake::Task["card:mod:install"].invoke
-      Rake::Task["card:mod:symlink"].invoke
-    end
-  end
-
-  %i[list symlink missing uninstall install].each do |task|
-    alias_task "mod:#{task}", "card:mod:#{task}"
-  end
-  alias_task :migrate, "card:migrate"
-
-  desc "insert existing card migrations into schema_migrations_cards " \
-       "to avoid re-migrating"
-  task :assume_card_migrations do
-    require "decko/engine"
-    Cardio::Schema.assume_migrated_upto_version :core_cards
-  end
-
-  def seed with_cache_reset: true
-    ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
-    # FIXME: this should be an option, but should not happen on standard creates!
-    begin
-      Rake::Task["db:drop"].invoke
-    rescue StandardError
-      puts "not dropped"
-    end
-
-    puts "creating"
-    Rake::Task["db:create"].invoke
-
-    puts "loading schema"
-    Rake::Task["db:schema:load"].invoke
-
-    load_task = "decko:load"
-    load_task << "_without_reset" unless with_cache_reset
-    Rake::Task[load_task].invoke
-  end
-end
-
-def failing_loudly task
-  yield
-rescue StandardError
-  # TODO: fix this so that message appears *after* the errors.
-  # Solution should ensure that rake still exits with error code 1!
-  raise "\n>>>>>> FAILURE! #{task} did not complete successfully." \
-        "\n>>>>>> Please address errors and re-run:\n\n\n"
-end
-
-def version
-  ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -32,28 +32,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.0
 - !ruby/object:Gem::Dependency
   name: card-mod-defaults
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
 description: a wiki approach to structured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -107,19 +107,15 @@ files:
 - lib/decko/mods_spec_helper.rb
 - lib/decko/railtie.rb
 - lib/decko/rest_spec_helper.rb
-- lib/decko/script_decko_loader.rb
 - lib/decko/swagger.rb
 - lib/decko/swagger/input_yml/layout.yml
 - lib/decko/swagger/output.yml
 - lib/generators/deck/deck_generator.rb
 - lib/rake_tasks/alias.rb
 - lib/rake_tasks/cucumber.rake
-- lib/rake_tasks/db.rake
 - lib/rake_tasks/decko.rake
 - lib/rake_tasks/decko/benchmark.rake
 - lib/rake_tasks/decko/docs.rake
-- lib/rake_tasks/decko/seed.rake
-- lib/rake_tasks/decko/tmpsets.rake
 homepage: https://decko.org
 licenses:
 - GPL-3.0
@@ -144,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: structured wiki web platform

data/lib/decko/script_decko_loader.rb

@@ -1,13 +0,0 @@
-require "pathname"
-
-require "cardio/script_loader"
-
-module Decko
-  module ScriptDeckoLoader
-    extend Cardio::ScriptLoader::ClassMethods
-
-    def self.script
-      File.join("script", "decko")
-    end
-  end
-end

data/lib/rake_tasks/db.rake

@@ -1,63 +0,0 @@
-require "rake"
-
-# This code lets us redefine existing Rake tasks, which is extremely
-# handy for modifying existing Rails rake tasks.
-# Credit for the original snippet of code goes to Jeremy Kemper
-# http://pastie.caboo.se/9620
-unless Rake::TaskManager.methods.include?(:redefine_task)
-  module Rake
-    module TaskManager
-      def redefine_task task_class, args, &block
-        task_name, _arg_names, deps = resolve_args(args)
-        task_name = task_class.scope_name(@scope, task_name)
-        deps = [deps] unless deps.respond_to?(:to_ary)
-        deps = deps.map(&:to_s)
-        task = @tasks[task_name.to_s] = task_class.new(task_name, self)
-        task.application = self
-        @last_comment = nil
-        task.enhance(deps, &block)
-        task
-      end
-    end
-
-    class Task
-      class << self
-        def redefine_task args, &block
-          Rake.application.redefine_task(self, [args], &block)
-        end
-      end
-    end
-  end
-end
-
-namespace :db do
-  namespace :fixtures do
-    desc "Load fixtures into the current environment's database. " \
-         "Load specific fixtures using FIXTURES=x,y"
-    task load: :environment do
-      require "active_record/fixtures"
-      fixture_path = File.join(Cardio.gem_root, "db", "seed", "test", "fixtures")
-      ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
-      (if ENV["FIXTURES"]
-         ENV["FIXTURES"].split(/,/)
-       else
-         Dir.glob(File.join(fixture_path,
-                            "*.{yml,csv}"))
-       end).each do |fixture_file|
-        ActiveRecord::FixtureSet.create_fixtures(fixture_path,
-                                                 File.basename(fixture_file, ".*"))
-      end
-    end
-  end
-
-  namespace :test do
-    desc "Prepare the test database and load the schema"
-    Rake::Task.redefine_task(prepare: :environment) do
-      if ENV["RELOAD_TEST_DATA"] == "true" || ENV["RUN_CODE_RUN"]
-        puts `env RAILS_ENV=test rake decko:seed`
-      else
-        puts "skipping loading test data.  to force, run `env RELOAD_TEST_DATA=true rake db:test:prepare`"
-      end
-    end
-  end
-end

data/lib/rake_tasks/decko/seed.rake

@@ -1,139 +0,0 @@
-require "cardio/seed"
-
-namespace :decko do
-  namespace :seed do
-    desc "reseed, migrate, re-clean, and re-dump"
-    task update: :environment do
-      ENV["STAMP_MIGRATIONS"] = "true"
-      ENV["GENERATE_FIXTURES"] = "true"
-      %w[reseed update
-         mod:uninstall mod:install seed:make_asset_output_coded
-         seed:clean seed:supplement seed:dump].each do |task|
-        Rake::Task["decko:#{task}"].invoke
-      end
-    end
-
-    desc "remove unneeded cards, acts, actions, changes, and references"
-    task clean: :environment do
-      Card::Cache.reset_all
-      clean_cards
-      clean_acts_and_actions
-      Card::Cache.reset_all
-    end
-
-    def clean_cards
-      puts "clean cards"
-      # change actors so we can delete unwanted user cards that made changes
-      Card::Act.update_all actor_id: Card::WagnBotID
-      delete_ignored_cards
-      refresh_assets
-      Card::Assets.make_output_coded
-      # clean_unwanted_cards
-      Card.empty_trash
-    end
-
-    def clean_unwanted_cards
-      Card.search(right: { codename: "all" }).each(&:delete!)
-    end
-
-    def delete_ignored_cards
-      return unless (ignore = Card["*ignore"])
-
-      Card::Auth.as_bot do
-        ignore.item_cards.each(&:delete!)
-      end
-    end
-
-    task refresh_assets: :environment do
-      refresh_assets
-    end
-
-    def refresh_assets
-      puts "refresh assets"
-      Card::Auth.as_bot do
-        Card.where(right_id: :asset_input.card_id).delete_all
-      end
-      Card::Cache.reset_all
-      Cardio.config.compress_assets = true
-      Card::Assets.refresh_assets force: true
-    end
-
-    task make_asset_output_coded: :environment do
-      Card::Assets.make_output_coded
-    end
-
-    # def clean_files
-    #   puts "clean files"
-    #   Card::Cache.reset_all
-    #   # TODO: generalize to all unnecessary files
-    #   remove_old_machine_files
-    # end
-
-    def clean_acts_and_actions
-      clean_history
-      clean_time_and_user_stamps
-    end
-
-    def clean_history
-      puts "clean history"
-      act = Card::Act.create! actor_id: Card::WagnBotID, card_id: Card::WagnBotID
-      Card::Action.make_current_state_the_initial_state act
-      # conn.execute("truncate card_acts")
-      ActiveRecord::Base.connection.execute("truncate sessions")
-    end
-
-    def clean_time_and_user_stamps
-      puts "clean time and user stamps"
-      conn = ActiveRecord::Base.connection
-      who_and_when = [Card::WagnBotID, Time.now.utc.to_s(:db)]
-      conn.update "UPDATE cards SET " \
-                  "creator_id=%1$s, created_at='%2$s', " \
-                  "updater_id=%1$s, updated_at='%2$s'" % who_and_when
-      conn.update "UPDATE card_acts SET actor_id=%s, acted_at='%s'" % who_and_when
-    end
-
-    desc "add test data"
-    task supplement: :environment do
-      add_test_data
-    end
-
-    def add_test_data
-      return unless Rails.env == "test"
-
-      load Cardio::Seed.test_script_path
-      SharedData.add_test_data
-    end
-
-    desc "dump db to bootstrap fixtures"
-    task dump: :environment do
-      Card::Cache.reset_all
-      Cardio::Seed::TABLES.each do |table|
-        i = "000"
-        write_seed_file table do
-          yamlize_records table do |record, hash|
-            hash["#{table}_#{i.succ!}"] = record
-          end
-        end
-      end
-    end
-
-    def write_seed_file table
-      path = Rails.env == "test" ? Cardio::Seed.test_path : Cardio::Seed.path
-      filename = File.join path, "#{table}.yml"
-      File.open filename, "w" do |file|
-        file.write yield
-      end
-    end
-
-    def yamlize_records table
-      data = ActiveRecord::Base.connection.select_all "select * from #{table}"
-      YAML.dump(
-        data.each_with_object({}) do |record, hash|
-          record["trash"] = false if record.key? "trash"
-          record["draft"] = false if record.key? "draft"
-          yield record, hash
-        end
-      )
-    end
-  end
-end

data/lib/rake_tasks/decko/tmpsets.rake

@@ -1,25 +0,0 @@
-namespace :decko do
-  namespace :tmpsets do
-    # We have to load the environment with `env REPO_TMPSETS=true` in
-    # development mode to trigger the tmpset generation.
-    # There's probably a more elegant way?
-    task :trigger do
-      ENV["REPO_TMPSETS"] = "true"
-      Rake::Task["decko:tmpsets:dummy"].invoke
-    end
-
-    # just load environment and trigger Card load
-    task dummy: :environment do
-      Card
-    end
-
-    task :copy do
-      require "fileutils"
-      require "cardio"
-
-      target = "#{Cardio.gem_root}/tmpsets"
-      FileUtils.rm_r Dir["#{target}/set*"]
-      FileUtils.cp_r Dir["#{Cardio.root}/tmpsets/set*"], "#{Cardio.gem_root}/tmpsets"
-    end
-  end
-end