decko 0.11.7 → 0.12.0

data/lib/decko/generators.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+
+require "cardio/generators"
+require "cardio/generators/class_methods"
+
+# note: despite the decko file name the base class is Cardio
+module Cardio
+  module Generators
+    # main definition of this module is in card gem
+    module ClassMethods
+      # generator USAGE docs will use "decko" rather than "card" when called with decko
+      def banner_command
+        "decko"
+      end
+    end
+  end
+end

data/lib/decko/mods_spec_helper.rb

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

data/lib/decko/script_decko_loader.rb

@@ -1,46 +1,13 @@
 require "pathname"
 
+require "cardio/script_loader"
+
 module Decko
   module ScriptDeckoLoader
-    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) +
-           RbConfig::CONFIG["EXEEXT"]
-    SCRIPT_DECKO = File.join("script", "decko")
-
-    class << self
-      def exec!
-        cwd = Dir.pwd
-        return unless continue?
-
-        exec_decko_script
-        recurse cwd
-      rescue SystemCallError
-        # could not chdir, no problem just return
-      end
-
-      def recurse cwd
-        Dir.chdir("..") do
-          # Recurse in a chdir block: if the search fails we want to be sure
-          # the application is generated in the original working directory.
-          exec! unless cwd == Dir.pwd
-        end
-      end
-
-      def exec_decko_script
-        exec RUBY, SCRIPT_DECKO, *ARGV if in_application?
-      end
-
-      def continue?
-        in_application? || in_application_subdirectory?
-      end
-
-      def in_application?
-        File.exist?(SCRIPT_DECKO)
-      end
+    extend Cardio::ScriptLoader::ClassMethods
 
-      def in_application_subdirectory? path=Pathname.new(Dir.pwd)
-        File.exist?(File.join(path, SCRIPT_DECKO)) ||
-          !path.root? && in_application_subdirectory?(path.parent)
-      end
+    def self.script
+      File.join("script", "decko")
     end
   end
 end

data/lib/decko/tasks/cucumber.rake

@@ -5,35 +5,32 @@
 # files.
 
 unless ARGV.any? { |a| a =~ /^gems/ } # Don't load anything when running the gems:* tasks
-  vendored_cucumber_bin =
-    Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-  unless vendored_cucumber_bin.nil?
-    $LOAD_PATH.unshift("#{File.dirname(vendored_cucumber_bin)}/../lib")
-  end
+  vendor_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+  $LOAD_PATH.unshift(File.dirname(vendor_bin) + "/../lib") unless vendor_bin.nil?
 
   begin
     require "cucumber/rake/task"
 
     namespace :cucumber do
