focuslight 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bba36269e54dd1576dea78ca16c3fd5a18aeef05
-  data.tar.gz: 21bfc8d84524e5362e04a08eb8b17a90c02000ed
+  metadata.gz: 8baaac32f2c61d12d953da8bc50a964f52c0305f
+  data.tar.gz: aaade6440a9e2f54d60a81ecf735d24c1f58da20
 SHA512:
-  metadata.gz: 16ab8bc51012ffcb268a858e2756503d0b8f54ec095eda64db9bd9858e184fa5c94a68eefa61d547608af95fdbf64c49e4592c568ca2fa110fa194bbb252a80e
-  data.tar.gz: d23d1cd4857666be4a35b7345cab1baeb902b6add1c94f2ae3eba647d0eb89e13443a56080a84d46144cc67924172ec806a361f33c96dd6f8f0c3d3b16f41219
+  metadata.gz: 984b5ea208adfd11c62806217d79fe78e989ec550904d60d0264e664e556e8ddec24f6a7e5f9e6d87dc2654ed4c2467103f2b7213dbe8daa60b717f807f70b59
+  data.tar.gz: 9ed76a9f4ca56a7de47333f5d5bb3ddceca1217c1479d4385982b40bb29618a2e31008e9f689b5ceb320d80f589c73695fda9a1b09835db85b612851b7f96363

data/.gitignore

@@ -19,3 +19,4 @@ data/
 .ruby-version
 log/
 *.log
+focuslight/

data/.travis.yml

@@ -6,4 +6,4 @@ gemfile:
 before_install:
   - sudo apt-get install rrdtool librrd-dev
 before_script:
-  - bundle exec rake init
+  - bundle exec focuslight init

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# 0.1.2 (2014/02/27)
+# 0.1.3 (2014/03/24)
+
+Enhancements:
+
+* Use unicorn-worker-killer
 
 Fixes:
 

data/Procfile

@@ -1,3 +1,3 @@
 web: bundle exec unicorn -E production -p $PORT -o $HOST
-worker1: bundle exec rake longer
-worker2: bundle exec rake shorter
+worker1: bundle exec focuslight longer
+worker2: bundle exec focuslight shorter

data/README.md

@@ -25,33 +25,40 @@ RRDTool and its dependencies must be installed before installing Focuslight.
 
 ## Installation
 
-Install focuslight with Ruby 2.0 or later. Execute after installation.
+Install focuslight with Ruby 2.0 or later. 
 
-### Using gem package
+### Gem package
 
-Four easy steps installation with gem.
+Five easy steps on installation with gem and SQLite.
 
-1. `gem install focuslight`
-2. `focuslight new`  # creates focuslight resource in `pwd`/focuslight
-3. `focuslight init` # creates database scheme
-4. `focuslight start`
+```bash
+$ gem install focuslight
+$ focuslight new
+$ cd focuslight
+$ focuslight init # creates database scheme on SQLite
+$ focuslight start
+```
+
+Then see `http://localhost:5125/`. Refer `Using MySQL` section to use MySQL instead of SQLite. 
 
-Then see `http://localhost:5125/`
+### Git repository
 
-### Using SQLite:
+Install from git repository. 
 
-1. clone this repository
-1. `cd focuslight`
-1. install dependencies: `bundle install`
-1. initialize database: `bundle exec rake init`
-1. execute: `bundle exec foreman start`
+```bash
+$ git clone https://github.com/focuslight/focuslight.git
+$ cd focuslight
+$ bundle
+$ bundle exec focuslight init # creates database scheme on SQLite
+$ bundle exec focuslight start
+```
 
-Then see `http://localhost:5125/`
+Then see `http://localhost:5125/`. Refer `Using MySQL` section to use MySQL instead of SQLite. 
 
-### Using MySQL:
+### Using MySQL
 
-You need to change DBURL parameter on .env file to `mysql2` version. 
-You may also configure the database name, the user name, and the password. See the Configuration section. 
+Change `DBURL` parameter on .env file to `mysql2` version like `DBURL=mysql2://root:@localhost/focuslight`. 
+Also configure the database name, the user name, and the password. See the Configuration section. 
 
 Then, create the database and assign permissions to the user as
 
