wagn 1.19.4 → 1.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930af46a0694af083fa46463e65ad2bfaa38120f
-  data.tar.gz: 3fa000fd4686922c15005c424dc5d7d850f75a45
+  metadata.gz: f024b8b0001ddf5423ba011ef9b18d7f3c7f9bf5
+  data.tar.gz: 92e141058800ba4e50beabe7156440187f630735
 SHA512:
-  metadata.gz: 6e723b5b89bb19c4bb3f0f186f1d1fdd2d7aa2ee35d6722c9d55dd358b04d759328a857c024f3fc5bd91bdcab3871553e2f7c5eef2214f06b87a8d5b9b3ec32b
-  data.tar.gz: c428b64ee754c681390a235f318c2e4685a277b6b137c32cdf617701d9750f1e2669fdd40de9752b70649cf1ccec11956e0455b0d27cfc6a69f30d551c09d5dd
+  metadata.gz: 54509726919a4016e20a534a09b6cd0a1311b68f4785a43cb4d32d5928bf2489861d9f13087aac3aa78099c83acefb262fdb052c49a6ab763b0ce04bcad2ad9a
+  data.tar.gz: ac23218fc2d08965e7c9daa3586b8d40acd11bdba863aebccf3a11ec8ee08dbfe1e8bc5efb2904930bb2b784ac2dc557e79fc915c814fdb7475cd830681e8ab8

data/features/support/env.rb

@@ -1,7 +1,8 @@
 # -*- encoding : utf-8 -*-
 ENV["RAILS_ENV"] = "cucumber"
 
-require File.expand_path("../../../lib/wagn/simplecov_helper.rb", __FILE__)
+require "wagn"
+require File.join Wagn.card_gem_root, "spec/support/simplecov_helper.rb"
 require "simplecov"
 require "minitest/autorun"
 

data/lib/wagn.rb

@@ -22,5 +22,20 @@ module Wagn
     def gem_root
       WAGN_GEM_ROOT
     end
+
+    def card_gem_root
+      @card_gem_root ||= locate_gem "card"
+    end
+
+    private
+
+    def locate_gem name
+      spec = Bundler.load.specs.find { |s| s.name == name }
+      unless spec
+        raise GemNotFound, "Could not find gem '#{name}' in the current bundle."
+      end
+      return File.expand_path("../../../", __FILE__) if spec.name == "bundler"
+      spec.full_gem_path
+    end
   end
 end

data/lib/wagn/commands.rb

@@ -87,7 +87,10 @@ else
     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]} "\

data/lib/wagn/mods_spec_helper.rb

@@ -1,65 +1,23 @@
 # -*- encoding : utf-8 -*-
 # require 'codeclimate-test-reporter'
 # CodeClimate::TestReporter.start
-require "spork"
 
-ENV["RAILS_ENV"] = "test"
+require "wagn" # only for card_gem_root
+require File.join Wagn.card_gem_root, "spec/support/card_spec_loader.rb"
 
-Spork.prefork do
-  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, "config", "simplecov_helper.rb"
+CardSpecLoader.init
 
+CardSpecLoader.prefork do
   if defined?(Bundler)
-    Bundler.require(:test)   # if simplecov is activated in the Gemfile, it has to be required here
+    Bundler.require(:test)
+    # if simplecov is activated in the Gemfile, it has to be required here
   end
-
-  require "rspec/rails"
-
-  # Requires supporting ruby files with custom matchers and macros, etc,
-  # in spec/support/ and its subdirectories.
-  #  Dir[ File.join(Wagn.gem_root, "spec/support/**/*.rb") ].each { |f| require f }
-
   #  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
-  JOE_USER_ID = Card["joe_user"].id
-
-  RSpec.configure do |config|
-    config.include RSpec::Rails::Matchers::RoutingMatchers,        file_path: /\bspec\/controllers\//
-    config.infer_spec_type_from_file_location!
-    # format_index = ARGV.find_index {|arg| arg =~ /--format/ }
-    # formatter = format_index ? ARGV[ format_index + 1 ] : 'documentation'
-    # config.add_formatter formatter
-
-    # config.include CustomMatchers
-    # config.include ControllerMacros, type: :controllers
-
-    # == Mock Framework
-    # If you prefer to mock with mocha, flexmock or RR, uncomment the appropriate symbol:
-    # :mocha, :flexmock, :rr
-
-    # config.mock_with :rr
-
-    config.use_transactional_fixtures = true
-    config.use_instantiated_fixtures  = false
-
-    config.before(:each) do
-      Card::Auth.current_id = JOE_USER_ID
-      Card::Cache.restore
-      Card::Env.reset
-    end
-    config.after(:each) do
-      Timecop.return
-    end
-  end
+  CardSpecLoader.rspec_config
 end
 
-Spork.each_run do
+CardSpecLoader.each_run do
   # This code will be run each time you run your specs.
 end
 
-require File.join Cardio.gem_root, "spec", "card_spec_helper.rb"
-
-RSpec::Core::ExampleGroup.send :include, Card::SpecHelper
+CardSpecLoader.helper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.19.4
+  version: 1.19.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-23 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.4
+        version: 1.19.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.4
+        version: 1.19.5
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@wagn.org
@@ -156,7 +156,6 @@ files:
 - lib/wagn/parser.rb
 - lib/wagn/response.rb
 - lib/wagn/script_wagn_loader.rb
-- lib/wagn/simplecov_helper.rb
 - lib/wagn/tasks/.gitkeep
 - lib/wagn/tasks/cucumber.rake
 - lib/wagn/tasks/db.rake

data/lib/wagn/simplecov_helper.rb

@@ -1,60 +0,0 @@
-def card_simplecov_filters
-  add_filter "spec/"
-  add_filter "/config/"
-  add_filter "/tasks/"
-
-  # filter all card mods
-  add_filter do |src_file|
-    src_file.filename =~ /tmp\// && !/\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
-  end
-
-  # add group for each deck mod
-  Dir["mod/*"].map { |path| path.sub("mod/", "") }.each do |mod|
-    add_group mod.capitalize do |src_file|
-      src_file.filename =~ /mod\/#{mod}\// ||
-        (
-          src_file.filename =~ /tmp\// &&
-          /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/#{mod}/**/#{m[1]}"].present? }
-        )
-    end
-  end
-
-  add_group "Sets" do |src_file|
-    src_file.filename =~ /tmp\/set\// &&
-      /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
-  end
-  add_group "Set patterns" do |src_file|
-    src_file.filename =~ /tmp\/set_pattern\// &&
-      /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
-  end
-  add_group "Formats" do |src_file|
-    src_file.filename =~ /mod\/[^\/]+\/formats/
-  end
-  add_group "Chunks" do |src_file|
-    src_file.filename =~ /mod\/[^\/]+\/chunks/
-  end
-end
-
-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/
-  end
-
-  add_filter "/spec/"
-  add_filter "/features/"
-  add_filter "/config/"
-  add_filter "/tasks/"
-  add_filter "/generators/"
-  add_filter "lib/card"
-
-  add_group "Card", "lib/card"
-  add_group "Set Patterns", "tmp/set_pattern/"
-  add_group "Sets",         "tmp/set/"
-  add_group "Formats" do |src_file|
-    src_file.filename =~ /mod\/[^\/]+\/format/
-  end
-  add_group "Chunks" do |src_file|
-    src_file.filename =~ /mod\/[^\/]+\/chunk/
-  end
-end