card 1.18.6 → 1.19.0

data/lib/card/subdirector_array.rb

@@ -13,16 +13,15 @@ class Card
       super()
     end
 
-    def add card
+    def add card, opts={}
       if card.is_a? Card::StageDirector
         card = card.card
       end
-      each do |dir|
-        return dir if dir.card == card
-      end
+      each { |dir| return dir if dir.card == card }
       dir = Card::DirectorRegister.fetch card, parent: @parent
       dir.main = false
       dir.parent = @parent
+      dir.transact_in_stage = opts[:transact_in_stage]
       self << dir
       dir
     end

data/lib/card/tasks/card.rake

@@ -0,0 +1,57 @@
+namespace :card do
+  desc "merge import card data that was updated since the last push into " \
+       "the the database"
+  task merge: :environment do
+    Card::Migration::Import.merge
+  end
+
+  desc "merge all import card data into the the database"
+  task merge_all: :environment do
+    Card::Migration::Import.merge true
+  end
+
+  desc "add card to import data"
+  task pull: :environment do
+    pull_card
+  end
+
+  desc "add card and all nested cards to import data"
+  task deep_pull: :environment do
+    pull_card deep: true
+  end
+
+  desc "add nested cards to import data (not the card itself)"
+  task deep_pull_items: :environment do
+    pull_card items_only: true
+  end
+
+  desc "add items of the export card to import data"
+  task pull_export: :environment do
+    Card::Migration::Import.pull "export", items_only: true,
+                                           remote: ENV["from"]
+  end
+
+  desc "add a new card to import data"
+  task add: :environment do
+    _task, name, type, codename = ARGV
+    Card::Migration::Import.add_card name: name, type: type || "Basic",
+                                     codename: codename
+    exit
+  end
+
+  desc "register remote for importing card data"
+  task add_remote: :environment do
+    _task, name, url = ARGV
+    raise "no name given" unless name.present?
+    raise "no url given" unless url.present?
+    Card::Migration::Import.add_remote name, url
+    exit
+  end
+
+  def pull_card opts={}
+    _task, card = ARGV
+    raise "no card given" unless card.present?
+    Card::Migration::Import.pull card, opts.merge(remote: ENV["from"])
+    exit # without exit the card argument is treated as second rake task
+  end
+end

data/lib/card/version.rb

@@ -3,7 +3,7 @@
 module Card::Version
   class << self
     def release
-      @@version ||= File.read(File.expand_path '../../../VERSION', __FILE__).strip
+      @@version ||= File.read(File.expand_path "../../../VERSION", __FILE__).strip
     end
   end
 end

data/lib/cardio.rb

@@ -1,17 +1,20 @@
 # -*- encoding : utf-8 -*-
 
-require 'active_support/core_ext/numeric/time'
+require "active_support/core_ext/numeric/time"
+require "delayed_job_active_record"
+require "cardio/schema.rb"
+
+ActiveSupport.on_load :card do
+  if Card.take
+    Card::Mod::Loader.load_mods
+  else
+    Rails.logger.warn "empty database"
+  end
+end
 
 module Cardio
-  CARD_GEM_ROOT = File.expand_path('../..', __FILE__)
-
-  ActiveSupport.on_load :card do
-    if Card.take
-      Card::Loader.load_mods
-    else
-      Rails.logger.warn 'empty database'
-    end
-  end
+  extend Schema
+  CARD_GEM_ROOT = File.expand_path("../..", __FILE__)
 
   mattr_reader :paths, :config, :cache
 
@@ -33,7 +36,7 @@ module Cardio
         override_protocol:      nil,
 
         no_authentication:      false,
-        files_web_path:         'files',
+        files_web_path:         "files",
 
         max_char_count:         200,
         max_depth:              20,
@@ -44,10 +47,10 @@ module Cardio
         space_last_in_multispace: true,
         closed_search_limit:    50,
 
-        non_createable_types:   [%w( signup setting set )],
+        non_createable_types:   [%w(signup setting set)],
         view_cache:             false,
 
-        encoding:               'utf-8',
+        encoding:               "utf-8",
         request_logger:         false,
         performance_logger:     false,
         sql_comments:           true
