wagn 1.19.6 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0439bece2df7839a8c57cd1195f2278cebb66b4
-  data.tar.gz: ab89c2608a18e1b84cee054bf7c1065909b84f17
+  metadata.gz: fd1e828fb6c8ee33f6cc48e17c3b5a102eb90483
+  data.tar.gz: 376b28cbee4e38ca2abe10591c0150e44145f156
 SHA512:
-  metadata.gz: 9a04bc19834623b232d09747675ec851efe6a3ccab8437062d1ca7ac477d075ca314ee18a0506806866a407729f90675da210072582293c251a1c52ff9d7f078
-  data.tar.gz: 81ff5f368c83d29d70025812dc728a2773040ff94187d4a7173b749c7b62245e39f1e2ba54b9af075347c4878610dff8c0d7b8e5e9d395daf3090adee5ba84bb
+  metadata.gz: df71a97b7d1ba6320557ca14a5e7d0d94bec48c62e8e064fb9c62b4507c10eea52308bbc5965fac9b11d7ca9f8d3afcb736ae642b41d15cf7c20378907ae8e31
+  data.tar.gz: 61c053e4f2f1854ad40d9303bce379910e0afef3744aabeffa1551314ab2aad23a601b995fc583f99f4c613b812cacdfcb9c54d53f38a41d6ce014d3219739eb

data/features/history.feature

@@ -1,7 +1,8 @@
 @javascript
 Feature: History
   As an editor
-  I want to be able to browse through the history and save an old version as current.
+  I want to be able to browse through the history and save an old version as
+  current.
 
   Background:
     Given I am signed in as Joe Admin
@@ -9,14 +10,16 @@ Feature: History
 
   Scenario: view history and rollback
     When I go to url "/First?view=history"
-    Then In the main card content I should see a del with content "egg"
+#    Then In the main card content I should see a del with content "egg"
 
     When I expand act 2
-    And In the main card content I click "Hide changes"
-    Then In the main card content I should not see a del with content "egg"
+#    And In the main card content I click "Hide changes"
+#    Then In the main card content I should not see a del with content "egg"
+    When In the main card body I click "Save as current"
+    And I wait until ajax response
 
-    When In the main card content I click "Save as current"
-    Then the card First should contain "chicken"
-    Then I wait a sec
+    Then In the main card content I should see "chicken"
+
+    #Then the card First should contain "chicken"
 
 

data/features/paging.feature

@@ -6,7 +6,7 @@ Feature: paging
 
   Background:
     Given I am signed in as Joe Admin
-    And I create Search card "basic card search" with content "{\"type\":\"basic\", \"limit\":2}"
+    And I create Search card "basic card search" with content "{\"type\":\"basic\"}"
 
   Scenario: jump to pages should keep the item structure
     When I create HTML card "basic item structure" with content "{{_|name}}"

data/features/step_definitions/history_steps.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 # rubocop:disable Lint/AmbiguousRegexpLiteral
 When /^I expand act (\d+)$/ do |index|
-  all("a.arrow-right")[-index.to_i].click
+  all('.panel-heading[data-toggle="collapse"]')[-index.to_i].click
 end

data/features/step_definitions/wagn_steps.rb

@@ -357,7 +357,7 @@ Then /^"([^"]*)" should be selected for "([^"]*)"$/ do |value, field|
 end
 
 Then /^"([^"]*)" should be signed in$/ do |user|  # "
-  has_css?("#my-card-link", text: user)
+  has_css?(".my-card-link", text: user)
 end
 
 When /^I press enter to search$/ do

data/features/step_definitions/web_steps.rb

@@ -3,12 +3,14 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
 # It is recommended to regenerate this file in the future when you upgrade to a
 # newer version of cucumber-rails. Consider adding your own code to a new file
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
+# instead of editing this one. Cucumber will automatically load all
+# features/**/*.rb files.
 
 require "uri"
 require "cgi"
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(
+  File.join(File.dirname(__FILE__), "..", "support", "paths")
+)
 
 # Commonly used webrat steps
 # http://github.com/brynary/webrat
@@ -29,6 +31,10 @@ When /^(?:|I )follow "([^"]*)"$/ do |link|
   click_link(link)
 end
 
+When /^(?:|I )click on "([^"]*)"$/ do |link|
+  click_link_or_button(link)
+end
+
 When /^(?:|I )follow "([^"]*)" within "([^"]*)"$/ do |link, parent|
   click_link_within(parent, link)
 end
@@ -45,6 +51,11 @@ When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
   select(value, from: field)
 end
 
+When /^(?:|I )single-select "([^"]*)" from "([^"]*)"$/ do |value, field|
+  find("label", text: field).parent.find("a.chosen-single").click
+  find("li", text: value).click
+end
+
 # Use this step in conjunction with Rail's datetime_select helper. For example:
 # When I select "December 25, 2008 10:00" as the date and time
 When /^(?:|I )select "([^"]*)" as the date and time$/ do |time|
@@ -66,8 +77,8 @@ end
 
 # Use this step in conjunction with Rail's time_select helper. For example:
 # When I select "2:20PM" as the time
-# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
-# will convert the 2:20PM to 14:20 and then select it.
+# Note: Rail's default time helper provides 24-hour time-- not 12 hour time.
+# Webrat will convert the 2:20PM to 14:20 and then select it.
 When /^(?:|I )select "([^"]*)" as the time$/ do |time|
   select_time(time)
 end
@@ -104,8 +115,9 @@ When /^(?:|I )choose "([^"]*)"$/ do |field|
   choose(field)
 end
 
