datashift 0.2.1 → 0.2.2

data/tasks/config/tidy_config.txt

@@ -1,13 +1,13 @@
-# Copyright:: (c) Autotelik Media Ltd 2011
-# Author ::   Tom Statter
-# Date ::     Aug 2010
-#
-# License::   Free, OpenSource... MIT ?
-
-# This is the best effort I've found so far to reduce the amount of MS cruft
-# to absolute minimum
-# ... but unfortunately these tags will NOT BE REMOVED completely - manual cleanup still required
-
-# TODO - add another ruby parse layer to strip these out completely
-
+# Copyright:: (c) Autotelik Media Ltd 2011
+# Author ::   Tom Statter
+# Date ::     Aug 2010
+#
+# License::   Free, OpenSource... MIT ?
+
+# This is the best effort I've found so far to reduce the amount of MS cruft
+# to absolute minimum
+# ... but unfortunately these tags will NOT BE REMOVED completely - manual cleanup still required
+
+# TODO - add another ruby parse layer to strip these out completely
+
 new-empty-tags: o:smarttagtype, st1:placename, st1:place, st1:placetype

data/tasks/{excel_generator.rake → export/excel_generator.rake}

@@ -1,79 +1,102 @@
-# Copyright:: (c) Autotelik Media Ltd 2011
-# Author ::   Tom Statter
-# Date ::     Aug 2011
-# License::   MIT.
-#
-# REQUIRES:   JRuby
-#
-# Usage::
-#
-#  In Rakefile:
-#
-#     require 'datashift'
-#
-#     DataShift::load_tasks
-#
-#  Cmd Line:
-#
-# => jruby -S rake datashift:generate:excel model=<active record class> result=<output_template.xls>
-#
-namespace :datashift do
-  namespace :generate do
-
-    desc "Generate a template .xls (Excel) file for a model"
-  
-    task :excel, [:model, :result] => [:environment] do |t, args|
-
-      require 'excel_generator'
-      
-      # in familiar ruby style args seems to have been become empty using this new style for rake 0.9.2
-      #  whatever format i try, on both Win and OSX .. so had to revert back to ENV
-      model = args[:model] || ENV['model']
-      result = args[:result] || ENV['result']
-    
-      raise "USAGE: jruby -S rake datashift:generate:excel model=<Class> result=<file.xls>" unless(result)
-      raise "ERROR: Cannot process without AR Model - please supply model=<Class>" unless(model)
-
-      begin
-        klass = Kernel.const_get(model)
-      rescue NameError
-        raise "ERROR: No such AR Model found - check valid model supplied via model=<Class>"
-      end
-
-      gen = DataShift::ExcelGenerator.new(result)
-
-      gen.generate(klass)
-    end
-
-  end
-
-  namespace :export do
-
-    desc "Export active record data to .xls (Excel) file"
-
-    task :excel, [:model, :result] => [:environment] do |t, args|
-
-      require 'excel_generator'
-
-      # in familiar ruby style args seems to have been become empty using this new style for rake 0.9.2
-      #  whatever format i try, on both Win and OSX .. so had to revert back to ENV
-      model = ENV['model']
-      result = ENV['result']
-
-      raise "USAGE: jruby -S rake datashift:gen:excel model=<Class> result=<file.xls>" unless(result)
-      raise "ERROR: Cannot process without AR Model - please supply model=<Class>" unless(model)
-
-      begin
-        klass = Kernel.const_get(model)
-      rescue NameError
-        raise "ERROR: No such AR Model found - check valid model supplied via model=<Class>"
-      end
-
-      gen = DataShift::ExcelGenerator.new(result)
-      
-      gen.export(klass.all)
-    end
-
-  end
-
+# Copyright:: (c) Autotelik Media Ltd 2011
+# Author ::   Tom Statter
+# Date ::     Aug 2011
+# License::   MIT.
+#
+# REQUIRES:   JRuby
+#
+# Usage::
+#
+#  In Rakefile:
+#
+#     require 'datashift'
+#
+#     DataShift::load_tasks
+#
+#  Cmd Line:
+#
+# => jruby -S rake datashift:generate:excel model=<active record class> result=<output_template.xls>
+#
+namespace :datashift do
+  
+  namespace :generate do
+    
+    include RakeUtils
+
+    desc "Generate a template .xls (Excel) file for a model"
+  
+    task :excel, [:model, :result] => :environment do |t, args|
+      
+      
+      # in familiar ruby style args seems to have been become empty using this new style for rake 0.9.2
+      #  whatever format i try, on both Win and OSX .. so had to revert back to ENV
+      model = args.model || ENV['model']
+      result = args.result || ENV['result']
+      
+      RakeUtils::check_args(args, [:model, :result]) do
+          x =<<-EOS
+      USAGE::
+
+        rake datashift:generate:excel model=<Class> result=<file.xls>
+
+             Generate a template Excel file representing an Active Record mode.
+             Once populated with data the template can be used to import the data,
+             via the partner import tasks
+             Parameters :
+                [:model]  - Mandatory - The database model to export.
+                [:results] - Mandatory -  Name of the output template file..
+          EOS
+          puts x
+        end
+
+
+      require 'excel_generator'
+      
+      raise "USAGE: jruby -S rake datashift:generate:excel model=<Class> result=<file.xls>" unless(result)
+
+
+      begin
+        # support modules e.g "Spree::Property") 
+        klass = ModelMapper::class_from_string(model)  #Kernel.const_get(model)
+      rescue NameError
+        raise "ERROR: No such AR Model found - check valid model supplied via model=<Class>"
+      end
+
+      gen = DataShift::ExcelGenerator.new(result)
+
+      gen.generate(klass)
+    end
+
+  end
+
+  namespace :export do
+
+    desc "Export active record data to .xls (Excel) file"
+
+    task :excel, [:model, :result] => [:environment] do |t, args|
+
+      require 'excel_generator'
+
+      # in familiar ruby style args seems to have been become empty using this new style for rake 0.9.2
+      #  whatever format i try, on both Win and OSX .. so had to revert back to ENV
+      model = ENV['model']
+      result = ENV['result']
+
+      raise "USAGE: jruby -S rake datashift:gen:excel model=<Class> result=<file.xls>" unless(result)
+      raise "ERROR: Cannot process without AR Model - please supply model=<Class>" unless(model)
+
+      begin
+        # support modules e.g "Spree::Property") 
+        klass = ModelMapper::class_from_string(model)  #Kernel.const_get(model)
+      rescue NameError
+        raise "ERROR: No such AR Model found - check valid model supplied via model=<Class>"
+      end
+
+      gen = DataShift::ExcelGenerator.new(result)
+      
+      gen.export(klass.all)
+    end
+
+  end
+
 end

