fluent-plugin-google-sheets 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 688f1cdc00554c3aa687502b679381e5f2e8237c
-  data.tar.gz: 24e23c085c4e78f13cb64a92b4f018f20d5d0e22
+SHA256:
+  metadata.gz: 4a0fa0f2d4fdd1e1bb837b5c4d578f0b07fe021e483f08b080b17abaa09873bf
+  data.tar.gz: db68189ec58ebc6bf68b564bc2560a1c9e0ef79a86e27f44577b78ae4b38d16d
 SHA512:
-  metadata.gz: aa1c47142c4388646fb31ce002be9184c6946ab2ceb6dfe902fed41927f6dd7253dfe68c2841c6ae8589c45cb4fcc7482d93a5a339f8b155c250740d35616c9a
-  data.tar.gz: 338da024298632daeadfee3f58b6c686abdca9469ee912972f85c0d4f92efb557b0314ade569f5149d483bd7d4cf27b8454b720939f2d29ac6be5460f6e8b97c
+  metadata.gz: f3d3550075023c2c58c869fafa12eaec1ffa7af4332cf8edbff8a2f413d7ffd2127bdd66a6b5b735040bf4b31aef174a6c2594a12503d86207c9efa94ae7a4d3
+  data.tar.gz: 9e9bb60b085e3b1c2d9622343d792e6fca728e42b1390d9b2a4a1a41f0c9f48790d72bae80bd90ad9b15f0f199e5ffbb956fd5d4b96ea65c80bca8331041a0e3

data/.devcontainer/Dockerfile

@@ -0,0 +1,22 @@
+FROM ruby:3.0.0
+
+ARG USERNAME=app
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+RUN groupadd --gid $USER_GID $USERNAME \
+  && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+  && apt-get update \
+  && apt-get install -y sudo \
+  && echo "$USERNAME ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/$USERNAME \
+  && chmod 0440 /etc/sudoers.d/$USERNAME
+
+ENV BUNDLE_PATH=/app/vendor/bundle
+RUN mkdir -p /app $BUNDLE_PATH
+RUN chown -R $USERNAME /app $BUNDLE_PATH
+
+ENV SHELL=/bin/bash
+
+USER $USERNAME
+
+WORKDIR /app

data/.devcontainer/app.env.example

@@ -0,0 +1 @@
+SPREADSHEET_ID=xxxxxxxxx

data/.devcontainer/devcontainer.json

@@ -0,0 +1,7 @@
+{
+  "dockerComposeFile": "./docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/app",
+  "name": "${localWorkspaceFolderBasename}",
+  "initializeCommand": "cp -n .devcontainer/app.env.example .devcontainer/app.env"
+}

data/.devcontainer/docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3.8"
+services:
+  app:
+    init: true
+    build:
+      context: .
+    command: sleep infinity
+    volumes:
+      - ..:/app:cached

data/.github/workflows/publish.yml

@@ -0,0 +1,18 @@
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - run: gem update --system
+      - run: bundle exec rake release
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}

data/.github/workflows/test.yml

@@ -0,0 +1,21 @@
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.5, 2.6, 2.7, '3.0']
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.gitignore

@@ -7,3 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
+service-account-file.json
+*.env

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Change log
+
+## 0.2.0
+
+- Release under MIT license (previously no license)
+- Add add_timestamp_column option (#1)
+
+## 0.1.0
+
+- First release

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fluent-plugin-google-sheets.gemspec
 gemspec
+
+gem 'pry-byebug'
+gem 'test-unit'
+gem 'vcr'
+gem 'webmock'
+gem 'warning'

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Fumiaki MATSUSHIMA
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -26,9 +26,20 @@ Or install it yourself as:
 
   credential_file_path path_to_your_service_account_credential
   spreadsheet_id your_spreadsheet_id
+  keys foo,bar # optional
+  add_timestamp_column false # optional, true by default
 </match>
 ```
 
+### Note
+
+1. Be sure to enable Drive API and Google Sheets API
+
+- https://console.cloud.google.com/apis/library/drive.googleapis.com
+- https://console.cloud.google.com/apis/library/sheets.googleapis.com
+
+2. Be sure to share the spreadsheet with the service account
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -37,5 +48,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/fluent-plugin-google-sheets.
-
+Bug reports and pull requests are welcome on GitHub at https://github.com/mtsmfm/fluent-plugin-google-sheets.

data/example/fluent.conf

@@ -0,0 +1,12 @@
+<source>
+  @type forward
+  @id forward_input
+</source>
+
+<match example>
+  @type google_sheets
+
+  credential_file_path service-account-file.json
+  spreadsheet_id "#{ENV['SPREADSHEET_ID']}"
+  keys foo
+</match>

data/fluent-plugin-google-sheets.gemspec

@@ -4,15 +4,15 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-google-sheets"
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.0'
   spec.authors       = ["Fumiaki MATSUSHIMA"]
   spec.email         = ["mtsmfm@gmail.com"]
 
   spec.summary       = %q{Fluentd output plugin to store data on Google Sheets.}
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/esminc/fluent-plugin-google-sheets"
+  spec.homepage      = "https://github.com/mtsmfm/fluent-plugin-google-sheets"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|vcr_cassettes)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fluentd"
   spec.add_dependency "google_drive"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler", ">= 2.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
 end

data/lib/fluent/plugin/out_google_sheets.rb

@@ -10,6 +10,7 @@ module Fluent
     config_param :keys, default: [] do |val|
       val.split(',')
     end
+    config_param :add_timestamp_column, :bool, default: true
 
     def format(tag, time, record)
       [tag, Time.at(time).strftime('%F %T'), record].to_json + "\n"
@@ -20,7 +21,7 @@ module Fluent
 
       data.each do |tag, xs|
         ws = worksheet(tag)
-        ws.insert_rows(ws.num_rows + 1, xs.map {|_, time, record| [time] + record.values })
+        ws.insert_rows(ws.num_rows + 1, xs.map {|_, time, record| (@add_timestamp_column ? [time] : []) + record.values })
         ws.save
       end
     end
@@ -28,7 +29,7 @@ module Fluent
     private
 
     def headers
-      %w(timestamp) + @keys
+      (@add_timestamp_column ? %w(timestamp) : %w()) + @keys
     end
 
     def worksheet(tag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-sheets
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Fumiaki MATSUSHIMA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -42,44 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
 description: Fluentd output plugin to store data on Google Sheets.
 email:
 - mtsmfm@gmail.com
@@ -87,16 +73,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/app.env.example"
+- ".devcontainer/devcontainer.json"
+- ".devcontainer/docker-compose.yml"
+- ".github/workflows/publish.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- example/fluent.conf
 - fluent-plugin-google-sheets.gemspec
 - lib/fluent/plugin/out_google_sheets.rb
-homepage: https://github.com/esminc/fluent-plugin-google-sheets
+homepage: https://github.com/mtsmfm/fluent-plugin-google-sheets
 licenses: []
 metadata: {}
 post_install_message: 
@@ -114,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin to store data on Google Sheets.