mina-clockwork 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 769828a7849cb076c9ff3ce576f037a65aca0035
-  data.tar.gz: 5b32a1ca1c75cf1cd88105ec105e6d1418bd4c8d
+  metadata.gz: 387254a2427a26eaade6be5168975b779dd9abd4
+  data.tar.gz: 7e959ca0b6cbe1704568e9ab091702ac149b01f9
 SHA512:
-  metadata.gz: 985956c6947930e96adc35c397ec882b890f7beca768244b30d7e451cf47294fe936d827a4167048796a25adac29cd2a4570f058a280f6980c9f36540c0ed7d0
-  data.tar.gz: 320d27d99625cc92081ee89777c06d32684ddf7acb822f75334522032e9818bf8f9dd7bddc98ed7351d971eb1f4213a173b50c3624aabce725d49d7a8ba5b453
+  metadata.gz: 4c47b151e42722821a72ed41d22d4fa89bbf0a359df35edbfcbfe6a8419f78fd1963d134a8872d60b047ff2a07d5d688574596b11ce66fb1a1dfe6369a88fef8
+  data.tar.gz: 9156439add92479076226a77db1c81a8b80a8d1352a3c0d4ac67a1ea1adbb7dbb71404088fc89f21538d13433e3e27dc202a104bf2cba5154cfa8452f59d2687

data/.gitignore

@@ -1,4 +1,5 @@
 pkg
 .ruby-version
+.ruby-gemset
 .bundle
 Gemfile.lock

data/Gemfile

@@ -1,2 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
 gemspec
+
+group :development do
+  gem "bundler"
+  gem "rake"
+end

data/README.md

@@ -1,59 +1,66 @@
-# Mina Clockwork
+# Mina + Clockwork
 
