datum 0.8.1 → 0.8.2

data/lib/datum/db_tasks.rb

@@ -11,7 +11,8 @@ module Datum
     end
     
     def migrate
-      ActiveRecord::Base.establish_connection(Rails.env)
+      # Not 100% sure why other methods of connecting are failing... 
+      # Rake::Task['db:create'].invoke()
       ActiveRecord::Migrator.migrate "#{@@local_path}/migrate"
     end
     

data/lib/datum/enable_task.rb

@@ -2,6 +2,18 @@
 module Datum
   class EnableTask
 
+    def disable_user_questions
+      @@ask_user = false
+    end
+
+    def disable_verification
+      @@use_verification = false
+    end
+
+    def datum_directories
+      return @@directories
+    end
+
     def rock
       puts "\n Enabling Datum Data-Driven Testing Tools."
       create_directories
@@ -9,13 +21,18 @@ module Datum
       update_yml if @@update_yml
       update_app if @@update_app
 
-      (Datum::VerificationTask.new).verify
+      if @@use_verification
+        verifier = Datum::VerificationTask.new
+        verifier.disable_user_questions if !@@ask_user
+        verifier.rock
+      end
 
       puts " Datum enabled.\n "
     end
     
     private
-    @@application_path = @@info = nil
+    @@use_verification = @@ask_user = true
+    @@directories = @@application_path = @@info = nil
     @@update_app = @@update_yml = false
     @@datum_drop_path = "test/lib/datum"
     @@datum_model_path = 'config.autoload_paths += %W(#{Rails.root}/' + 
@@ -26,9 +43,13 @@ module Datum
     #"config.autoload_paths.*#{encoded_path}\/models"
     
     def create_directories
-      ["#{@@datum_drop_path}/fixtures", "#{@@datum_drop_path}/locals",
-      "#{@@datum_drop_path}/migrate", "#{@@datum_drop_path}/models"].each { 
-        |path| FileUtils.mkdir_p(path) if !File::directory?(path)}  
+      @@directories = ["#{@@datum_drop_path}/fixtures", 
+        "#{@@datum_drop_path}/locals", "#{@@datum_drop_path}/migrate", 
+        "#{@@datum_drop_path}/models"]
+      
+      @@directories.each { 
+        |path| FileUtils.mkdir_p(path) if !File::directory?(path)
+      }  
       
       puts " Datum directories created."
     end
@@ -46,12 +67,15 @@ module Datum
       puts " Files that may need updates: "
       puts "   database.yml" if @@update_yml
       puts "   application.rb" if @@update_app
-      puts "\n>>>>>>>>>>>>>>>> Attempt updates for you? y/n"
-      continue = STDIN.gets.chomp
-      unless continue == 'y' || continue == 'yes'
-        puts "\n Files must be updated manually to fully enable Datum"
-        puts " Run rake task 'datum:db:verify' after manual update.\n "
-        exit!
+
+      if @@ask_user
+        puts "\n>>>>>>>>>>>>>>>> Attempt updates for you? y/n"
+        continue = STDIN.gets.chomp
+        unless continue == 'y' || continue == 'yes'
+          puts "\n Files must be updated manually to fully enable Datum"
+          puts " Run rake task 'datum:db:verify' after manual update.\n "
+          exit!
+        end
       end
     end
     

data/lib/datum/verification_task.rb

@@ -4,16 +4,23 @@ module Datum
   # intended to be used as part of enable to report datum readiness
   class VerificationTask
 
-    def verify
+
+    def disable_user_questions
+      @@ask_user = false
+    end    
+
+    def rock
       
       puts "\n### !!!Datum Verification !!!"
       puts "### !!!This command DROPS the Datum Database!!!"
-      puts "\n>>>>>>>>>>>>>>>> Proceed with Datum Verification? y/n"
-      continue = STDIN.gets.chomp
-      
-      unless continue == 'y' || continue == 'yes'
-        puts "\n ... Canceling Datum Verification\n "
-        exit!
+
+      if @@ask_user
+        puts "\n>>>>>>>>>>>>>>>> Proceed with Datum Verification? y/n"
+        continue = STDIN.gets.chomp
+        unless continue == 'y' || continue == 'yes'
+          puts "\n ... Canceling Datum Verification\n "
+          exit!
+        end
       end
       
       database_ready = false