data/tasks/file_tasks.rake

@@ -1,37 +1,37 @@
-# Copyright:: (c) Autotelik Media Ltd 2011
-# Author ::   Tom Statter
-# Date ::     Feb 2011
-# License::   MIT
-#
-# Usage::     rake datashift:file_rename input=/blah image_load input=path_to_images
-#
-namespace :datashift do
-
-  desc "copy or mv a folder of files, consistently renaming in the process"
-  task :file_rename, :input, :offset, :prefix, :width, :commit, :mv do |t, args|
-    raise "USAGE: rake file_rename input='C:\blah' [offset=n prefix='str' width=n]" unless args[:input] && File.exists?(args[:input])
-    width = args[:width] || 2
-
-    action = args[:mv] ? 'mv' : 'cp'
-
-    cache = args[:input]
-
-    if(File.exists?(cache) )
-      puts "Renaming files from #{cache}"
-      Dir.glob(File.join(cache, "*")) do |name|
-        path, base_name = File.split(name)
-        id = base_name.slice!(/\w+/)
-
-        id = id.to_i + args[:offset].to_i if(args[:offset])
-        id = "%0#{width}d" % id.to_i if(args[:width])
-        id = args[:prefix] + id.to_s if(args[:prefix])
-
-        destination = File.join(path, "#{id}#{base_name}")
-        puts "ACTION: #{action} #{name} #{destination}"
-
-        File.send( action, name, destination) if args[:commit]
-      end
-    end
-  end
-
+# Copyright:: (c) Autotelik Media Ltd 2011
+# Author ::   Tom Statter
+# Date ::     Feb 2011
+# License::   MIT
+#
+# Usage::     rake datashift:file_rename input=/blah image_load input=path_to_images
+#
+namespace :datashift do
+
+  desc "copy or mv a folder of files, consistently renaming in the process"
+  task :file_rename, :input, :offset, :prefix, :width, :commit, :mv do |t, args|
+    raise "USAGE: rake file_rename input='C:\blah' [offset=n prefix='str' width=n]" unless args[:input] && File.exists?(args[:input])
+    width = args[:width] || 2
+
+    action = args[:mv] ? 'mv' : 'cp'
+
+    cache = args[:input]
+
+    if(File.exists?(cache) )
+      puts "Renaming files from #{cache}"
+      Dir.glob(File.join(cache, "*")) do |name|
+        path, base_name = File.split(name)
+        id = base_name.slice!(/\w+/)
+
+        id = id.to_i + args[:offset].to_i if(args[:offset])
+        id = "%0#{width}d" % id.to_i if(args[:width])
+        id = args[:prefix] + id.to_s if(args[:prefix])
+
+        destination = File.join(path, "#{id}#{base_name}")
+        puts "ACTION: #{action} #{name} #{destination}"
+
+        File.send( action, name, destination) if args[:commit]
+      end
+    end
+  end
+
 end