@@ -68,7 +71,7 @@ module Cardio
     end
 
     def read_only?
-      !ENV['WAGN_READ_ONLY'].nil?
+      !ENV["WAGN_READ_ONLY"].nil?
     end
 
     # In production mode set_config gets called twice.
@@ -80,33 +83,33 @@ module Cardio
 
     def set_paths paths
       @@paths = paths
-      add_path 'tmp/set', root: root
-      add_path 'tmp/set_pattern', root: root
+      add_path "tmp/set", root: root
+      add_path "tmp/set_pattern", root: root
 
-      add_path 'mod'
+      add_path "mod"
 
-      add_path 'db'
-      add_path 'db/migrate'
-      add_path 'db/migrate_core_cards'
-      add_path 'db/migrate_deck_cards', root: root, with: 'db/migrate_cards'
-      add_path 'db/seeds', with: 'db/seeds.rb'
+      add_path "db"
+      add_path "db/migrate"
+      add_path "db/migrate_core_cards"
+      add_path "db/migrate_deck_cards", root: root, with: "db/migrate_cards"
+      add_path "db/seeds", with: "db/seeds.rb"
 
-      add_path 'config/initializers', glob: '**/*.rb'
+      add_path "config/initializers", glob: "**/*.rb"
       add_initializers root
     end
 
     def set_mod_paths
-      each_mod_path { |mod_path| add_initializers File.join(mod_path, '*') }
+      each_mod_path { |mod_path| add_initializers File.join(mod_path, "*") }
     end
 
     def add_initializers dir
       Dir.glob("#{dir}/config/initializers").each do |initializers_dir|
-        paths['config/initializers'] << initializers_dir
+        paths["config/initializers"] << initializers_dir
       end
     end
 
     def each_mod_path
-      paths['mod'].each do |mod_path|
+      paths["mod"].each do |mod_path|
         yield mod_path
       end
     end
@@ -127,63 +130,17 @@ module Cardio
 
     def future_stamp
       # # used in test data
-      @@future_stamp ||= Time.zone.local 2020, 1, 1, 0, 0, 0
+      @future_stamp ||= Time.zone.local 2020, 1, 1, 0, 0, 0
     end
 
     def migration_paths type
       list = paths["db/migrate#{schema_suffix type}"].to_a
       if type == :deck_cards
-        list += Card::Loader.mod_dirs.map do |p|
-          Dir.glob "#{p}/db/migrate_cards"
-        end.flatten
-      end
-      list
-    end
-
-    def assume_migrated_upto_version type
-      Cardio.schema_mode(type) do
-        ActiveRecord::Schema.assume_migrated_upto_version(
-          Cardio.schema(type), Cardio.migration_paths(type)
-        )
-      end
-    end
-
-    def schema_suffix type
-      case type
-      when :core_cards then '_core_cards'
-      when :deck_cards then '_deck_cards'
-      else ''
+        Card::Mod::Loader.mod_dirs.each("db/migrate_cards") do |path|
+          list += Dir.glob path
+        end
       end
-    end
-
-    def delete_tmp_files id=nil
-      dir = Cardio.paths['files'].existent.first + '/tmp'
-      dir += "/#{id}" if id
-      FileUtils.rm_rf dir, secure: true
-    rescue
-      Rails.logger.info 'failed to remove tmp files'
-    end
-
-    def schema_mode type
-      new_suffix = Cardio.schema_suffix type
-      original_suffix = ActiveRecord::Base.table_name_suffix
-      ActiveRecord::Base.table_name_suffix = new_suffix
-      ActiveRecord::SchemaMigration.reset_table_name
-      paths = Cardio.migration_paths(type)
-      yield(paths)
-      ActiveRecord::Base.table_name_suffix = original_suffix
-      ActiveRecord::SchemaMigration.reset_table_name
-    end
-
-    def schema type=nil
-      File.read(schema_stamp_path type).strip
-    end
-
-    def schema_stamp_path type
-      root_dir = (type == :deck_cards ? root : gem_root)
-      stamp_dir = ENV['SCHEMA_STAMP_PATH'] || File.join(root_dir, 'db')
-
-      File.join stamp_dir, "version#{schema_suffix type}.txt"
+      list.flatten
     end
   end
 end