@@ -61,7 +68,7 @@ mysql> GRANT  CREATE, ALTER, DELETE, INSERT, UPDATE, SELECT \\
   ON focuslight.* TO 'user'\@'localhost' IDENTIFIED BY password;
 ```
 
-Then, do the same thing with SQLite case. 
+After that, follow the same procedure with the SQLite case.
 
 ## Configuration
 
@@ -100,9 +107,9 @@ LOG_LEVEL=warn
 * Daemonize support
 * Add tests, and tests, and more tests
 
-## Imcompatible Features
+## Incompatible Features
 
-Focuslight has following incompatibilitie with GrowthForecast as specifications.
+Focuslight has following incompatibilities with GrowthForecast as specifications.
 
 ### Subtract
 

data/Rakefile

@@ -10,12 +10,6 @@ end
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dotenv/tasks'
-require "focuslight/worker"
-
-task :init => :dotenv do
-  require "focuslight/init"
-  Focuslight::Init.run
-end
 
 task :console => :dotenv do
   require "focuslight/init"
@@ -26,13 +20,5 @@ task :console => :dotenv do
 end
 task :c => :console
 
-task :longer => :dotenv do
-  Focuslight::Worker.run(interval: 300, target: :normal)
-end
-
-task :shorter => :dotenv do
-  Focuslight::Worker.run(interval: 60, target: :short)
-end
-
 task :test => :spec
 task :default => :spec

data/config.ru

@@ -1,6 +1,15 @@
 require "rubygems"
 require "sinatra"
+require "focuslight"
+require "focuslight/web"
 
-require File.expand_path '../lib/focuslight/web.rb', __FILE__
+# Unicorn self-process killer
+require 'unicorn/worker_killer'
+
+# Max requests per worker
+use Unicorn::WorkerKiller::MaxRequests, 3072, 4096
+
+# Max memory size (RSS) per worker
+use Unicorn::WorkerKiller::Oom, (192*(1024**2)), (256*(1024**2))
 
 run Focuslight::Web

data/focuslight.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Focuslight::VERSION
   spec.authors       = ["TAGOMORI Satoshi", "Naotoshi Seo", "Shota Fukumori (sora_h)"]
   spec.email         = ["tagomoris@gmail.com", "sonots@gmail.com", "her@sorah.jp"]
-  spec.description   = %q{Ruby port of GrowthForecast}
-  spec.summary       = %q{Lightning Fast Graphing/Visualization}
+  spec.description   = %q{Lightning Fast Graphing/Visualization, built on RRDTool}
+  spec.summary       = %q{Lightning Fast Graphing/Visualization, built on RRDTool}
   spec.homepage      = "https://github.com/tagomoris/focuslight"
   spec.license       = "MIT"
 
@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "sinatra-contrib"
   spec.add_runtime_dependency "erubis"
   spec.add_runtime_dependency "unicorn"
+  spec.add_runtime_dependency "unicorn-worker-killer"
 
   spec.add_runtime_dependency "sequel"
   spec.add_runtime_dependency "sqlite3"

data/lib/focuslight/cli.rb

@@ -11,6 +11,8 @@ class Focuslight::CLI < Thor
   LOG_DIR = File.join(BASE_DIR, "log")
   LOG_FILE = File.join(LOG_DIR, "application.log")
   ENV_FILE = File.join(BASE_DIR, ".env")
+  PROCFILE = File.join(BASE_DIR, "Procfile")
+  CONFIGRU_FILE = File.join(BASE_DIR, "config.ru")
 
   DEFAULT_DOTENV =<<-EOS
 DATADIR=#{DATA_DIR}
@@ -26,62 +28,50 @@ DBURL=#{DBURL}
 # MOUNT=/
 LOG_PATH=#{LOG_FILE}
 LOG_LEVEL=warn
+EOS
+
+  DEFAULT_PROCFILE =<<-EOS
+web: unicorn -E production -p $PORT -o $HOST
+worker1: focuslight longer
+worker2: focuslight shorter
 EOS
 
   default_command :start
 
-  desc "new", "Creating focuslight resource directory"
+  desc "new", "Creates focuslight resource directory"
   def new
     FileUtils.mkdir_p(LOG_DIR)
     File.write ENV_FILE, DEFAULT_DOTENV
+    File.write PROCFILE, DEFAULT_PROCFILE
+    configru_file = File.expand_path("../../../config.ru", __FILE__)
+    FileUtils.copy(configru_file, CONFIGRU_FILE)
   end
 
-  desc "init", "Creating database schema"
+  desc "init", "Creates database schema"
   def init
-    abort "\"#{ENV_FILE}\" is not found. Run `focuslight new` first" unless File.exist? ENV_FILE
-
-    Dotenv.load ENV_FILE
+    Dotenv.load
     require "focuslight/init"
     Focuslight::Init.run
   end
 
   desc "start", "Sartup focuslight"
   def start
-    abort "\"#{ENV_FILE}\" is not found. Run `focuslight new` first" unless File.exist? ENV_FILE
-
-    Dotenv.load ENV_FILE
+    Dotenv.load
     require "foreman/cli"
-    procfile = File.expand_path("../../../Procfile-gem", __FILE__)
-    Foreman::CLI.new.invoke(:start, [], procfile: procfile)
+    Foreman::CLI.new.invoke(:start, [], {})
   end
 
   desc "longer", "Startup focuslight longer worker"
   def longer
-    abort "\"#{ENV_FILE}\" is not found. Run `focuslight new` first" unless File.exist? ENV_FILE
-
-    Dotenv.load ENV_FILE
+    Dotenv.load
     require "focuslight/worker"
     Focuslight::Worker.run(interval: 300, target: :normal)
   end
 
   desc "shorter", "Startup focuslight shorter worker"
   def shorter
-    abort "\"#{ENV_FILE}\" is not found. Run `focuslight new` first" unless File.exist? ENV_FILE
-
-    Dotenv.load ENV_FILE
+    Dotenv.load
     require "focuslight/worker"
     Focuslight::Worker.run(interval: 60, target: :short)
   end
-
-  #desc "web", "Startup focuslight web server"
-  #def web
-  # ToDo
-  #end
-
-  no_tasks do
-    def abort(msg)
-      $stderr.puts msg
-      exit 1
-    end
-  end
 end

data/lib/focuslight/version.rb

@@ -1,3 +1,3 @@
 module Focuslight
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/cli_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'focuslight/cli'
+
+describe Focuslight::CLI do
+  let(:cli) { Focuslight::CLI.new }
+
+  context "#new" do
+    before { cli.invoke(:new) }
+    it {
+      expect(Dir.exists?(Focuslight::CLI::BASE_DIR)).to be_true
+      expect(Dir.exists?(Focuslight::CLI::LOG_DIR)).to be_true
+      expect(File.read(Focuslight::CLI::ENV_FILE)).to eql(Focuslight::CLI::DEFAULT_DOTENV)
+      expect(File.read(Focuslight::CLI::PROCFILE)).to eql(Focuslight::CLI::DEFAULT_PROCFILE)
+      expect(File.exists?(Focuslight::CLI::CONFIGRU_FILE)).to be_true
+    }
+    after { FileUtils.remove_dir(Focuslight::CLI::BASE_DIR) }
+  end
+
+  context "#init" do
+    before {
+      cli.invoke(:new)
+      Dir.chdir(Focuslight::CLI::BASE_DIR) {|path|
+        cli.invoke(:init)
+      }
+    }
+    it { expect(Dir.exists?(Focuslight::CLI::DATA_DIR)).to be_true }
+    after { FileUtils.remove_dir(Focuslight::CLI::BASE_DIR) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: focuslight
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -194,6 +194,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicorn-worker-killer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +278,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Ruby port of GrowthForecast
+description: Lightning Fast Graphing/Visualization, built on RRDTool
 email:
 - tagomoris@gmail.com
 - sonots@gmail.com
@@ -281,7 +295,6 @@ files:
 - Gemfile
 - LICENSE.txt
 - Procfile
-- Procfile-gem
 - README.md
 - Rakefile
 - bin/focuslight
@@ -311,6 +324,7 @@ files:
 - public/js/jquery-1.10.2.min.map
 - public/js/jquery.storageapi.min.js
 - public/js/site.js
+- spec/cli_spec.rb
 - spec/spec_helper.rb
 - spec/syntax_spec.rb
 - spec/validator_predefined_rules_spec.rb
@@ -349,8 +363,9 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Lightning Fast Graphing/Visualization
+summary: Lightning Fast Graphing/Visualization, built on RRDTool
 test_files:
+- spec/cli_spec.rb
 - spec/spec_helper.rb
 - spec/syntax_spec.rb
 - spec/validator_predefined_rules_spec.rb

data/Procfile-gem

@@ -1,3 +0,0 @@
-web: unicorn -E production -p $PORT -o $HOST
-worker1: focuslight longer
-worker2: focuslight shorter