data/tasks/import/csv.rake

@@ -1,50 +1,51 @@
-# Copyright:: (c) Autotelik Media Ltd 2011
-# Author ::   Tom Statter
-# Date ::     Aug 2011
-# License::   MIT
-#
-# Usage::
-#
-#  In Rakefile:
-#
-#     require 'datashift'
-#
-#     DataShift::load_tasks
-#
-#  Cmd Line:
-#
-# => jruby -S rake datashift:import:csv model=<active record class> input=<file.csv>
-#
-namespace :datashift do
-
-  namespace :import do
-
-    desc "Populate a model's table in db with data from CSV file"
-    task :csv, [:model, :loader, :input, :verbose] => [:environment] do |t, args|
-
-      # in familiar ruby style args seems to have been become empty with rake 0.9.2 whatever i try
-      # so had to revert back to ENV
-      model = ENV['model']
-      input = ENV['input']
-   
-      raise "USAGE: rake datashift:import:csv input=file.csv model=<Class>" unless(input)
-      raise "ERROR: Cannot process without AR Model - please supply model=<Class>" unless(model)
-      raise "ERROR: Could not find csv file #{args[:input]}" unless File.exists?(input)
-
-      require 'csv_loader'
-      
-      begin
-        klass = Kernel.const_get(model)
-      rescue NameError
-        raise "ERROR: No such AR Model found - check valid model supplied via model=<Class>"
-      end
-
-      puts "INFO: Using CSV loader"
-    
-      loader = DataShift::CsvLoader.new(klass)
-
-      loader.perform_load(input)
-    end
-  end
-  
+# Copyright:: (c) Autotelik Media Ltd 2011
+# Author ::   Tom Statter
+# Date ::     Aug 2011
+# License::   MIT
+#
+# Usage::
+#
+#  In Rakefile:
+#
+#     require 'datashift'
+#
+#     DataShift::load_tasks
+#
+#  Cmd Line:
+#
+# => jruby -S rake datashift:import:csv model=<active record class> input=<file.csv>
+#
+namespace :datashift do
+
+  namespace :import do
+
+    desc "Populate a model's table in db with data from CSV file"
+    task :csv, [:model, :loader, :input, :verbose] => [:environment] do |t, args|
+
+      # in familiar ruby style args seems to have been become empty with rake 0.9.2 whatever i try
+      # so had to revert back to ENV
+      model = ENV['model']
+      input = ENV['input']
+   
+      raise "USAGE: rake datashift:import:csv input=file.csv model=<Class>" unless(input)
+      raise "ERROR: Cannot process without AR Model - please supply model=<Class>" unless(model)
+      raise "ERROR: Could not find csv file #{args[:input]}" unless File.exists?(input)
+
+      require 'csv_loader'
+      
+      begin
+        # support modules e.g "Spree::Property") 
+        klass = ModelMapper::class_from_string(model)  #Kernel.const_get(model)
+      rescue NameError
+        raise "ERROR: No such AR Model found - check valid model supplied via model=<Class>"
+      end
+
+      puts "INFO: Using CSV loader"
+    
+      loader = DataShift::CsvLoader.new(klass)
+
+      loader.perform_load(input)
+    end
+  end
+  
 end

data/tasks/import/excel.rake

