ical2gcal 0.4.2 → 0.5.0

data/Gemfile

@@ -8,9 +8,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 gem 'ri_cal'
-gem 'gcalapi', :git => 'https://github.com/wtnabe/gcalapi'
-gem 'simple-rss'
-gem 'pit'
+gem 'google-api-client'
 
 group :development do
   gem "rspec"

data/README.rdoc

@@ -12,33 +12,24 @@ sync ics(es) to google calendar
 == Requirements
 
 * PC :-)
-* Ruby ( tested with REE 1.8.7 and CRuby 1.9.3)
-* 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
+* Ruby ( tested with CRuby 1.9.3)
+* ri_cal                 http://ri-cal.rubyforge.org/
+* google-api-ruby-client https://github.com/google/google-api-ruby-client
 
 == How to use
 
 1. Install Ruby
 2. `gem install ical2gcal`
-3. Setup Your Google account info using Pit
-4. Prepare calendar that you like to import to
+3. open Your Google API Console and setup your App and Credential, and download JSON and put as 'client_secrets.json' ( defined in ruby-client )
+4. Prepare calendar that you like to import to, and note that id
 5. type `ical2gcal --help`
 
-== How to config pit
+see https://developers.google.com/google-apps/calendar/firstapp
 
-1. SET ENVIRONMENT VARIABLE *EDITOR*
-2. type
+== Incompatible Changes ( v0.5 )
 
- pit set google
-
-ex)
-
-    username: `google account'
-    password: PASSWORD
-    calendar:                       ( optional below )
-      name: `calendar name above'
+ * How to specify calendar is changed to ID from name
+ * How to save the authentication information is changed to Credential from Pit
 
 == Contributing to ical2gcal
  

data/Rakefile