data/lib/cardio/schema.rb

@@ -0,0 +1,41 @@
+module Cardio
+  module Schema
+    def assume_migrated_upto_version type
+      Cardio.schema_mode(type) do
+        ActiveRecord::Schema.assume_migrated_upto_version(
+          Cardio.schema(type), Cardio.migration_paths(type)
+        )
+      end
+    end
+
+    def schema_suffix type
+      case type
+      when :core_cards then "_core_cards"
+      when :deck_cards then "_deck_cards"
+      else ""
+      end
+    end
+
+    def schema_mode type
+      new_suffix = Cardio.schema_suffix type
+      original_suffix = ActiveRecord::Base.table_name_suffix
+      ActiveRecord::Base.table_name_suffix = new_suffix
+      ActiveRecord::SchemaMigration.reset_table_name
+      paths = Cardio.migration_paths(type)
+      yield(paths)
+      ActiveRecord::Base.table_name_suffix = original_suffix
+      ActiveRecord::SchemaMigration.reset_table_name
+    end
+
+    def schema type=nil
+      File.read(schema_stamp_path(type)).strip
+    end
+
+    def schema_stamp_path type
+      root_dir = (type == :deck_cards ? root : gem_root)
+      stamp_dir = ENV["SCHEMA_STAMP_PATH"] || File.join(root_dir, "db")
+
+      File.join stamp_dir, "version#{schema_suffix type}.txt"
+    end
+  end
+end

data/lib/generators/card.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
-require 'rails/generators'
-require 'rails/generators/active_record'
+require "rails/generators"
+require "rails/generators/active_record"
 
 class Card
   module Generators
@@ -10,13 +10,13 @@ class Card
         if path
           @_card_source_root = path
         else
-          @_card_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'card', generator_name, 'templates'))
+          @_card_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), "card", generator_name, "templates"))
         end
       end
 
       # Override Rails default banner (wagn is the command name).
       def banner
-        "wagn generate #{namespace} #{arguments.map(&:usage) * ' '} [options]".gsub(/\s+/, ' ')
+        "wagn generate #{namespace} #{arguments.map(&:usage) * ' '} [options]".gsub(/\s+/, " ")
       end
     end
 

data/lib/generators/card/format/USAGE

@@ -2,8 +2,8 @@ Description:
     Generates a new format
 
 Example:
-    wagn generate card:format 01_core backup
+    wagn generate card:format core backup
 
     This will create:
-        mod/01_core/format/backup_format.rb
-        spec/mod/01_core/format/backup_format_spec.rb
+        mod/core/format/backup_format.rb
+        spec/mod/core/format/backup_format_spec.rb

data/lib/generators/card/format/format_generator.rb

@@ -1,26 +1,26 @@
 # -*- encoding : utf-8 -*-
 
-require 'generators/card'
+require "generators/card"
 
 class Card
   module Generators
     class FormatGenerator < NamedBase
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
 
       argument :module_name, required: true
-      class_option 'core', type: :boolean, aliases: '-c', default: false, group: :runtime,
-                           desc: 'create format files in Card gem'
+      class_option "core", type: :boolean, aliases: "-c", default: false, group: :runtime,
+                           desc: "create format files in Card gem"
 
       def create_files
         mod_path = if options.core?
-                     File.join Cardio.gem_root, 'mod', file_name
+                     File.join Cardio.gem_root, "mod", file_name
                    else
-                     File.join 'mod', file_name
+                     File.join "mod", file_name
           end
-        format_path = File.join(mod_path, 'format', "#{module_name}_format.rb")
-        spec_path = File.join(mod_path, 'spec', 'format', "#{module_name}_format_spec.rb")
-        template 'format_template.erb', format_path
-        template 'format_spec_template.erb', spec_path
+        format_path = File.join(mod_path, "format", "#{module_name}_format.rb")
+        spec_path = File.join(mod_path, "spec", "format", "#{module_name}_format_spec.rb")
+        template "format_template.erb", format_path
+        template "format_spec_template.erb", spec_path
       end
     end
   end

