ical2gcal 0.2.3 → 0.3.0

data/Gemfile

@@ -6,7 +6,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 gem 'ri_cal'
-gem 'gcal4ruby'
+gem 'gcalapi'
+gem 'simple-rss'
 gem 'pit'
 
 group :development do

data/README.rdoc

@@ -5,28 +5,28 @@ sync ics(es) to google calendar
 == Benefits
 
 * Solve the PROBLEM that Android's calendar program cannot reference webcal !
-* Complete sync calendar from .ics to google calendar ( also deleting )
+* Complete sync calendar from .ics to google calendar ( also deleting events )
 
 == Requirements
 
 * PC :-)
 * Ruby ( tested with CRuby 1.8.7 )
-* RiCal
-* GCal4ruby
-* Pit
-* Googlecl ( made with Python )
+* ri_cal      http://ri-cal.rubyforge.org/
+* gcalapi     http://gcalapi.rubyforge.org/
+* simple-rss  http://simple-rss.rubyforge.org/
+* pit         http://coderepos.org/share/browser/lang/ruby/pit
 
 == How to use
 
-1. Install Ruby and gems.
-2. Install Googlecl from http://code.google.com/p/googlecl/
+1. Install Ruby
+2. `gem install ical2gcal`
 3. Setup Your Google account info using Pit
 4. Prepare calendar that you like to import to
-5. Here we go !
+5. type `ical2gcal --help`
 
 == How to config pit
 
-1. SET ENVIRONMENT VARIABLE **EDITOR**
+1. SET ENVIRONMENT VARIABLE *EDITOR*
 2. type
 
  pit set google
@@ -35,7 +35,7 @@ ex)
 
     username: `google account'
     password: PASSWORD
-    calendar:
+    calendar:                       ( optional below )
       name: `calendar name above'
 
 == Contributing to ical2gcal

data/Rakefile

@@ -26,7 +26,8 @@ Jeweler::Tasks.new do |gem|
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
 
   gem.add_runtime_dependency 'ri_cal'
-  gem.add_runtime_dependency 'gcal4ruby'
+  gem.add_runtime_dependency 'gcalapi'
+  gem.add_runtime_dependency 'simple-rss'
   gem.add_runtime_dependency 'pit'
 
   #  gem.add_development_dependency 'rspec', '> 1.2.3'

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/ical2gcal.gemspec

@@ -5,12 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ical2gcal}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["wtnabe"]
-  s.date = %q{2011-04-28}
-  s.default_executable = %q{ical2gcal}
+  s.date = %q{2011-04-30}
   s.description = %q{You can sync local and remote ics file(s) to google calendar}
   s.email = %q{wtnabe@gmail.com}
   s.executables = ["ical2gcal"]
@@ -28,7 +27,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/ical2gcal",
     "ical2gcal.gemspec",
-    "lib/google_calendar.rb",
+    "lib/google.rb",
     "lib/ical2gcal.rb",
     "lib/ics.rb",
     "lib/ics/events.rb",
