databasion 0.1.0 → 0.1.1

data/README.md

@@ -4,7 +4,7 @@
 
 A database management tool.  The theory is that a designer/planner can edit application data and a programmer can setup the database and it's fields, all in one happy little place.  As tables are added and data is changed, if the script is run once again it will update the target database.
 
-TODO: While this system uses Rails Migrations, it isn't taking full advantage of them (i.e. tracking changes, allowing for rollbacks, etc.).  This was also created under a high pressure timeline, so it was unfortunate that I could not create a fully working test suite.
+TODO: While this system uses Rails Migrations, it isn't taking full advantage of them (i.e. tracking changes, allowing for rollbacks, etc).
 
 ## Requirements
 
@@ -100,17 +100,17 @@ Edit _config/google.yml_.  Then run the scripts.
 
     databasion --google
     databasion --migrate
-    databasion --update
+    databasion --load
     databasion --svn
     databasion --git
     
 Or run them all in order.
 
-    databasion --google --migrate --update --git
+    databasion --google --migrate --load --git
     
 You can supply a different config path as well.
 
-    databasion -g -m -u -i --config config/my.other.config.yml
+    databasion -g -m -l -i --config config/my.other.config.yml
     
 Someone administrating a production database with this tool would definitely want to run each script sequentially by hand.
     
@@ -123,6 +123,7 @@ Someone administrating a production database with this tool would definitely wan
 * _output_: Where to output the relevant data.
 * _svn_: SVN configuration data.
 * _git_: GIT configuration data.
+* _cron_: Crontab parameters.
 
 ## SVN
 
@@ -132,13 +133,31 @@ If the currently created databasion project is committed to SVN, running the _--
 
 Much like SVN, if the project is commited to a GIT repo, the _--git_ switch will auto-add and commit all the project files.  If there isn't a repository, it will also initialize a new one for you.
 
+## Version Control
+
+There is now a system in place to do crontab driven auto-updates.  This allows the data to be updated without anyone having to access any systems.
+
+First update _config/google.yml_'s cron section to reflect your project settings.  The _options_ are your standard databasion switches.  Make sure to supply a location for the version file so that it can be read at a later date.
+
+Next, add a _Version_ spreadsheet to the master worksheet.  In the A1 field use whichever number works best to start versioning with.  When using this to manage the project, if the number is higher than before then the system will be updated.  Currently version controlled rollbacks are not implemented.
+
+Finally, add the databasion script to crontab.
+
+Example crontab:
+
+    */1 * * * * cd /home/my_user/project && databasion -r
+    
+This checks the Version spreadsheet once a minute, and if the version has changed runs databasion with the supplied options.
+
+Note:  This could easily be used from the commandline as well, and not just crontab.
+
 ## Roadmap
 
 Long and winding.
 
 ## Testing
 
-Currently Databasion uses the cucumber test suite.  The tests aren't complete, unfortunately.
+Currently Databasion uses the cucumber test suite.  A functional set of rudimentary tests are currently available, but it does not test everything 100%.
 
 ## Author
 

data/Rakefile

@@ -8,7 +8,7 @@ Jeweler::Tasks.new do |gem|
   gem.email       = "mojobojo@gmail.com"
   gem.homepage    = "http://github.com/boj/databasion"
   gem.authors     = ["Brian Jones", "Istpika"]
-  gem.version     = "0.1.0"
+  gem.version     = "0.1.1"
 
   gem.add_dependency('activerecord', '>= 2.3.5')
   gem.add_dependency('activesupport', '>= 2.3.5')

data/bin/databasion

@@ -3,4 +3,4 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(_
 
 require 'databasion'
 
-Databasion::Applcize.run
+Databasion::Application.run

data/config/example.google.yml

@@ -18,3 +18,9 @@ svn:
   
 git:
   bin: /usr/local/bin/git
+    
+cron:
+  project_base: /home/user/project
+  version:
+    file: /home/user/project/config/version
+  options: -g -m -l -i

data/databasion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{databasion}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Jones", "Istpika"]
-  s.date = %q{2010-10-28}
+  s.date = %q{2010-11-04}
   s.default_executable = %q{databasion}
   s.email = %q{mojobojo@gmail.com}
   s.executables = ["databasion"]
@@ -24,29 +24,29 @@ Gem::Specification.new do |s|
      "bin/databasion",
      "config/example.google.yml",
      "databasion.gemspec",
-     "features/databasion.feature",
-     "features/databasion/googlize.feature",
-     "features/databasion/migitize.feature",
-     "features/databasion/step_definitions/googlize_steps.rb",
-     "features/databasion/step_definitions/migitize_steps.rb",
-     "features/databasion/step_definitions/svnilize_steps.rb",
-     "features/databasion/step_definitions/yamalize_steps.rb",
-     "features/databasion/svnilize.feature",
-     "features/databasion/yamalize.feature",
-     "features/step_definitions/databasion_steps.rb",
+     "features/build_migration.feature",
+     "features/create_project.feature",
+     "features/cron_system.feature",
+     "features/env/helper_methods.rb",
+     "features/google_loader.feature",
+     "features/step_definitions/build_migration_steps.rb",
+     "features/step_definitions/create_project_steps.rb",
+     "features/step_definitions/cron_system_steps.rb",
+     "features/step_definitions/google_loader_steps.rb",
+     "features/step_definitions/yaml_builder_steps.rb",
+     "features/yaml_builder.feature",
      "lib/databasion.rb",
-     "lib/databasion/applcize.rb",
-     "lib/databasion/csvilize.rb",
-     "lib/databasion/datacize.rb",
-     "lib/databasion/excelize.rb",
-     "lib/databasion/gitilize.rb",
-     "lib/databasion/googlize.rb",
-     "lib/databasion/loadlize.rb",
-     "lib/databasion/migitize.rb",
-     "lib/databasion/svnilize.rb",
+     "lib/databasion/application.rb",
+     "lib/databasion/build_migration.rb",
+     "lib/databasion/cron_system.rb",
+     "lib/databasion/git_committer.rb",
+     "lib/databasion/google_loader.rb",
+     "lib/databasion/load_data.rb",
+     "lib/databasion/migrate.rb",
+     "lib/databasion/svn_committer.rb",
      "lib/databasion/templates/migration.erb",
      "lib/databasion/templates/model.erb",
-     "lib/databasion/yamalize.rb",
+     "lib/databasion/yaml_builder.rb",
      "lib/migration_helpers/MIT-LICENSE",
      "lib/migration_helpers/README.markdown",
      "lib/migration_helpers/init.rb",

data/features/build_migration.feature

@@ -0,0 +1,8 @@
+Feature: Build Ruby Migrations
+    In order to run ruby migrations
+    We must build a file suite
+    
+    Scenario: Build Ruby Migrations
+        Given a set of YAML data
+        When we run the BuildMigration system
+        Then it should build a migration, model, and database file

data/features/create_project.feature

@@ -0,0 +1,8 @@
+Feature: Create Project
+    In order to run databasion
+    A project directory should be built
+    
+    Scenario: User runs databasion with the --create command
+        Given a project named test_project
+        When the databasion create command is ran
+        Then a project folder and config file should exist

data/features/cron_system.feature

@@ -0,0 +1,7 @@
+Feature: Crontab
+    Allow a user to run databasion updates via crontab
+    
+    Scenario: User configures the Version spreadsheet
+        Given a version spreadsheet in Google Docs
+        When the cron system is ran and the version changes
+        Then databasion should have been ran

data/features/env/helper_methods.rb

@@ -0,0 +1,12 @@
+def load_parse_data
+  {
+    'name'        => 'mock',
+    'plural'      => true,
+    'indexes'     => ["id"],
+    'fields'      => ["id", "name", "power"],
+    'types'       => ["integer", "string, 20", "string, 40"],
+    'data'        => [[1, "Brian Jones", "Super Intelligence"], [2, "Superman", "Invincible"], [3, "Batman", "Strength"]],
+    'ignore_cols' => [2],
+    'connection'  => {'database' => 'moon', 'dbname' => 'db1'}
+  }
+end

data/features/google_loader.feature

@@ -0,0 +1,8 @@
+Feature: Use GoogleLoader
+    In order for a user to access google
+    They need to connect first
+    
+    Scenario: Log into Google
+        Given a google account from the yaml config
+        When GoogleLoader logs in
+        Then we should have a GoogleSpreadsheet session

data/features/step_definitions/build_migration_steps.rb

@@ -0,0 +1,22 @@
+require 'lib/databasion'
+
+Given /a set of YAML data/ do
+  @config = YAML.load(File.open('config/google.yml'))
+
+  @parse_data = load_parse_data
+  Databasion::YamlBuilder.run(@parse_data, @config['output']['yaml_path'])
+end
+
+When /we run the BuildMigration system/ do
+  Databasion::BuildMigration.run(Dir['%s/**.yml' % @config['output']['yaml_path']], @config)
+end
+
+Then /it should build a migration, model, and database file/ do
+  File.exist?('%s/%s/100_%s_migration.rb' % [@config['output']['migrations']['path'], @parse_data['connection']['dbname'], @parse_data['name']]).should == true
+  File.exist?('%s/%s.rb' % [@config['output']['migrations']['models'], @parse_data['name']]).should == true
+  File.exist?('config/database.yml').should == true
+  FileUtils.rm_rf @config['output']['migrations']['path']
+  FileUtils.rm_rf @config['output']['migrations']['models']
+  FileUtils.rm_rf @config['output']['yaml_path']
+  FileUtils.rm 'config/database.yml'
+end

data/features/step_definitions/create_project_steps.rb

@@ -0,0 +1,13 @@
+Given /a project named (.*)/ do |project_name|
+  @project = project_name
+end
+
+When /the databasion create command is ran/ do
+  system 'bin/databasion -c %s' % @project
+end
+
+Then /a project folder and config file should exist/ do
+  File.exists?('%s' % @project).should == true
+  File.exists?('%s/config/google.yml' % @project).should == true
+  FileUtils.rm_rf '%s/' % @project
+end

data/features/step_definitions/cron_system_steps.rb

@@ -0,0 +1,17 @@
+require 'lib/databasion'
+
+Given /a version spreadsheet in Google Docs/ do
+  @config = YAML.load(File.open('config/google.yml'))
+end
+
+When /the cron system is ran and the version changes/ do
+  Databasion::CronSystem.config = @config
+  Databasion::CronSystem.run
+end
+
+Then /databasion should have been ran/ do
+  Databasion::GoogleLoader.config = @config
+  version = Databasion::GoogleLoader.run_version
+  File.open(@config['cron']['version']['file']).readline.strip.should == version
+  FileUtils.rm_rf @config['cron']['version']['file']
+end

data/features/step_definitions/google_loader_steps.rb

@@ -0,0 +1,14 @@
+require 'lib/databasion'
+
+Given /a google account from the yaml config/ do
+  @config = YAML.load(File.open('config/google.yml'))
+end
+
+When /GoogleLoader logs in/ do
+  Databasion::GoogleLoader.config = @config
+  Databasion::GoogleLoader.login
+end
+
+Then /we should have a GoogleSpreadsheet session/ do
+  Databasion::GoogleLoader.session.should be_kind_of(GoogleSpreadsheet::Session)
+end

data/features/step_definitions/yaml_builder_steps.rb

@@ -0,0 +1,16 @@
+require 'lib/databasion'
+
+Given /a complete set of YAML definitions/ do
+  @config = YAML.load(File.open('config/google.yml'))
+
+  @parse_data = load_parse_data
+end
+
+When /the YAML files are parsed/ do
+  Databasion::YamlBuilder.run(@parse_data, @config['output']['yaml_path'])
+end
+
+Then /the result is Ruby migration files/ do
+  File.exist?("%s/%s.yml" % [@config['output']['yaml_path'], @parse_data['name']]).should == true
+  FileUtils.rm_rf @config['output']['yaml_path']
+end

data/features/{databasion/migitize.feature → yaml_builder.feature}

@@ -5,4 +5,4 @@ Feature: Parse YAML into Ruby migrations
   Scenario: Build Ruby migrations
     Given a complete set of YAML definitions
     When the YAML files are parsed
-    Then the result is Ruby migration files
+    Then the result is Ruby migration files

data/lib/databasion.rb

@@ -14,7 +14,7 @@ module Databasion
   
   @@config = nil
   
-  def self.databate(system, config=nil)
+  def self.run(system, config=nil, opts=nil)
     LOGGER.level = Logger::INFO
     
     raise DatabasionError, 'Databasion requires a YAML config file path.' if config.nil?
@@ -22,63 +22,63 @@ module Databasion
     
     case system
     when "google"
-      googlize
-    when "excel"
-      excelize
+      run_google
     when "migrate"
-      datacize
-    when "update"
-      loadalize
+      run_migrate
+    when "load"
+      run_load(opts)
     when "svn"
-      svnilize
+      run_svn
     when "git"
-      gitilize
+      run_git
+    when "cron"
+      run_cron
     end
   end
   
   private
-  def self.googlize
-    Databasion::Googlize.config = @@config
-    Databasion::Googlize.googlebate
+  def self.run_google
+    Databasion::GoogleLoader.config = @@config
+    Databasion::GoogleLoader.run
   end
-
-  def self.excelize
-    Databasion::Excelize.excelbate
+  
+  def self.run_migrate
+    Databasion::Migrate.config = @@config
+    Databasion::Migrate.run
   end
   
-  def self.datacize
-    Databasion::Datacize.config = @@config
-    Databasion::Datacize.datacize
+  def self.run_load(opts)
+    Databasion::LoadData.config = @@config
+    Databasion::LoadData.run(opts)
   end
   
-  def self.loadalize
-    Databasion::Loadlize.config = @@config
-    Databasion::Loadlize.loadalize
+  def self.run_svn
+    Databasion::SvnCommitter.config = @@config
+    Databasion::SvnCommitter.commit
   end
   
-  def self.svnilize
-    Databasion::Svnilize.config = @@config
-    Databasion::Svnilize.commit
+  def self.run_git
+    Databasion::GitCommitter.config = @@config
+    Databasion::GitCommitter.commit
   end
   
-  def self.gitilize
-    Databasion::Gitilize.config = @@config
-    Databasion::Gitilize.commit
+  def self.run_cron
+    Databasion::CronSystem.config = @@config
+    Databasion::CronSystem.run
   end
 
   def self.set_ar_logger
     ActiveRecord::Base.logger = Databasion::LOGGER
   end
   
-  autoload :Applcize, APP_PATH + '/databasion/applcize.rb'
-  autoload :Googlize, APP_PATH + '/databasion/googlize.rb'
-  autoload :Yamalize, APP_PATH + '/databasion/yamalize.rb'
-  autoload :Excelize, APP_PATH + '/databasion/excelize.rb'
-  autoload :Csvilize, APP_PATH + '/databasion/csvilize.rb'
-  autoload :Migitize, APP_PATH + '/databasion/migitize.rb'
-  autoload :Loadlize, APP_PATH + '/databasion/loadlize.rb'
-  autoload :Datacize, APP_PATH + '/databasion/datacize.rb'
-  autoload :Svnilize, APP_PATH + '/databasion/svnilize.rb'
-  autoload :Gitilize, APP_PATH + '/databasion/gitilize.rb'
+  autoload :Application,    APP_PATH + '/databasion/application.rb'
+  autoload :GoogleLoader,   APP_PATH + '/databasion/google_loader.rb'
+  autoload :YamlBuilder,    APP_PATH + '/databasion/yaml_builder.rb'
+  autoload :Migrate,        APP_PATH + '/databasion/migrate.rb'
+  autoload :BuildMigration, APP_PATH + '/databasion/build_migration.rb'
+  autoload :LoadData,       APP_PATH + '/databasion/load_data.rb'
+  autoload :SvnCommitter,   APP_PATH + '/databasion/svn_committer.rb'
+  autoload :GitCommitter,   APP_PATH + '/databasion/git_committer.rb'
+  autoload :CronSystem,     APP_PATH + '/databasion/cron_system.rb'
   
 end

data/lib/databasion/{applcize.rb → application.rb}

@@ -3,7 +3,7 @@ require 'fileutils'
 
 module Databasion
   
-  class Applcize
+  class Application
     
     def self.run
       opts = Trollop::options do
@@ -16,11 +16,13 @@ module Databasion
         EOS
         opt :create, "Create a base deploy directory", :type => String
         opt :config, "Path to YAML config.  Looks for config/google.yml by default", :type => String
-        opt :google, "Googlize data from Google Spreadsheets"
-        opt :migrate, "Migrate after Googlizing or Excelizing"
-        opt :update, "Load parsed YAML into migrated database"
+        opt :google, "Load data from Google Spreadsheets"
+        opt :migrate, "Migrate after GoogleLoading"
+        opt :load, "Load parsed YAML data into migrated database"
+        opt :diff, "Manually check the diff of each database update from the load command"
         opt :svn, "Auto commit the project files (assuming it has been committed to SVN)"
         opt :git, "Auto commit the project files (assuming a working git repo)"
+        opt :cron, "Run the version control system via crontab and update on version changes"
       end
       if opts[:config].nil? and opts[:create].nil?
         config = "config/google.yml"
@@ -40,20 +42,23 @@ module Databasion
     end
     
     def self.execute_databasion(opts)
+      if opts[:cron]
+        Databasion.run('cron', opts[:config], opts)
+      end
       if opts[:google]
-        Databasion.databate('google', opts[:config])
+        Databasion.run('google', opts[:config], opts)
       end
       if opts[:migrate]
-        Databasion.databate('migrate', opts[:config])
+        Databasion.run('migrate', opts[:config], opts)
       end
-      if opts[:update]
-        Databasion.databate('update', opts[:config])
+      if opts[:load]
+        Databasion.run('load', opts[:config], opts)
       end
       if opts[:svn]
-        Databasion.databate('svn', opts[:config])
+        Databasion.run('svn', opts[:config], opts)
       end
       if opts[:git]
-        Databasion.databate('git', opts[:config])
+        Databasion.run('git', opts[:config], opts)
       end
     end
     

data/lib/databasion/{migitize.rb → build_migration.rb}

@@ -4,20 +4,18 @@ require 'fileutils'
 
 module Databasion
   
-  class MigitizeError < StandardError; end
+  class BuildMigrationError < StandardError; end
   
-  class Migitize
+  class BuildMigration
     
     @@migration_start = 100
     
-    def self.migrabate(file_list=[], config=nil)
-      raise MigitizeError, 'Databasion::Migitize requires an array list of files.  Try Yamalizing first.' if file_list.empty?
-      raise MigitizeError, 'Databasion::Migitize requires a parsed YAML config.' if config.nil?
+    def self.run(file_list=[], config=nil)
+      raise BuildMigrationError, 'Databasion::BuildMigration requires an array list of files.  Try GoogleLoading first.' if file_list.empty?
+      raise BuildMigrationError, 'Databasion::BuildMigration requires a parsed YAML config.' if config.nil?
       @@config = config
       
-      Databasion::LOGGER.info "Migrabating..."
       parse(file_list)
-      Databasion::LOGGER.info "Migrabated!"
     end
     
     private
@@ -28,6 +26,7 @@ module Databasion
     end
     
     def self.parse(file_list)
+      Databasion::LOGGER.info "Migrabating..."
       database_configs = []
       file_list.each do |file|
         meta = YAML.load(File.open(file))['meta']
@@ -35,6 +34,7 @@ module Databasion
         process(meta)
       end
       write_database_yaml(database_configs)
+      Databasion::LOGGER.info "Migrabated!"
     end
     
     def self.process(meta)
@@ -116,6 +116,7 @@ module Databasion
       f = File.open("config/database.yml", 'w')
       f.write(YAML.dump(output))
       f.close
+      Databasion::LOGGER.info "Wrote database config..."
     end
     
     def self.migration_exists?(file_name)

data/lib/databasion/cron_system.rb

@@ -0,0 +1,53 @@
+module Databasion
+  
+  class CronSystemError < StandardError; end
+
+  class CronSystem
+    
+    @@config = nil
+    
+    def self.config?
+      raise CronSystemError, 'CronSystem cannot load without a config.' unless defined?(@@config)
+      true
+    end
+    
+    def self.config=(data)
+      @@config = data
+    end
+    
+    def self.config
+      config?
+      @@config
+    end
+    
+    def self.run
+      Databasion::GoogleLoader.config = @@config
+      version = Databasion::GoogleLoader.run_version
+      
+      if File.exist?(@@config['cron']['version']['file'])
+        old_version = File.open(@@config['cron']['version']['file']).readline.strip
+        if version > old_version
+          Databasion::LOGGER.info "Version changed, running databasion."
+          system "cd %s && databasion %s" % [@@config['cron']['project_base'], @@config['cron']['options']]
+          write_version(version)
+        elsif version < old_version
+          Databasion::LOGGER.info "Version rollback is currently not implemented."
+        else
+          Databasion::LOGGER.info "Version has not changed."
+        end
+      else
+        Databasion::LOGGER.info "CronSystem running for the first time."
+        system "cd %s && databasion %s" % [@@config['cron']['project_base'], @@config['cron']['options']]
+        write_version(version)
+      end
+    end
+    
+    def self.write_version(version)
+      File.open(@@config['cron']['version']['file'], 'w') do |file|
+        file.write version
+      end
+    end
+    
+  end
+  
+end

data/lib/databasion/{gitilize.rb → git_committer.rb}

@@ -1,10 +1,10 @@
 module Databasion
   
-  class Gitilize
+  class GitCommitter
     
     @@config = nil
     
-    class GitilizeError < StandardError; end
+    class GitCommitterError < StandardError; end
     
     def self.config=(config)
       @@config = config
@@ -19,7 +19,7 @@ module Databasion
     end
     
     def self.commit(path=Dir.pwd)
-      raise GitilizeError, "A file lock is in place.  Cannot commit." if check_lock?
+      raise GitCommitterError, "A file lock is in place.  Cannot commit." if check_lock?
       create unless check_repo?
       create_lock
       Databasion::LOGGER.info 'running: git commit -am "databasion auto commit"'
@@ -31,6 +31,7 @@ module Databasion
       Databasion::LOGGER.info 'creating new git repository'
       Databasion::LOGGER.info 'running: git init'
       system git_path + ' init'
+      system git_path + ' add .'
     end
     
     def self.check_repo?

data/lib/databasion/{googlize.rb → google_loader.rb}

@@ -2,14 +2,21 @@ require "google_spreadsheet"
 
 module Databasion
   
-  class GooglizeError < StandardError; end
+  class GoogleLoaderError < StandardError; end
   
-  class Googlize
+  class GoogleLoader
 
-    @@master_sheet = 'Database'
+    @@master_sheet  = 'Database'
+    @@version_sheet = 'Version'
+    
+    @@table_def  = 'table'
+    @@field_def  = 'field'
+    @@type_def   = 'type'
+    @@index_def  = 'index'
+    @@ignore_def = 'ignore'
     
     def self.config?
-      raise 'Googlize cannot load without a config.' unless defined?(@@config)
+      raise GoogleLoaderError, 'GoogleLoader cannot load without a config.' unless defined?(@@config)
       true
     end
     
@@ -34,25 +41,40 @@ module Databasion
       @@master_sheet
     end
     
+    def self.version_sheet=(version)
+      @@version_sheet = version
+    end
+    
+    def self.version_sheet
+      @@version_sheet
+    end
+    
     def self.login
       begin
         @@session = GoogleSpreadsheet.login(@@config['login']['username'], @@config['login']['password'])
       rescue
-        raise GooglizeError, "Couldn't log into Google."
+        raise GoogleLoaderError, "Couldn't log into Google."
       end
     end
     
-    def self.googlebate
+    def self.run
       config?
       login
-      
-      Databasion::LOGGER.info "Googlizing..."
-      process
-      Databasion::LOGGER.info "Googlized!"
+      process.each do |data_hash|
+        Databasion::YamlBuilder.run(data_hash, @@config['output']['yaml_path'])
+      end
+    end
+    
+    def self.run_version
+      config?
+      login
+      fetch_version
     end
     
     private
     def self.process
+      Databasion::LOGGER.info "Googlizing..."
+      data_list = []
       @@config['sheets'].each do |token|
         spreadsheet = @@session.spreadsheet_by_key(token['key'])
         master_list  = get_master(spreadsheet)
@@ -60,16 +82,18 @@ module Databasion
           next unless master_list.collect { |row| row['spreadsheet'] }.include?(worksheet.title)
           data_hash = parse(worksheet)
           data_hash['connection'] = master_list.collect { |row| row if row['spreadsheet'] == worksheet.title }.reject { |d| d.nil? }[0]
-          Databasion::Yamalize.yamlbate(data_hash, @@config['output']['yaml_path'])
+          data_list << data_hash
         end
       end
+      Databasion::LOGGER.info "Googlized!"
+      data_list
     end
     
     def self.get_master(spreadsheet)
       master_list = []
       header_info = nil
       spreadsheet.worksheets.each do |worksheet|
-        if worksheet.title == @@master_sheet
+        if worksheet.title == master_sheet
           worksheet.rows.each_with_index do |row, index|
             if index == 0
               header_info = row
@@ -84,7 +108,7 @@ module Databasion
           break
         end
       end
-      raise GooglizeError, "There was no master sheet defined in the spreadsheet %s." % token['name'] if master_list.size == 0
+      raise GoogleLoaderError, "There was no master sheet defined in the spreadsheet %s." % token['name'] if master_list.size == 0
       master_list
     end
     
@@ -102,7 +126,7 @@ module Databasion
         next if (row.reject { |s| s.strip.empty? }).size == 0
 
         case row[0]
-        when "table"
+        when @@table_def
           begin
             d = row[1].split(",")
             name = d[0].strip
@@ -111,19 +135,19 @@ module Databasion
             name = row[1]
             plural = true
           end
-        when "field"
+        when @@field_def
           row.each do |field|
             fields.push field unless field.empty?
           end
-        when "type"
+        when @@type_def
           row.each do |type|
             types.push type unless type.empty?
           end
-        when "index"
+        when @@index_def
           row.each_with_index do |index, i|
             indexes.push i-1 unless index.empty? or i == 0
           end
-        when "ignore"
+        when @@ignore_def
           row.each_with_index do |ignore, i|
             ignore_cols.push i-1 unless ignore.empty? or i == 0
           end
@@ -145,6 +169,22 @@ module Databasion
       }
     end
     
+    def self.fetch_version
+      version = nil
+      @@config['sheets'].each do |token|
+        spreadsheet = @@session.spreadsheet_by_key(token['key'])
+        spreadsheet.worksheets.each do |worksheet|
+          if worksheet.title == version_sheet
+            worksheet.rows.each do |row|
+              version = row[0]
+            end
+          end
+        end
+      end
+      raise GoogleLoaderError, "A Version spreadsheet was not found in any of the Google Spreadsheets supplied in google.yml" if version.nil?
+      version
+    end
+    
   end
   
 end

data/lib/databasion/{loadlize.rb → load_data.rb}

@@ -1,6 +1,6 @@
 module Databasion
   
-  class Loadlize
+  class LoadData
     
     @@config = nil
     
@@ -12,7 +12,7 @@ module Databasion
       @@config
     end
    
-    def self.loadalize
+    def self.run(opts)
       Databasion.set_ar_logger
       Databasion::LOGGER.info "Updating from YAML..."
 

data/lib/databasion/{datacize.rb → migrate.rb}

@@ -1,6 +1,6 @@
 module Databasion
   
-  class Datacize
+  class Migrate
     
     @@config = nil
     
@@ -8,11 +8,11 @@ module Databasion
       @@config = config
     end
     
-    def self.datacize
+    def self.run
       require 'migration_helpers/init'
 
       files = Dir["%s/*.yml" % @@config['output']['yaml_path']]