-Clockwork deployment scenario for mina. It uses `clockworkd` to start clockwork daemon.
+Clockwork deployment scenario for mina. It uses `clockworkd` executable to start
+clockwork daemon on the server. `clockworkd` is the part of the [`clockwork`](https://github.com/Rykian/clockwork).
 
-## Installation
+*Important!* You will need both `clockwork` and `daemons` gems available on the server!
 
-Via Bundler:
+## Installation
 
 ```ruby
 # Gemfile
-gem 'mina-clockwork', require: false
-```
 
-PS: You will need the `daemons` gem to use `clockworkd`, be sure that `daemons`
-is available in the deployed environment!
+gem "mina-clockwork"
 
-## Usage example
+group :production do
+  gem "daemons"  # for `clockworkd`
+end
+```
+
+## Configuration
 
 ```ruby
 # config/deploy.rb
 
-require 'mina/clockwork'
+require "mina/clockwork"
 
-set :clockwork_file, -> { "#{deploy_to}/#{current_path}/app/clockwork.rb" }
-set :clockwork_identifier, -> { rails_env }
-... other options
+... set configuration options here if you need ...
 
 task deploy: :environment do
   deploy do
-    invoke 'clockwork:stop'
-    invoke 'git:clone'
+    invoke :"clockwork:stop"
     ...
 
-    to :launch do
+    on :launch do
       ...
-      invoke 'clockwork:start'
+      invoke :"clockwork:start"
     end
   end
 end
 ```
 
+Use these options to configure the plugin:
+
+* `clockwork_dir` - Daemon working dir (Default: current deployment path)
+* `clockwork_file` - Clock file (Default: [current deployment path]/clock.rb)
+* `clockwork_identifier` - Identifier of the `clockworkd` process (Default: name of the clock file)
+* `clockwork_pid_dir` - Dir for `*.pid` file (Default: [shared path]/tmp/pids)
+* `clockwork_log_dir` - Dir for `*.log` files (Default: [shared path]/log)
+
+Example:
+
+```ruby
+set :clockwork_file, -> { "#{fetch(:current_path)}/my_clock_file.rb"  }
+```
+
 ## Tasks
 
 ```
-mina clockwork:restart  # Restart clockworkd
-mina clockwork:start    # Start clockworkd
-mina clockwork:stop     # Stop clockworkd
+mina clockwork:restart  # Restart clockwork daemon
+mina clockwork:start    # Start clockwork daemon
+mina clockwork:stop     # Stop clockwork daemon
 ```
 
-## Configuration
-
-* `clockwork_dir` - Working dir (Default: current deployment path)
-* `clockwork_file` - Clock file (Default: [current deployment path]/clock.rb)
-* `clockwork_identifier` - Identifier for clockworkd process (Default: name of clock file)
-* `clockwork_pid_dir` - Dir for pid file (Default: [shared path]/tmp/pids)
-* `clockwork_log_dir` - Dir for log files (Default: [shared path]/log)
 
 ## Contributing
 

data/Rakefile

@@ -1,2 +1,2 @@
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 

data/lib/mina/clockwork/tasks.rb

@@ -1,34 +1,47 @@
-require 'mina/bundler'
+set :clockwork_dir,        -> { "#{fetch(:current_path)}" }
+set :clockwork_file,       -> { "#{fetch(:current_path)}/clock.rb"  }
+set :clockwork_identifier, -> { File.basename(clockwork_file, ".rb") }
+set :clockwork_pid_dir,    -> { "#{fetch(:shared_path)}/tmp/pids" }
+set :clockwork_log_dir,    -> { "#{fetch(:shared_path)}/log" }
 
-namespace :clockwork do
-  set_default :clockwork_dir, -> { "#{deploy_to}/#{current_path}" }
-  set_default :clockwork_file, -> { "#{deploy_to}/#{current_path}/clock.rb"  }
-  set_default :clockwork_identifier, -> { File.basename(clockwork_file, '.rb') }
-  set_default :clockwork_pid_dir, -> { "#{deploy_to}/#{shared_path}/tmp/pids" }
-  set_default :clockwork_log_dir, -> { "#{deploy_to}/#{shared_path}/log"  }
-  set_default :clockworkd_cmd, -> { "#{bundle_prefix} clockworkd" }
-  set_default :clockworkd_full_cmd, -> { %[cd #{deploy_to}/#{current_path} && #{clockworkd_cmd} \\
--c '#{clockwork_file}' \\
--i '#{clockwork_identifier}' \\
--d '#{clockwork_dir}' \\
---pid-dir '#{clockwork_pid_dir}' \\
---log --log-dir '#{clockwork_log_dir}'] }
+set :clockworkd_cmd,       -> {
+  if set?(:bundle_prefix)
+    "#{fetch(:bundle_prefix)} clockworkd"
+  elsif set?(:bundle_bin)
+    "#{fetch(:bundle_bin)} exec clockworkd"
+  else
+    "clockworkd"
+  end
+}
 
-  desc 'Start clockworkd'
+set :clockworkd_full_cmd,  -> {
+%[cd #{fetch(:current_path)} && #{fetch(:clockworkd_cmd)} \\
+-c '#{fetch(:clockwork_file)}' \\
+-i '#{fetch(:clockwork_identifier)}' \\
+-d '#{fetch(:clockwork_dir)}' \\
+--pid-dir '#{fetch(:clockwork_pid_dir)}' \\
+--log --log-dir '#{fetch(:clockwork_log_dir)}']
+}
+
+namespace :clockwork do
+  # mina clockwork:start
+  desc "Start clockwork daemon"
   task start: :environment do
-    queue %[echo '-----> Start clockwork']
-    queue! "#{clockworkd_full_cmd} start"
+    comment "Starting clockwork daemon"
+    command "#{fetch(:clockworkd_full_cmd)} start"
   end
 
-  desc 'Stop clockworkd'
+  # mina clockwork:stop
+  desc "Stop clockwork daemon"
   task stop: :environment do
-    queue %[echo '-----> Stop clockwork']
-    queue! "#{clockworkd_full_cmd} stop"
+    comment "Stopping clockwork daemon"
+    command "#{fetch(:clockworkd_full_cmd)} stop"
   end
 
-  desc 'Restart clockworkd'
+  # mina clockwork:restart
+  desc "Restart clockwork daemon"
   task restart: :environment do
-    queue %[echo '-----> Restart clockwork']
-    queue! "#{clockworkd_full_cmd} restart"
+    comment "Restarting clockwork daemon"
+    command "#{fetch(:clockworkd_full_cmd)} restart"
   end
 end

data/lib/mina/clockwork/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Clockwork
-    VERSION = '0.0.3'
+    VERSION = "1.0.0"
   end
 end

data/lib/mina/clockwork.rb

@@ -1,2 +1,2 @@
-require 'mina/clockwork/version'
-require 'mina/clockwork/tasks'
+require "mina/clockwork/version"
+require "mina/clockwork/tasks"

data/mina-clockwork.gemspec

@@ -1,27 +1,23 @@
-# encoding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mina/clockwork/version'
+
+require "mina/clockwork/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'mina-clockwork'
+  spec.name          = "mina-clockwork"
   spec.version       = Mina::Clockwork::VERSION
-  spec.authors       = ['Alexey Chernenkov']
-  spec.email         = ['laise@pisem.net']
-  spec.summary       = 'Clockwork deployment scenario for mina.'
-  spec.description   = ''
-  spec.homepage      = 'https://github.com/907th/mina-clockwork'
-  spec.license       = 'MIT'
+  spec.authors       = ["Alexey Chernenkov"]
+  spec.email         = ["laise@pisem.net"]
+  spec.summary       = "Clockwork deployment scenario for mina."
+  spec.description   = ""
+  spec.homepage      = "https://github.com/907th/mina-clockwork"
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake'
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'clockwork'
-  spec.add_dependency 'daemons'
+  spec.add_dependency "clockwork"
+  spec.add_dependency "mina", ">= 1.0.2"
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mina-clockwork
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexey Chernenkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: clockwork
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: mina
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 description: ''
 email:
 - laise@pisem.net
@@ -102,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Clockwork deployment scenario for mina.