wagn 1.14.9 → 1.15.pre

data/lib/wagn/generators/wagn/wagn_generator.rb

@@ -5,10 +5,10 @@ class WagnGenerator < Rails::Generators::AppBase
 
 #class WagnGenerator < Rails::Generators::AppGenerator
 
-  
-
   source_root File.expand_path('../templates', __FILE__)
   
+  argument :deck_path, :required=>false
+
   class_option :database, :type => :string, :aliases => "-d", :default => "mysql",
     :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
     
@@ -16,7 +16,7 @@ class WagnGenerator < Rails::Generators::AppBase
     desc: "Prepare deck for wagn core testing"
     
   class_option 'gem-path', :type => :string, aliases: '-g', :default => false, :group => :runtime, 
-    desc: "Path to local gem installation"
+    desc: "Path to local gem installation (Default, use env WAGN_GEM_PATH)"
     
   class_option 'mod-dev', :type => :boolean, aliases: '-m', :default => false, :group => :runtime, 
     desc: "Prepare deck for mod testing"
@@ -28,22 +28,34 @@ class WagnGenerator < Rails::Generators::AppBase
   
 ## should probably eventually use rails-like AppBuilder approach, but this is a first step.  
   def dev_setup
-    @wagn_path = options['gem-path']
+    # TODO: rename or split, gem_path points to the source repo, card and wagn gems are subdirs
+    @gemfile_gem_path = @gem_path = options['gem-path']
+    env_gem_path = ENV['WAGN_GEM_PATH']
+    if env_gem_path.present?
+      @gemfile_gem_path = %q{#{ENV['WAGN_GEM_PATH']}}
+      @gem_path = env_gem_path
+    end
+    
+    @include_jasmine_engine = false
     if options['core-dev']
-      @wagn_path ||= ask("Enter the path to your local wagn gem installation: ")
-      @spec_path = @wagn_path
-      @spec_helper_path = File.join @spec_path, 'spec', 'spec_helper'
+      unless @gem_path
+        @gemfile_gem_path = @gem_path = ask("Enter the path to your local wagn gem installation: ")
+      end
+
+      @include_jasmine_engine = true
+      @spec_path = @gem_path
+      @spec_helper_path = File.join @spec_path, 'card', 'spec', 'spec_helper'
       empty_directory 'spec'
       inside 'spec' do
         copy_file File.join('javascripts', 'support', 'wagn_jasmine.yml'), File.join('javascripts', 'support','jasmine.yml')
       end
-      @features_path = File.join @wagn_path, 'features/'  # ending slash is important in order to load support and step folders
-      @simplecov_config = "wagn_core_dev_simplecov_filters"
       
+      @features_path = File.join @gem_path, 'wagn/features/'  # ending slash is important in order to load support and step folders
+      @simplecov_config = "card_core_dev_simplecov_filters"
     elsif options['mod-dev']
       @spec_path = 'mod/'
       @spec_helper_path = './spec/spec_helper'
-      @simplecov_config = "wagn_simplecov_filters"
+      @simplecov_config = "card_simplecov_filters"
       empty_directory 'spec'
       inside 'spec' do
         template 'spec_helper.rb'
@@ -61,22 +73,10 @@ class WagnGenerator < Rails::Generators::AppBase
     end
   end
 
-  
   def rakefile
     template "Rakefile"
   end
 
-  def app
-    empty_directory 'app'
-    inside "app" do
-      empty_directory 'assets'
-      inside "assets" do
-        empty_directory 'javascripts'  
-        empty_directory 'stylesheets'
-      end
-    end
-  end
-
 #  def readme
 #    copy_file "README", "README.rdoc"
 #  end
@@ -114,6 +114,7 @@ class WagnGenerator < Rails::Generators::AppBase
 
     inside "config" do
       template "application.rb"
+      template 'routes.erb', "routes.rb"
       template "environment.rb"
       template "boot.rb"
       template "databases/#{options[:database]}.yml", "database.yml"  

data/lib/wagn/mods_spec_helper.rb

@@ -5,14 +5,14 @@ ENV["RAILS_ENV"] = 'test'
 
 
 Spork.prefork do
-  require File.expand_path( '../simplecov_helper.rb', __FILE__ )
-  
+    
   if ENV["RAILS_ROOT"]
     require File.join( ENV["RAILS_ROOT"], '/config/environment')
   else
     require File.expand_path( '../../config/environment', __FILE__ )
   end
-
+  require File.join Cardio.gem_root, 'lib', 'card', 'simplecov_helper.rb'
+  
   if defined?(Bundler)
     Bundler.require(:test)   # if simplecov is activated in the Gemfile, it has to be required here
   end
@@ -48,11 +48,11 @@ Spork.prefork do
 
     config.use_transactional_fixtures = true
     config.use_instantiated_fixtures  = false
-    
+
 
     config.before(:each) do
       Card::Auth.current_id = JOE_USER_ID
-      Wagn::Cache.restore
+      Card::Cache.restore
       Card::Env.reset
     end
     config.after(:each) do
@@ -66,7 +66,8 @@ Spork.each_run do
   # This code will be run each time you run your specs.
 end
 
-require 'wagn/spec_helper'
-RSpec::Core::ExampleGroup.send :include, Wagn::SpecHelper
+require File.join Cardio.gem_root, 'lib', 'card', 'spec_helper.rb'
+
+RSpec::Core::ExampleGroup.send :include, Card::SpecHelper
 
 

data/lib/wagn/simplecov_helper.rb

@@ -1,9 +1,9 @@
-def wagn_simplecov_filters
+def card_simplecov_filters
   add_filter 'spec/'
   add_filter '/config/'
   add_filter '/tasks/'
 	
-	# filter all wagn mods
+	# filter all card mods
   add_filter do |src_file|
     src_file.filename =~ /tmp\// and not
     /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
@@ -36,7 +36,7 @@ def wagn_simplecov_filters
   end
 end
 
-def wagn_core_dev_simplecov_filters
+def card_core_dev_simplecov_filters
   filters.clear # This will remove the :root_filter that comes via simplecov's defaults
   add_filter do |src|
     !(src.filename =~ /^#{SimpleCov.root}/) unless src.filename =~ /wagn/
@@ -47,7 +47,7 @@ def wagn_core_dev_simplecov_filters
   add_filter '/config/'
   add_filter '/tasks/'
   add_filter '/generators/'
-  add_filter 'lib/wagn'
+  add_filter 'lib/card'
 
   add_group 'Card', 'lib/card'  
   add_group 'Set Patterns', 'tmp/set_pattern/'
@@ -58,4 +58,4 @@ def wagn_core_dev_simplecov_filters
   add_group 'Chunks' do |src_file|
     src_file.filename =~ /mod\/[^\/]+\/chunk/
   end
-end
+end

data/lib/wagn/tasks/db.rake

@@ -37,8 +37,8 @@ namespace :db do
     task :load => :environment do
       require 'active_record/fixtures'
       ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
-      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Wagn.gem_root.to_s, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-        ActiveRecord::Fixtures.create_fixtures(File.join(Wagn.gem_root.to_s, 'test', 'fixtures'), File.basename(fixture_file, '.*'))
+      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Cardio.gem_root, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+        ActiveRecord::Fixtures.create_fixtures(File.join(Cardio.gem_root, 'test', 'fixtures'), File.basename(fixture_file, '.*'))
       end
     end
   end

data/lib/wagn/tasks/test.rake

@@ -2,6 +2,7 @@ def set_database( db )
   y = YAML.load_file("#{Wagn.root}/config/database.yml")
   y["development"]["database"] = db if y["development"]
   y["production"]["database"] = db if y["production"]
+
   File.open( "#{Wagn.root}/config/database.yml", 'w' ) do |out|
     YAML.dump( y, out )
   end
@@ -73,7 +74,7 @@ namespace :test do
     ActiveRecord::Base.establish_connection
     tables.each do |table_name|
       i = "000"
-      File.open("#{Wagn.gem_root}/test/fixtures/#{table_name}.yml", 'w') do |file|
+      File.open("#{Cardio.gem_root}/test/fixtures/#{table_name}.yml", 'w') do |file|
         data = ActiveRecord::Base.connection.select_all(sql % table_name)
         file.write data.inject({}) { |hash, record|
           record['trash'] = false if record.has_key? 'trash'
@@ -87,7 +88,8 @@ namespace :test do
 
   desc "create sample data for testing"
   task :populate_template_database => :environment do
-    load "#{Wagn.gem_root}/test/seed.rb"
+    puts "populate test data\n"
+    load "#{Cardio.gem_root}/test/seed.rb"
     SharedData.add_test_data
   end
 

data/lib/wagn/tasks/wagn.rake

@@ -1,17 +1,21 @@
 
+require 'wagn/application'
+
 WAGN_BOOTSTRAP_TABLES = %w{ cards card_actions card_acts card_changes card_references }
 
 def prepare_migration
-  Wagn::Cache.reset_global
-  Wagn.config.action_mailer.perform_deliveries = false
+  Card::Cache.reset_global
+  Card.config.action_mailer.perform_deliveries = false
   Card.reset_column_information
   Card::Reference.reset_column_information  # this is needed in production mode to insure core db 
                                             # structures are loaded before schema_mode is set
 end
 
 namespace :wagn do
-  desc "create a wagn database from scratch"
-  task :create do
+  desc "create a wagn database from scratch, load initial data"
+  task :seed do
+    ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
+
     puts "dropping"
     #fixme - this should be an option, but should not happen on standard creates!
     begin
@@ -20,17 +24,40 @@ namespace :wagn do
       puts "not dropped"
     end
 
-    ENV['SCHEMA'] ||= "#{Wagn.gem_root}/db/schema.rb"
-     
     puts "creating"
     Rake::Task['db:create'].invoke
 
     puts "loading schema"
     Rake::Task['db:schema:load'].invoke
-    
+
+    Rake::Task['wagn:load'].invoke
+  end
+
+  desc "clear and load fixtures with existing tables"
+  task :reseed do
+    ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
+
+    Rake::Task['wagn:clear'].invoke
+
+    Rake::Task['wagn:load'].invoke
+  end
+
+  desc "empty the card tables"
+  task :clear do
+    conn = ActiveRecord::Base.connection
+
+    puts "delete all data in bootstrap tables"
+    WAGN_BOOTSTRAP_TABLES.each do |table|
+      conn.delete "delete from #{table}"
+    end
+  end
+
+  desc "Load bootstrap data into database"
+  task :load do
+    require 'decko/engine'
     puts "update card_migrations"
     Rake::Task['wagn:assume_card_migrations'].invoke
-    
+
     if Rails.env == 'test'
       puts "loading test fixtures"
       Rake::Task['db:fixtures:load'].invoke
@@ -38,11 +65,11 @@ namespace :wagn do
       puts "loading bootstrap"
       Rake::Task['wagn:bootstrap:load'].invoke
     end
-    
+
     puts "set symlink for assets"
     Rake::Task['wagn:update_assets_symlink'].invoke
   end
-  
+
   desc "update wagn gems and database"
   task :update do
     #system 'bundle update'
@@ -55,24 +82,25 @@ namespace :wagn do
     puts "set symlink for assets"
     Rake::Task['wagn:update_assets_symlink'].invoke
   end
-  
+
   desc "reset cache"
-  task :reset_cache => :environment  do
-    Wagn::Cache.reset_global
+  task :reset_cache => :environment do
+    Card::Cache.reset_global
   end
 
   desc "set symlink for assets"
   task :update_assets_symlink do
     assets_path = File.join(Rails.public_path, "assets")
-    if Rails.root.to_s != Wagn.gem_root and not (File.exists? assets_path or File.symlink? assets_path)
-      FileUtils.ln_s( Wagn.paths['gem-assets'].first, assets_path )
+    if Rails.root.to_s != Wagn.gem_root and not File.exists? assets_path
+      FileUtils.rm assets_path if File.symlink? assets_path
+      FileUtils.ln_s( Decko::Engine.paths['gem-assets'].first, assets_path )
     end
   end
 
   desc "migrate structure and cards"
-  task :migrate =>:environment do
-    ENV['SCHEMA'] ||= "#{Wagn.gem_root}/db/schema.rb"
-    
+  task :migrate => :environment do
+    ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
+
     stamp = ENV['STAMP_MIGRATIONS']
 
     puts 'migrating structure'
@@ -80,71 +108,87 @@ namespace :wagn do
     if stamp
       Rake::Task['wagn:migrate:stamp'].invoke :structure
     end
-    
+
     puts 'migrating core cards'
-    Wagn::Cache.reset_global
+    Card::Cache.reset_global
     Rake::Task['wagn:migrate:core_cards'].execute #not invoke because we don't want to reload environment
     if stamp
       Rake::Task['wagn:migrate:stamp'].reenable
       Rake::Task['wagn:migrate:stamp'].invoke :core_cards
     end
-    
+
     puts 'migrating deck cards'
     Rake::Task['wagn:migrate:deck_cards'].execute #not invoke because we don't want to reload environment
     if stamp
       Rake::Task['wagn:migrate:stamp'].reenable
       Rake::Task['wagn:migrate:stamp'].invoke :deck_cards
     end
-    
-    Wagn::Cache.reset_global
+
+    Card::Cache.reset_global
   end
 
   desc 'insert existing card migrations into schema_migrations_cards to avoid re-migrating'
   task :assume_card_migrations do
-    Wagn::CoreMigration.schema_mode  do
-      ActiveRecord::Schema.assume_migrated_upto_version Wagn::Version.schema(:core_cards), Wagn::CoreMigration.paths
-    end
+    require 'decko/engine'
+
+    Cardio.assume_migrated_upto_version :core_cards
   end
 
   namespace :migrate do
-    desc "migrate cards" 
-    task :cards => :environment do
+    desc "migrate cards"
+    task :cards do
       Rake::Task['wagn:migrate:core_cards'].invoke
       Rake::Task['wagn:migrate:deck_cards'].invoke
     end
-    
+
+    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 = Cardio.migration_paths(:structure)
+        ActiveRecord::Migrator.migrate paths
+        Rake::Task['db:_dump'].invoke   # write schema.rb
+      end
+    end
+
     desc "migrate core cards"
     task :core_cards => :environment do
-      ENV['SCHEMA'] ||= "#{Wagn.gem_root}/db/schema.rb"
+      require 'card/core_migration'
+
+      Card::Cache.reset_global
+      ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
       prepare_migration
-      paths = ActiveRecord::Migrator.migrations_paths = Wagn::CoreMigration.paths
+      paths = ActiveRecord::Migrator.migrations_paths = Cardio.migration_paths(:core_cards)
     
-      Wagn::CoreMigration.schema_mode do
+      Card::CoreMigration.schema_mode :core_cards do
         ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         ActiveRecord::Migrator.migrate paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       end
     end
-    
+
     desc "migrate deck cards"
     task :deck_cards => :environment do
-      ENV['SCHEMA'] ||= "#{Rails.root}/db/schema.rb"
+      require 'card/migration'
+
+      Card::Cache.reset_global
+      ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
       prepare_migration
-      paths = ActiveRecord::Migrator.migrations_paths = Wagn::Migration.paths
+      paths = ActiveRecord::Migrator.migrations_paths = Cardio.migration_paths(:deck_cards)
     
-      Wagn::Migration.schema_mode do
+      Cardio.schema_mode(:deck_cards) do
         ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         ActiveRecord::Migrator.migrate paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       end
     end
-  
-    desc 'write the version to a file (not usually called directly)' #maybe we should move this to a method? 
+
+    desc 'write the version to a file (not usually called directly)' #maybe we should move this to a method?
     task :stamp, :type do |t, args|
-      ENV['SCHEMA'] ||= "#{Wagn.gem_root}/db/schema.rb"
-      Wagn.config.action_mailer.perform_deliveries = false
-      
-      stamp_file = Wagn::Version.schema_stamp_path( args[:type] )
-      
-      Wagn::Migration.schema_mode args[:type] do
+      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 and file = open(stamp_file, 'w')
           puts ">>  writing version: #{version} to #{stamp_file}"
@@ -157,8 +201,8 @@ namespace :wagn do
 
   namespace :emergency do
     task :rescue_watchers => :environment do
-      follower_hash = Hash.new { |h, v| h[v] = [] } 
-      
+      follower_hash = Hash.new { |h, v| h[v] = [] }
+
       Card.where("right_id" => 219).each do |watcher_list|
         watcher_list.include_set_modules
         if watcher_list.left
@@ -168,13 +212,13 @@ namespace :wagn do
           end
         end
       end
-      
+
       Card.search(:right=>{:codename=>"following"}).each do |following|
         Card::Auth.as_bot do
           following.update_attributes! :content=>''
         end
       end
-      
+
       follower_hash.each do |user, items|
         if card=Card.fetch(user) and card.account
           Card::Auth.as(user) do
@@ -185,13 +229,14 @@ namespace :wagn do
       end
     end
   end
-  
+
   namespace :bootstrap do
     desc "rid template of unneeded cards, acts, actions, changes, and references"
     task :clean => :environment do
-      Wagn::Cache.reset_global
+      Card::Cache.reset_global
       conn =  ActiveRecord::Base.connection
       # Correct time and user stamps
+      # USER related
       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 )
@@ -199,16 +244,17 @@ namespace :wagn do
 
       Card::Auth.as_bot do
         # delete ignored cards
-        
+
         if ignoramus = Card['*ignore']
           ignoramus.item_cards.each do |card|
             card.delete!
           end
         end
-        Wagn::Cache.reset_global
+        Card::Cache.reset_global
+        # 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            
+            FileUtils.rm_rf File.join('files', card.id.to_s ), :secure=>true
             card.delete!
           end
         end
@@ -216,6 +262,8 @@ namespace :wagn do
 
       Card.empty_trash
 
+      # FIXME: move this to history
+      # Card::Act.clear_history(:actor_id=>Card::WagnBotID, :card_id=>Card::WagnBotID)
       Card::Action.delete_old
       Card::Change.delete_actionless
 
@@ -227,24 +275,24 @@ namespace :wagn do
       Card::Action.find_each do |action|
         action.update_attributes!(:card_act_id=>act.id)
       end
-      
-      Wagn::Cache.reset_global
-      
+
+      Card::Cache.reset_global
+
     end
 
     desc "dump db to bootstrap fixtures"
     task :dump => :environment do
-      Wagn::Cache.reset_global
-      
+      Card::Cache.reset_global
+
       Rake::Task['wagn:bootstrap:copy_mod_files'].invoke
-      
+
       YAML::ENGINE.yamler = 'syck'
       # 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_BOOTSTRAP_TABLES.each do |table|
         i = "000"
-        File.open("#{Wagn.gem_root}/db/bootstrap/#{table}.yml", 'w') do |file|
+        File.open("#{Cardio.gem_root}/db/bootstrap/#{table}.yml", 'w') do |file|
           data = ActiveRecord::Base.connection.select_all( "select * from #{table}" )
           file.write YAML::dump( data.inject({}) do |hash, record|
             record['trash'] = false if record.has_key? 'trash'
@@ -258,20 +306,20 @@ namespace :wagn do
           end)
         end
       end
-      
+
     end
 
     desc "copy files from template database to standard mod and update cards"
     task :copy_mod_files => :environment do
-      
+
       mod_name = '05_standard'
       template_files_dir = "#{Wagn.root}/files"
-      standard_files_dir = "#{Wagn.gem_root}/mod/#{mod_name}/file"
-      
+      standard_files_dir = "#{Cardio.gem_root}/mod/#{mod_name}/file"
+
       FileUtils.remove_dir standard_files_dir, force=true
       FileUtils.cp_r template_files_dir, standard_files_dir
 
-      # add a fourth line to the raw content of each image (or file) to identify it as a mod file      
+      # add a fourth line to the raw content of each image (or file) to identify it as a mod file
       Card::Auth.as_bot do
         Card.search( :type=>['in', 'Image', 'File'], :ne=>'' ).each do |card|
           unless card.db_content.split(/\n/).last == mod_name
@@ -289,13 +337,13 @@ namespace :wagn do
     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"
+      puts "bootstrap load starting #{File.join( Cardio.gem_root, 'db/bootstrap')}"
       require 'active_record/fixtures'
 #      require 'time'
 
-      ActiveRecord::Fixtures.create_fixtures File.join( Wagn.gem_root, 'db/bootstrap'), WAGN_BOOTSTRAP_TABLES
-
+      ActiveRecord::Fixtures.create_fixtures File.join( Cardio.gem_root, 'db/bootstrap'), WAGN_BOOTSTRAP_TABLES
     end
+
   end
 
 end