-      Databasion::Migitize.migrabate(files, @@config)
+      Databasion::BuildMigration.run(files, @@config)
 
       Databasion.set_ar_logger
       Databasion::LOGGER.info "Migrating..."

data/lib/databasion/{svnilize.rb → svn_committer.rb}

@@ -2,11 +2,11 @@ require 'fileutils'
 
 module Databasion
   
-  class Svnilize
+  class SvnCommitter
     
     @@config = nil
     
-    class SvnilizeError < StandardError; end
+    class SvnCommitterError < StandardError; end
     
     def self.config=(config)
       @@config = config
@@ -21,7 +21,7 @@ module Databasion
     end
     
     def self.commit(path=Dir.pwd)
-      raise SvnilizeError, "A file lock is in place.  Cannot commit." if check_lock?
+      raise SvnCommitterError, "A file lock is in place.  Cannot commit." if check_lock?
       create_lock
       svn_add_files(path)
       Databasion::LOGGER.info 'running: svn commit -m "databasion auto commit"'

data/lib/databasion/{yamalize.rb → yaml_builder.rb}

@@ -2,12 +2,12 @@ require 'fileutils'
 
 module Databasion
   
-  class YamalizeError < StandardError; end
+  class YamlBuilderError < StandardError; end
   
-  class Yamalize
+  class YamlBuilder
     
