ncal2gcal 0.1.3 → 0.1.4

data/bin/ncal2gcal

@@ -20,7 +20,7 @@ opts = OptionParser.new do |opts|
   opts.on("-P", "--gmail-password PASSWORD", "Google mail password") { |conf[:gmail_password]| }
   opts.on("-C", "--gmail-calendar CALENDAR", "Google calendar (default: 'LotusNotes')") { |conf[:gmail_calendar]| }
   opts.on("-D", "--days DAYS", "Do not sync events older then DAYS days (default: no limit)") { |days| conf[:days]=days.to_i }
-  opts.on("--sync-desc", "Do sync event description (default: no)") { conf[:sync_desc] }
+  opts.on("--sync-desc", "Do sync event description (default: no)") { |conf[:sync_desc]| }
   opts.separator ""
   opts.separator "Example:" 
   opts.separator "    ncal2gcal sync -u user123 -p secret123 -d mail123.nsf -U username@gmail.com -P top123secret -C LotusNotes -D 14"

data/lib/ncal2gcal/counter.rb

@@ -0,0 +1,36 @@
+module NCal2GCal
+
+  class Counter
+    attr_accessor :updates, :inserts, :deletes, :selects, :ignored, :t_start, :t_end
+    
+    def initialize
+      @updates = 0
+      @inserts = 0
+      @deletes = 0
+      @selects = 0
+      @ignored = 0      
+      start
+    end
+    def runtime
+      @t_end - @t_start 
+    end 
+    def start
+      @t_start = Time.now
+    end
+    def end
+      @t_end = Time.now
+    end
+    def show
+      puts "\nStatistics:"
+      puts "-"*20
+      puts sprintf("Inserts    : %05d", @inserts)
+      puts sprintf("Updates    : %05d", @updates)
+      puts sprintf("Deletes    : %05d", @deletes)
+      puts sprintf("Ingored    : %05d", @ignored)
+      puts "-"*20
+      puts sprintf("Total      : %05d", @selects)
+      puts          "Runtime    : #{runtime} sec"
+    end
+  end
+  
+end

data/lib/ncal2gcal/gcal4ruby_gateway.rb

@@ -0,0 +1,60 @@
+require 'rubygems'
+require 'gcal4ruby'
+
+##
+# This is an extension/modification of the classes 
+# in the gcal4ruby-module
+#
+# at the moment it is only used to allaw the usage 
+# of the user-relevant end-date in all-day events
+#
+module GCal4Ruby
+ DAY_SECS = 86400
+ class Event
+    
+   alias :start_time= :start=
+   alias :start_time :start  
+
+   def all_day=(is_all_day)
+     if self.end and !(is_all_day == @all_day)
+       is_all_day ? self.end=(self.end()+DAY_SECS) :  self.end=(self.end-DAY_SECS)
+     end
+     @all_day = is_all_day
+   end
+   ##
+   # The event end date and time 
+   # For all_day-events it is the day, when 
+   # the event ends (and not the day after 
+   # as in the google api)
+   #
+   def end_time=(t)
+     tc = convert_to_time(t)
+     if @all_day
+       self.end = tc + DAY_SECS
+     else
+       self.end = tc
+     end
+   end
+   #
+   # see end_time=()
+   def end_time
+     if @all_day
+       return (self.end-DAY_SECS)
+     else
+       return self.end()
+     end
+   end
+
+   def convert_to_time(t)
+      if t.is_a?String
+        return Time.parse(t)      
+      elsif t.is_a?Time
+        return t
+      else
+        raise "Time must be either Time or String"
+      end
+   end
+   
+ end
+end
+# ---

data/lib/ncal2gcal/google_calendar.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
-require 'gcal4ruby'
+require 'ncal2gcal/gcal4ruby_gateway'
+
 
 module NCal2GCal
 

data/lib/ncal2gcal/string.rb