@@ -101,6 +108,7 @@ module Datum
     end
 
     private
+    @@ask_user = true
     @@local_path = "#{Rails.root}/test/lib/datum"
     @@gem_path = File.expand_path(File.dirname(__FILE__))
     @@migration_file = "20120726105125_create_datum_versions.rb"

data/lib/datum/version.rb

@@ -1,5 +1,6 @@
 module Datum
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end
 
-## Added datum:db:verify to simplify pre-release holes in config
+## Added datum:db:verify to simplify detecting pre-release holes in config
+## Added tests to formally sign-off datum releases

data/lib/tasks/datum.rake

@@ -5,32 +5,32 @@ require "datum/db_tasks"
 namespace :datum do
   
   desc "Enable datum functionality"
-  task :enable do
+  task :enable => :environment do
     (Datum::EnableTask.new).rock
   end
 
   namespace :db do
 
     desc "Create datum database"
-    task :create do invoke "create" end
+    task :create => :environment do invoke "create" end
     
     desc "Migrate datum database"
-    task :migrate do invoke "migrate" end
+    task :migrate => :environment do invoke "migrate" end
     
     desc "Drop datum database"
-    task :drop do invoke "drop" end
+    task :drop => :environment do invoke "drop" end
     
     desc "Dump data as fixtures from datum database"
-    task :dump do invoke "dump" end
+    task :dump => :environment do invoke "dump" end
     
     desc "Loads fixtures specific to datum database"
-    task :load do invoke "load" end
+    task :load => :environment do invoke "load" end
     
     #desc "Quick verification of basic datum functionality"
     #task :verify do invoke "verify" end
     
     desc "Enables datum execution without database dependency"
-    task :localize, :table do |t, args|
+    task :localize, [:table] => [:environment] do |t, args|
       (Datum::DbTasks.new).localize args
     end
     

data/test/datum_test.rb

@@ -3,13 +3,13 @@ require 'rake'
 
 class DatumTest < ActiveSupport::TestCase
   
-  test "db_migrate should migrate" do
-    
-#    Rake.application.rake_require "tasks/datum"
-#    DatumTasks.migrate
-#    assert_equal 0, 1, "Nope"
-
-  end
+  #test "db_migrate should migrate" do
+   # puts "this is the second test...."
+    #    Rake.application.rake_require "tasks/datum"
+    #    DatumTasks.migrate
+    #    assert_equal 0, 1, "Nope"
+    #    puts "... Path: #{Rails.env}"
+  #end
   
 #  test "truth" do
 #    assert_kind_of Module, Datum

data/test/dummy/config/application.rb

