wagn 1.13.0 → 1.14.0.pre1

data/lib/card/set.rb

@@ -5,6 +5,7 @@ class Card
 
     mattr_accessor :modules, :traits
     @@modules = { :base=>[], :base_format=>{}, :nonbase=>{}, :nonbase_format=>{} }
+   
     
 =begin
     A "Set" is a group of cards to which "Rules" may be applied.  Sets can be as specific as
@@ -134,6 +135,7 @@ class Card
 
         define_method event do
           run_callbacks event do
+            #puts event
             send final_method
           end
         end
@@ -143,6 +145,7 @@ class Card
     end
 
 
+    
     #
     # ActiveCard support: accessing plus cards as attributes
     #

data/lib/wagn/all.rb

@@ -6,5 +6,11 @@ require 'airbrake'
 require 'RMagick'
 require 'paperclip'
 require 'coderay'
+require 'haml'
+require 'kaminari'
+require 'diff/lcs'
+require 'diffy'
+#require 'scheduler_daemon'
 
 require 'wagn/application'
+

data/lib/wagn/application.rb

@@ -4,7 +4,7 @@ require 'wagn/all'
 require 'active_support/core_ext/numeric/time'
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
+  Bundler.require *Rails.groups(:assets => %w(development test))   
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
@@ -27,6 +27,13 @@ module Wagn
       end
     end
     
+    initializer :load_mod_initializers,  :after => :load_wagn_config_initializers do
+      paths.add 'mod-initializers', :with=>'mod', :glob=>"**/initializers/*.rb"
+      config.paths['mod-initializers'].existent.sort.each do |initializer|
+        load(initializer)
+      end
+    end
+    
     class << self
       def inherited(base)
         Rails.application = base.instance
@@ -43,7 +50,8 @@ module Wagn
         
         config.autoload_paths += Dir["#{Wagn.gem_root}/app/**/"]
         config.autoload_paths += Dir["#{Wagn.gem_root}/lib/**/"]
-        config.autoload_paths += Dir["#{Wagn.gem_root}/mod/standard/lib/**/"]
+        config.autoload_paths += Dir["#{Wagn.gem_root}/mod/*/lib/**/"]
+        config.autoload_paths += Dir["#{Wagn.root}/mod/*/lib/**/"]
         
         config.assets.enabled = false
         config.assets.version = '1.0'
@@ -66,6 +74,8 @@ module Wagn
         config.override_protocol     = nil
         
         config.token_expiry          = 2.days
+        config.revisions_per_page    = 10
+        config.request_logger        = false
         
         config
       end
@@ -95,7 +105,7 @@ module Wagn
         paths.add 'files'
         paths.add 'tmp/set'
         paths.add 'tmp/set_pattern'
-        
+        paths.add 'db/migrate_deck_cards', :with=>'db/migrate_cards'
         paths
       end
     end
@@ -113,9 +123,9 @@ module Wagn
 
     def load_tasks(app=self)
       super
-      unless approot_is_gemroot?
-        Rake::Task["db:schema:dump"].clear
-      end
+#      unless approot_is_gemroot?
+#        Rake::Task["db:schema:dump"].clear
+#      end
       self
     end
   end

data/lib/wagn/commands.rb

@@ -1,14 +1,14 @@
+require 'optparse'
+require 'active_support/core_ext/object/inclusion' # adds method in? to Object class
+
 def load_rake_tasks
   require './config/environment'
   require 'rake'
   Wagn::Application.load_tasks
 end
 