-# Adds support for validates_attachment_content_type. Without the mime-type getting
-# passed to attach_file() you will get a "Photo file is not one of the allowed file types."
+# Adds support for validates_attachment_content_type.
+# Without the mime-type getting passed to attach_file() you will get a
+# "Photo file is not one of the allowed file types."
 # error message
 When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
   type = path.split(".")[1]
@@ -133,4 +145,5 @@ Then /^(?:|I )should not see "([^"]*)"$/ do |text|
 end
 
 Then /^show me the page$/ do
+  save_and_open_page
 end

data/features/support/paths.rb

@@ -25,7 +25,9 @@ module NavigationHelpers
       "/#{Regexp.last_match(1).to_name.url_key}"
 
     when /new (.*) presetting name to "(.*)" and author to "(.*)"/
-      url = "/new/#{Regexp.last_match(1)}?card[name]=#{Regexp.last_match(2).to_name.url_key}&_author=#{CGI.escape(Regexp.last_match(3))}"
+      "/new/#{Regexp.last_match(1)}" \
+      "?card[name]=#{Regexp.last_match(2).to_name.url_key}" \
+      "&_author=#{CGI.escape(Regexp.last_match(3))}"
 
     when /new card named (.*)$/
       "/card/new?card[name]=#{CGI.escape(Regexp.last_match(1))}"

data/features/support/scopes.rb

@@ -21,6 +21,9 @@ module ScopeHelpers
     when /main card frame/
       "#main > .card-slot > .card-frame"
 
+    when /main card body/
+      "#main > .card-slot > .card-frame > .card-body"
+
     else
       raise "Can't find mapping from \"#{section}\" to a scope.\n" \
             "Now, go and add a mapping in #{__FILE__}"

data/lib/wagn/commands.rb

@@ -1,8 +1,5 @@
-require "optparse"
-
 # add method in? to Object class
 require "active_support/core_ext/object/inclusion"
-require "wagn/parser"
 
 def load_rake_tasks
   require "./config/environment"
@@ -12,6 +9,9 @@ end
 
 RAILS_COMMANDS = %w( generate destroy plugin benchmarker profiler console
                      server dbconsole application runner ).freeze
