md2slides 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c82f7759595882a7bce78e9a46dfd95b91dc784038ad91d7295c62c9d73bd414
-  data.tar.gz: 76a42b4e8731d1e9888f6ce8534afa876bbe0ed45cae5507dd8caf414af89141
+  metadata.gz: 37da571eb1e048ee8704c95778e990564251cc1dfed86fb0e5c92c8d63378227
+  data.tar.gz: ef0f3367747ea41eb5e0850ac02a6d844a9b69ca9af8fe1395c3c19484f0fd88
 SHA512:
-  metadata.gz: b5a792702ae0716d1b0bd3cadb0de3fcfa0bfc798b05cbdb7bd78e67afed69dc1c9c826c1b837fbcad11c5b61b36148f4347d1144a86bcb0d039396c355b0812
-  data.tar.gz: f742639e88eff95e7a20af0eb79c6a0f0df19a86c97e6429181a8a1eae2d35262d20e85b67eb3c4de21a663116514c5f373d9bc2eaa6c3bbd5e9df8ed010c3bb
+  metadata.gz: 4b65446aa4824038aa84c4f7f9954ed6986d8ae3e7c8107806b803f4e75df8fd199c10061371075c229d5886f767d725b21430f3d2611cbf268b2d7b8dc779bb
+  data.tar.gz: 9e0a800ed47263fe9fd3b55a226891f987a2bb91f6eb32396bfe8e8bf6eebdbe01790d23e066ea8cb18e0a369e8c4a56f00cab71b69c5ccca978bc855663163c

data/README.md

@@ -3,10 +3,27 @@
 A video file of a presentation will be also generated, and it may contains narration if supplied.
 Narration can be given as notes in slides, and the audio will be generated using Google text-to-speech API and ffmpeg.
 
+## Installation
+
+install by gem:
+
+    % gem install md2slides
+
+Or add this line to your application's Gemfile:
+
+```ruby
+gem 'md2slides'
+```
+
+and then execute:
+
+    $ bundle
+
 ## Quick start
 1. Generate your Google API credentials and copy it to credentails.json:
 ```
-% cat >> config/credentials.json
+% mkdir ~/.config/gcloud
+% cat >> ~/.config/gcloud/credentials.json
 {
   "type": "service_account",
   "project_id": "project-id",
@@ -23,14 +40,9 @@ Narration can be given as notes in slides, and the audio will be generated using
 ```
 2. install ffmpeg if necessary (if producing video file).
 
-3. install necessary gems.
-```
-% bundle install --path vendor/bundle
-```
-
-4. create an empty Google slide.
+3. create an empty Google slide, share it with **client_email** user, and copy the URL.
 
-5. write a markdown file.
+4. write a markdown file.
 ```
 cat >> doc/sample.md
 ---
@@ -52,33 +64,21 @@ narration text...
 ^D (this means CTRL + D)
 ```
 
-6. execute.
+5. run the script.
 ```
-bundle exec bin/md2slides doc/sample.md
+% md2slides sample.md
 ```
 
-7. the Google presentation is updated, and the video is stored in `data/`.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'md2slides'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install md2slides
+the Google presentation is updated, and the video is stored in the current directory.
 
 ## Usage
 
 TODO: Write usage instructions here
 
