onebody-updateagent 0.4.1 → 0.4.2

data/VERSION

@@ -0,0 +1 @@
+0.4.2

data/bin/update_onebody

@@ -3,6 +3,8 @@
 require 'optparse'
 require 'yaml'
 
+UPDATEAGENT_VERSION = File.read(File.dirname(__FILE__) + '/../VERSION').strip
+
 options = {:confirm => true, :force => false}
 config = nil
 opt_parser = OptionParser.new do |opts|
@@ -32,8 +34,14 @@ opt_parser = OptionParser.new do |opts|
   opts.on("-g", "--groups", "Sync groups.csv rather than people.csv") do |g|
     options[:sync_groups] = true
   end
-  opts.on("-d", "--delete", "Delete people and families not found in source file") do |d|
-    options[:delete] = true
+  # doesn't work yet
+  #opts.on("-d", "--delete", "Delete people and families not found in source file") do |d|
+  #  options[:delete] = true
+  #end
+  opts.on("--version", "Show version and exit.") do
+    puts "OneBody UpdateAgent version #{UPDATEAGENT_VERSION}"
+    puts
+    exit
   end
 end
 opt_parser.parse!
@@ -78,7 +86,7 @@ if ARGV[0] # path/to/people.csv or path/to/groups.csv
       agent.compare(options[:force])
       if agent.has_work?
         if options[:confirm]
-          case ask("#{agent.create.length} record(s) to create and #{agent.update.length} record(s) to update. Continue? (Yes, No, Review) ") { |q| q.in = %w(yes no review y n r) }
+          case ask("#{agent.create_count} record(s) to create and #{agent.update_count} record(s) to update. Continue? (Yes, No, Review) ") { |q| q.in = %w(yes no review y n r) }
           when 'review', 'r'
             agent.present
             unless agent.confirm

data/lib/updateagent/updateagent.rb

@@ -112,8 +112,8 @@ class UpdateAgent
   def present_record(row, new=false)
     puts "#{row['legacy_id'].to_s.ljust(10)} #{name_for(row).to_s.ljust(40)} #{new ? '(new)' : '     '}"
     if DEBUG
-      puts row.values_hash(@attributes)
-      puts row['remote_hash']
+      puts "Local values:  #{row.values_for_hash(@attributes).join}"
+      puts "Remote values: #{row['remote_hash']}"
     end
   end
   
@@ -128,7 +128,7 @@ class UpdateAgent
     index = 0
     print "#{resource.name} 0/0\r"; STDOUT.flush
     (@create + @update).each_slice(MAX_TO_BATCH_AT_A_TIME) do |records|
-      response = resource.post(:batch, {}, records.to_xml)
+      response = resource.post(:batch, {}, {:options => @options['remote_options'], :records => records}.to_xml)
       statuses = Hash.from_xml(response.body)['records']
       statuses.each do |status|
         record = data_by_id[status['legacy_id']]

data/lib/updateagent/updaters/people_updater.rb

@@ -37,7 +37,7 @@ class PeopleUpdater < UpdateAgent
     puts
     @data = person_data
     @attributes.reject! { |a| a =~ /^family_/ and a != 'family_id' }
-    @family_agent = FamilyUpdater.new(family_data.values)
+    @family_agent = FamilyUpdater.new(family_data.values, @options)
   end
   
   @@required_columns = %w(legacy_id legacy_family_id)
@@ -68,6 +68,14 @@ class PeopleUpdater < UpdateAgent
     super
   end
   
+  def create_count
+    @create.length + @family_agent.create.length
+  end
+
+  def update_count
+    @update.length + @family_agent.update.length
+  end
+
   def push
     @family_agent.push
     super

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: onebody-updateagent
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Tim Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -06:00
+date: 2009-11-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- VERSION
 - example.yml
 - README.markdown
 - bin/update_onebody