data/lib/generators/card/migration/migration_generator.rb

@@ -1,17 +1,17 @@
 # -*- encoding : utf-8 -*-
 
-require 'generators/card'
+require "generators/card"
 
 class Card
   module Generators
     class MigrationGenerator < MigrationBase
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
 
-      class_option 'core', type: :boolean, aliases: '-c', default: false, group: :runtime,
-                           desc: 'Create card migration for card core'
+      class_option "core", type: :boolean, aliases: "-c", default: false, group: :runtime,
+                           desc: "Create card migration for card core"
 
       def create_migration_file
-        migration_type = options['core'] ? :core_cards : :deck_cards
+        migration_type = options["core"] ? :core_cards : :deck_cards
         mig_paths = Cardio.migration_paths(migration_type)
         raise "No migration directory for #{migration_type}" if mig_paths.blank?
         set_local_assigns!
@@ -25,8 +25,8 @@ class Card
       # and the table name instance variables are setup.
 
       def set_local_assigns!
-        @migration_template = 'card_migration.erb'
-        @migration_parent_class = options['core'] ? 'Card::CoreMigration' : 'Card::Migration'
+        @migration_template = "card_migration.erb"
+        @migration_parent_class = options["core"] ? "Card::Migration::Core" : "Card::Migration"
         case file_name
         when /^(import)_(.*)(?:\.json)?/
           @migration_action = Regexp.last_match(1)

data/lib/generators/card/set/USAGE

@@ -2,14 +2,14 @@ Description:
     Generates new set files in mods and matching specs.
 
 Example:
-    wagn generate card:set 05_standard type tshirt
+    wagn generate card:set standard type tshirt
 
     This will create:
-        mod/05_standard/set/type/tshirt.rb
-        spec/mod/05_standard/set/type/tshirt_spec.rb
+        mod/standard/set/type/tshirt.rb
+        spec/mod/standard/set/type/tshirt_spec.rb
 
-    wagn generate card:set 05_standard type_plus_right basic about tshirt
+    wagn generate card:set standard type_plus_right basic about tshirt
 
     This will create:
-        mods/05_standard/set/type_plus_right/basic/about/tshirt.rb
-        mods/05_standard/spec/set/type_plus_right/basic/about/tshirt_spec.rb
+        mods/standard/set/type_plus_right/basic/about/tshirt.rb
+        mods/standard/spec/set/type_plus_right/basic/about/tshirt_spec.rb

data/lib/generators/card/set/set_generator.rb

@@ -1,27 +1,27 @@
 # -*- encoding : utf-8 -*-
 
-require 'generators/card'
+require "generators/card"
 
 class Card
   module Generators
     class SetGenerator < NamedBase
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
 
       argument :set_pattern, required: true
       argument :anchors, required: true, type: :array
-      class_option 'core', type: :boolean, aliases: '-c', default: false, group: :runtime,
-                           desc: 'create set files in Card gem'
+      class_option "core", type: :boolean, aliases: "-c", default: false, group: :runtime,
+                           desc: "create set files in Card gem"
 
       def create_files
         mod_path = if options.core?
-                     File.join Cardio.gem_root, 'mod', file_name
+                     File.join Cardio.gem_root, "mod", file_name
                    else
-                     File.join 'mod', file_name
+                     File.join "mod", file_name
           end
-        set_path  = File.join(mod_path, 'set', set_pattern, anchors[0..-2], "#{anchors.last}.rb")
-        spec_path = File.join(mod_path, 'spec', 'set', set_pattern, anchors[0..-2], "#{anchors.last}_spec.rb")
-        template 'set_template.erb', set_path
-        template 'set_spec_template.erb', spec_path
+        set_path  = File.join(mod_path, "set", set_pattern, anchors[0..-2], "#{anchors.last}.rb")
+        spec_path = File.join(mod_path, "spec", "set", set_pattern, anchors[0..-2], "#{anchors.last}_spec.rb")
+        template "set_template.erb", set_path
+        template "set_spec_template.erb", spec_path
       end
     end
   end