-    def self.yamlbate(data_hash, output_path=nil)
-      raise YamalizeError, 'Databasion::Yamalize requires an output path.' if output_path.nil?
+    def self.run(data_hash, output_path=nil)
+      raise YamalizeError, 'Databasion::YamlBuilder requires an output path.' if output_path.nil?
       @@output_path = output_path
       
       Databasion::LOGGER.info "Yamlbating %s..." % data_hash['name']

data/lib/tasks/databasion.rake

@@ -3,21 +3,26 @@ require 'lib/databasion'
 namespace :databasion do
   desc "Run Databasion for Google Spreadsheets"
   task :google do
-    Databasion.databate('google', 'config/google.yml')
+    Databasion.run('google', 'config/google.yml')
   end
   
   desc "Run Ruby Migration scripts"
   task :migrate do
-    Databasion.databate('migrate', 'config/google.yml')
+    Databasion.run('migrate', 'config/google.yml')
   end
   
-  desc "Run the update script to stuff YAML data into database"
-  task :update do
-    Databasion.databate('update', 'config/google.yml')
+  desc "Run the load script to stuff YAML data into database"
+  task :load do
+    Databasion.run('load', 'config/google.yml')
   end
   
   desc "Run the SVN auto-commit system"
   task :svn do
-    Databasion.databate('svn', 'config/google.yml')
+    Databasion.run('svn', 'config/google.yml')
+  end
+  
+  desc "Run the GIT auto-commit system"
+  task :git do
+    Databasion.run('git', 'config/google.yml')
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: databasion
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Brian Jones
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 +09:00
+date: 2010-11-04 00:00:00 +09:00
 default_executable: databasion
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,29 +100,29 @@ files:
 - bin/databasion
 - config/example.google.yml
 - databasion.gemspec
