focuslight 0.1.4 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51b11a9f7f6bda320667d5ae7b21209d5191653d
-  data.tar.gz: c03705eec5c79ba6a0a958c60081dc8d8140cf9b
+SHA256:
+  metadata.gz: f392ede3eb9c48a3ec3dbe74aea3af5f15c8437a1fb3f0990929fb21e4e1422e
+  data.tar.gz: b82c5ab13f118d8eed164759713eb449442b5d1bf14774710a3ae1ce8b9271b1
 SHA512:
-  metadata.gz: d121500a5835a361d07d43dd8a43a5547fb3fa3b00df0a538ba292a18cb0fc563a5029d2061c2834a5beedccd4bbbfc8803b1e0d9f3a31c205d77696c9e35cb3
-  data.tar.gz: b580aee081ec57efd5dd17b5f7e74e43db9f59c55f41fb46c2969dde3ff5591e44afda6585bc7c261a6a45cad02cbaa2940367dc4b47709cd57d8093fe3b08a2
+  metadata.gz: 9005817ad6b4469234162451434b19cdab46a008bcceb88fa89a804439cb9dfd98ac3e0f7e212be8dddd9742049d66095bd9ed469fa37d8b46e6e7a801a76a68
+  data.tar.gz: 4b273f96970e9695cfa98d32f5ed644542d63e168f036afb57971594f3489946a4153985cbb3f6c8afff346b0e85398853f848b0258e4c903f01207e5c11161d

data/.dockerignore

@@ -0,0 +1,2 @@
+.env
+vendor

data/.github/workflows/unit-test.yml

@@ -0,0 +1,39 @@
+name: "Unit test on Ubuntu"
+
+on:
+  push:
+    branches: "*"
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-16.04, ubuntu-18.04]
+        ruby: [2.5, 2.6, 2.7]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up package
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential mysql-client libsqlite3-dev rrdtool librrd-dev
+
+      - name: Set up Ruby version
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Set up bundler
+        run: |
+          gem install bundler --no-document
+          # bundle config set deployment 'true'
+
+      - name: bundle install
+        run: bundle install --jobs 4 --retry 3
+
+      - name: test
+        run: |
+          bundle exec focuslight init
+          bundle exec rake

data/.gitignore

@@ -20,3 +20,4 @@ data/
 log/
 *.log
 focuslight/
+.env

data/.travis.yml

@@ -1,9 +1,13 @@
+language: ruby
 rvm:
-  - 2.0.0
-  - 2.1
+  - 2.7
 gemfile:
   - Gemfile
+bundler_args:
+cache: bundler
 before_install:
-  - sudo apt-get install rrdtool librrd-dev
+  - sudo apt-get install rrdtool librrd-dev sqlite3 libsqlite3-dev
+  - gem install -v "2.1.4" bundler
+  - bundle config set path vendor/bundle
 before_script:
   - bundle exec focuslight init

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.2.0 (2019/04/20)
+
+Enhancements:
+
+* Support Ruby version 2.5 higher
+
+Fixes:
+
+* Security fix:
+  * ffi, rack, rack-protection
+* Fix ulimti/llimit check
+
 # 0.1.4 (2014/06/11)
 
 Enhancements:

data/Dockerfile