@@ -0,0 +1,19 @@
+# 
+class String
+  def asciify()
+    str = self
+    # ----------------------------------------------------------------
+    # Umlauts
+    # ----------------------------------------------------------------
+    str = str.gsub(/\334/,"Ü")  # �
+    str = str.gsub(/\374/,"ü") # �
+    str = str.gsub(/\326/,"Ö") # �
+    str = str.gsub(/\366/,"ö") # �
+    str = str.gsub(/\304/,"Ä") # �
+    str = str.gsub(/\344/,"ä")  # �
+    str = str.gsub(/\337/,"ß") # �
+    # bez_neu = Iconv.conv('UTF-8','CP850', bez_neu)
+    #str = str.gsub(/([^\d\w\s\.\[\]-])/, '')
+    return str
+  end 
+end 

data/lib/ncal2gcal/sync.rb

@@ -6,67 +6,12 @@ require 'dm-core'
 require 'fileutils'
 require 'ncal2gcal/lotus_notes_calendar'
 require 'ncal2gcal/google_calendar'
-
-class String
-  def asciify()
-    str = self
-    # ----------------------------------------------------------------
-    # Sonderzeichenbehandlung
-    # ----------------------------------------------------------------
-    str = str.gsub(/\334/,"Ü")  # �
-    str = str.gsub(/\374/,"ü") # �
-    str = str.gsub(/\326/,"Ö") # �
-    str = str.gsub(/\366/,"ö") # �
-    str = str.gsub(/\304/,"Ä") # �
-    str = str.gsub(/\344/,"ä")  # �
-    str = str.gsub(/\337/,"ß") # �
-    # bez_neu = Iconv.conv('UTF-8','CP850', bez_neu)
-    #str = str.gsub(/([^\d\w\s\.\[\]-])/, '')
-    return str
-  end 
-end 
+require 'ncal2gcal/string'
+require 'ncal2gcal/counter'
+require 'ncal2gcal/sync_entry'
 
 
 module NCal2GCal
-  raise "environment variable %APPDATA% not set" unless ENV['APPDATA'] 
-  FileUtils::cd(ENV['APPDATA']) 
-  FileUtils::mkdir_p('ncal2gcal')
-  
-  db_file = "#{Dir.pwd}/ncal2gcal/ncal2gcal.sqlite"
-  DataMapper::setup(:default, "sqlite3://#{db_file}")
-
-  class Counter
-    attr_accessor :updates, :inserts, :deletes, :selects, :ignored, :t_start, :t_end
-    
-    def initialize
-      @updates = 0
-      @inserts = 0
-      @deletes = 0
-      @selects = 0
-      @ignored = 0      
-      start
-    end
-    def runtime
-      @t_end - @t_start 
-    end 
-    def start
-      @t_start = Time.now
-    end
-    def end
-      @t_end = Time.now
-    end
-    def show
-      puts "\nStatistics:"
-      puts "-"*20
-      puts sprintf("Inserts    : %05d", @inserts)
-      puts sprintf("Updates    : %05d", @updates)
-      puts sprintf("Deletes    : %05d", @deletes)
-      puts sprintf("Ingored    : %05d", @ignored)
-      puts "-"*20
-      puts sprintf("Total      : %05d", @selects)
-      puts          "Runtime    : #{runtime} sec"
-    end
-  end
   
   class NotesGoogleSync
     def initialize(params)
@@ -177,21 +122,21 @@ module NCal2GCal
     def init_google_event(notes_event,start_time,end_time)
       event = @google_calendar.new_event
       google_event= set_google_event_attrs(notes_event, event,start_time,end_time )
-      google_event.start = start_time 
-      google_event.end = end_time 
+      google_event.start_time = start_time 
+      google_event.end_time = end_time 
       return google_event
     end
     def set_google_event_attrs(notes_event, google_event,start_time=nil,end_time=nil)
       google_event.title = notes_event.subject.asciify if notes_event.subject
       if start_time
-        google_event.start = start_time     
+        google_event.start_time = start_time     
       else
-        google_event.start = notes_event.start_time 
+        google_event.start_time = notes_event.start_time 
       end
       if end_time
-        google_event.end = end_time 
+        google_event.end_time = end_time 
       else