@@ -11,7 +11,7 @@ module Dummy
     # Added as part of datum install, enables access to datum specific models
     config.autoload_paths += %W(#{Rails.root}/test/lib/datum/models)
 
-    
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

data/test/dummy/test/lib/datum/utils/application.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require
+require "datum"
+
+module Dummy
+  class Application < Rails::Application
+
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Use SQL instead of Active Record's schema dumper when creating the 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
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    # config.active_record.whitelist_attributes = true
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+  end
+end
+

data/test/dummy/test/lib/datum/utils/database.yml

@@ -0,0 +1,42 @@
+# MySQL.  Versions 4.1 and 5.0 are recommended.
+# 
+# Install the MYSQL driver
+#   gem install mysql2
+#
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: datum_dummy_development
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock
+
+# 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:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: datum_dummy_test
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock
+
+production:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: datum_dummy_production
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock

data/test/dummy/test/unit/enable_task_test.rb

@@ -0,0 +1,70 @@
+require 'test_helper'
+require "datum/enable_task"
+
+class EnableTaskTest < ActiveSupport::TestCase
+  
+  def setup
+    @enableTask = Datum::EnableTask.new
+    @enableTask.disable_user_questions
+    @enableTask.disable_verification
+  end
+
+  def call_enable
+    assert_nothing_raised do
+      @enableTask.rock
+    end
+  end
+
+  test "enable should create directories" do
+    call_enable
+    dirs = @enableTask.datum_directories
+    assert_not_nil dirs, "Enable Task directories should not be nil"
+
+    dirs.each { |directory|
+      assert File.directory?(directory), 
+      "Enable Task did not create directory: #{directory}"
+    }
+  end
+
+  test "post call to need_yml should return false" do
+    call_enable
+    assert false == @enableTask.send(:need_yml?), 
+    "need_yml? did not detect new yml section"
+  end
+
+  test "post call to need_app should return false" do
+    call_enable
+    assert false == @enableTask.send(:need_app?), 
+    "need_app? did not detect new config add-in"
+  end
+
+  test "clean database.yml should yield true need_yml" do
+
+      clean_yml = "#{Rails.env}/dummy/test/lib/datum/utils/database.yml"
+      config_dir = "#{Rails.env}/dummy/config/database.yml"
+
+      FileUtils.cp(clean_yml, config_dir)
+
+      assert true == @enableTask.send(:need_yml?), 
+    "need_yml? should have returned true with a clean yml"
+
+    test_post_call_to_need_yml_should_return_false
+  end
+
+  test "clean application.rb should yield true need_app" do
+
+      clean_app = "#{Rails.env}/dummy/test/lib/datum/utils/application.rb"
+      config_app = "#{Rails.env}/dummy/config/application.rb"
+
+      FileUtils.cp(clean_app, config_app)
+
+      assert true == @enableTask.send(:need_app?), 
+    "need_app? should have returned true with a clean application.rb"
+
+    test_post_call_to_need_app_should_return_false
+
+  end
+
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datum
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70155510735080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,12 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70155510735080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 description: Flexible data-driven test solution for Rails
 email:
 - datum@tyemill.com
@@ -75,8 +80,6 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -84,8 +87,10 @@ files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
+- test/dummy/test/lib/datum/utils/application.rb
+- test/dummy/test/lib/datum/utils/database.yml
 - test/dummy/test/test_helper.rb
-- test/dummy/test/unit/simple_model_test.rb
+- test/dummy/test/unit/enable_task_test.rb
 - test/test_helper.rb
 homepage: https://github.com/tyemill/datum
 licenses: []
@@ -101,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2549513625839685057
+      hash: -1610739616957127343
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,10 +115,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2549513625839685057
+      hash: -1610739616957127343
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Flexible data-driven test solution for Rails
@@ -143,8 +148,6 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -152,6 +155,8 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
+- test/dummy/test/lib/datum/utils/application.rb
+- test/dummy/test/lib/datum/utils/database.yml
 - test/dummy/test/test_helper.rb
-- test/dummy/test/unit/simple_model_test.rb
+- test/dummy/test/unit/enable_task_test.rb
 - test/test_helper.rb

data/test/dummy/log/development.log

@@ -1,17 +0,0 @@
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-   (87.1ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
-   (188.3ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
-   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-   (1.9ms)  DROP DATABASE IF EXISTS `datum_dummy_test`
-   (0.2ms)  CREATE DATABASE `datum_dummy_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
-Connecting to database specified by database.yml
-   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-Connecting to database specified by database.yml
-   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-   (0.4ms)  DROP DATABASE IF EXISTS `datum_dummy_test`
-   (0.2ms)  CREATE DATABASE `datum_dummy_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
-   (19.0ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
-   (14.4ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
-   (0.2ms)  SELECT version FROM `schema_migrations`
-   (0.5ms)  INSERT INTO `schema_migrations` (version) VALUES ('0')

data/test/dummy/log/test.log

@@ -1,25 +0,0 @@
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml
-   (0.2ms)  BEGIN
-   (0.0ms)  ROLLBACK
-Connecting to database specified by database.yml
-   (0.1ms)  BEGIN
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-   (0.0ms)  ROLLBACK
-Connecting to database specified by database.yml
-   (0.1ms)  BEGIN
-   (0.2ms)  ROLLBACK
-Connecting to database specified by database.yml
-   (0.0ms)  BEGIN
-   (0.0ms)  ROLLBACK
-Connecting to database specified by database.yml
-   (0.1ms)  BEGIN
-   (0.1ms)  ROLLBACK
-Connecting to database specified by database.yml
-   (0.1ms)  BEGIN
-   (0.1ms)  ROLLBACK
-Connecting to database specified by database.yml
-   (0.0ms)  BEGIN
-   (0.1ms)  ROLLBACK

data/test/dummy/test/unit/simple_model_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class SimpleModelTest
-  test "should pass" do
-    
-  end
-end