+## TODO
+
+See [TODO.md](https://github.com/ohmori7/md2slides/blob/main/TODO.md "TODO.md")
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/md2slides/presentation.rb

@@ -16,7 +16,7 @@ class Presentation
 	attr_reader :id
 
 	def self.filename_sanitize(s)
-		s.gsub(/[\/\\:\*\?"<>\|]/, '')
+		s&.gsub(/[\/\\:\*\?"<>\|]/, '')
 	end
 
 	def initialize(url = nil)
@@ -40,7 +40,14 @@ class Presentation
 		@drive_service.authorization = @authorizer
 
 		if @id
-			@presentation = @slides_service.get_presentation(@id)
+			begin
+				@presentation = @slides_service.get_presentation(@id)
+			rescue => e
+				require 'webrick'
+				raise(e, "#{e.message} (#{e.status_code} " +
+				    "#{WEBrick::HTTPStatus.reason_phrase(e.status_code)})\n" +
+				    "#{e.full_message}")
+			end
 		end
 
 		@requests = []
@@ -60,7 +67,7 @@ class Presentation
 
 	def existence_check
 		if ! exists?
-			raise("presentation (ID: #{@id})does not exists!!!")
+			raise("presentation (ID: #{@id}) does not exists!!!")
 		end
 	end
 
@@ -356,9 +363,7 @@ class Presentation
 	end
 
 	def __data_path(basedir)
-		if basedir.nil?
-			basedir = File.join(BASEDIR, 'data')
-		end
+		basedir = '.' if basedir.nil?
 		title, subtitle = get_title
 		title = self.class.filename_sanitize(title)
 		subtitle = self.class.filename_sanitize(subtitle)

data/lib/md2slides/version.rb

@@ -1,3 +1,3 @@
 module Md2slides
-	VERSION = "0.0.2"
+	VERSION = "0.0.4"
 end

data/lib/md2slides/video.rb

@@ -1,6 +1,9 @@
 require 'open3'
 
 class Presentation
+	VIDEO_FRAME_RATE = 1
+	VIDEO_ONLY_DURATION = 4
+
 	def generate_slide_video(i, dir)
 		img = __data_slide_path(i, '.png', dir)
 		audio = __data_slide_path(i, '.m4a', dir)
@@ -11,11 +14,11 @@ class Presentation
 			timeopt = '-shortest'
 		else
 			audioin = "-f lavfi -i aevalsrc=0"
-			timeopt = "-vframes 60"
+			timeopt = "-vframes #{VIDEO_FRAME_RATE * VIDEO_ONLY_DURATION}"
 		end
 		cmd = <<~CMD
 			ffmpeg -hide_banner -y				\
-			    -framerate 15 -loop 1 -i "#{img}"		\
+			    -framerate #{VIDEO_FRAME_RATE} -loop 1 -i "#{img}" \
 			    #{audioin} -map 0:v:0 -map 1:a:0		\
 			    -c:v libx264 -tune stillimage		\
 			    -c:a aac -ar #{AUDIO_RATE} -ac 1		\
@@ -36,13 +39,13 @@ class Presentation
 		end
 
 		print "concatenate video files..."
-		videolist = File.join(dir, 'video-list.txt')
-		File.open(videolist, 'w') do |f|
+		videolist = 'video-list.txt'
+		File.open(File.join(dir, videolist), 'w') do |f|
 			@presentation.slides.each_with_index do |slide, i|
 				f.puts("file #{__data_slide_path(i, '.mp4')}")
 			end
 		end
-		video = File.join(dir, 'video.mp4')
+		video = 'video.mp4'
 		cmd = <<~CMD
 			cd "#{dir}" &&					\
 			    ffmpeg -hide_banner -y -f concat -safe 0	\

data/lib/md2slides.rb

@@ -3,7 +3,9 @@ $:.unshift File.dirname(File.dirname(File.realpath(__FILE__)))
 module Md2slides
 	class Error < StandardError; end
 
-	require 'config/config'
+	# XXX: platform independent path configuration...
+	ENV['GOOGLE_APPLICATION_CREDENTIALS'] ||= File.join(Dir.home, ".config/gcloud/credentials.json")
+
 	require 'md2slides/md'
 	require 'md2slides/presentation'
 	require 'md2slides/text_to_speech'

data/md2slides.gemspec

@@ -35,11 +35,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "googleauth"
-# spec.add_development_dependency "google-apis-people_v1"
-  spec.add_development_dependency "google-apis-slides_v1"
-  spec.add_development_dependency "google-apis-drive_v3"
-  spec.add_development_dependency "google-cloud-text_to_speech", "~>0.7.0"
+  spec.add_dependency "googleauth"
+# spec.add_dependency "google-apis-people_v1"
+  spec.add_dependency "google-apis-slides_v1"
+  spec.add_dependency "google-apis-drive_v3"
+  spec.add_dependency "google-cloud-text_to_speech", "~>0.7.0"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md2slides
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Motoyuki OHMORI
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,7 +31,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,7 +45,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -111,7 +111,9 @@ dependencies:
 description: Generate Google slides and its video file from a markdown file.
 email:
 - ohmori@tottori-u.ac.jp
-executables: []
+executables:
+- md2slides
+- text2mp3
 extensions: []
 extra_rdoc_files: []
 files:
@@ -123,11 +125,9 @@ files:
 - Rakefile
 - TODO.md
 - bin/console
-- bin/md2slides
 - bin/setup
-- bin/text2mp3
-- config/.gitignore
-- config/config.rb
+- exe/md2slides
+- exe/text2mp3
 - lib/md2slides.rb
 - lib/md2slides/audio.rb
 - lib/md2slides/md.rb

data/config/.gitignore

@@ -1,3 +0,0 @@
-*
-!config.rb
-!.gitignore

data/config/config.rb

@@ -1,2 +0,0 @@
-BASEDIR = File.dirname(File.dirname(File.realpath(__FILE__)))
-ENV['GOOGLE_APPLICATION_CREDENTIALS'] = "#{BASEDIR}/config/credentials.json"