-- features/databasion.feature
-- features/databasion/googlize.feature
-- features/databasion/migitize.feature
-- features/databasion/step_definitions/googlize_steps.rb
-- features/databasion/step_definitions/migitize_steps.rb
-- features/databasion/step_definitions/svnilize_steps.rb
-- features/databasion/step_definitions/yamalize_steps.rb
-- features/databasion/svnilize.feature
-- features/databasion/yamalize.feature
-- features/step_definitions/databasion_steps.rb
+- features/build_migration.feature
+- features/create_project.feature
+- features/cron_system.feature
+- features/env/helper_methods.rb
+- features/google_loader.feature
+- features/step_definitions/build_migration_steps.rb
+- features/step_definitions/create_project_steps.rb
+- features/step_definitions/cron_system_steps.rb
+- features/step_definitions/google_loader_steps.rb
+- features/step_definitions/yaml_builder_steps.rb
+- features/yaml_builder.feature
 - lib/databasion.rb
-- lib/databasion/applcize.rb
-- lib/databasion/csvilize.rb
-- lib/databasion/datacize.rb
-- lib/databasion/excelize.rb
-- lib/databasion/gitilize.rb
-- lib/databasion/googlize.rb
-- lib/databasion/loadlize.rb
-- lib/databasion/migitize.rb
-- lib/databasion/svnilize.rb
+- lib/databasion/application.rb
+- lib/databasion/build_migration.rb
+- lib/databasion/cron_system.rb
+- lib/databasion/git_committer.rb
+- lib/databasion/google_loader.rb
+- lib/databasion/load_data.rb
+- lib/databasion/migrate.rb
+- lib/databasion/svn_committer.rb
 - lib/databasion/templates/migration.erb
 - lib/databasion/templates/model.erb