+WAGN_COMMANDS = %w(new cucumber rspec jasmine).freeze
+WAGN_DB_COMMANDS = %w(seed reseed load update).freeze
+
 ALIAS = {
   "rs" => "rspec",
   "cc" => "cucumber",
@@ -24,103 +24,66 @@ ALIAS = {
   "r"  => "runner"
 }.freeze
 
-ARGV << "--help" if ARGV.empty?
-
 def supported_rails_command? arg
   arg.in?(RAILS_COMMANDS) || ALIAS[arg].in?(RAILS_COMMANDS)
 end
 
-def find_spec_file filename, base_dir
-  file, line = filename.split(":")
-  if file.include?("_spec.rb") && File.exist?(file)
-    filename
-  else
-    file = File.basename(file, ".rb").sub(/_spec$/, "")
-    Dir.glob("#{base_dir}/**/#{file}_spec.rb").flatten.map do |spec_file|
-      line ? "#{spec_file}:#{line}" : file
-    end.join(" ")
-  end
-end
+ARGV << "--help" if ARGV.empty?
 
-def exit_with_child_status command
-  command += " 2>&1"
-  exit $CHILD_STATUS.exitstatus unless system command
-end
+module Wagn
+  module Commands
+    class << self
+      def run_new
+        if ARGV.first.in?(["-h", "--help"])
+          require "wagn/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 'wagn' for help."
+          exit(1)
+        end
+      end
 
-WAGN_DB_TASKS = %w(seed reseed load update).freeze
+      def run_rspec
+        require "wagn/commands/rspec_command"
+        RspecCommand.new(ARGV).run
+      end
 
-if supported_rails_command? ARGV.first
+      def run_cucumber
+        require "wagn/commands/cucumber_command"
+        CucumberCommand.new(ARGV).run
+      end
+
+      def run_db_task command
+        require "wagn/commands/rake_command"
+        RakeCommand.new("wagn:#{command}", ARGV).run
+      end
+
+      def run_jasmine
+        require "wagn/commands/rake_command"
+        RakeCommand.new("spec:javascript", envs: "test").run
+      end
+    end
+  end
+end
+
+command = ARGV.first
+command = ALIAS[command] || command
+if supported_rails_command? command
   ENV["PRY_RESCUE_RAILS"] = "1" if ARGV.delete("--rescue")
-  command = ARGV.first
-  command = ALIAS[command] || command
 
   # without this, the card generators don't list with: wagn g --help
   require "generators/card" if command == "generate"
   require "rails/commands"
 else
-  command = ARGV.shift
-  command = ALIAS[command] || command
-
+  ARGV.shift
   case command
-  when "cucumber"
-    require "wagn"
-    require "./config/environment"
-    feature_paths = Card::Mod::Loader.mod_dirs.map do |p|
-      Dir.glob "#{p}/features"
-    end.flatten
-    require_args = "-r #{Wagn.gem_root}/features "
-    require_args += feature_paths.map { |path| "-r #{path}" }.join(" ")
-    feature_args = ARGV.empty? ? feature_paths.join(" ") : ARGV.shelljoin
-    exit_with_child_status "RAILS_ROOT=. bundle exec cucumber " \
-                           "#{require_args} #{feature_args}"
-  when "jasmine"
-    exit_with_child_status "RAILS_ENV=test bundle exec rake spec:javascript"
-  when "rspec"
-    require "rspec/core"
-    require "wagn/application"
-
-    before_split = true
-    wagn_args, rspec_args =
-      ARGV.partition do |a|
-        before_split = (a == "--" ? false : before_split)
-      end
-    rspec_args.shift
-    opts = {}
-    Wagn::Parser.rspec(opts).parse!(wagn_args)
-    # no coverage if rspec was started with file argument
-    if (opts[:files] || rspec_args.present?) && !opts[:simplecov]
-      opts[:simplecov] = "COVERAGE=false"
-    end
-    rspec_command =
-      "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} " \
-      " #{opts[:rescue]} rspec #{rspec_args.shelljoin} #{opts[:files]} "\
-      " --exclude-pattern \"./card/vendor/**/*\""
-    exit_with_child_status rspec_command
   when "--version", "-v"
     puts "Wagn #{Card::Version.release}"
-  when "new"
-    if ARGV.first.in?(["-h", "--help"])
-      require "wagn/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 'wagn' for help."
-      exit(1)
-    end
-  when *WAGN_DB_TASKS
-    opts = {}
-    Wagn::Parser.db_task(command, opts).parse!(ARGV)
-    task_cmd = "bundle exec rake wagn:#{command}"
-    if !opts[:envs] || opts[:envs].empty?
-      puts task_cmd
-      puts `#{task_cmd}`
-    else
-      opts[:envs].each do |env|
-        puts "env RAILS_ENV=#{env} #{task_cmd}"
-        puts `env RAILS_ENV=#{env} #{task_cmd}`
-      end
-    end
-
+  when *WAGN_COMMANDS
+    Wagn::Commands.send("run_#{command}")
+  when *WAGN_DB_COMMANDS
+    Wagn::Commands.run_db_task command
   else
     puts "Error: Command not recognized" unless command.in?(["-h", "--help"])
     puts <<-EOT

data/lib/wagn/commands/command.rb

@@ -0,0 +1,15 @@
+module Wagn
+  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
+    end
+  end
+end

data/lib/wagn/commands/cucumber_command.rb

@@ -0,0 +1,41 @@
+require File.expand_path("../command", __FILE__)
+
+module Wagn
+  module Commands
+    class CucumberCommand < Command
+      def initialize args
+        require "wagn"
+        require "./config/environment"
+        @args = args
+      end
+
+      def command
+        @cmd ||=
+          "#{env_args} bundle exec cucumber #{require_args} #{feature_args}"
+      end
+
+      private
+
+      def env_args
+        env_args = "RAILS_ROOT=."
+        env_args << " COVERAGE=false" if @args.present?
+        env_args
+      end
+
+      def feature_args
+        @args.empty? ? feature_paths.join(" ") : @args.shelljoin
+      end
+
+      def require_args
+        "-r #{Wagn.gem_root}/features " +
+          feature_paths.map { |path| "-r #{path}" }.join(" ")
+      end
+
+      def feature_paths
+        Card::Mod::Loader.mod_dirs.map do |p|
+          Dir.glob "#{p}/features"
+        end.flatten
+      end
+    end
+  end
+end

data/lib/wagn/commands/rake_command.rb

@@ -0,0 +1,35 @@
+require File.expand_path("../command", __FILE__)
+
+module Wagn
+  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
+        command.each do |cmd|
+          puts cmd
+          puts `#{cmd}`
+        end
+      end
+
+      def command
+        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", __FILE__)

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

@@ -0,0 +1,34 @@
+# -*- encoding : utf-8 -*-
+require "optparse"
+
+module Wagn
+  module Commands
+    class RakeCommand
+      class Parser < OptionParser
+        def initialize command, opts
+          super() do |parser|
+            parser.banner = "Usage: wagn #{command} [options]\n\n" \
+                          "Run wagn:#{command} task on the production "\
+                          " database specified in config/database.yml\n\n"
+            parser.on("--production", "-p",
+                      "#{command} production database (default)") do
+              opts[:envs] = ["production"]
+            end
+            parser.on("--test", "-t",
+                      "#{command} test database") do
+              opts[:envs] = ["test"]
+            end
+            parser.on("--development", "-d",
+                      "#{command} development database") do
+              opts[:envs] = ["development"]
+            end
+            parser.on("--all", "-a",
+                      "#{command} production, test, and development database") do
+              opts[:envs] = %w(production development test)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/wagn/commands/rspec_command.rb

@@ -0,0 +1,50 @@
+require File.expand_path("../command", __FILE__)
+
+module Wagn
+  module Commands
+    class RspecCommand < Command
+      def initialize args
+        require "rspec/core"
+        require "wagn/application"
+
+        @wagn_args, @rspec_args = split_wagn_and_rspec_args args
+        @opts = {}
+        Parser.new(@opts).parse!(@wagn_args)
+      end
+
+      def command
+        "#{env_args} #{@opts[:executer]} " \
+          " #{@opts[:rescue]} rspec #{@rspec_args.shelljoin} #{@opts[:files]} "\
+          " --exclude-pattern \"./card/vendor/**/*\""
+      end
+
+      private
+
+      def env_args
+        ["RAILS_ROOT=.", coverage].compact.join " "
+      end
+
+      def coverage
+        # no coverage if rspec was started with file argument
+        if (@opts[:files] || @rspec_args.present?) && !@opts[:simplecov]
+          @opts[:simplecov] = "COVERAGE=false"
+        end
+        @opts[:simplecov]
+      end
+
+      def split_wagn_and_rspec_args args
+        before_split = true
+        wagn, rspec =
+          args.partition do |a|
+            before_split = (a == "--" ? false : before_split)
+          end
+        rspec.shift
+        [wagn, rspec]
+      end
+
+
+    end
+  end
+end
+
+require File.expand_path("../rspec_command/parser", __FILE__)

data/lib/wagn/commands/rspec_command/parser.rb

@@ -0,0 +1,84 @@
+# -*- encoding : utf-8 -*-
+require "optparse"
+
+module Wagn
+  module Commands
+    class RspecCommand
+      class Parser < OptionParser
+        def initialize opts
+          super() do |parser|
+            parser.banner = "Usage: wagn rspec [WAGN ARGS] -- [RSPEC ARGS]\n\n" \
+                            "RSPEC ARGS"
+            parser.separator <<-EOT
+
+            WAGN ARGS
+
+            You don't have to give a full path for FILENAME, the basename is enough
+              If FILENAME does not include '_spec' rspec searches for the
+              corresponding spec file.
+              The line number always referes to example in the (corresponding) spec
+              file.
+
+            EOT
+
+            parser.on("-d", "--spec FILENAME(:LINE)",
+                      "Run spec for a Wagn deck file") do |file|
+              opts[:files] = find_spec_file(file, "#{Wagn.root}/mod")
+            end
+            parser.on("-c", "--core-spec FILENAME(:LINE)",
+                      "Run spec for a Wagn core file") do |file|
+              opts[:files] = find_spec_file(file, Cardio.gem_root)
+            end
+            parser.on("-m", "--mod MODNAME",
+                      "Run all specs for a mod or matching a mod") do |file|
+              opts[:files] =
+                if File.exist?("mod/#{file}")
+                  "#{Cardio.gem_root}/mod/#{file}"
+                elsif File.exist?("#{Cardio.gem_root}/mod/#{file}")
+                  "#{Cardio.gem_root}/mod/#{file}"
+                elsif (files = find_spec_file(file, "mod")) && files.present?
+                  files
+                else
+                  find_spec_file(file, "#{Cardio.gem_root}/mod")
+                end
+            end
+            parser.on("-s", "--[no-]simplecov", "Run with simplecov") do |s|
+              opts[:simplecov] = s ? "" : "COVERAGE=false"
+            end
+            parser.on("--rescue", "Run with pry-rescue") do
+              if opts[:executer] == "spring"
+                puts "Disabled pry-rescue. Not compatible with spring."
+              else
+                opts[:rescue] = "rescue "
+              end
+            end
+            parser.on("--[no-]spring", "Run with spring") do |spring|
+              if spring
+                opts[:executer] = "spring"
+                if opts[:rescue]
+                  opts[:rescue] = ""
+                  puts "Disabled pry-rescue. Not compatible with spring."
+                end
+              else
+                opts[:executer] = "bundle exec"
+              end
+            end
+            parser.separator "\n"
+          end
+        end
+
+        def find_spec_file filename, base_dir
+          file, line = filename.split(":")
+          if file.include?("_spec.rb") && File.exist?(file)
+            filename
+          else
+            file = File.basename(file, ".rb").sub(/_spec$/, "")
+            Dir.glob("#{base_dir}/**/#{file}_spec.rb").flatten.map do |spec_file|
+              line ? "#{spec_file}:#{line}" : file
+            end.join(" ")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/wagn/generators/wagn/templates/Gemfile

@@ -27,6 +27,8 @@ group :test do
   gem 'rspec', '~> 3.4'
   gem 'rspec-rails'         # behavior-driven-development suite
   gem 'spork', '>=0.9'
+  gem 'rubocop'
+  gem 'rubocop-decko'
 end
 
 group :test, :development do
@@ -111,7 +113,7 @@ end
 gem 'ruby-prof', :group=>:profile  # profiling
 
 group :debug do
-  gem 'better_errors', :git=>"https://github.com/xithan/better_errors.git"
+  gem 'better_errors'
   gem 'binding_of_caller'
 end
 <% end %>

data/lib/wagn/tasks/wagn.rake

@@ -6,27 +6,6 @@ WAGN_SEED_PATH = File.join(
   ENV["DECKO_SEED_REPO_PATH"] || [Cardio.gem_root, "db", "seed"], "new"
 )
 
-def run_card_migration core_or_deck
-  prepare_migration
-  verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-  Cardio.schema_mode(core_or_deck) do |paths|
-    ActiveRecord::Migrator.migrations_paths = paths
-    ActiveRecord::Migration.verbose = verbose
-    ActiveRecord::Migrator.migrate paths, version
-  end
-end
-
-def prepare_migration
-  Card::Cache.reset_all
-  ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
-  Card::Cache.reset_all
-  Card.config.action_mailer.perform_deliveries = false
-  Card.reset_column_information
-  # this is needed in production mode to insure core db
-  Card::Reference.reset_column_information
-  # structures are loaded before schema_mode is set
-end
-
 namespace :wagn do
   desc "create a wagn database from scratch, load initial data"
   task :seed do
@@ -155,61 +134,6 @@ namespace :wagn do
     Cardio.assume_migrated_upto_version :core_cards
   end
 
-  namespace :migrate do
-    desc "migrate cards"
-    task cards: [:core_cards, :deck_cards]
-
-    desc "migrate structure"
-    task structure: :environment do
-      ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
-      Cardio.schema_mode(:structure) do |paths|
-        ActiveRecord::Migrator.migrations_paths = paths
-        ActiveRecord::Migrator.migrate paths, version
-        Rake::Task["db:_dump"].invoke   # write schema.rb
-      end
-    end
-
-    desc "migrate core cards"
-    task core_cards: :environment do
-      require "card/migration/core"
-      run_card_migration :core_cards
-    end
-
-    desc "migrate deck cards"
-    task deck_cards: :environment do
-      require "card/migration"
-      run_card_migration :deck_cards
-    end
-
-    desc 'Redo the deck cards migration given by VERSION.'
-    task redo: :environment do
-      version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-      verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      raise "VERSION is required" unless version
-      ActiveRecord::Migration.verbose = verbose
-      ActiveRecord::SchemaMigration.where(:version => version.to_s).delete_all
-      ActiveRecord::Migrator.run :up, Cardio.migration_paths(:deck_cards),
-                                 version
-    end
-
-    # maybe we should move this to a method?
-    desc "write the version to a file (not usually called directly)"
-    task :stamp, :type do |_t, args|
-      ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
-      Cardio.config.action_mailer.perform_deliveries = false
-
-      stamp_file = Cardio.schema_stamp_path(args[:type])
-
-      Cardio.schema_mode args[:type] do
-        version = ActiveRecord::Migrator.current_version
-        if version.to_i > 0 && (file = open(stamp_file, "w"))
-          puts ">>  writing version: #{version} to #{stamp_file}"
-          file.puts version
-        end
-      end
-    end
-  end
-
   namespace :emergency do
     task rescue_watchers: :environment do
       follower_hash = Hash.new { |h, v| h[v] = [] }
@@ -238,126 +162,6 @@ namespace :wagn do
       end
     end
   end
-
-  namespace :bootstrap do
-    desc "rid template of unneeded cards, acts, actions, changes, and references"
-    task clean: :environment do
-      Card::Cache.reset_all
-      clear_history
-      delete_unwanted_cards
-      Card.empty_trash
-      correct_time_and_user_stamps
-      Card::Cache.reset_all
-    end
-
-    desc "dump db to bootstrap fixtures"
-    task dump: :environment do
-      Card::Cache.reset_all
-
-      # FIXME: temporarily taking this out!!
-      Rake::Task["wagn:bootstrap:copy_mod_files"].invoke
-      Card[:all, :script].make_machine_output_coded
-      Card[:all, :style].make_machine_output_coded
-      Card[:script_html5shiv_printshiv].make_machine_output_coded
-
-      YAML::ENGINE.yamler = "syck" if RUBY_VERSION !~ /^(2|1\.9)/
-      # use old engine while we're supporting ruby 1.8.7 because it can't
-      # support Psych, which dumps with slashes that syck can't understand
-
-      WAGN_SEED_TABLES.each do |table|
-        i = "000"
-        File.open(File.join(WAGN_SEED_PATH, "#{table}.yml"), "w") do |file|
-          data = ActiveRecord::Base.connection.select_all(
-            "select * from #{table}"
-          )
-          file.write YAML.dump(data.each_with_object({}) do |record, hash|
-            record["trash"] = false if record.key? "trash"
-            record["draft"] = false if record.key? "draft"
-            if record.key? "content"
-              record["content"] = record["content"].gsub(/\u00A0/, " ")
-              # sych was handling nonbreaking spaces oddly.
-              # would not be needed with psych.
-            end
-            hash["#{table}_#{i.succ!}"] = record
-          end)
-        end
-      end
-    end
-
-    desc "copy files from template database to standard mod and update cards"
-    task copy_mod_files: :environment do
-      source_files_dir = "#{Wagn.root}/files"
-
-      # mark mod files as mod files
-      Card::Auth.as_bot do
-        Card.search(type: %w(in Image File), ne: "").each do |card|
-          if card.coded? || card.codename == "new_file" ||
-             card.codename == "new_image"
-            puts "skipping #{card.name}: already in code"
-            next
-          else
-            puts "working on #{card.name}"
-          end
-
-          # make card a mod file card
-          mod_name = if (l = card.left) && l.type_id == Card::SkinID
-                       "bootstrap"
-                     else
-                       "standard"
-                     end
-          card.update_attributes! storage_type: :coded,
-                                  mod: mod_name,
-                                  empty_ok: true
-        end
-      end
-    end
-
-    desc "load bootstrap fixtures into db"
-    task load: :environment do
-      # FIXME: shouldn't we be more standard and use seed.rb for this code?
-      Rake.application.options.trace = true
-      puts "bootstrap load starting #{WAGN_SEED_PATH}"
-      Rake::Task["db:seed"].invoke
-    end
-  end
-end
-
-def correct_time_and_user_stamps
-  conn = ActiveRecord::Base.connection
-  who_and_when = [Card::WagnBotID, Time.now.utc.to_s(:db)]
-  card_sql = "update cards set creator_id=%1$s, created_at='%2$s', updater_id=%1$s, updated_at='%2$s'"
-  conn.update(card_sql                                          % who_and_when)
-  conn.update("update card_acts set actor_id=%s, acted_at='%s'" % who_and_when)
-end
-
-def delete_unwanted_cards
-  Card::Auth.as_bot do
-    if (ignoramus = Card["*ignore"])
-      ignoramus.item_cards.each(&:delete!)
-    end
-    Card::Cache.reset_all
-    # FIXME: can this be associated with the machine module somehow?
-    %w(machine_input machine_output).each do |codename|
-      Card.search(right: { codename: codename }).each do |card|
-        FileUtils.rm_rf File.join("files", card.id.to_s), secure: true
-        card.delete!
-      end
-    end
-  end
-end
-
-def clear_history
-  Card::Action.delete_old
-  Card::Change.delete_actionless
-
-  conn = ActiveRecord::Base.connection
-  conn.execute("truncate card_acts")
-  conn.execute("truncate sessions")
-  act = Card::Act.create! actor_id: Card::WagnBotID,
-                          card_id: Card::WagnBotID
-  Card::Action.find_each do |action|
-    action.update_attributes!(card_act_id: act.id)
-  end
 end
 
 def version

data/lib/wagn/tasks/wagn/bootstrap.rake

@@ -0,0 +1,121 @@
+namespace :wagn do
+  namespace :bootstrap do
+    desc "rid template of unneeded cards, acts, actions, changes, " \
+         "and references"
+    task clean: :environment do
+      Card::Cache.reset_all
+      clear_history
+      delete_unwanted_cards
+      Card.empty_trash
+      correct_time_and_user_stamps
+      Card::Cache.reset_all
+    end
+
+    desc "dump db to bootstrap fixtures"
+    task dump: :environment do
+      Card::Cache.reset_all
+
+      # FIXME: temporarily taking this out!!
+      Rake::Task["wagn:bootstrap:copy_mod_files"].invoke
+      Card[:all, :script].make_machine_output_coded
+      Card[:all, :style].make_machine_output_coded
+      Card[:script_html5shiv_printshiv].make_machine_output_coded
+
+      YAML::ENGINE.yamler = "syck" if RUBY_VERSION !~ /^(2|1\.9)/
+      # use old engine while we're supporting ruby 1.8.7 because it can't
+      # support Psych, which dumps with slashes that syck can't understand
+
+      WAGN_SEED_TABLES.each do |table|
+        i = "000"
+        File.open(File.join(WAGN_SEED_PATH, "#{table}.yml"), "w") do |file|
+          data = ActiveRecord::Base.connection.select_all(
+            "select * from #{table}"
+          )
+          file.write YAML.dump(data.each_with_object({}) do |record, hash|
+            record["trash"] = false if record.key? "trash"
+            record["draft"] = false if record.key? "draft"
+            if record.key? "content"
+              record["content"] = record["content"].gsub(/\u00A0/, " ")
+              # sych was handling nonbreaking spaces oddly.
+              # would not be needed with psych.
+            end
+            hash["#{table}_#{i.succ!}"] = record
+          end)
+        end
+      end
+    end
+
+    desc "copy files from template database to standard mod and update cards"
+    task copy_mod_files: :environment do
+      # mark mod files as mod files
+      Card::Auth.as_bot do
+        Card.search(type: %w(in Image File), ne: "").each do |card|
+          if card.coded? || card.codename == "new_file" ||
+             card.codename == "new_image"
+            puts "skipping #{card.name}: already in code"
+            next
+          else
+            puts "working on #{card.name}"
+          end
+
+          # make card a mod file card
+          mod_name = if (l = card.left) && l.type_id == Card::SkinID
+                       "bootstrap"
+                     else
+                       "standard"
+                     end
+          card.update_attributes! storage_type: :coded,
+                                  mod: mod_name,
+                                  empty_ok: true
+        end
+      end
+    end
+
+    desc "load bootstrap fixtures into db"
+    task load: :environment do
+      # FIXME: shouldn't we be more standard and use seed.rb for this code?
+      Rake.application.options.trace = true
+      puts "bootstrap load starting #{WAGN_SEED_PATH}"
+      Rake::Task["db:seed"].invoke
+    end
+  end
+end
+
+def correct_time_and_user_stamps
+  conn = ActiveRecord::Base.connection
+  who_and_when = [Card::WagnBotID, Time.now.utc.to_s(:db)]
+  card_sql = "update cards set creator_id=%1$s, created_at='%2$s', " \
+             "updater_id=%1$s, updated_at='%2$s'"
+  conn.update(card_sql % who_and_when)
+  conn.update("update card_acts set actor_id=%s, acted_at='%s'" % who_and_when)
+end
+
+def delete_unwanted_cards
+  Card::Auth.as_bot do
+    if (ignoramus = Card["*ignore"])
+      ignoramus.item_cards.each(&:delete!)
+    end
+    Card::Cache.reset_all
+    # FIXME: can this be associated with the machine module somehow?
+    %w(machine_input machine_output).each do |codename|
+      Card.search(right: { codename: codename }).each do |card|
+        FileUtils.rm_rf File.join("files", card.id.to_s), secure: true
+        card.delete!
+      end
+    end
+  end
+end
+
+def clear_history
+  Card::Action.delete_old
+  Card::Change.delete_actionless
+
+  conn = ActiveRecord::Base.connection
+  conn.execute("truncate card_acts")
+  conn.execute("truncate sessions")
+  act = Card::Act.create! actor_id: Card::WagnBotID,
+                          card_id: Card::WagnBotID
+  Card::Action.find_each do |action|
+    action.update_attributes!(card_act_id: act.id)
+  end
+end

data/lib/wagn/tasks/wagn/migrate.rake

@@ -0,0 +1,77 @@
+def run_card_migration core_or_deck
+  prepare_migration
+  verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+  Cardio.schema_mode(core_or_deck) do |paths|
+    ActiveRecord::Migrator.migrations_paths = paths
+    ActiveRecord::Migration.verbose = verbose
+    ActiveRecord::Migrator.migrate paths, version
+  end
+end
+
+def prepare_migration
+  Card::Cache.reset_all
+  ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
+  Card::Cache.reset_all
+  Card.config.action_mailer.perform_deliveries = false
+  Card.reset_column_information
+  # this is needed in production mode to insure core db
+  Card::Reference.reset_column_information
+  # structures are loaded before schema_mode is set
+end
+
+namespace :wagn do
+  namespace :migrate do
+    desc "migrate cards"
+    task cards: [:core_cards, :deck_cards]
+
+    desc "migrate structure"
+    task structure: :environment do
+      ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
+      Cardio.schema_mode(:structure) do |paths|
+        ActiveRecord::Migrator.migrations_paths = paths
+        ActiveRecord::Migrator.migrate paths, version
+        Rake::Task["db:_dump"].invoke # write schema.rb
+      end
+    end
+
+    desc "migrate core cards"
+    task core_cards: :environment do
+      require "card/migration/core"
+      run_card_migration :core_cards
+    end
+
+    desc "migrate deck cards"
+    task deck_cards: :environment do
+      require "card/migration"
+      run_card_migration :deck_cards
+    end
+
+    desc "Redo the deck cards migration given by VERSION."
+    task redo: :environment do
+      version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+      verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+      raise "VERSION is required" unless version
+      ActiveRecord::Migration.verbose = verbose
+      ActiveRecord::SchemaMigration.where(version: version.to_s).delete_all
+      ActiveRecord::Migrator.run :up, Cardio.migration_paths(:deck_cards),
+                                 version
+    end
+
+    # maybe we should move this to a method?
+    desc "write the version to a file (not usually called directly)"
+    task :stamp, :type do |_t, args|
+      ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
+      Cardio.config.action_mailer.perform_deliveries = false
+
+      stamp_file = Cardio.schema_stamp_path(args[:type])
+
+      Cardio.schema_mode args[:type] do
+        version = ActiveRecord::Migrator.current_version
+        if version.to_i > 0 && (file = open(stamp_file, "w"))
+          puts ">>  writing version: #{version} to #{stamp_file}"
+          file.puts version
+        end
+      end
+    end
+  end
+end

data/rails/controllers/card_controller.rb

@@ -127,7 +127,6 @@ class CardController < ActionController::Base
   rescue_from StandardError do |exception|
     Rails.logger.info "exception = #{exception.class}: #{exception.message}"
     @card ||= Card.new
-    Card::Error.current = exception
     show Card::Error.exception_view(@card, exception)
   end
 end

data/rails/engine-routes.rb

@@ -4,9 +4,9 @@ Decko::Engine.routes.draw do
   # most common
   root "card#read"
   get "#{Decko::Engine.config.files_web_path}/:id/:rev_id(-:size).:format" =>
-                                 "card#read", id: /[^-]+/, rev_id: /[^-]+/, explicit_file: true
+    "card#read", id: /[^-]+/, rev_id: /[^-]+/, explicit_file: true
   get "#{Decko::Engine.config.files_web_path}/:id(-:size)-:rev_id.:format" =>
-                                 "card#read", id: /[^-]+/, explicit_file: true  # deprecated
+    "card#read", id: /[^-]+/, explicit_file: true  # deprecated
   get "assets/*filename"      => "card#asset"
   get "javascripts/*filename" => "card#asset"
   get "jasmine/*filename"     => "card#asset"

data/spec/controllers/card_controller_spec.rb

@@ -9,7 +9,7 @@ describe CardController do
       route_to opts.merge(controller: "card")
     end
 
-    it "should recognize type" do
+    it "recognizes type" do
       # all_routes = Rails.application.routes.routes
       # require 'rails/application/route_inspector'
       # warn "rountes#{ENV['CONTROLLER']}:\n" + Rails::Application::RouteInspector.new.format(all_routes, ENV['CONTROLLER'])* "\n"
@@ -18,12 +18,12 @@ describe CardController do
         .to card_route_to(action: "read", type: "Phrase", view: "new")
     end
 
-    it "should recognize .rss on /recent" do
+    it "recognizes .rss on /recent" do
       expect(get: "/recent.rss")
         .to card_route_to(action: "read", id: ":recent", format: "rss")
     end
 
-    it "should handle RESTful posts" do
+    it "handles RESTful posts" do
       expect(put: "/mycard").to card_route_to(action: "update", id: "mycard")
       expect(put: "/").to card_route_to(action: "update")
     end
@@ -35,17 +35,17 @@ describe CardController do
 
     ["/wagn", ""].each do |prefix|
       describe "routes prefixed with '#{prefix}'" do
-        it "should recognize .rss format" do
+        it "recognizes .rss format" do
           expect(get: "#{prefix}/*recent.rss")
             .to card_route_to(action: "read", id: "*recent", format: "rss")
         end
 
-        it "should recognize .xml format" do
+        it "recognizes .xml format" do
           expect(get: "#{prefix}/*recent.xml")
             .to card_route_to(action: "read", id: "*recent", format: "xml")
         end
 
-        it "should accept cards without dots" do
+        it "accepts cards without dots" do
           expect(get: "#{prefix}/random")
             .to card_route_to(action: "read", id: "random")
         end
@@ -207,7 +207,7 @@ describe CardController do
         login_as "joe_user"
       end
 
-      it "should work on index" do
+      it "works on index" do
         get :read, view: "new"
         expect(assigns["card"].name).to eq("")
         assert_response :success, "response should succeed"
@@ -241,7 +241,7 @@ describe CardController do
         assert_response :success
       end
 
-      it "should use card params name over id in new cards" do
+      it "uses card params name over id in new cards" do
         get :read, id: "my_life", card: { name: "My LIFE" }, view: "new"
         expect(assigns["card"].name).to eq("My LIFE")
       end
@@ -276,9 +276,9 @@ describe CardController do
 
       it "handles image with no read permission" do
         get :read, id: "mao2"
-        assert_response 403, "should deny html card view"
+        assert_response 403, "denies html card view"
         get :read, id: "mao2", format: "jpg"
-        assert_response 403, "should deny simple file view"
+        assert_response 403, "denies simple file view"
       end
 
       it "handles image with read permission" do
@@ -373,7 +373,7 @@ describe CardController do
       end
     end
 
-    it "should comment" do
+    it "comments" do
       Card::Auth.as_bot do
         Card.create name: "basicname+*self+*comment",
                     content: "[[Anyone Signed In]]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.19.6
+  version: 1.20.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.6
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.6
+        version: 1.20.0
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@wagn.org
@@ -112,6 +112,12 @@ files:
 - lib/wagn/cli.rb
 - lib/wagn/commands.rb
 - lib/wagn/commands/application.rb
+- lib/wagn/commands/command.rb
+- lib/wagn/commands/cucumber_command.rb
+- lib/wagn/commands/rake_command.rb
+- lib/wagn/commands/rake_command/parser.rb
+- lib/wagn/commands/rspec_command.rb
+- lib/wagn/commands/rspec_command/parser.rb
 - lib/wagn/config/environments/cucumber.rb
 - lib/wagn/config/environments/development.rb
 - lib/wagn/config/environments/production.rb
@@ -153,7 +159,6 @@ files:
 - lib/wagn/generators/wagn/wagn_generator.rb
 - lib/wagn/generators/wagn/wagn_generator/interactive.rb
 - lib/wagn/mods_spec_helper.rb
-- lib/wagn/parser.rb
 - lib/wagn/response.rb
 - lib/wagn/script_wagn_loader.rb
 - lib/wagn/tasks/.gitkeep
@@ -161,6 +166,8 @@ files:
 - lib/wagn/tasks/db.rake
 - lib/wagn/tasks/test.rake
 - lib/wagn/tasks/wagn.rake
+- lib/wagn/tasks/wagn/bootstrap.rake
+- lib/wagn/tasks/wagn/migrate.rake
 - rails/application-routes.rb
 - rails/assets/ace/ext-searchbox.js
 - rails/assets/ace/mode-coffee.js

data/lib/wagn/parser.rb

@@ -1,93 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-module Wagn
-  class Parser
-    class << self
-      def db_task command, opts
-        OptionParser.new do |parser|
-          parser.banner = "Usage: wagn #{command} [options]\n\n" \
-                          "Run wagn:#{command} task on the production "\
-                          " database specified in config/database.yml\n\n"
-          parser.on("--production", "-p",
-                    "#{command} production database (default)") do
-            opts[:envs] = ["production"]
-          end
-          parser.on("--test", "-t",
-                    "#{command} test database") do
-            opts[:envs] = ["test"]
-          end
-          parser.on("--development", "-d",
-                    "#{command} development database") do
-            opts[:envs] = ["development"]
-          end
-          parser.on("--all", "-a",
-                    "#{command} production, test, and development database") do
-            opts[:envs] = %w(production development test)
-          end
-        end
-      end
-
-      def rspec opts
-        OptionParser.new do |parser|
-          parser.banner = "Usage: wagn rspec [WAGN ARGS] -- [RSPEC ARGS]\n\n" \
-                          "RSPEC ARGS"
-          parser.separator <<-WAGN
-
-      WAGN ARGS
-
-        You don't have to give a full path for FILENAME, the basename is enough
-        If FILENAME does not include '_spec' rspec searches for the
-        corresponding spec file.
-        The line number always referes to example in the (corresponding) spec
-        file.
-
-      WAGN
-
-          parser.on("-d", "--spec FILENAME(:LINE)",
-                    "Run spec for a Wagn deck file") do |file|
-            opts[:files] = find_spec_file(file, "#{Wagn.root}/mod")
-          end
-          parser.on("-c", "--core-spec FILENAME(:LINE)",
-                    "Run spec for a Wagn core file") do |file|
-            opts[:files] = find_spec_file(file, Cardio.gem_root)
-          end
-          parser.on("-m", "--mod MODNAME",
-                    "Run all specs for a mod or matching a mod") do |file|
-            opts[:files] =
-              if File.exist?("mod/#{file}")
-                "#{Cardio.gem_root}/mod/#{file}"
-              elsif File.exist?("#{Cardio.gem_root}/mod/#{file}")
-                "#{Cardio.gem_root}/mod/#{file}"
-              elsif (files = find_spec_file(file, "mod")) && files.present?
-                files
-              else
-                find_spec_file(file, "#{Cardio.gem_root}/mod")
-              end
-          end
-          parser.on("-s", "--[no-]simplecov", "Run with simplecov") do |s|
-            opts[:simplecov] = s ? "" : "COVERAGE=false"
-          end
-          parser.on("--rescue", "Run with pry-rescue") do
-            if opts[:executer] == "spring"
-              puts "Disabled pry-rescue. Not compatible with spring."
-            else
-              opts[:rescue] = "rescue "
-            end
-          end
-          parser.on("--[no-]spring", "Run with spring") do |spring|
-            if spring
-              opts[:executer] = "spring"
-              if opts[:rescue]
-                opts[:rescue] = ""
-                puts "Disabled pry-rescue. Not compatible with spring."
-              end
-            else
-              opts[:executer] = "bundle exec"
-            end
-          end
-          parser.separator "\n"
-        end
-      end
-    end
-  end
-end