hanreki 2.0.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5063f6f82205ddf8c8ba3393966f4e743e95c834
-  data.tar.gz: '06729fefac6d2ff13f70e81f4dede11d8940159b'
+SHA256:
+  metadata.gz: 4087d3e4cc1c029750b320de3458e2d844bcdb94bb99847a9f16a675a775ebe9
+  data.tar.gz: e52bcbc070d523ce3809586b5fb83d08a3d9af46be2405b1f3758b73a8a82d75
 SHA512:
-  metadata.gz: ef56f66855bc14838ff616b045f9452def5b53fc7591f602ab9aec1a1bd16b32fe6cd06fcbdcbd4230bc642362bb4a0150a0603106deb5fb4ced4f60abb5757a
-  data.tar.gz: 979e7634f02f3b456c83e63d4f3b49cda6be01c9800f50aeb17aa750ff849e5b81a8a7620d4c52c03037d91aca304147f51907ca6742d4965f7fd0e57bcc7d9e
+  metadata.gz: a822ec03978588e36c3c9008115d917202764a4ee3d6e7669ecdf13e3f5333d0f4304acb23729807d6f57162236c0c65c548090a054668a504e4b96335dbb46a
+  data.tar.gz: 6c8d428c6c26b581f922f32d094ba5168e84fd68c42a123aa11973ac4973ed65ff5b35c8fea140cf45c5ff1198bfaa6277b962a879cd93ad84c64a243b9aa031

data/README.md

@@ -5,6 +5,11 @@
 
 Simple schedule manager for [CAMPHOR-](https://camph.net/)
 
+## Features
+- Manage public & private schedules
+- Manage events using simple CSV master files
+- Convert master files to iCal and JSON files
+
 ## Installation
 ### Gem
 Install hanreki with gem command:
@@ -27,6 +32,23 @@ And then execute:
 ## Usage
 Run `hanreki help` or `bundle exec hanreki help`.
 
+### Create a master file
+`hanreki blank` generates a master file for the next month.
+
+### Sync
+`hanreki sync` generates iCal and JSON files from master files.
+
+### Edit
+`hanreki edit` opens a editor and validates master files.
+Hanreki chooses the editor in the following order:
+
+1. Editor specified by the environment variable: `CAMPHOR_SCHEDULE_EDITOR`
+2. Editor specified by the environment variable: `EDITOR`
+3. `vi`
+
+### Validation
+`hanreki validate` validates master files.
+
 ## Development
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 

data/hanreki.gemspec

@@ -26,11 +26,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'thor', '>= 0.19', '< 2.0'
   spec.add_dependency 'icalendar', '~> 2.3'
   spec.add_dependency 'json-schema', '~> 2.7'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/hanreki/cli.rb

@@ -30,12 +30,12 @@ module Hanreki
       validate
     end
 
-    desc 'sync', 'Sync iCal, JSON, and JSONP'
+    desc 'sync', 'Sync iCal and JSON'
     def sync
       schedule = load_schedule
+      schedule.sort_by_date!
       schedule.out_ical
       schedule.out_json
-      schedule.out_jsonp
     end
 
     desc 'validate', 'Validate master files'

data/lib/hanreki/event.rb

@@ -101,6 +101,18 @@ class Event
       end
     end
 
+    if @public_summary == 'Make'
+      if @start == @end
+        raise ValidationError.new(self), '"make" event should have duration'
+      end
+    end
+
+    if @public_summary == 'Online Open'
+      if @start == @end
+        raise ValidationError.new(self), '"online open" event should have duration'
+      end
+    end
+
     if @private_summary == 'Closed'
       if not @public_summary.nil?
         raise ValidationError.new(self), 'invalid public summary for a closed event'

data/lib/hanreki/schedule.rb

@@ -13,8 +13,6 @@ class Schedule
   ICAL_PRIVATE_PATH = 'ical/camphor_private_events.ics'
   JSON_PUBLIC_PATH = 'json/camphor_public_events.json'
   JSON_PRIVATE_PATH = 'json/camphor_private_events.json'
-  JSONP_PUBLIC_PATH = 'jsonp/camphor_public_events.js'
-  JSONP_PRIVATE_PATH = 'jsonp/camphor_private_events.js'
   JSON_SCHEMA_PATH = File.expand_path('../schema.json', __FILE__)
 
   def initialize
@@ -64,16 +62,6 @@ class Schedule
     end
   end
 
-  # Output private and public JSONP calendar files
-  def out_jsonp(callback = 'callback')
-    File.open(JSONP_PUBLIC_PATH, 'w') do |f|
-      f.write("#{callback}(#{events_to_json(public_events, :public)});")
-    end
-    File.open(JSONP_PRIVATE_PATH, 'w') do |f|
-      f.write("#{callback}(#{events_to_json(private_events, :private)});")
-    end
-  end
-
   # Output master file
   def out_master
     CSV.open(
@@ -88,6 +76,10 @@ class Schedule
     File.exists? file_path
   end
 
+  def sort_by_date!
+    @events.sort_by! { |e| [e.start, e.end] }
+  end
+
   private
 
   def file_path

data/lib/hanreki/version.rb

@@ -1,3 +1,3 @@
 module Hanreki
-  VERSION = '2.0.0'
+  VERSION = '4.3.0'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: hanreki
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 4.3.0
 platform: ruby
 authors:
 - CAMPHOR-
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +64,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple schedule manager for CAMPHOR-