@@ -0,0 +1,17 @@
+FROM ruby:2.7.2
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    default-mysql-client \
+    libsqlite3-dev \
+    rrdtool librrd-dev
+
+WORKDIR /app
+
+ADD Gemfile /app/Gemfile
+ADD Gemfile.lock /app/Gemfile.lock
+ADD focuslight.gemspec /app/focuslight.gemspec
+ADD lib/focuslight/version.rb /app/lib/focuslight/version.rb
+RUN gem install bundler
+RUN bundle install
+ADD . /app
+RUN rm -rf /var/lib/apt/lists/*

data/README.md

@@ -25,7 +25,7 @@ RRDTool and its dependencies must be installed before installing Focuslight.
 
 ## Installation
 
-Install focuslight with Ruby 2.0 or later. 
+Install focuslight with Ruby 2.4 or later.
 
 ### Gem package
 
@@ -70,6 +70,21 @@ mysql> GRANT  CREATE, ALTER, DELETE, INSERT, UPDATE, SELECT \\
 
 After that, follow the same procedure with the SQLite case.
 
+### Using Docker
+
+You can use Docker to build a focuslight development environment for MySQL.
+
+bash
+$ git clone https://github.com/focuslight/focuslight.git
+$ cd focuslight
+$ docker-compose build
+$ docker-compose up
+$ docker-compose exec app bash
+$ mysql -u root -proot -h db
+mysql> CREATE DATABASE focuslight;
+mysql> \q
+$ bundle exec focuslight init
+
 ## Configuration
 
 To configure Focuslight, edit the `.env` file in the project root directory.
@@ -85,6 +100,7 @@ HOST=0.0.0.0
 # 1MIN_METRICS=n
 FLOAT_SUPPORT=n # y
 DBURL=sqlite://data/gforecast.db
+DBTIMEOUT=60000
 # DBURL=mysql2://root:@localhost/focuslight
 # RRDCACHED=n
 # MOUNT=/
@@ -97,6 +113,14 @@ LOG_LEVEL=warn
 1. Copy GrowthForecast's `datadir` directory (and its contents) to `./data` (or where you specified)
 1. Execute Focuslight
 
+## Example: Creating a New Graph
+
+Using curl:
+
+```
+$ curl -F number=10 http://localhost:5125/api/socialgame/member/register
+```
+
 ## TODO
 
 * Merge GrowthForecast's commits after Jan 09, 2014

data/docker-compose.yml

@@ -0,0 +1,35 @@
+version: '3.8'
+services:
+  app:
+    build: .
+    command: /bin/sh -c "bundle install -j 4 && bundle exec focuslight start"
+    ports:
+      - '5125:5125'
+    volumes:
+      - .:/app
+      - gem-data:/usr/local/bundle
+    environment:
+      DATADIR: ./data
+      PORT: 5125
+      HOST: 0.0.0.0
+      FLOAT_SUPPORT: n
+      DBURL: mysql2://root:root@db/focuslight
+      DBTIMEOUT: 60000
+      LOG_FILE: log/application.log
+      LOG_LEVEL: warn
+    tty: true
+    stdin_open: true
+    depends_on:
+      - db
+  db:
+    image: mysql:5.7
+    ports:
+      - '4306:3306'
+    volumes:
+      - db-data:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_USER: root
+      MYSQL_ROOT_PASSWORD: root
+volumes:
+  db-data:
+  gem-data:

data/focuslight.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-nav"
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "sinatra-contrib"
-  spec.add_runtime_dependency "erubis"
+  spec.add_runtime_dependency "erubi"
   spec.add_runtime_dependency "unicorn"
   spec.add_runtime_dependency "unicorn-worker-killer"
 

data/view/view_graph.erb

@@ -3,7 +3,7 @@
   <li class="prev <%= params[:t] == 'sh' ? 'active' : '' %>"><a href="<%= url_for link_path, t:'sh' %>">hour・8hours(1min)</a></li>
   <li class="prev <%= params[:t] == 'sd' ? 'active' : '' %>"><a href="<%= url_for link_path, t:'sd' %>">day・3days(1min)</a></li>
   <li class="prev <%= params[:t] == 'h' ? 'active' : '' %>"><a href="<%= url_for link_path, t:'h' %>">hour・halfday</a></li>
-  <li class="<%= ['h','m','sh','sd'].include?(params[:t]) ? '' : 'activate' %>"><a href="<%= url_for link_path %>">day・week</a></li>
+  <li class="<%= ['h','m','sh','sd'].include?(params[:t]) ? '' : 'active' %>"><a href="<%= url_for link_path %>">day・week</a></li>
   <li class="next <%= params[:t] == 'm' ? 'active' : '' %>"><a href="<%= url_for link_path, t:'m' %>">month・year</a></li>
 </ul>
 <div class="clearfix"></div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: focuslight
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.4
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -290,17 +290,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env"
+- ".dockerignore"
+- ".github/workflows/unit-test.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - Procfile
 - README.md
 - Rakefile
 - bin/focuslight
 - config.ru
+- docker-compose.yml
 - focuslight.gemspec
 - lib/focuslight.rb
 - lib/focuslight/cli.rb
@@ -361,8 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Lightning Fast Graphing/Visualization, built on RRDTool

data/.env

@@ -1,13 +0,0 @@
-DATADIR=./data
-PORT=5125
-HOST=0.0.0.0
-# FRONT_PROXY
-# ALLOW_FROM
-# 1MIN_METRICS=n
-FLOAT_SUPPORT=n # y
-DBURL=sqlite://data/gforecast.db
-# DBURL=mysql2://root:@localhost/focuslight
-# RRDCACHED=n
-# MOUNT=/
-LOG_PATH=log/application.log
-LOG_LEVEL=warn