-require 'active_support/core_ext/object/inclusion' # adds method in? to Object class
-
-ARGV << '--help' if ARGV.empty?
-
-aliases = {
+RAILS_COMMANDS = %w( generate destroy plugin benchmarker profiler console server dbconsole application runner )
+ALIAS = {
   "rs" => "rspec",
   "cc" => "cucumber",
   "g"  => "generate",
@@ -19,44 +19,101 @@ aliases = {
   "r"  => "runner"
 }
 
-rails_commands = %w( generate destroy plugin benchmarker profiler console server dbconsole application runner )
+ARGV << '--help' if ARGV.empty?
+
+def supported_rails_command? arg
+  arg.in? RAILS_COMMANDS or ALIAS[arg].in? RAILS_COMMANDS
+end
+
+def find_spec_file filename, base_dir
+  file, line = filename.split(':')
+  if file.include? '_spec.rb' and File.exist?(file)
+    filename
+  else
+    file = File.basename(file,".rb").sub(/_spec$/,'')
+    Dir.glob("#{base_dir}/**/#{file}_spec.rb").flatten.map{ |file| line ? "#{file}:#{line}" : file}.join(' ')
+  end
+end
+
 
-if ARGV.first.in? rails_commands or aliases[ARGV.first].in? rails_commands
+if supported_rails_command? ARGV.first
+  if ARGV.delete('--rescue')
+    ENV["PRY_RESCUE_RAILS"]="1"
+  end
   require 'wagn'
   require 'rails/commands'
 else
   command = ARGV.shift
-  command = aliases[command] || command
+  command = ALIAS[command] || command
 
   case command
   when 'seed'
-    #load_rake_tasks  we can't load config/environment if the database doesn't exist, use config/application instead
-    require './config/application'
-    require 'wagn/migration_helper'
-    require 'rake'
-    Wagn::Application.load_tasks
-    Rake::Task['wagn:create'].invoke
-    if ARGV.include? "--test-data" 
-      ENV['RELOAD_TEST_DATA'] = 'true'
-      Rake::Task['db:test:prepare'].invoke
+    envs = ['production']
+    parser = OptionParser.new do |parser|
+      parser.banner = "Usage: wagn seed [options]\n\nCreate and seed the production database specified in config/database.yml\n\n"
+      parser.on('--production','-p', 'seed production database (default)') do
+        envs = ['test']
+      end
+      parser.on('--test','-t', 'seed test database') do
+        envs = ['test']
+      end
+      parser.on('--development', '-d', 'seed development database') do
+        envs = ['development']
+      end
+      parser.on('--all', '-a', 'seed production, test, and development database') do
+        envs = %w( production development test)          
+      end
+    end
+    parser.parse!(ARGV)
+    envs.each do |env|
+      puts "env RAILS_ENV=#{env} bundle exec rake wagn:create"
+      puts `env RAILS_ENV=#{env} bundle exec rake wagn:create`
     end
   when 'update'
     load_rake_tasks
     Rake::Task['wagn:update'].invoke
   when 'cucumber'
-    system "RAILS_ROOT=. bundle exec cucumber #{ ARGV.join(' ') }"
+    feature_paths = Dir.glob("./mod/**/features")
+    require_args = "-r #{Wagn.gem_root}/features "
+    require_args += feature_paths.map { |path| "-r #{path}"}.join(' ')
+    feature_args = ARGV.empty? ? feature_paths.join(' ') : ARGV.join(' ')
+    system "RAILS_ROOT=. bundle exec cucumber #{require_args} #{feature_args}"
   when 'rspec'
-    if index = ( ARGV.index("-s") || ARGV.index("--spec" ))
-      ARGV.delete_at(index)
-      files = Dir.glob("mod/**/#{ARGV[index]}_spec.rb").flatten.join(' ')
-      ARGV.delete_at(index)
+    opts = {}
+    require 'rspec/core'
+    parser = RSpec::Core::Parser.new.parser(opts)
+    parser.banner = "Usage: wagn rspec [WAGN ARGS] -- [RSPEC ARGS]\n\nRSPEC 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, "mod")
+    end
+    parser.on('-c', '--core-spec FILENAME(:LINE)', 'Run spec for a Wagn core file') do |file|
+      opts[:files] = find_spec_file( file, "#{Wagn.gem_root}" )
+    end
+    parser.on('-m', '--mod MODNAME', 'Run all specs for a mod') do |file|
+      opts[:files] = "mod/#{file}"
     end
-    if index = ( ARGV.index("-m") || ARGV.index("--mod" ))
-      ARGV.delete_at(index)
-      files = "mod/#{ARGV[index]}"
-      ARGV.delete_at(index)
+    parser.on('-s', '--[no-]simplecov', 'Run with simplecov') do |s|
+      opts[:simplecov] = s ? '' : 'COVERAGE=false'
     end
-    system "RAILS_ROOT=. bundle exec rspec #{ARGV.join(' ')} #{files}"
+    parser.on('--rescue', 'Run with pry-rescue') do
+      opts[:rescue] = 'rescue '
+    end
+    parser.separator "\n"
+
+    wagn_args, rspec_args = (' '<<ARGV.join(' ')).split(' -- ')
+    parser.parse!(wagn_args.split(' '))
+
+    system "RAILS_ROOT=. #{opts[:simplecov]} bundle exec #{opts[:rescue]} rspec #{rspec_args} #{opts[:files]}" 
   when '--version', '-v'
     puts "Wagn #{Wagn::Version.release}"
   when 'new'
@@ -102,3 +159,6 @@ else
     exit(1)
   end
 end
+
+
+

data/lib/wagn/config/environments/development.rb

@@ -7,6 +7,15 @@ Wagn.application.class.configure do
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
+  config.reload_classes_only_on_change = false
+  if defined?(RailsDevTweaks)
+    config.dev_tweaks.autoload_rules do
+      skip '/files'
+    end
+  end
+  
+
+  
   
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
@@ -57,6 +66,14 @@ Wagn.application.class.configure do
 
   config.action_mailer.perform_deliveries = false
   
+  # Use Pry instead of IRB
+  silence_warnings do
+    begin
+      require 'pry'
+      IRB = Pry
+    rescue LoadError
+    end
+  end
 end
 
 

data/lib/wagn/config/environments/test.rb

@@ -29,8 +29,12 @@ Wagn.application.class.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
+  config.action_mailer.perform_deliveries = true
   config.action_mailer.default :charset=>"utf-8"
-
+  
+  #config.action_mailer.delivery_method = :smtp
+  #config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
+  
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
@@ -42,4 +46,13 @@ Wagn.application.class.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+  
+  # Use Pry instead of IRB
+  silence_warnings do
+    begin
+      require 'pry'
+      IRB = Pry
+    rescue LoadError
+    end
+  end
 end

data/lib/wagn/config/initializers/airbrake.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-filename = '/etc/airbrake.key'
+filename = File.join Wagn.root, 'config/airbrake.key'
 if File.exists? filename
   key = File.read( filename ).strip
   Airbrake.configure do |config|

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

@@ -14,33 +14,43 @@ gem 'therubyracer'
 
 <% if options['mod-dev'] -%>
 group :test do
-  gem 'rspec-rails', "~> 2.6"   # behavior-driven-development suite
+  gem 'rspec-rails', '~> 3.1.0'   # behavior-driven-development suite
   gem 'spork', '>=0.9'
+  # gem 'simplecov' # code coverage analysis tool
 end
 
 group :test, :development do
   gem 'rails-dev-tweaks'
   gem 'sprockets' # just so above works
-  gem 'byebug'
+  # gem 'pry-rails'
+  # gem 'pry-rescue'
+  # gem 'pry-stack_explorer'
+  if RUBY_VERSION =~ /^2/
+		gem 'byebug' 
+    # gem 'pry-byebug'
+	else
+		gem 'debugger'
+	end
 end
 
 <% end -%>
-<% if options['core-dev'] -%>
-  
+
+<% if options['core-dev'] -%>  
 group :assets do
   gem 'jquery-rails',  '~> 3.1'                # main js framework, along with rails-specific unobtrusive lib
   gem 'jquery-ui-rails',  '~> 4.2'             # main js framework, along with rails-specific unobtrusive lib
   gem "jquery_mobile_rails", "~> 1.4.1"
 
   gem 'tinymce-rails', '~> 3.4'                # wysiwyg editor
-
-  # execjs is necessary for developing coffeescript.  mac users have execjs built-in; don't need this one
-  gem 'therubyrhino', :platform=>:ruby         # :ruby is MRI rubies, so if you use a mac ruby ...
 end
 
+group :development do
+  gem 'rails-dev-tweaks'
+  gem 'sprockets' # just so above works
+end
 
 group :test do
-  gem 'rspec-rails', "~> 2.6"                  # behavior-driven-development suite
+  gem 'rspec-rails', '~> 3.1.0'                 # behavior-driven-development suite
   gem 'spork', '>=0.9'                                           
   gem 'rr'#, '=1.0.0'
   
@@ -49,6 +59,8 @@ group :test do
   gem 'guard-rspec', '~> 4.2'                  # trigger test runs based on file edits
   if RUBY_PLATFORM =~ /darwin/
     gem 'terminal-notifier-guard', '~> 1.5'    # use growler notifications on macs
+    # gem 'rspec-legacy_formatters'
+    # gem 'wagn-rspec-formatter', :path=>'/opt/wagn-rspec-formatter'
   end
 
   # CUKES see features dir
@@ -71,9 +83,15 @@ end
 
 gem 'ruby-prof', '~>0.12.1', :group=>:profile  # profiling
 
+group :development, :test do
+  gem 'pry-rails'
+  gem 'pry-rescue'
+  gem 'pry-stack_explorer'
+end
+
 group :debug do
   if RUBY_VERSION =~ /^2/
-		gem 'byebug' 
+    gem 'pry-byebug'
 	else
 		gem 'debugger'
 	end

data/lib/wagn/generators/wagn/templates/config/application.rb

@@ -13,7 +13,18 @@ module <%= app_const_base %>
     #
     # IMPORTANT: please be sure to register for your own recaptcha keys before deploying a live site
     # It's quick and easy.  Just follow instructions at https://www.google.com/recaptcha/admin/create
-    #
+  
+    
+    # Email configuration
+    config.action_mailer.perform_deliveries = false
+    # config.action_mailer.delivery_method  = ...
+    # config.action_mailer.smtp_settings    = ...
+    
+    # Example configuration for mailcatcher, a simple smtp server. 
+    # See http://mailcatcher.me for more information
+    # config.action_mailer.delivery_method = :smtp
+    # config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
+    
     # The below keys are fine for testing but should not be used in production sites.
         
     # config.read_only = true
@@ -41,7 +52,5 @@ module <%= app_const_base %>
 
     # config.override_protocol = nil
     # don't autodetect protocol (http/https) from web requests
-
-
   end
 end

data/lib/wagn/generators/wagn/templates/simplecov

@@ -0,0 +1,5 @@
+unless ENV['COVERAGE'] == 'false'
+	SimpleCov.start do
+		<%= @simplecov_config %>
+	end
+end

data/lib/wagn/generators/wagn/templates/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'wagn/mods_spec_helper'

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

@@ -15,28 +15,38 @@ class WagnGenerator < Rails::Generators::AppBase
   class_option 'core-dev', :type => :boolean, aliases: '-c', :default => false, :group => :runtime, 
     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"
+    
   class_option 'mod-dev', :type => :boolean, aliases: '-m', :default => false, :group => :runtime, 
     desc: "Prepare deck for mod testing"
     
   class_option 'interactive', :type => :boolean, aliases: '-i', :default => false, :group => :runtime, 
-      desc: "Prompt with dynamic installation options"
+    desc: "Prompt with dynamic installation options"
                         
   public_task :create_root
   
 ## should probably eventually use rails-like AppBuilder approach, but this is a first step.  
-  def core_dev_setup  
+  def dev_setup  
     if options['core-dev']
-      @wagn_path = ask "Enter the path to your local wagn installation: "
+      @wagn_path = options['gem-path'] || ask("Enter the path to your local wagn installation: ")
       #@wagndev_path = ask "Please enter the path to your local wagn-dev installation (leave empty to use the wagn-dev gem): "
-      @spec_path = File.join @wagn_path, 'spec'
-      @spec_helper_path = File.join @spec_path, 'spec_helper'
+      @spec_path = @wagn_path
+      @spec_helper_path = File.join @spec_path, 'spec', 'spec_helper'
       @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"
       template "rspec", ".rspec"
+      template "simplecov", ".simplecov"
     elsif options['mod-dev']
       @spec_path = 'mod/'
-      @spec_helper_path = 'wagn/mods_spec_helper'
+      @spec_helper_path = './spec/spec_helper'
+      @simplecov_config = "wagn_simplecov_filters"
       template "rspec", ".rspec"
+      template "simplecov", ".simplecov"
+      empty_directory 'spec'
+      inside 'spec' do
+        template 'spec_helper.rb'
+      end
     end
   end
 
@@ -115,45 +125,69 @@ class WagnGenerator < Rails::Generators::AppBase
   
   def seed_data
     if options['interactive']
-      seeded = false
+
       require File.join destination_root, 'config', 'application'  # need this for Rails.env
-      while  (answer = ask( <<-TEXT
-        
-What would you like to do next?
-  e - edit database configuration file (config/database.yml)
-  s - seed #{Rails.env}#{ " and test" if options['core-dev'] or options['mod-dev']} database
-  a - seed all databases (production, development, and test)
-  x - exit #{ seeded ? "\n  r - run wagn server" : "(run 'wagn seed' to complete the installation later)"}
-[esax#{'r' if seeded}]
-TEXT
-)) != 'x'      
-        case answer
-        when 'e'
-          system "nano #{File.join destination_root, 'config', 'database.yml'}"
-        when 's'
-          require 'wagn/migration_helper'
-          require 'rake'
-          Wagn::Application.load_tasks
-          Rake::Task['wagn:create'].invoke
-          if options['core-dev'] or options['mod-dev']
-            ENV['RELOAD_TEST_DATA'] = 'true'
-            Rake::Task['db:test:prepare'].invoke
-          end
-          seeded = true
-        when 'a'
-          %w( production development test ).each do |env|
-            system("cd #{destination_root} && RAILS_ENV=#{env} rake wagn:create")  
-            # tried to set rails environment and invoke the task three times but it was only execute once, so I'm using 'system'
+      menu_options = ActiveSupport::OrderedHash.new()
+      
+      database_seeded = proc do
+        menu_options['x'][:desc] = "exit"
+        menu_options['r'] = {
+          :desc    => 'run wagn server',
+          :command => 'wagn server',
+          :code    => proc { system "cd #{destination_root} && wagn server" }
+        }
+      end
+      
+      menu_options['d'] = { 
+          :desc    => 'edit database configuration file',
+          :command => 'nano config/database.yml',
+          :code    =>  proc { system "nano #{File.join destination_root, 'config', 'database.yml'}" }
+        }
+      menu_options['c'] =  { 
+          :desc    => 'configure Wagn (e.g. email settings)',
+          :command => 'nano config/application.rb',
+          :code    =>  proc { system "nano #{File.join destination_root, 'config', 'application.rb'}" }
+        }
+      menu_options['s'] =  { 
+          :desc    => "seed #{Rails.env}#{ " and test" if options['core-dev'] or options['mod-dev']} database",
+          :command => 'wagn seed',
+          :code    => proc do
+            system("cd #{destination_root} && bundle exec rake wagn:create") 
+            if options['core-dev'] or options['mod-dev']
+              system("cd #{destination_root} && RAILS_ENV=test bundle exec rake wagn:create")  
+            end
+            database_seeded.call
           end
-          seeded = true
-        when 'r'
-          if seeded
-            system "cd #{destination_root} && wagn server"
-          else
-            puts "You have to seed the database first before you can start the server."
+        }
+      menu_options['a'] = { 
+          :desc    => 'seed all databases (production, development, and test)',
+          :command => 'wagn seed --all',
+          :code    => proc do
+            %w( production development test ).each do |env|
+              system("cd #{destination_root} && RAILS_ENV=#{env} bundle exec rake wagn:create")  
+            end
+            database_seeded.call
           end
+        }
+      menu_options['x'] =  { 
+          :desc    => "exit (run 'wagn seed' to complete the installation later)" 
+        }
+      
+      
+      def build_menu options
+        lines = ["What would you like to do next?"]
+        lines += options.map do |key, v| 
+          command = ' '*(65-v[:desc].size) + '[' + v[:command] + ']' if v[:command] 
+          "  #{key} - #{v[:desc]}#{command if command}"
         end
+        lines << "[#{options.keys.join}]"
+        "\n#{lines.join("\n")}\n"
+      end
+      
+      while  (answer = ask(build_menu(menu_options))) != 'x'      
+        menu_options[answer][:code].call       
       end
+      
     else
       puts "Review the database configuration in config/database.yml and run 'wagn seed' to complete the installation.\nStart the server with 'wagn server'."
     end
@@ -215,8 +249,4 @@ TEXT
       raise Error, "Invalid application name #{app_name}, constant #{app_const_base} is already in use. Please choose another application name."
     end
   end
-  
-  
-
-
 end