-        google_event.end = notes_event.end_time 
+        google_event.end_time = notes_event.end_time 
       end
       google_event.where = notes_event.where.asciify if notes_event.where
       google_event.all_day = notes_event.all_day?
@@ -243,20 +188,4 @@ module NCal2GCal
     end
   end
   
-  class SyncEntry
-    include DataMapper::Resource
-    #storage_names[:repo] = 'ncal2gal_sync_entries'
-
-    property :id, Serial
-    property :sync_time, DateTime
-    property :sync_action, String
-    
-    property :lotus_notes_uid, Text, :index=>true
-    property :lotus_notes_last_modified, DateTime  
-    property :gcal_id, Text
-
-  end
-  
-  # automatically create the SyncEntry table
-  SyncEntry.auto_migrate! unless File.exists?(db_file) #SyncEntry.table_exists?
 end

data/lib/ncal2gcal/sync_entry.rb

@@ -0,0 +1,27 @@
+
+module NCal2GCal
+  raise "environment variable %APPDATA% not set" unless ENV['APPDATA'] 
+  FileUtils::cd(ENV['APPDATA']) 
+  FileUtils::mkdir_p('ncal2gcal')
+  
+  db_file = "#{Dir.pwd}/ncal2gcal/ncal2gcal.sqlite"
+  DataMapper::setup(:default, "sqlite3://#{db_file}")
+
+  
+  class SyncEntry
+    include DataMapper::Resource
+    #storage_names[:repo] = 'ncal2gal_sync_entries'
+
+    property :id, Serial
+    property :sync_time, DateTime
+    property :sync_action, String
+    
+    property :lotus_notes_uid, Text, :index=>true
+    property :lotus_notes_last_modified, DateTime  
+    property :gcal_id, Text
+
+  end
+  
+  # automatically create the SyncEntry table
+  SyncEntry.auto_migrate! unless File.exists?(db_file) #SyncEntry.table_exists?
+end

data/ncal2gcal.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |s|
   s.name = %q{ncal2gcal}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
   s.authors = ["Elias Kugler"]
   s.email = %q{groesser3@gmail.com}
   s.files =   Dir["lib/**/*"] + Dir["bin/**/*"] + Dir["*.rb"] + ["MIT-LICENSE","ncal2gcal.gemspec"]
@@ -15,11 +15,11 @@ spec = Gem::Specification.new do |s|
   s.require_path = "lib"
   s.default_executable = %q{ncal2gcal}
   s.executables = ["ncal2gcal"]
-  s.homepage = %q{http://ncal2gcal.rubyforge.org}
+  s.homepage = %q{http://rubyforge.org/projects/ncal2gcal/}
   s.rubyforge_project = %q{ncal2gcal}
   s.add_dependency("dm-core", ">= 0.10.0")
   s.add_dependency("do_sqlite3", ">= 0.10.0")
-  s.add_dependency("gcal4ruby", ">=0.2.8")
+  s.add_dependency("gcal4ruby", ">=0.3.1")
   s.add_dependency("log4r", ">=1.0.5")
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ncal2gcal
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Elias Kugler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 +01:00
+date: 2010-02-18 00:00:00 +01:00
 default_executable: ncal2gcal
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.8
+        version: 0.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: log4r
@@ -61,15 +61,19 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- lib/ncal2gcal/counter.rb
+- lib/ncal2gcal/gcal4ruby_gateway.rb
 - lib/ncal2gcal/google_calendar.rb
 - lib/ncal2gcal/lotus_notes_calendar.rb
+- lib/ncal2gcal/string.rb
 - lib/ncal2gcal/sync.rb
+- lib/ncal2gcal/sync_entry.rb
 - bin/ncal2gcal
 - MIT-LICENSE
 - ncal2gcal.gemspec
 - README.rdoc
 has_rdoc: true
-homepage: http://ncal2gcal.rubyforge.org
+homepage: http://rubyforge.org/projects/ncal2gcal/
 licenses: []
 
 post_install_message: