wagn 1.15.pre → 1.15.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf949be019dcb768fbf0b0422481ecd301803e0
-  data.tar.gz: 76d5ec5fa5a86d7085402c657e01b4f5d2fed4c7
+  metadata.gz: 0e730e4f0587f9ed9cb2be2f38a6acbe2c8a5a91
+  data.tar.gz: 8f75540cb3364d479cf2b6807259485e2f61ffac
 SHA512:
-  metadata.gz: dc6393e65ad6bb87a1f98bb8d9971707ab115b0f7f54b8661fd25fc3ef5998fcff60a4d867d0bcae46299109ce431d243606c27c4f4e097d038f56df98e323a4
-  data.tar.gz: 0e5fee8eb58a735a1c475a851082974b27777b63dec4abbf9248ed0ab53dbd5c6b60f6850c340fb5c6f7403bf866f273ea6aa5d9d6130f08751369aef4653d27
+  metadata.gz: 515ddc6a266d52d36b53ce34f1ae94849906bc9527aa6d4a7a1751d806d18248ebd0a971246e0dbd51d860ed5b497ba6668548c1e953a4ae27331b9e945a9479
+  data.tar.gz: ca3f8c78c99de445207b70b039a9365db55f76abc17e4f50d9c501b178fbb60c75daa2f5f7e3fc80a431e40d77fdbd2d7bbf0dfac5bddc78f1e5ed08e6b69347

data/features/history.feature

@@ -9,7 +9,6 @@ Feature: History
     
   Scenario: view history and rollback 
     When I go to url "/First?view=history"
-    Then show me the page
     Then In the main card content I should see a del with content "egg"
     
     When I expand act 2

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

@@ -175,9 +175,9 @@ class WagnGenerator < Rails::Generators::AppBase
           :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") 
+            system("cd #{destination_root} && bundle exec rake wagn:seed") 
             if options['core-dev'] or options['mod-dev']
-              system("cd #{destination_root} && RAILS_ENV=test bundle exec rake wagn:create")  
+              system("cd #{destination_root} && RAILS_ENV=test bundle exec rake wagn:seed")  
             end
             database_seeded.call
           end
@@ -187,7 +187,7 @@ class WagnGenerator < Rails::Generators::AppBase
           :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")  
+              system("cd #{destination_root} && RAILS_ENV=#{env} bundle exec rake wagn:seed")  
             end
             database_seeded.call
           end

data/lib/wagn/tasks/db.rake

@@ -47,7 +47,7 @@ namespace :db do
     desc 'Prepare the test database and load the schema'
     Rake::Task.redefine_task( :prepare => :environment ) do
       if ENV['RELOAD_TEST_DATA'] == 'true' || ENV['RUN_CODE_RUN']
-        puts `env RAILS_ENV=test rake wagn:create`
+        puts `env RAILS_ENV=test rake wagn:seed`
       else
         puts "skipping loading test data.  to force, run `env RELOAD_TEST_DATA=true rake db:test:prepare`"
       end

data/lib/wagn/tasks/test.rake

@@ -42,7 +42,7 @@ namespace :test do
       # assume we have a good database, ie. just migrated dev db.
       puts "setting database to wagn_test_template"
       set_database 'wagn_test_template'
-      Rake::Task['wagn:create'].invoke
+      Rake::Task['wagn:seed'].invoke
 
       # I spent waay to long trying to do this in a less hacky way--
       # Basically initial database setup/migration breaks your models and you really

data/lib/wagn/tasks/wagn.rake

@@ -312,16 +312,36 @@ namespace :wagn do
     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 = "#{Cardio.gem_root}/mod/#{mod_name}/file"
-
-      FileUtils.remove_dir standard_files_dir, force=true
-      FileUtils.cp_r template_files_dir, standard_files_dir
-
+      source_files_dir = "#{Wagn.root}/files"
       # 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|
+          
+          if card.attach_mod
+            puts "skipping #{card.name}: already in code"
+            next
+          else
+            puts "working on #{card.name}"
+          end
+
+          base_card = card.cardname.junction? ? card.left : card
+          raise "need codename for file" unless base_card.codename.present?
+          
+          mod_name = base_card.type_id==Card::SkinID ? '06_bootstrap' : '05_standard'
+          source_dir =  "#{source_files_dir}/#{card.id}"
+
+          target_dir = "#{Cardio.gem_root}/mod/#{mod_name}/file/#{base_card.codename}"
+          FileUtils.remove_dir target_dir, force=true if Dir.exists? target_dir  
+          FileUtils.mkdir_p target_dir
+          
+          Dir.entries( source_dir ).each do |filename|
+            next if filename =~ /^\./
+
+            target_filename = filename.gsub /\d+/, card.type_code.to_s
+            FileUtils.cp "#{source_dir}/#{filename}", "#{target_dir}/#{target_filename}"
+          end
+          
+          
           unless card.db_content.split(/\n/).last == mod_name
             new_content = card.db_content + "\n#{mod_name}"
             card.update_column :db_content, new_content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.15.pre
+  version: 1.15.pre2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.pre
+        version: 1.15.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.pre
+        version: 1.15.pre2
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org