wagn 1.14.9 → 1.15.pre

data/lib/wagn/commands.rb

@@ -9,15 +9,15 @@ end
 
 RAILS_COMMANDS = %w( generate destroy plugin benchmarker profiler console server dbconsole application runner )
 ALIAS = {
-  "rs" => "rspec",
-  "cc" => "cucumber",
-  "jm" => "jasmine",
-  "g"  => "generate",
-  "d"  => "destroy",
-  "c"  => "console",
-  "s"  => "server",
-  "db" => "dbconsole",
-  "r"  => "runner"
+  'rs' => 'rspec',
+  'cc' => 'cucumber',
+  'jm' => 'jasmine',
+  'g'  => 'generate',
+  'd'  => 'destroy',
+  'c'  => 'console',
+  's'  => 'server',
+  'db' => 'dbconsole',
+  'r'  => 'runner'
 }
 
 ARGV << '--help' if ARGV.empty?
@@ -36,37 +36,40 @@ def find_spec_file filename, base_dir
   end
 end
 
+TASK_COMMANDS = %w[seed reseed load]
 
 if supported_rails_command? ARGV.first
   if ARGV.delete('--rescue')
     ENV["PRY_RESCUE_RAILS"]="1"
   end
-  require 'wagn'
+  command = ARGV.first
+  command = ALIAS[command] || command
+  require 'generators/card' if command == 'generate' # without this, the card generators don't list with: wagn g --help
   require 'rails/commands'
 else
   command = ARGV.shift
   command = ALIAS[command] || command
 
   case command
-  when 'seed'
+  when *TASK_COMMANDS
     envs = []
     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
+      parser.banner = "Usage: wagn #{command} [options]\n\nRun wagn:#{command} task on the production database specified in config/database.yml\n\n"
+      parser.on('--production','-p', "#{command} production database (default)") do
         envs = ['production']
       end
-      parser.on('--test','-t', 'seed test database') do
+      parser.on('--test','-t', "#{command} test database") do
         envs = ['test']
       end
-      parser.on('--development', '-d', 'seed development database') do
+      parser.on('--development', '-d', "#{command} development database") do
         envs = ['development']
       end
-      parser.on('--all', '-a', 'seed production, test, and development database') do
+      parser.on('--all', '-a', "#{command} production, test, and development database") do
         envs = %w( production development test)
       end
     end
     parser.parse!(ARGV)
-    task_cmd="bundle exec rake wagn:create"
+    task_cmd="bundle exec rake wagn:#{command}"
     if envs.empty?
       puts task_cmd
       puts `#{task_cmd}`
@@ -80,7 +83,11 @@ else
     load_rake_tasks
     Rake::Task['wagn:update'].invoke
   when 'cucumber'
-    feature_paths = Dir.glob("./mod/**/features")
+    require 'wagn'
+    require './config/environment'
+    feature_paths = Card::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.join(' ')
@@ -94,6 +101,7 @@ else
   when 'rspec'
     opts = {}
     require 'rspec/core'
+    require 'wagn/application'
     parser = RSpec::Core::Parser.new.parser(opts)
     parser.banner = "Usage: wagn rspec [WAGN ARGS] -- [RSPEC ARGS]\n\nRSPEC ARGS"
     parser.separator <<-WAGN
@@ -107,13 +115,20 @@ WAGN ARGS
 WAGN
 
     parser.on('-d', '--spec FILENAME(:LINE)', 'Run spec for a Wagn deck file') do |file|
-      opts[:files] = find_spec_file( file, "mod")
+      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, "#{Wagn.gem_root}" )
+      opts[:files] = find_spec_file( file, Cardio.gem_root)
     end
-    parser.on('-m', '--mod MODNAME', 'Run all specs for a mod') do |file|
-      opts[:files] = "mod/#{file}"
+    parser.on('-m', '--mod MODNAME', 'Run all specs for a mod or matching a mod') do |file|
+      if File.exists? mod_path = "mod/#{file}"
+        opts[:files] = "#{Cardio.gem_root}/mod/#{file}"
+      elsif File.exists? mod_path = "#{Cardio.gem_root}/mod/#{file}"
+        opts[:files] = "#{Cardio.gem_root}/mod/#{file}"
+      elsif (opts[:files] = find_spec_file( file, "mod")).present?
+      else
+        opts[:files] = 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'
@@ -138,15 +153,18 @@ WAGN
     end
     parser.separator "\n"
 
-    wagn_args, rspec_args = (' '<<ARGV.join(' ')).split(' -- ')
-    parser.parse!(wagn_args.split(' '))
+    before_split = true
+    wagn_args, rspec_args = ARGV.partition {|a| before_split = a=='--' ? false : before_split}
+    rspec_args.shift
+
+    parser.parse!(wagn_args)
 
-    rspec_command = "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} #{opts[:rescue]} rspec #{rspec_args} #{opts[:files]} 2>&1" 
+    rspec_command = "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} #{opts[:rescue]} rspec #{rspec_args*' '} #{opts[:files]} 2>&1" 
     unless system rspec_command
       exit $?.exitstatus
     end
   when '--version', '-v'
-    puts "Wagn #{Wagn::Version.release}"
+    puts "Wagn #{Card::Version.release}"
   when 'new'
     if ARGV.first.in?(['-h', '--help'])
       require 'wagn/commands/application'

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

@@ -1,3 +1,9 @@
+
+
+Decko::Engine.configure do
+  config.cache_classes = false
+end
+
 # -*- encoding : utf-8 -*-
 
 Wagn.application.class.configure do
@@ -8,14 +14,14 @@ Wagn.application.class.configure do
   # 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'
+      skip /view\=status/
     end
   end
   
-
-  
   
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
@@ -85,4 +91,4 @@ Wagn.application.class.configure do
 end
 
 
-#Paperclip.options[:command_path] = "/opt/local/bin"
+

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

@@ -14,15 +14,18 @@ Wagn.application.class.configure do
 
   # Don't check template timestamps - once again this
   # is to avoid IO times overwhelming profile results
-  config.action_view.cache_template_loading            = true
+  config.action_view.cache_template_loading = true
 
   # This is debatable, but turn off action controller
   # caching to see how long it really takes to run
   # queries and render templates
-  config.action_controller.perform_caching             = true
+  config.action_controller.perform_caching = true
 
   # Turn off most logging
   config.log_level = :info
   
   config.active_support.deprecation = :log
+  
+  config.action_mailer.perform_deliveries = false
 end
+

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

@@ -6,4 +6,4 @@ Wagn.config.session_store :active_record_store
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rails generate session_migration")
-# Wagn.config.session_store :active_record_store
+# Cardio.config.session_store :active_record_store

data/lib/wagn/exceptions.rb

@@ -1,11 +1,6 @@
 # -*- encoding : utf-8 -*-
+
 module Wagn
-  class NotFound < StandardError
-  end
-  
   class BadAddress < StandardError
   end
-  
-  class PermissionDenied < StandardError # can remove after obviating admin controller
-  end
 end

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

@@ -1,6 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'wagn'<%= ", :path=>'#{@wagn_path}'"  if @wagn_path.present? %>
+<% if @gem_path %>
+gem 'wagn',        :path=>"<%= @gemfile_gem_path %>/wagn"
+gem 'card',        :path=>"<%= @gemfile_gem_path %>/card", :require => false
+<% else %>
+gem 'wagn'
+<% end %>
 
 <%= database_gemfile_entry -%>
 
@@ -32,11 +37,11 @@ group :test, :development do
   # gem 'pry-rescue'
   # gem 'pry-stack_explorer'
   if RUBY_VERSION =~ /^2/
-		gem 'byebug' 
-    # gem 'pry-byebug'
-	else
-		gem 'debugger'
-	end
+  gem 'byebug' 
+  # gem 'pry-byebug'
+  else
+    gem 'debugger'
+  end
 end
 
 <% end -%>
@@ -61,11 +66,9 @@ group :test do
   gem 'spork', '>=0.9'                                           
   gem 'rr'#, '=1.0.0'
 	gem 'simplecov', '~> 0.7.1', :require => false  #test coverage
-   
-  # gem 'guard-rspec', '~> 4.2'    # trigger test runs based on file edits
-                                   # currently not compatible with spring-watcher-listen gem, 
-                                   # is supposed to be fixed in the next spring-watcher-listen release
-                                   
+    
+  # gem 'guard-rspec', '~> 4.2'           # trigger test runs based on file edits, 
+                                          # currently not compatible with spring-watcher-listen
   if RUBY_PLATFORM =~ /darwin/
     # gem 'terminal-notifier-guard', '~> 1.5'    # use growler notifications on macs
     # gem 'rspec-legacy_formatters'
@@ -90,7 +93,7 @@ group :test do
   gem 'minitest', "~>4.0"
 end
 
-gem 'ruby-prof', '~>0.12.1', :group=>:profile  # profiling
+gem 'ruby-prof', :group=>:profile  # profiling
 
 group :development, :test do
   gem 'spring'

data/lib/wagn/generators/wagn/templates/config.ru

@@ -1,5 +1,11 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
+<% if options['core-dev'] -%>
 
+if Rails.env.profile?
+  use Rack::RubyProf, :path => 'tmp/profile'
+end
+
+<% end -%>
 run <%= app_const %>

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

@@ -1,10 +1,11 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'wagn/all'
+require 'wagn/application'
 
 module <%= app_const_base %>
   class Application < Wagn::Application
-    
+    config.performance_logger = nil
+
     # Wagn inherits Rails configuration options.  See http://guides.rubyonrails.org/configuring.html
 
     config.recaptcha_public_key  = '6LdhRssSAAAAAFfLt1Wkw43hoaA8RTIgso9-tvtc'
@@ -13,21 +14,21 @@ 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. 
+
+    # 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
     # defaults to false
     # disallows creating, updating, and deleting cards.
@@ -42,12 +43,12 @@ module <%= app_const_base %>
     # config.paths['files'] = 'files'
     # where uploaded files are actually stored. (eg Image and File cards)
 
-    # config.paths['local-mod'] = 'mod'
-    # where mods are stored
+    # config.paths['mod'] << 'my-mod-dir'
+    # add a new directory for code customizations, or "mods"
 
     # config.allow_inline_styles = false
     # don't strip style attributes (not recommended)
-        
+
     # config.override_host = nil
     # don't autodetect host (example.com) from web requests
 

data/lib/wagn/generators/wagn/templates/config/cucumber.yml

@@ -1 +1 @@
-default: '<%= @features_path %>'
+default: '<%= @features_path %>'

data/lib/wagn/generators/wagn/templates/config/databases/mysql.yml

@@ -1,11 +1,12 @@
 # MySQL.  Versions 4.1 and 5.0 are recommended.
 # Be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
+
+production: 
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: <%= app_name %>_development
+  database: <%= app_name %>_production
   pool: 5
   username: root
   password:
@@ -15,14 +16,12 @@ development:
   host: localhost
 <% end -%>
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test: &test
+
+development: &development
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: <%= app_name %>_test
+  database: <%= app_name %>_development
   pool: 5
   username: root
   password:
@@ -32,13 +31,14 @@ test: &test
   host: localhost
 <% end -%>
 
-cucumber: *test
-
-production: 
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test: &test
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: <%= app_name %>_production
+  database: <%= app_name %>_test
   pool: 5
   username: root
   password:
@@ -47,3 +47,11 @@ production:
 <% else -%>
   host: localhost
 <% end -%>
+
+cucumber: *test
+
+profile: *development
+
+
+
+

data/lib/wagn/generators/wagn/templates/config/routes.erb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+
+Wagn.application.routes.draw do
+<% if @include_jasmine_engine %>
+  if !Rails.env.production? && Object.const_defined?( :JasmineRails )
+    mount Object.const_get(:JasmineRails).const_get(:Engine) => "<%= deck_path %>/specs"
+  end
+<% end %>
+  mount Decko::Engine => '<%= deck_path %>/'
+end

data/lib/wagn/generators/wagn/templates/spec/javascripts/support/deck_jasmine.yml

@@ -28,7 +28,7 @@ css_files:
     # - "**/*.{css,scss}"
 # THIS IS IMPORTANT!!
 include_dir: "mod"
-  #- <%= Wagn.gem_root+"/mod/03_machines/lib/javascript" %>
+  #- <%= Cardio.gem_root+"/mod/03_machines/lib/javascript" %>
 # path to parent directory of spec_files
 # relative path from Rails.root
 #

data/lib/wagn/generators/wagn/templates/spec/javascripts/support/wagn_jasmine.yml

@@ -2,7 +2,7 @@
 # relative path from Rails.root
 # defaults to app/assets/javascripts
 # useless for wagn file structure
-src_dir: <%= Wagn.gem_root+"/mod/03_machines/lib/javascript" %>
+src_dir: <%= Cardio.gem_root %>/mod/03_machines/lib/javascript
 #"app/assets/javascripts"
 
 # path to additional directory of source file that are not part of assets pipeline and need to be included
@@ -15,7 +15,7 @@ src_dir: <%= Wagn.gem_root+"/mod/03_machines/lib/javascript" %>
 # relative path from Rails.root
 # defaults to app/assets/stylesheets
 # useless for wagn file structure
-css_dir: <%= Wagn.gem_root+"/mod/03_machines/lib/stylesheets" %>
+css_dir: <%= Cardio.gem_root %>/mod/03_machines/lib/stylesheets
 
 # list of file expressions to include as source files
 # relative path from src_dir
@@ -41,7 +41,7 @@ css_files:
     # - "**/*.{css,scss}"
 # THIS IS IMPORTANT!!!
 include_dir:
-  - <%= Wagn.gem_root+"/mod/03_machines/lib/javascript" %>
+  - <%= Cardio.gem_root %>/mod/03_machines/lib/javascript
 # path to parent directory of spec_files
 # relative path from Rails.root
 #
@@ -51,7 +51,7 @@ include_dir:
 #   - ../engine/spec/javascripts
 #
 # defaults to spec/javascripts
-spec_dir:  <%= Wagn.gem_root+"/spec/javascripts" %>
+spec_dir:  <%= Wagn.gem_root %>/spec/javascripts
 
 # list of file expressions to include as helpers into spec runner
 # relative path from spec_dir