-      Cucumber::Rake::Task.new({ ok: "db:test:prepare" },
+      Cucumber::Rake::Task.new({ ok: "test:prepare" },
                                "Run features that should pass") do |t|
-        t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+        t.binary = vendor_bin # If nil, the gem's binary is used.
         t.fork = true # You may get faster startup if you set this to false
         t.profile = "default"
       end
 
-      Cucumber::Rake::Task.new({ wip: "db:test:prepare" },
+      Cucumber::Rake::Task.new({ wip: "test:prepare" },
                                "Run features that are being worked on") do |t|
-        t.binary = vendored_cucumber_bin
+        t.binary = vendor_bin
         t.fork = true # You may get faster startup if you set this to false
         t.profile = "wip"
       end
 
       Cucumber::Rake::Task.new(
-        { rerun: "db:test:prepare" },
+        { rerun: "test:prepare" },
         "Record failing features and run only them if any exist"
       ) do |t|
-        t.binary = vendored_cucumber_bin
+        t.binary = vendor_bin
         t.fork = true # You may get faster startup if you set this to false
         t.profile = "rerun"
       end
@@ -45,7 +42,17 @@ unless ARGV.any? { |a| a =~ /^gems/ } # Don't load anything when running the gem
         require "rails/code_statistics"
         ::STATS_DIRECTORIES << %w[Cucumber\ features features] if File.exist?("features")
         ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?("features")
-        ::STATS_DIRECTORIES << %w[Mods mods] if File.exist?("mods")
+      end
+
+      task :annotations_setup do
+        Rails.application.configure do
+          if config.respond_to?(:annotations)
+            config.annotations.directories << "features"
+            config.annotations.register_extensions("feature") do |tag|
+              /#\s*(#{tag}):?\s*(.*)$/
+            end
+          end
+        end
       end
     end
     desc "Alias for cucumber:ok"
@@ -54,14 +61,17 @@ unless ARGV.any? { |a| a =~ /^gems/ } # Don't load anything when running the gem
     task default: :cucumber
 
     task features: :cucumber do
-      warn "*** The 'features' task is deprecated. See rake -T cucumber ***"
+      STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
     end
 
-    # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
-    task "db:test:prepare" do
+    # In case we don't have the generic Rails test:prepare hook,
+    # append a no-op task that we can depend upon.
+    task "test:prepare" do
     end
 
     task stats: "cucumber:statsetup"
+
+    task notes: "cucumber:annotations_setup"
   rescue LoadError
     desc "cucumber rake task not available (cucumber not installed)"
     task :cucumber do
@@ -69,5 +79,4 @@ unless ARGV.any? { |a| a =~ /^gems/ } # Don't load anything when running the gem
             "Be sure to install cucumber as a gem or plugin"
     end
   end
-
 end

data/lib/decko/tasks/decko.rake

@@ -1,6 +1,5 @@
 require "decko/application"
 require_relative "alias"
-require "card/seed_consts"
 
 CARD_TASKS =
   [
@@ -41,7 +40,7 @@ decko_namespace = namespace :decko do
     conn = ActiveRecord::Base.connection
 
     puts "delete all data in bootstrap tables"
-    CARD_SEED_TABLES.each do |table|
+    Cardio::Seed::TABLES.each do |table|
       conn.delete "delete from #{table}"
     end
   end

data/lib/decko/tasks/decko/seed.rake

@@ -1,3 +1,5 @@
+require "cardio/seed"
+
 namespace :decko do
   namespace :seed do
     desc "reseed, migrate, re-clean, and re-dump"
@@ -119,14 +121,14 @@ namespace :decko do
     def add_test_data
       return unless Rails.env == "test"
 
-      load CARD_TEST_SEED_SCRIPT_PATH
+      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
-      CARD_SEED_TABLES.each do |table|
+      Cardio::Seed::TABLES.each do |table|
         i = "000"
         write_seed_file table do
           yamlize_records table do |record, hash|
@@ -137,7 +139,7 @@ namespace :decko do
     end
 
     def write_seed_file table
-      path = Rails.env == "test" ? CARD_TEST_SEED_PATH : CARD_SEED_PATH
+      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

data/lib/generators/deck/deck_generator.rb

@@ -0,0 +1,12 @@
+require "cardio/generators/deck_generator_loader"
+
+module Cardio
+  module Generators
+    module Deck
+      # Create new Decks (Decko Applications)
+      class DeckGenerator
+        # TODO: move decko-specific deck components here (eg cucumber)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,36 +10,50 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3.1
 - !ruby/object:Gem::Dependency
   name: card
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.7
+        version: 1.102.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.7
+        version: 1.102.0
 - !ruby/object:Gem::Dependency
   name: card-mod-defaults
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        version: 0.12.0
 description: a wiki approach to structured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -77,64 +91,10 @@ files:
 - lib/decko/cli.rb
 - lib/decko/commands.rb
 - lib/decko/commands/application.rb
-- lib/decko/commands/command.rb
 - lib/decko/commands/cucumber_command.rb
 - lib/decko/commands/cucumber_command/parser.rb
-- lib/decko/commands/rake_command.rb
-- lib/decko/commands/rake_command/parser.rb
-- lib/decko/commands/rspec_command.rb
-- lib/decko/commands/rspec_command/parser.rb
-- lib/decko/config/environments/cucumber.rb
-- lib/decko/config/environments/cypress.rb
-- lib/decko/config/environments/development.rb
-- lib/decko/config/environments/production.rb
-- lib/decko/config/environments/profile.rb
-- lib/decko/config/environments/test.rb
-- lib/decko/config/initializers/secret_token.rb
-- lib/decko/config/initializers/sedate_parser.rb
-- lib/decko/config/initializers/session_store.rb
 - lib/decko/engine.rb
-- lib/decko/generators/deck/USAGE
-- lib/decko/generators/deck/deck_generator.rb
-- lib/decko/generators/deck/deck_generator/deck_helper.rb
-- lib/decko/generators/deck/deck_generator/interactive.rb
-- lib/decko/generators/deck/deck_generator/rails_overrides.rb
-- lib/decko/generators/deck/templates/Gemfile.erb
-- lib/decko/generators/deck/templates/Rakefile.erb
-- lib/decko/generators/deck/templates/bin/spring.erb
-- lib/decko/generators/deck/templates/config.ru.erb
-- lib/decko/generators/deck/templates/config/application.rb.erb
-- lib/decko/generators/deck/templates/config/boot.rb.erb
-- lib/decko/generators/deck/templates/config/cucumber.yml
-- lib/decko/generators/deck/templates/config/databases/frontbase.yml
-- lib/decko/generators/deck/templates/config/databases/ibm_db.yml
-- lib/decko/generators/deck/templates/config/databases/jdbc.yml
-- lib/decko/generators/deck/templates/config/databases/jdbcmysql.yml
-- lib/decko/generators/deck/templates/config/databases/jdbcpostgresql.yml
-- lib/decko/generators/deck/templates/config/databases/jdbcsqlite3.yml
-- lib/decko/generators/deck/templates/config/databases/mysql.yml
-- lib/decko/generators/deck/templates/config/databases/oracle.yml
-- lib/decko/generators/deck/templates/config/databases/postgresql.yml
-- lib/decko/generators/deck/templates/config/databases/sqlite3.yml
-- lib/decko/generators/deck/templates/config/deck.yml
-- lib/decko/generators/deck/templates/config/environment.rb.erb
-- lib/decko/generators/deck/templates/config/initializers/cypress.rb
-- lib/decko/generators/deck/templates/config/puma.rb
-- lib/decko/generators/deck/templates/config/routes.rb.erb
-- lib/decko/generators/deck/templates/config/storage.yml
-- lib/decko/generators/deck/templates/gitignore
-- lib/decko/generators/deck/templates/pryrc
-- lib/decko/generators/deck/templates/public/files/htaccess
-- lib/decko/generators/deck/templates/public/robots.txt
-- lib/decko/generators/deck/templates/rspec.erb
-- lib/decko/generators/deck/templates/script/decko
-- lib/decko/generators/deck/templates/script/decko_cucumber
-- lib/decko/generators/deck/templates/script/decko_rspec
-- lib/decko/generators/deck/templates/script/delayed_job
-- lib/decko/generators/deck/templates/simplecov.rb.erb
-- lib/decko/generators/deck/templates/spec/javascripts/support/deck_jasmine.yml.erb
-- lib/decko/generators/deck/templates/spec/javascripts/support/decko_jasmine.yml.erb
-- lib/decko/generators/deck/templates/spec/spec_helper.rb
+- lib/decko/generators.rb
 - lib/decko/mods_spec_helper.rb
 - lib/decko/rest_spec_helper.rb
 - lib/decko/script_decko_loader.rb
@@ -148,6 +108,7 @@ files:
 - lib/decko/tasks/decko/docs.rake
 - lib/decko/tasks/decko/seed.rake
 - lib/decko/tasks/decko/tmpsets.rake
+- lib/generators/deck/deck_generator.rb
 - rails/application-routes.rb
 - rails/assets/external_link.png
 - rails/assets/jasmine/404.html
@@ -155,9 +116,6 @@ files:
 - rails/assets/jasmine/card_form.html
 - rails/assets/jquery.min.map
 - rails/engine-routes.rb
-- script/autospec
-- script/decko
-- script/rails
 homepage: https://decko.org
 licenses:
 - GPL-3.0
@@ -182,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: structured wiki web platform

data/lib/decko/commands/command.rb

@@ -1,28 +0,0 @@
-# require "English" # needed for CHILD_STATUS, but not sure this is the best place for this.
-
-module Decko
-  module Commands
-    class Command
-      def run
-        puts command
-        exit_with_child_status command
-      end
-
-      def exit_with_child_status command
-        command += " 2>&1"
-        exit $CHILD_STATUS.exitstatus unless system command
-      end
-
-      # split special decko args and original command args separated by '--'
-      def split_args args
-        before_split = true
-        decko_args, command_args =
-          args.partition do |a|
-            before_split = (a == "--" ? false : before_split)
-          end
-        command_args.shift
-        [decko_args, command_args]
-      end
-    end
-  end
-end

data/lib/decko/commands/rake_command.rb

@@ -1,42 +0,0 @@
-require File.expand_path("command", __dir__)
-# require "pry"
-
-module Decko
-  module Commands
-    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])
-      end
-
-      def run
-        commands.each do |cmd|
-          puts cmd
-          # exit_with_child_status cmd
-
-          result = `#{cmd}`
-          process = $?
-          puts result
-          exit process.exitstatus unless process.success?
-        end
-      end
-
-      def commands
-        task_cmd = "bundle exec rake #{@task}"
-        return [task_cmd] if !@envs || @envs.empty?
-
-        @envs.map do |env|
-          "env RAILS_ENV=#{env} #{task_cmd}"
-        end
-      end
-    end
-  end
-end
-
-require File.expand_path("rake_command/parser", __dir__)