-- lib/databasion/yamalize.rb
+- lib/databasion/yaml_builder.rb
 - lib/migration_helpers/MIT-LICENSE
 - lib/migration_helpers/README.markdown
 - lib/migration_helpers/init.rb

data/features/databasion.feature

@@ -1,23 +0,0 @@
-Feature: Run System
-  In order for the user to choose what they want to do
-  The user should be able to pass in configuration settings
-  
-  Scenario: User calls google databate with config
-    Given there is an actual yaml config file for google
-    When the user runs databate for google
-    Then Databasion should not fail for google
-    
-  Scenario: User calls google databate without config
-    Given there is no config file for google
-    When the user calls databate without config for google
-    Then Databasion should fail for google
-    
-  Scenario: User calls excel databate with config
-    Given there is an actual yaml config file for excel
-    When the user runs databate for excel
-    Then Databasion should not fail for excel
-
-  Scenario: User calls excel databate without config
-    Given there is no config file for excel
-    When the user calls databate without config for excel
-    Then Databasion should fail for excel

data/features/databasion/googlize.feature

@@ -1,13 +0,0 @@
-Feature: Use Googlize
-  In order for a user to access google
-  They need to connect first
-    
-  Scenario: Log into Google
-    Given a google account
-    When Googlize logs in
-    Then we should have a GoogleSpreadsheet session
-    
-  Scenario: Run system with config
-    Given a google yaml config
-    When Googlize starts up
-    Then Googlize should not fail

data/features/databasion/step_definitions/googlize_steps.rb

@@ -1,32 +0,0 @@
-require 'lib/databasion'
-
-Given /a google account/ do
-  @config = YAML.load(File.open('config/google.yml'))
-end
-
-When /Googlize logs in/ do
-  Databasion::Googlize.config = @config
-  Databasion::Googlize.login
-end
-
-Then /we should have a GoogleSpreadsheet session/ do
-  Databasion::Googlize.session.should be_kind_of(GoogleSpreadsheet::Session)
-end
-
-Given /a google yaml config/ do
-  @config = YAML.load(File.open('config/google.yml'))
-end
-
-When /Googlize starts up/ do
-  Databasion::Googlize.config = @config
-  begin
-    Databasion::Googlize.googlebate
-    @error = false
-  rescue
-    @error = true
-  end
-end
-
-Then /Googlize should not fail/ do
-  @error.should == false
-end

data/features/databasion/step_definitions/migitize_steps.rb

@@ -1,26 +0,0 @@
-require 'lib/databasion'
-
-Given /a complete set of YAML definitions/ do
-  @config = YAML.load(File.open('config/google.yml'))
-
-  @parse_data = {
-    'name'        => 'mock',
-    'plural'      => true,
-    'fields'      => ["id", "name", "power"],
-    'types'       => ["integer", "string, 20", "string, 40"],
-    'data'        => [[1, "Brian Jones", "Super Intelligence"], [2, "Superman", "Invincible"], [3, "Batman", "Strength"]],
-    'ignore_cols' => [2],
-    'connection'  => [{'database' => 'moon'}]
-  }
-  Databasion::Yamalize.yamlbate(@parse_data, @config['output']['yaml_path'])
-
-  @files = Dir["%s/%s.yml" % [@config['output']['yaml_path'], @parse_data['name']]]
-end
-
-When /the YAML files are parsed/ do
-  Databasion::Migitize.migrabate(@files, @config)
-end
-
-Then /the result is Ruby migration files/ do
-  File.exist?("%s/100_%s.rb" % [@config['output']['migrations']['path'], @parse_data['name']]).should == true
-end

data/features/databasion/step_definitions/svnilize_steps.rb

@@ -1,14 +0,0 @@
-require 'lib/databasion'
-
-Given /a databasion created file structure/ do
-  Databasion::Applcize.create_project({ :create => 'cucumber_test' })
-end
-
-When /the commit command is ran/ do
-  Databasion::Svnilize.commit('cucumber_test')
-end
-
-Then /the data should be stored in SVN/ do
-
-  FileUtils.rm_rf 'cucumber_test'
-end

data/features/databasion/step_definitions/yamalize_steps.rb

@@ -1,29 +0,0 @@
-require 'lib/databasion'
-
-Given /a chunk of (.*) data/ do |name|
-  @config = YAML.load(File.open('config/google.yml'))
-  @parse_data = {
-    'name'        => 'mock',
-    'plural'      => true,
-    'fields'      => ["id", "name", "power"],
-    'types'       => ["integer", "string, 20", "string, 40"],
-    'data'        => [[1, "Brian Jones", "Super Intelligence"], [2, "Superman", "Invincible"], [3, "Batman", "Strength"]],
-    'ignore_cols' => [2],
-    'connection'  => [{'database' => 'moon'}]
-  }
-end
-
-When /we parse it/ do
-  Databasion::Yamalize.yamlbate(@parse_data, @config['output']['yaml_path'])
-end
-
-Then /it should create a relevant YAML file/ do
-  File.exist?("%s/%s.yml" % [@config['output']['yaml_path'], @parse_data['name']]).should == true
-end
-
-And /should contain the correct data/ do
-  data = YAML.load(File.open("%s/%s.yml" % [@config['output']['yaml_path'], @parse_data['name']]))
-  data.should include('meta')
-  data.should include('data')
-  data['meta'].should include('connection')
-end

data/features/databasion/svnilize.feature

@@ -1,8 +0,0 @@
-Feature: SVN Auto Commit
-  In order to save files in SVN
-  We need a system that runs the commands for us
-  
-  Scenario: A typical auto commit
-    Given a databasion created file structure
-    When the commit command is ran
-    Then the data should be stored in SVN

data/features/databasion/yamalize.feature

@@ -1,9 +0,0 @@
-Feature: Convert parsed hash into YAML
-  In order to convert the higher level into YAML
-  We need to process it and write it out to files
-  
-  Scenario: Google passes data
-    Given a chunk of google data
-    When we parse it
-    Then it should create a relevant YAML file
-    And should contain the correct data

data/features/step_definitions/databasion_steps.rb

@@ -1,35 +0,0 @@
-require 'lib/databasion'
-
-Given /there is an actual yaml config file for (.*)/ do |name|
-  @config = 'config/google.yml'
-end
-
-When /the user runs databate for (.*)/ do |name|
-  begin
-    Databasion.databate(name, @config)
-    @error = false
-  rescue
-    @error = true
-  end
-end
-
-Then /Databasion should not fail for (.*)/ do |name|
-  @error.should == false
-end
-
-Given /there is no config file for (.*)/ do |name|
-  @config = nil
-end
-
-When /the user calls databate without config for (.*)/ do |name|
-  begin
-    Databasion.databate(name, @config)
-    @error = false
-  rescue
-    @error = true
-  end
-end
-
-Then /Databasion should fail for (.*)/ do |name|
-  @error.should == true
-end

data/lib/databasion/csvilize.rb

@@ -1,11 +0,0 @@
-module Databasion
-  
-  class Csvilize
-    
-    def self.csvbate
-      
-    end
-    
-  end
-  
-end

data/lib/databasion/excelize.rb

@@ -1,11 +0,0 @@
-module Databasion
-  
-  class Excelize
-    
-    def self.excelbate
-      
-    end
-    
-  end
-  
-end