@@ -42,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/wtnabe/ical2gcal}
   s.licenses = ["two-clause BSD"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{sync ics(es) to google calendar}
   s.test_files = [
     "spec/ics/events_spec.rb",
@@ -55,37 +54,43 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ri_cal>, [">= 0"])
-      s.add_runtime_dependency(%q<gcal4ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<gcalapi>, [">= 0"])
+      s.add_runtime_dependency(%q<simple-rss>, [">= 0"])
       s.add_runtime_dependency(%q<pit>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<ri_cal>, [">= 0"])
-      s.add_runtime_dependency(%q<gcal4ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<gcalapi>, [">= 0"])
+      s.add_runtime_dependency(%q<simple-rss>, [">= 0"])
       s.add_runtime_dependency(%q<pit>, [">= 0"])
     else
       s.add_dependency(%q<ri_cal>, [">= 0"])
-      s.add_dependency(%q<gcal4ruby>, [">= 0"])
+      s.add_dependency(%q<gcalapi>, [">= 0"])
+      s.add_dependency(%q<simple-rss>, [">= 0"])
       s.add_dependency(%q<pit>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<ri_cal>, [">= 0"])
-      s.add_dependency(%q<gcal4ruby>, [">= 0"])
+      s.add_dependency(%q<gcalapi>, [">= 0"])
+      s.add_dependency(%q<simple-rss>, [">= 0"])
       s.add_dependency(%q<pit>, [">= 0"])
     end
   else
     s.add_dependency(%q<ri_cal>, [">= 0"])
-    s.add_dependency(%q<gcal4ruby>, [">= 0"])
+    s.add_dependency(%q<gcalapi>, [">= 0"])
+    s.add_dependency(%q<simple-rss>, [">= 0"])
     s.add_dependency(%q<pit>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<ri_cal>, [">= 0"])
-    s.add_dependency(%q<gcal4ruby>, [">= 0"])
+    s.add_dependency(%q<gcalapi>, [">= 0"])
+    s.add_dependency(%q<simple-rss>, [">= 0"])
     s.add_dependency(%q<pit>, [">= 0"])
   end
 end

data/lib/google.rb

@@ -0,0 +1,81 @@
+# -*- mode: ruby; coding: utf-8 -*-
+
+require 'gcalapi'
+require 'simple-rss'
+
+module Ical2gcal
+  class Google
+
+    def initialize( opts )
+      @service  = nil
+      @opts     = {
+        'username' => nil,
+        'password' => nil,
+        'calendar' => nil
+      }.merge( opts )
+      @calendar = nil
+      @events   = nil
+    end
+
+    #
+    # [return] GoogleCalendar::Service
+    #
+    def service
+      if ( !@service and @opts )
+        @service = GoogleCalendar::Service.new( @opts['username'],
+                                                @opts['password'] )
+      end
+
+      @service
+    end
+
+    #
+    # [return] Array
+    #
+    def calendars
+      SimpleRSS.parse( service.calendars.body ).entries
+    end
+
+    #
+    # [return] GoogleCalendar::Calendar
+    #
+    def calendar
+      if ( !@calendar )
+        cal = calendars.find { |c|
+          c.title == calendar_name
+        }
+        @calendar = GoogleCalendar::Calendar.new( @service, cal[:link] )
+      end
+
+      @calendar
+    end
+
+    #
+    # [return] String
+    #
+    def calendar_name
+      @opts['calendar']['name']
+    end
+
+    def create_event( event )
+      e        = calendar.create_event
+      e.title  = event.summary
+      e.desc   = event.description
+      e.where  = event.location
+      e.st     = Time.parse(event.start_time.to_s.sub(/\+.*/, ''))
+      e.allday = e.st.hour == 0 and e.st.min == 0 and not event.respond_to? :end_time
+      e.en     = if event.respond_to? :end_time
+                   Time.parse(event.end_time.to_s.sub(/\+.*/, ''))
+                 else
+                   Time.parse(event.start_time.to_s.sub(/\+.*/, ''))
+                 end
+      e.save!
+    end
+
+    def remove_all_events
+      calendar.events.each { |e|
+        e.destroy!
+      }
+    end
+  end
+end

data/lib/ical2gcal.rb

@@ -1,6 +1,6 @@
 require 'rubygems' unless defined? ::Gem
 require File.dirname( __FILE__ ) + '/ics'
-require File.dirname( __FILE__ ) + '/google_calendar'
+require File.dirname( __FILE__ ) + '/google'
 
 require 'optparse'
 require 'pit'
@@ -19,19 +19,18 @@ module Ical2gcal
 
       opts = ::Pit.get('google')
       opts.merge!( {'calendar' => {'name' => @target}} ) if @target
-      if ( Ical2gcal::GoogleCalendar.authenticated? )
-        g = Ical2gcal::GoogleCalendar.new( opts )
-        g.remove_all_events
-        calendars.each { |c|
-          Ical2gcal::Ics::Events.new( c ).each { |e|
-            g.create_event( e )
-          }
+      g = Ical2gcal::Google.new( opts )
+      g.remove_all_events
+      calendars.each { |c|
+        Ical2gcal::Ics::Events.new( c ).each { |e|
+          g.create_event( e )
         }
-      else
-        puts "Your `google' command is not authorized. Please type `google calendar list' and get auth."
-      end
+      }
     end
 
+    #
+    # [return] Array
+    #
     def calendars
       if ( @ics )
         @calendars = @ics
@@ -44,6 +43,9 @@ module Ical2gcal
       @calendars
     end
 
+    #
+    # [return] OptionParser
+    #
     def opts
       OptionParser.new do |opt|
         opt.on( '-c', '--calendar-name NAME' ) { |c|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ical2gcal
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - wtnabe
@@ -15,13 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +09:00
-default_executable: ical2gcal
+date: 2011-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,11 +28,11 @@ dependencies:
         - 0
         version: "0"
   name: ri_cal
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +41,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: gcal4ruby
-  version_requirements: *id002
+  name: gcalapi
+  prerelease: false
+  type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: simple-rss
   prerelease: false
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,11 +70,11 @@ dependencies:
         - 0
         version: "0"
   name: pit
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,11 +86,11 @@ dependencies:
         - 0
         version: 2.3.0
   name: rspec
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,11 +102,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,11 +118,11 @@ dependencies:
         - 2
         version: 1.5.2
   name: jeweler
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,11 +132,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,11 +146,11 @@ dependencies:
         - 0
         version: "0"
   name: ri_cal
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -148,12 +159,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: gcal4ruby
-  version_requirements: *id009
+  name: gcalapi
+  prerelease: false
+  type: :runtime
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: simple-rss
   prerelease: false
   type: :runtime
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,7 +188,9 @@ dependencies:
         - 0
         version: "0"
   name: pit
-  version_requirements: *id010
+  prerelease: false
+  type: :runtime
+  requirement: *id012
 description: You can sync local and remote ics file(s) to google calendar
 email: wtnabe@gmail.com
 executables: 
@@ -183,7 +210,7 @@ files:
 - VERSION
 - bin/ical2gcal
 - ical2gcal.gemspec
-- lib/google_calendar.rb
+- lib/google.rb
 - lib/ical2gcal.rb
 - lib/ics.rb
 - lib/ics/events.rb
@@ -193,7 +220,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/ics_list.txt
 - spec/support/japanese_holidays.ics
-has_rdoc: true
 homepage: http://github.com/wtnabe/ical2gcal
 licenses: 
 - two-clause BSD
@@ -223,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: sync ics(es) to google calendar

data/lib/google_calendar.rb

@@ -1,110 +0,0 @@
-# -*- mode: ruby; coding: utf-8 -*-
-
-require 'pty'
-require 'expect'
-require 'gcal4ruby'
-
-module Ical2gcal
-  class GoogleCalendar
-    include GCal4Ruby
-
-    class GoogleclNotAuthenticated < StandardError; end
-
-    def initialize( opts )
-      @service  = nil
-      @opts     = {
-        'username' => nil,
-        'password' => nil,
-        'calendar' => nil
-      }.merge( opts )
-      @calendar = nil
-      @events   = nil
-    end
-
-    def service
-      if ( !@service and @opts )
-        @service = Service.new
-        @service.authenticate( @opts['username'], @opts['password'] )
-      end
-
-      @service
-    end
-
-    def calendar
-      if ( !@calendar )
-        @calendar = Calendar.find( service, :title => calendar_name ).first
-      end
-
-      @calendar
-    end
-
-    def calendar_name
-      @opts['calendar']['name']
-    end
-
-    def create_event( event )
-      begin
-        e            = Event.new( service )
-        e.calendar   = calendar
-        e.title      = event.summary
-        e.start_time = Time.parse(event.start_time.to_s.sub(/\+.*/, ''))
-        e.all_day    = e.start_time.hour == 0 and e.start_time.min == 0 and not event.respond_to? :end_time
-        e.end_time   = if event.respond_to? :end_time
-                         Time.parse(event.end_time.to_s.sub(/\+.*/, ''))
-                       else
-                         Time.parse(event.start_time.to_s.sub(/\+.*/, ''))
-                       end
-        e.save
-      rescue
-        ;
-      end
-    end
-
-    def remove_all_events
-      if ( events.size )
-        PTY.spawn( "google calendar delete --cal '#{calendar_name}' --title '.*'" ) { |r, w|
-          w.sync = true
-
-          events.each { |e|
-            r.expect( /Are you SURE.*\?.*\(y\/N\)/iu, 5 ) {
-              w.puts 'y'
-            }
-          }
-        }
-      end
-    end
-
-    def events
-      if ( !@events )
-        @events    = []
-        list_below = false
-
-        `google calendar list --cal '#{calendar_name}' --title '.*'`.lines.each { |line|
-          if ( line.chomp == "[#{calendar_name}]" )
-            list_below = true
-            next
-          end
-          if ( list_below )
-            @events << line.chomp
-          end
-        }
-      end
-
-      @events
-    end
-
-    def self.authenticated?
-      begin
-        PTY.spawn( 'google calendar list' ) { |r, w|
-          r.expect( /(?:user|pass)/, 3 ) { |s|
-            raise GoogleclNotAuthenticated if ( s and s[0] =~ /(?:user|pass)/ )
-          }
-        }
-      rescue GoogleclNotAuthenticated
-        false
-      else
-        true
-      end
-    end
-  end
-end