wagn 1.18.4 → 1.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e933d025e07645dd7f92d25942d0ecc4665355a3
-  data.tar.gz: 0658db4a559f088eb629e608568c44da66e5c9e4
+  metadata.gz: 79ff0e554520287e0bf0ddff40a0be9285e427c7
+  data.tar.gz: daa96e17edce87930c2ee83b4593e00fdbcb7f74
 SHA512:
-  metadata.gz: 68b1be15a9980ba07e2c8e750b8d1df15ee8f158c67c937dcc27b499d6c097abff25acfa2c8112b51a507b1414368477c8450eea07412fa78f5c353676c2342d
-  data.tar.gz: 2cfe84024ef8f98c1bf5f82e9b0694ee38c439335f3a3cb3b90aeec7801f2d25532629a84a8427b69319c814a49266ebb51254026a03559f1333702f815954f8
+  metadata.gz: 05086fdf37eaef8649776d437708c824a0a24b93c6dae2caff1632ada312a7d80c57084f2ad116b5bb68b491505705d08d6e37981d6c1c96e55590ddacac30b3
+  data.tar.gz: b2a6246be28895fcd6ffd7eb7e059600ba5d3536148b866075fbe10deb9f472de98f91cede7117232936de86d25e3104a01318ba6a9f9c4bee2ad5db6e373afd

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

@@ -23,11 +23,12 @@ end
 group :test, :development do
   gem 'rails-dev-tweaks'
   gem 'jasmine'
-  gem 'jasmine-rails', :git=>"https://github.com/chuenlok/jasmine-rails.git"
+  gem 'jasmine-rails' #, :git=>"https://github.com/chuenlok/jasmine-rails.git"
   gem 'jasmine-jquery-rails'
   gem 'sprockets' # just so above works
   <%- if spring_install? %>
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'listen', '3.0.6'
   gem 'spring'
   gem 'spring-commands-rspec'
   gem 'spring-commands-cucumber'
@@ -97,7 +98,9 @@ gem 'ruby-prof', :group=>:profile  # profiling
 
 group :development, :test do
   <%- if spring_install? %>
+  gem 'listen', '3.0.6'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'listen', '3.0.6'
   gem 'spring'
   gem 'spring-commands-rspec'
   gem 'spring-commands-cucumber'
@@ -107,7 +110,7 @@ group :development, :test do
   gem 'pry-rescue'
   # gem 'pry-stack_explorer'
   gem 'jasmine'
-  gem 'jasmine-rails', :git=>"https://github.com/chuenlok/jasmine-rails.git"
+  gem 'jasmine-rails' #, :git=>"https://github.com/chuenlok/jasmine-rails.git"
   gem 'jasmine-jquery-rails'
   gem 'phantomjs', '1.9.7.1' #locked because 1.9.8.0 is breaking
 end

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: <%= Cardio.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: <%= Cardio.gem_root %>/mod/03_machines/lib/javascript
 # relative path from Rails.root
 # defaults to app/assets/stylesheets
 # useless for wagn file structure
-css_dir: <%= Cardio.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:
-  - <%= Cardio.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

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

@@ -166,8 +166,11 @@ class WagnGenerator < Rails::Generators::AppBase
     @spec_path = @gem_path
     @spec_helper_path = File.join @spec_path, 'card', 'spec', 'spec_helper'
     empty_directory 'spec'
+
+    @cardio_gem_root = File.join @gem_path, 'card'
+    @wagn_gem_root = File.join @gem_path, 'wagn'
     inside 'spec' do
-      copy_file File.join('javascripts', 'support', 'wagn_jasmine.yml'),
+      template File.join('javascripts', 'support', 'wagn_jasmine.yml'),
                 File.join('javascripts', 'support', 'jasmine.yml')
     end
 
@@ -184,7 +187,7 @@ class WagnGenerator < Rails::Generators::AppBase
     empty_directory 'spec'
     inside 'spec' do
       template 'spec_helper.rb'
-      copy_file File.join('javascripts', 'support', 'deck_jasmine.yml'),
+      template File.join('javascripts', 'support', 'deck_jasmine.yml'),
                 File.join('javascripts', 'support', 'jasmine.yml')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.18.4
+  version: 1.18.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.4
+        version: 1.18.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.4
+        version: 1.18.5
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@wagn.org
@@ -723,7 +723,7 @@ files:
 - spec/controllers/location_spec.rb
 - spec/javascripts/helpers/.gitkeep
 - spec/javascripts/helpers/jasmine-jquery.js
-- spec/javascripts/support/jasmine.yml
+- spec/javascripts/support/jasmine.yml.erb
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/wagn_spec.coffee
@@ -798,7 +798,7 @@ test_files:
 - spec/controllers/location_spec.rb
 - spec/javascripts/helpers/.gitkeep
 - spec/javascripts/helpers/jasmine-jquery.js
-- spec/javascripts/support/jasmine.yml
+- spec/javascripts/support/jasmine.yml.erb
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/wagn_spec.coffee
@@ -810,3 +810,4 @@ test_files:
 - test/script/run_engine_deck.sh
 - test/script/run_mig.sh
 - test/test_helper.rb
+has_rdoc: