ical2gcal 0.5.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: b15751f45dc2db6d9c0a261ccceccfd608980fe0d93ed8f8a3f2a00a7c0eec78
+  data.tar.gz: b148860065fb884108e5aad44c106a7b8f51313c98a5aeca2027b8448e3932ea
+SHA512:
+  metadata.gz: 971f3d099771b3c987de9fdc34038ce37ad981278d1189b380701218ac7d8ea8585aaf78cdab46d32035e53c2730ae402b9409a91875b423b207bb58a75eaf6c
+  data.tar.gz: ff67b850ddcc3e04412b1ae7afd1423e70da6fdb0ca5aac45906e0e8debc9d5e96324b5cddda91d27eeea8464bc582def034c77050bb60c113a3330483b42fa8

data/.rspec

@@ -1 +1,2 @@
 --color
+-f d

data/Gemfile

@@ -1,24 +1,12 @@
 # -*- mode: ruby -*-
 
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+
+gemspec
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-gem 'ri_cal'
-gem 'google-api-client'
 
-group :development do
-  gem "rspec"
-  gem "bundler"
-  gem "jeweler"
-  if RUBY_VERSION < '1.9'
-    gem "ruby-debug"
-    gem "rcov", ">= 0"
-  else
-    gem "debugger"
-    gem 'simplecov'
-  end
-end
+gem "rake", "~> 13.0"
+gem "rspec"
+gem "pry-byebug"

data/HISTORY.md

@@ -0,0 +1,14 @@
+## v0.7 ( 2022-01-09 )
+
+ * support Ruby version only 2.5, 2.6, 2.7
+ * drop Jeweler for simlifying dependencies and packaging gem
+
+## v0.6 ( unreleased )
+
+ * drop support ruby 1.8 & 1.9
+
+## v0.5 ( 2014-12-07 )
+
+ * change that how to specify calendar from name to ID
+ * change that how to save the authentication information from Pit to Credential
+ * change that how to access google api from v2 to v3 ( from gcalapi gem to google-api-client gem )

data/README.rdoc

@@ -12,7 +12,7 @@ sync ics(es) to google calendar
 == Requirements
 
 * PC :-)
-* Ruby ( tested with CRuby 1.9.3)
+* Ruby ( tested with CRuby 2.5, 2.6, 2.7 )
 * ri_cal                 http://ri-cal.rubyforge.org/
 * google-api-ruby-client https://github.com/google/google-api-ruby-client
 

data/Rakefile

@@ -1,63 +1,10 @@
 # -*- mode: ruby -*-
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "ical2gcal"
-  gem.homepage = "http://github.com/wtnabe/ical2gcal"
-  gem.license = "two-clause BSD"
-  gem.summary = %Q{sync ics(es) to google calendar}
-  gem.description = %Q{You can sync local and remote ics file(s) to google calendar}
-  gem.email = "wtnabe@gmail.com"
-  gem.authors = ["wtnabe"]
-  gem.executables = %w( ical2gcal )
-  # Include your dependencies below. Runtime dependencies are required when using your 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 'google-api-client'
-
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ical2gcal #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-namespace :git do
-  desc 'git ls-files -o'
-  task :untracked do
-    sh 'git ls-files -o -X .gitignore'
-  end
-end
+task default: :spec

data/ical2gcal.gemspec

@@ -1,85 +1,35 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
-Gem::Specification.new do |s|
-  s.name = "ical2gcal"
-  s.version = "0.5.0"
+require_relative "lib/ical2gcal/version"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["wtnabe"]
-  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"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".travis.yml",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/ical2gcal",
-    "ical2gcal.gemspec",
-    "lib/google.rb",
-    "lib/ical2gcal.rb",
-    "lib/ics.rb",
-    "lib/ics/events.rb",
-    "lib/ics/list.rb",
-    "spec/ical2gcal_spec.rb",
-    "spec/ics/events_spec.rb",
-    "spec/ics/list_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/ics_list.txt",
-    "spec/support/japanese_holidays.ics"
-  ]
-  s.homepage = "http://github.com/wtnabe/ical2gcal"
-  s.licenses = ["two-clause BSD"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "sync ics(es) to google calendar"
+Gem::Specification.new do |spec|
+  spec.name = "ical2gcal"
+  spec.version = Ical2gcal::VERSION
+  spec.authors = ["wtnabe"]
+  spec.email = ["18510+wtnabe@userspec.noreply.github.com"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.summary = "sync ics(es) to google calendar"
+  spec.description = "You can sync local and remote ics file(s) to google calendar"
+  spec.homepage = "http://github.com/wtnabe/ical2gcal"
+  spec.required_ruby_version = ">= 2.5.0"
+  spec.licenses = ["BSD-2-Clause"]
 
-    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<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<google-api-client>, [">= 0"])
-    else
-      s.add_dependency(%q<ri_cal>, [">= 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<google-api-client>, [">= 0"])
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
     end
-  else
-    s.add_dependency(%q<ri_cal>, [">= 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<google-api-client>, [">= 0"])
   end
-end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
+  spec.add_dependency "ri_cal", ">= 0"
+  spec.add_dependency "google-api-client", "< 0.8"
+  spec.add_dependency "faraday", "< 1"
+  spec.add_dependency "retriable", "< 3"
+  spec.add_dependency "launchy"
+end

data/lib/google.rb

@@ -4,6 +4,7 @@ require 'google/api_client'
 require 'google/api_client/client_secrets'
 require 'google/api_client/auth/installed_app'
 require 'google/api_client/auth/file_storage'
+require_relative '../monkey_patches/multi_json'
 
 module Ical2gcal
   class Google
@@ -34,7 +35,9 @@ module Ical2gcal
     def init_and_auth_calendar(calendar_id, store)
       @client = ::Google::APIClient.new(
                                   :application_name    => :ical2gcal,
-                                  :application_version => Version)
+                                  :application_version => Ical2gcal::VERSION,
+                                  :user_agent => "ical2gcal-#{Ical2gcal::VERSION} (#{RUBY_PLATFORM})"
+      )
 
       credential = ::Google::APIClient::FileStorage.new(store)
       secrets    = ::Google::APIClient::ClientSecrets.load(File.dirname(store))
@@ -59,16 +62,17 @@ module Ical2gcal
     # [return] String
     #
     def create_event( event )
-      body = {
-        :summary     => event.summary,
-        :description => event.description,
-        :location    => event.location
-      }
+      body = {:summary => event.summary.force_encoding('UTF-8')}
+      body.merge!(:description => event.description.force_encoding('UTF-8')) if event.description
+      body.merge!(:location    => event.location.force_encoding('UTF-8')) if event.location
 
       if all_day?(event)
+        start_date = event.dtstart.to_s
+        end_date   = event.dtend.to_s
+
         body.merge!(
-          :start => {:date => event.dtstart.to_s},
-          :end   => {:date => event.dtend.to_s})
+          :start => {:date => start_date},
+          :end   => {:date => end_date.size > 0 ? end_date : (Date.parse(start_date) + 1).to_s})
       else
         body.merge!(
           :start => {:dateTime => localtime(event.start_time)},

data/lib/ical2gcal/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Ical2gcal
+  VERSION = "0.7.0"
+end

data/lib/ical2gcal.rb

@@ -1,10 +1,10 @@
-require 'rubygems' unless defined? ::Gem
 require File.dirname( __FILE__ ) + '/ics'
 require File.dirname( __FILE__ ) + '/google'
 
 require 'optparse'
 
-Version = open(File.dirname(__FILE__) + '/../VERSION').read
+require_relative './ical2gcal/version'
+Version = Ical2gcal::VERSION
 
 module Ical2gcal
   class App

data/monkey_patches/multi_json.rb

@@ -0,0 +1,24 @@
+module MultiJson
+  alias_method :orig_load, :load
+
+  #
+  # google-api-client の credentials の読み取りの部分で ActiveSupport
+  # の String でも Symbol でもいい具合に扱っている機能に依存していたが
+  # MultiJson が ActiveSupport を drop して動かなくなった問題へのパッチ
+  #
+  # 他の項目は Symbol と String の両方で読み取りを試みるが :flow だけ
+  # Symbol しか試みていないので詰め直している
+  #
+  # @param [String] json_string
+  # @return [Object]
+  #
+  def self.load(json_string)
+    json = orig_load(json_string)
+
+    if json && json.has_key?("flow")
+      json[:flow] = json["flow"]
+    end
+
+    json
+  end
+end

metadata

@@ -1,216 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: ical2gcal
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - wtnabe
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ri_cal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: ri_cal
+  name: retriable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: You can sync local and remote ics file(s) to google calendar
-email: wtnabe@gmail.com
+email:
+- 18510+wtnabe@userspec.noreply.github.com
 executables:
 - ical2gcal
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .document
-- .rspec
-- .travis.yml
+- ".document"
+- ".rspec"
 - Gemfile
+- HISTORY.md
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
-- bin/ical2gcal
+- exe/ical2gcal
 - ical2gcal.gemspec
 - lib/google.rb
 - lib/ical2gcal.rb
+- lib/ical2gcal/version.rb
 - lib/ics.rb
 - lib/ics/events.rb
 - lib/ics/list.rb
-- spec/ical2gcal_spec.rb
-- spec/ics/events_spec.rb
-- spec/ics/list_spec.rb
-- spec/spec_helper.rb
-- spec/support/ics_list.txt
-- spec/support/japanese_holidays.ics
+- monkey_patches/multi_json.rb
 homepage: http://github.com/wtnabe/ical2gcal
 licenses:
-- two-clause BSD
+- BSD-2-Clause
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: http://github.com/wtnabe/ical2gcal
+  source_code_uri: http://github.com/wtnabe/ical2gcal
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3072721261050515473
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.1.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: sync ics(es) to google calendar
 test_files: []

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - ree

data/VERSION

@@ -1 +0,0 @@
-0.5.0

data/spec/ical2gcal_spec.rb

@@ -1,4 +0,0 @@
-require File.dirname(__FILE__) + "/spec_helper"
-
-describe Ical2gcal::App do
-end

data/spec/ics/events_spec.rb

@@ -1,27 +0,0 @@
-require File.dirname( __FILE__ ) + '/../spec_helper'
-
-HOLIDAYS = File.dirname( __FILE__ ) + '/../support/japanese_holidays.ics'
-
-describe Ical2gcal::Ics::Events do
-  describe 'get' do
-    it {
-      events = Ical2gcal::Ics::Events.new( HOLIDAYS ).get
-      events.class.should be Array
-      events.size.should > 0
-      events.each { |e|
-        e.class.should be RiCal::Component::Event
-      }
-    }
-  end
-
-  describe 'each' do
-    it {
-      count = 0
-      Ical2gcal::Ics::Events.new( HOLIDAYS ).each { |e|
-        e.class.should be RiCal::Component::Event
-        count += 1
-      }
-      count.should > 0
-    }
-  end
-end