@@ -26,9 +26,7 @@ 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 'gcalapi'
-  gem.add_runtime_dependency 'simple-rss'
-  gem.add_runtime_dependency 'pit'
+  gem.add_runtime_dependency 'google-api-client'
 
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/ical2gcal.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ical2gcal"
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["wtnabe"]
-  s.date = "2013-12-13"
+  s.date = "2014-12-07"
   s.description = "You can sync local and remote ics file(s) to google calendar"
   s.email = "wtnabe@gmail.com"
   s.executables = ["ical2gcal"]
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/wtnabe/ical2gcal"
   s.licenses = ["two-clause BSD"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.23"
   s.summary = "sync ics(es) to google calendar"
 
   if s.respond_to? :specification_version then
@@ -51,47 +51,35 @@ 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<gcalapi>, [">= 0"])
-      s.add_runtime_dependency(%q<simple-rss>, [">= 0"])
-      s.add_runtime_dependency(%q<pit>, [">= 0"])
+      s.add_runtime_dependency(%q<google-api-client>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<debugger>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<ri_cal>, [">= 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_runtime_dependency(%q<google-api-client>, [">= 0"])
     else
       s.add_dependency(%q<ri_cal>, [">= 0"])
-      s.add_dependency(%q<gcalapi>, [">= 0"])
-      s.add_dependency(%q<simple-rss>, [">= 0"])
-      s.add_dependency(%q<pit>, [">= 0"])
+      s.add_dependency(%q<google-api-client>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<ri_cal>, [">= 0"])
-      s.add_dependency(%q<gcalapi>, [">= 0"])
-      s.add_dependency(%q<simple-rss>, [">= 0"])
-      s.add_dependency(%q<pit>, [">= 0"])
+      s.add_dependency(%q<google-api-client>, [">= 0"])
     end
   else
     s.add_dependency(%q<ri_cal>, [">= 0"])
-    s.add_dependency(%q<gcalapi>, [">= 0"])
-    s.add_dependency(%q<simple-rss>, [">= 0"])
-    s.add_dependency(%q<pit>, [">= 0"])
+    s.add_dependency(%q<google-api-client>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<ri_cal>, [">= 0"])
-    s.add_dependency(%q<gcalapi>, [">= 0"])
-    s.add_dependency(%q<simple-rss>, [">= 0"])
-    s.add_dependency(%q<pit>, [">= 0"])
+    s.add_dependency(%q<google-api-client>, [">= 0"])
   end
 end
 

data/lib/google.rb

@@ -1,115 +1,145 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
-require 'gcalapi'
-require 'simple-rss'
+require 'google/api_client'
+require 'google/api_client/client_secrets'
+require 'google/api_client/auth/installed_app'
+require 'google/api_client/auth/file_storage'
 
 module Ical2gcal
   class Google
 
-    def initialize( opts )
-      @service  = nil
-      @opts     = {
-        'username' => nil,
-        'password' => nil,
-        'calendar' => nil
-      }.merge( opts )
-      @calendar = nil
-      @events   = nil
-    end
+    class CalendarIdNotDefined < StandardError; end
 
     #
-    # [return] GoogleCalendar::Service
+    # [param] String calendar_id
+    # [param] String store
     #
-    def service
-      if ( !@service and @opts )
-        @service = GoogleCalendar::Service.new( @opts['username'],
-                                                @opts['password'] )
-      end
+    def initialize(calendar_id, store = nil)
+      raise CalendarIdNotDefined.new unless calendar_id
 
-      @service
+      @calendar_id = nil
+      @calendar    = nil # Calendar API
+      @client      = nil # Google API Client
+      @events      = nil
+
+      init_and_auth_calendar(calendar_id, store)
     end
+    attr_reader :client, :calendar, :calendar_id
 
     #
-    # [return] Array
+    # [param] String calendar_id
+    # [param] String dir
+    # [return] Object Calendar API
     #
-    def calendars
-      SimpleRSS.parse( service.calendars.body ).entries
+    def init_and_auth_calendar(calendar_id, store)
+      @client = ::Google::APIClient.new(
+                                  :application_name    => :ical2gcal,
+                                  :application_version => Version)
+
+      credential = ::Google::APIClient::FileStorage.new(store)
+      secrets    = ::Google::APIClient::ClientSecrets.load(File.dirname(store))
+
+      if credential.authorization.nil?
+        flow = ::Google::APIClient::InstalledAppFlow.new(
+          :client_id     => secrets.client_id,
+          :client_secret => secrets.client_secret,
+          :scope         => 'https://www.googleapis.com/auth/calendar')
+        client.authorization = flow.authorize
+        credential.write_credentials(client.authorization)
+      else
+        client.authorization = credential.authorization
+      end
+
+      @calendar_id = calendar_id
+      @calendar    = client.discovered_api('calendar', 'v3')
     end
 
     #
-    # [return] GoogleCalendar::Calendar
+    # [param]  RiCal::Component::Event
+    # [return] String
     #
-    def calendar
-      if ( !@calendar )
-        cal = calendars.find { |c|
-          c.title == calendar_name
-        }
-        @calendar = GoogleCalendar::Calendar.new( @service, cal[:link] )
+    def create_event( event )
+      body = {
+        :summary     => event.summary,
+        :description => event.description,
+        :location    => event.location
+      }
+
+      if all_day?(event)
+        body.merge!(
+          :start => {:date => event.dtstart.to_s},
+          :end   => {:date => event.dtend.to_s})
+      else
+        body.merge!(
+          :start => {:dateTime => localtime(event.start_time)},
+          :end   => {:dateTime => localtime((event.respond_to? :end_time) ? event.end_time : event.start_time)})
       end
 
-      @calendar
+      client.execute(
+        :api_method => calendar.events.insert,
+        :parameters => {:calendarId  => calendar_id},
+        :headers    => {'Content-Type' => 'application/json'},
+        :body       => JSON.dump(body)).response.body
     end
 
     #
-    # [return] String
+    # [param]  Rical::Component::Event event
+    # [return] Boolean
     #
-    def calendar_name
-      @opts['calendar']['name']
+    def all_day?(event)
+      event.dtstart.class == Date
     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!
+    #
+    # create Time object with local timezone
+    #
+    # [param]  String datetime
+    # [return] String
+    #
+    def localtime(datetime)
+      Time.parse(datetime.iso8601.sub(/(\+.*)\z/, '')).iso8601
     end
 
     def remove_all_events
-      max_retry = 3
-
-      omni_retry = max_retry
-
-      while calendar.events.size > 0 and omni_retry > 0
-        calendar.events.each { |e|
-          remove_one_event(e, max_retry)
-        }
-        omni_retry -= 1
-
-        sleep 1
-      end
+      all_events.each {|e| remove_one_event(e)}
     end
 
     #
     # remove one event with retry
     #
     # [param] GoogleCalendar::Event
-    # [param] Fixnum
-    #
-    def remove_one_event(evt, num_retry)
-      begin
-        evt.destroy!
-      rescue => e
-        case e
-        when NoMethodError
-          ;
-        else
-          num_retry -= 1
-          if num_retry > 0
-            sleep 1 and retry
-          else
-            raise e
-          end
-        end
+    #
+    def remove_one_event(event)
+      client.execute(
+        :api_method => calendar.events.delete,
+        :parameters => {:calendarId => calendar_id, :eventId => event['id']})
+    end
+
+    #
+    # [return] Array
+    #
+    def all_events
+      result = events_request
+      events = result['items']
+      while ( result['nextPageToken'] )
+        result = events_request(result['nextPageToken'])
+        events += result['items']
       end
+
+      events
     end
 
+    #
+    # [param]  String next_page_token
+    # [return] Hash
+    #
+    def events_request(next_page_token = nil)
+      params = {:calendarId => calendar_id}
+      params.merge!(:pageToken => next_page_token) if next_page_token
+
+      JSON.parse(client.execute(
+                        :api_method => calendar.events.list,
+                        :parameters => params).response.body)
+    end
   end
 end

data/lib/ical2gcal.rb

@@ -3,28 +3,40 @@ require File.dirname( __FILE__ ) + '/ics'
 require File.dirname( __FILE__ ) + '/google'
 
 require 'optparse'
-require 'pit'
 
 Version = open(File.dirname(__FILE__) + '/../VERSION').read
 
 module Ical2gcal
-  class MissingPitConfigOfGoogleAccount < StandardError; end
-
   class App
     def initialize
-      @ics       = nil
-      @list      = nil
-      @calendars = nil
-      @target    = nil
+      @ics        = nil
+      @list       = nil
+      @calendars  = nil
+      @target     = nil
+      @credential = nil
+
+      set_credential(Dir.pwd)
+    end
+
+    #
+    # [param]  String path
+    # [return] String
+    #
+    def set_credential(path)
+      @credential = if File.directory?(path)
+                      File.join(path, '.ical2gcal_credential')
+                    else
+                      path
+                    end
     end
 
     def run
       opts.parse( ARGV )
+      unless @target
+        puts opts.help
+        exit
+      end
 
-      conf = pit_get_google
-      conf.merge!( {'calendar' => {'name' => @target}} ) if @target
-      g = Ical2gcal::Google.new( conf )
-      g.remove_all_events
       if calendars
         cals = case calendars
                when Array
@@ -32,6 +44,8 @@ module Ical2gcal
                else
                  [calendars]
                end
+        g = Ical2gcal::Google.new(@target, @credential)
+        g.remove_all_events
         cals.each { |c|
           Ical2gcal::Ics::Events.new( c ).each { |e|
             g.create_event( e )
@@ -42,19 +56,6 @@ module Ical2gcal
       end
     end
 
-    #
-    # [return] Hash
-    #
-    def pit_get_google
-      info = ::Pit.get('google')
-
-      if info.size > 0
-        info
-      else
-        raise MissingPitConfigOfGoogleAccount, 'execute "pit set google"'
-      end
-    end
-
     #
     # [return] Array
     #
@@ -75,15 +76,18 @@ module Ical2gcal
     #
     def opts
       OptionParser.new do |opt|
-        opt.on( '-c', '--calendar-name NAME' ) { |c|
+        opt.on( '-c', '--calendar-id ID' ) { |c|
           @target = c
         }
         opt.on( '-i', '--ics URI' ) { |i|
           @ics = i
         }
-        opt.on( '-l', '--calendar-list' ) { |l|
+        opt.on( '-l', '--calendar-list LIST' ) { |l|
           @list = l
         }
+        opt.on( '-s', '--credential-store STORE' ) { |s|
+          set_credential(s)
+        }
       end
     end
   end

data/spec/ical2gcal_spec.rb

@@ -1,27 +1,4 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
 describe Ical2gcal::App do
-  describe '#pit_get_google' do
-    context 'has google conf' do
-      before {
-        Pit.stub(:get) { {'username' => 'foo'} }
-      }
-      subject {
-        Ical2gcal::App.new.pit_get_google.class
-      }
-      it {
-        should == Hash
-      }
-    end
-    context 'doen\'t have google conf' do
-      before {
-        Pit.stub(:get) { {} }
-      }
-      it {
-        expect{
-          Ical2gcal::App.new.pit_get_google.class
-        }.to raise_error(Ical2gcal::MissingPitConfigOfGoogleAccount)
-      }
-    end
-  end
 end

data/spec/ics/list_spec.rb

@@ -48,12 +48,12 @@ describe Ical2gcal::Ics::List do
   describe 'with_scheme?' do
     context 'localfile' do
       it {
-        Ical2gcal::Ics::List.new( ICS_FILE ).with_scheme?.should be_false
+        Ical2gcal::Ics::List.new( ICS_FILE ).with_scheme?.should == false
       }
     end
     context 'uri' do
       it {
-        Ical2gcal::Ics::List.new( JAPANESE_HOLIDAYS ).with_scheme?.should be_true
+        Ical2gcal::Ics::List.new( JAPANESE_HOLIDAYS ).with_scheme?.should == true
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ical2gcal
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ri_cal
-  requirement: &13540240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13540240
-- !ruby/object:Gem::Dependency
-  name: gcalapi
-  requirement: &13537920 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *13537920
 - !ruby/object:Gem::Dependency
-  name: simple-rss
-  requirement: &13554660 !ruby/object:Gem::Requirement
+  name: google-api-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13554660
-- !ruby/object:Gem::Dependency
-  name: pit
-  requirement: &13553160 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *13553160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13550200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13550200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13547860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13547860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13547200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13547200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &13563460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13563460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13562720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13562720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ri_cal
-  requirement: &13562020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,21 +133,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13562020
-- !ruby/object:Gem::Dependency
-  name: gcalapi
-  requirement: &13561320 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *13561320
 - !ruby/object:Gem::Dependency
-  name: simple-rss
-  requirement: &13560740 !ruby/object:Gem::Requirement
+  name: google-api-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,18 +149,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13560740
-- !ruby/object:Gem::Dependency
-  name: pit
-  requirement: &13560160 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *13560160
 description: You can sync local and remote ics file(s) to google calendar
 email: wtnabe@gmail.com
 executables:
@@ -199,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1734280500545708509
+      hash: 3072721261050515473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: sync ics(es) to google calendar