@@ -1,72 +1,75 @@
-# Copyright:: (c) Autotelik Media Ltd 2011
-# Author ::   Tom Statter
-# Date ::     Feb 2011
-# License::   TBD. Free, Open Source. MIT ?
-#
-# REQUIRES:   JRuby
-#
-# Usage::
-#
-#  In Rakefile:
-#
-#     require 'datashift'
-#
-#     DataShift::load_tasks
-#
-#  Cmd Line:
-#
-# => jruby -S rake datashift:import:excel model=<active record class> input=<file.xls>
-# => jruby -S rake datashift:import:excel model=<active record class> input=C:\MyProducts.xlsverbose=true
-#
-require 'datashift'
-require 'excel_loader'
-
-namespace :datashift do
-
-  namespace :import do
-
-    desc "Populate model's table with data from .xls (Excel) file"
-  
-    task :excel, [:model, :loader, :input, :config, :verbose] => [:environment] do |t, args|
-
-      # in familiar ruby style args seems to have been become empty using this new style for rake 0.9.2
-      #  whatever format i try, on both Win and OSX .. so had to revert back to ENV
-      model = ENV['model']
-      input = ENV['input']
-    
-      raise "USAGE: jruby -S rake datashift:import:excel input=excel_file.xls model=<Class>" unless(input)
-      raise "ERROR: Cannot process without AR Model - please supply model=<Class>" unless(model)
-      raise "ERROR: Could not find file #{args[:input]}" unless File.exists?(input)
-
-      begin
-        klass = Kernel.const_get(model)
-      rescue NameError
-        raise "ERROR: No such AR Model found - check valid model supplied via model=<Class>"
-      end
-
-      if(ENV['loader'])
-        begin
-          loader_klass = Kernel.const_get(ENV['loader'])
-
-          loader = loader_klass.new(klass)
-
-          puts "INFO: Using loader : #{loader.class}"
-        rescue
-          puts "INFO: No specific #{model}Loader found  - using generic ExcelLoader"
-          loader = DataShift::ExcelLoader.new(klass)
-        end
-      else
-        puts "INFO: No Loader specified - using generic ExcelLoader"
-        loader = DataShift::ExcelLoader.new(klass)
-      end
-
-      puts "ARGS #{args.inspect} #{args[:verbose]} [#{args.verbose}]"
-      loader.logger.verbose if(ENV['verbose'])
-      
-      loader.configure_from( ENV['config'] ) if(ENV['config'])
-       
-      loader.perform_load(input)
-    end
-
-  end
+# Copyright:: (c) Autotelik Media Ltd 2011
+# Author ::   Tom Statter
+# Date ::     Feb 2011
+# License::   TBD. Free, Open Source. MIT ?
+#
+# REQUIRES:   JRuby
+#
+# Usage::
+#
+#  In Rakefile:
+#
+#     require 'datashift'
+#
+#     DataShift::load_tasks
+#
+#  Cmd Line:
+#
+# => jruby -S rake datashift:import:excel model=<active record class> input=<file.xls>
+# => jruby -S rake datashift:import:excel model=<active record class> input=C:\MyProducts.xlsverbose=true
+#
+require 'datashift'
+require 'excel_loader'
+
+namespace :datashift do
+
+  namespace :import do
+
+    desc "Populate model's table with data from .xls (Excel) file"
+  
+    task :excel, [:model, :loader, :input, :config, :verbose] => [:environment] do |t, args|
+
+      # in familiar ruby style args seems to have been become empty using this new style for rake 0.9.2
+      #  whatever format i try, on both Win and OSX .. so had to revert back to ENV
+      model = ENV['model']
+      input = ENV['input']
+    
+      raise "USAGE: jruby -S rake datashift:import:excel input=excel_file.xls model=<Class>" unless(input)
+      raise "ERROR: Cannot process without AR Model - please supply model=<Class>" unless(model)
+      raise "ERROR: Could not find file #{args[:input]}" unless File.exists?(input)
+
+      begin
+        # support modules e.g "Spree::Property") 
+        klass = ModelMapper::class_from_string(model)  #Kernel.const_get(model)
+      rescue NameError
+        raise "ERROR: No such AR Model found - check valid model supplied via model=<Class>"
+      end
+
+      if(ENV['loader'])
+        begin
+          #loader_klass = Kernel.const_get(ENV['loader'])
+          # support modules e.g "Spree::Property") 
+          loader_klass = ModelMapper::class_from_string(ENV['loader'])  #Kernel.const_get(model)
+
+          loader = loader_klass.new(klass)
+
+          puts "INFO: Using loader : #{loader.class}"
+        rescue
+          puts "INFO: No specific #{model}Loader found  - using generic ExcelLoader"
+          loader = DataShift::ExcelLoader.new(klass)
+        end
+      else
+        puts "INFO: No Loader specified - using generic ExcelLoader"
+        loader = DataShift::ExcelLoader.new(klass)
+      end
+
+      puts "ARGS #{args.inspect} #{args[:verbose]} [#{args.verbose}]"
+      loader.logger.verbose if(ENV['verbose'])
+      
+      loader.configure_from( ENV['config'] ) if(ENV['config'])
+       
+      loader.perform_load(input)
+    end
+
+  end
 end