mina-sidekiq 0.4.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f110d06a373caf157e7ad1ab5813aa8d567bfffd
-  data.tar.gz: f00cd8d8d44198bb991c70d0748dad73042c1448
+  metadata.gz: d6a002d492fb54e6a01583a09efe302e1546e2b7
+  data.tar.gz: 1048b8227cd914a3f026c4d251bbbf88c8f41c53
 SHA512:
-  metadata.gz: 09813f8ebdb01e318e6c547e756a7fd3bbb9180c21d66d229cf8228c80b4eadf9e0af69b104597b6162798ef339b5ed2d6b42f97f07d75cad945b9c8085cb5d4
-  data.tar.gz: 5f1a6964a8204656b6a9bab472e4fdac368321550248ac01845d84281cf565e84d09ce725009882507f1423ce557182034985f57fd2728affc4a36e148b13644
+  metadata.gz: e6e261d3d3cdf3f5fd4363290cbdb54dd78a5152b2715f6e94529ce61a69b72faa477a02c599e9465695ebeb6302545ec311297e9033f7c34ef690056229ba13
+  data.tar.gz: b66da6613c2382ab9a362009fceb5cef9bb7f5bb5e2b0f756e2b19b42537ff05a069cc0b39e9546c4387218e4e7fd1416536d3bdc920d3ebd1ea22aa7e33ebaa

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 sudo: false
 rvm:
-  - "1.9.3"
-  - "2.0.0"
-  - "2.1.0"
+  - "2.2.5"
+  - "2.3.1"
 services: redis
-env: FORCE_ADD_SSH_KEY=1
+
+before_install:
+  - ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa
+  - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+  - echo "Host localhost" >> /home/travis/.ssh/config
+  - echo "  StrictHostKeyChecking no" >> /home/travis/.ssh/config
+  - chmod g-rw,o-rw /home/travis/.ssh/*

data/Changelog.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.0.0 2016-10-10
+----------------
+* support for mina 1.0 (thanks @devvmh)
+
 0.4.1 2016-06-27
 ----------------
 * Default `sidekiq_concurrency` to nil. It now needs explicitly set to

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://www.rubygems.org"
+source "https://www.rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,20 +1,37 @@
 PATH
   remote: .
   specs:
-    mina-sidekiq (0.3.1)
-      mina
+    mina-sidekiq (1.0.0)
+      mina (>= 1.0.0)
 
 GEM
-  remote: http://www.rubygems.org/
+  remote: https://www.rubygems.org/
   specs:
-    mina (0.3.1)
+    byebug (9.0.6)
+    coderay (1.1.1)
+    method_source (0.8.2)
+    mina (1.0.0)
       open4 (~> 1.3.4)
       rake
+    minitest (5.9.1)
     open4 (1.3.4)
-    rake (10.4.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    rake (11.3.0)
+    slop (3.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   mina-sidekiq!
+  minitest
+  pry-byebug
+
+BUNDLED WITH
+   1.13.1

data/README.md

@@ -6,10 +6,7 @@ mina-sidekiq
 mina-sidekiq is a gem that adds tasks to aid in the deployment of [Sidekiq] (http://mperham.github.com/sidekiq/)
 using [Mina] (http://nadarei.co/mina).
 
-##CURRENTLY UNMAINTAINED
-
-The original author of this library do not use mina nor sidekiq at the moment.
-If you want to further develop this project please contact <joerg@higgsboson.tk>
+Starting with 1.0.0 this gem requires Mina 1.0!
 
 # Getting Start
 
@@ -70,7 +67,7 @@ If you want to further develop this project please contact <joerg@higgsboson.tk>
 
 The test requires a local running ssh server with the ssh keys of the current
 user added to its `~/.ssh/authorized_keys`. In OS X, this is "Remote Login"
-under the Sharing pref pane.
+under the Sharing pref pane. You will also need a working rvm installation.
 
 To run the full blown test suite use:
 
@@ -83,6 +80,6 @@ For faster release cycle use
 
 ## Copyright
 
-Copyright (c) 2013 Jörg Thalheim http://higgsboson.tk/joerg
+Copyright (c) 2016 Jörg Thalheim <joerg@higgsboson.tk>
 
 See LICENSE for further details.

data/Rakefile

@@ -1,5 +1,4 @@
-require "rake"
-require "rake/testtask"
+require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << "test"

data/lib/mina_sidekiq/tasks.rb

@@ -6,7 +6,7 @@
 #     ...
 #     task :setup do
 #       # sidekiq needs a place to store its pid file
-#       queue! %[mkdir -p "#{deploy_to}/shared/pids/"]
+#       command %[mkdir -p "#{fetch(:deploy_to)}/shared/pids/"]
 #     end
 #
 #     task :deploy do
@@ -22,54 +22,51 @@
 #       end
 #     end
 
-require 'mina/bundler'
-require 'mina/rails'
-
 # ## Settings
 # Any and all of these settings can be overriden in your `deploy.rb`.
 
 # ### sidekiq
 # Sets the path to sidekiq.
-set_default :sidekiq, lambda { "#{bundle_bin} exec sidekiq" }
+set :sidekiq, -> { "#{fetch(:bundle_bin)} exec sidekiq" }
 
 # ### sidekiqctl
 # Sets the path to sidekiqctl.
-set_default :sidekiqctl, lambda { "#{bundle_prefix} sidekiqctl" }
+set :sidekiqctl, -> { "#{fetch(:bundle_prefix)} sidekiqctl" }
 
 # ### sidekiq_timeout
 # Sets a upper limit of time a process is allowed to finish, before it is killed by sidekiqctl.
-set_default :sidekiq_timeout, 11
+set :sidekiq_timeout, 11
 
 # ### sidekiq_config
 # Sets the path to the configuration file of sidekiq
-set_default :sidekiq_config, lambda { "#{deploy_to}/#{current_path}/config/sidekiq.yml" }
+set :sidekiq_config, -> { "#{fetch(:current_path)}/config/sidekiq.yml" }
 
 # ### sidekiq_log
 # Sets the path to the log file of sidekiq
 #
 # To disable logging set it to "/dev/null"
-set_default :sidekiq_log, lambda { "#{deploy_to}/#{current_path}/log/sidekiq.log" }
+set :sidekiq_log, -> { "#{fetch(:current_path)}/log/sidekiq.log" }
 
 # ### sidekiq_pid
 # Sets the path to the pid file of a sidekiq worker
-set_default :sidekiq_pid, lambda { "#{deploy_to}/#{shared_path}/pids/sidekiq.pid" }
+set :sidekiq_pid, -> { "#{fetch(:shared_path)}/pids/sidekiq.pid" }
 
 # ### sidekiq_processes
 # Sets the number of sidekiq processes launched
-set_default :sidekiq_processes, 1
+set :sidekiq_processes, 1
 
 # ### sidekiq_concurrency
 # Sets the number of sidekiq threads per process (overrides value in sidekiq.yml)
-set_default :sidekiq_concurrency, nil
+set :sidekiq_concurrency, nil
 
 # ## Control Tasks
 namespace :sidekiq do
   def for_each_process(&block)
-    sidekiq_processes.times do |idx|
+    fetch(:sidekiq_processes).times do |idx|
       pid_file = if idx == 0
-                   sidekiq_pid
+                   fetch(:sidekiq_pid)
                  else
-                   "#{sidekiq_pid}-#{idx}"
+                   "#{fetch(:sidekiq_pid)}-#{idx}"
                  end
       yield(pid_file, idx)
     end
@@ -78,49 +75,49 @@ namespace :sidekiq do
   # ### sidekiq:quiet
   desc "Quiet sidekiq (stop accepting new work)"
   task :quiet => :environment do
-    queue %[echo "-----> Quiet sidekiq (stop accepting new work)"]
+    comment 'Quiet sidekiq (stop accepting new work)'
     for_each_process do |pid_file, idx|
-      queue %{
-        if [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then
-          cd "#{deploy_to}/#{current_path}"
-          #{echo_cmd %{#{sidekiqctl} quiet #{pid_file}} }
+      command %{
+        if [ -f #{pid_file} ] && kill -0 `cat #{pid_file}` > /dev/null 2>&1; then
+          cd "#{fetch(:current_path)}"
+          #{fetch(:sidekiqctl)} quiet #{pid_file}
         else
           echo 'Skip quiet command (no pid file found)'
         fi
-      }
+      }.strip
     end
   end
 
   # ### sidekiq:stop
   desc "Stop sidekiq"
   task :stop => :environment do
-    queue %[echo "-----> Stop sidekiq"]
+    comment 'Stop sidekiq'
     for_each_process do |pid_file, idx|
-      queue %[
+      command %{
         if [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then
-          cd "#{deploy_to}/#{current_path}"
-          #{echo_cmd %[#{sidekiqctl} stop #{pid_file} #{sidekiq_timeout}]}
+          cd #{fetch(:current_path)}
+          #{fetch(:sidekiqctl)} stop #{pid_file} #{fetch(:sidekiq_timeout)}
         else
           echo 'Skip stopping sidekiq (no pid file found)'
         fi
-      ]
+      }.strip
     end
   end
 
   # ### sidekiq:start
   desc "Start sidekiq"
   task :start => :environment do
-    queue %[echo "-----> Start sidekiq"]
+    comment 'Start sidekiq'
     for_each_process do |pid_file, idx|
+      sidekiq_concurrency = fetch(:sidekiq_concurrency)
       concurrency_arg = if sidekiq_concurrency.nil?
                           ""
                         else
                           "-c #{sidekiq_concurrency}"
                         end
-      queue %{
-        cd "#{deploy_to}/#{current_path}"
-        #{echo_cmd %[#{sidekiq} -d -e #{rails_env} #{concurrency_arg} -C #{sidekiq_config} -i #{idx} -P #{pid_file} -L #{sidekiq_log}] }
-      }
+      in_path(fetch(:current_path)) do
+        command %[#{fetch(:sidekiq)} -d -e #{fetch(:rails_env)} #{concurrency_arg} -C #{fetch(:sidekiq_config)} -i #{idx} -P #{pid_file} -L #{fetch(:sidekiq_log)}]
+      end
     end
   end
 
@@ -133,7 +130,6 @@ namespace :sidekiq do
 
   desc "Tail log from server"
   task :log => :environment do
-    queue %[tail -f #{sidekiq_log}]
+    command %[tail -f #{sidekiq_log}]
   end
-
 end

data/lib/mina_sidekiq/version.rb

@@ -1,5 +1,5 @@
 module MinaSidekiq
   def self.version
-    "0.4.1"
+    '1.0.0'
   end
 end

data/mina-sidekiq.gemspec

@@ -16,13 +16,8 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.post_install_message = <<-MESSAGE
-Starting with 0.2.0, you have to add:
 
-    require "mina_sidekiq/tasks"
-
-in your deploy.rb to load the library
-MESSAGE
-
-  s.add_runtime_dependency "mina"
+  s.add_runtime_dependency 'mina', '>= 1.0.0'
+  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'minitest'
 end

data/test/deploy_test.rb

@@ -16,6 +16,7 @@ describe "mina_sidekiq" do
   end
 
   def check_process(pid)
+    pid = pid.to_i
     begin
       Process.kill(0, pid)
       return true
@@ -40,7 +41,7 @@ describe "mina_sidekiq" do
         mina "deploy"
       rescue Exception => e
         log = "./deploy/shared/sidekiq.log"
-        if File.exists?(log)
+        if File.exist?(log)
           puts "cat #{log}"
           puts File.open(log).read
         end
@@ -50,12 +51,13 @@ describe "mina_sidekiq" do
     it "should start/stop sidekiq" do
       sidekiq_pid_path = @env_root.join("deploy", "shared", "pids", "sidekiq.pid")
       # fresh deploy
+      mina "deploy"
       mina "sidekiq:start"
       pid = File.read(sidekiq_pid_path)
       check_process(pid).must_equal true
       # second deploy
       mina "sidekiq:stop"
-      check_process(pid).must_equal true
+      check_process(pid).must_equal false
     end
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-require "minitest/spec"
 require "minitest/autorun"
 require 'pathname'
 

data/test_env/config/deploy.rb

@@ -1,12 +1,9 @@
-require 'mina'
+require 'mina/rails'
 require 'mina/git'
-require 'mina_sidekiq/tasks'
-require 'mina/git'
-require 'mina/bundler'
 require 'mina/rvm'
+require 'mina_sidekiq/tasks'
 require 'fileutils'
 
-
 FileUtils.mkdir_p "#{Dir.pwd}/deploy"
 
 set :ssh_options, '-o StrictHostKeyChecking=no'
@@ -17,31 +14,35 @@ set :repository, 'https://github.com/Mic92/mina-sidekiq-test-rails.git'
 set :keep_releases, 2
 set :sidekiq_processes, 2
 
-set :shared_paths, ['log']
+set :shared_dirs, fetch(:shared_dirs, []).push('log')
 
 task :environment do
-  invoke :'rvm:use[ruby-2.1.2]'
+  # this line is disabled because of a bug in mina 1.0.0
+  # invoke :'rvm:use', ENV.fetch('RUBY_VERSION', 'ruby-2.3.1')
+  env = ENV.fetch('RUBY_VERSION', 'ruby-2.3.1')
+  command %{source #{fetch(:rvm_use_path)}}
+  command %{rvm use "#{env}" --create}
 end
 
 task setup: :environment do
-  queue! %[mkdir -p "#{deploy_to}/shared/pids/"]
-  queue! %[mkdir -p "#{deploy_to}/shared/log/"]
+  command %(mkdir -p "#{fetch(:deploy_to)}/shared/pids/")
+  command %(mkdir -p "#{fetch(:deploy_to)}/shared/log/")
 end
 
-task deploy: :environment do
+task :deploy do
   deploy do
     invoke :'git:clone'
     invoke :'deploy:link_shared_paths'
     invoke :'bundle:install'
 
-    to :launch do
+    on :launch do
       invoke :'sidekiq:start'
-      queue! %[sleep 3; kill -0 `cat #{sidekiq_pid}`]
+      command %(sleep 3; kill -0 `cat #{fetch(:sidekiq_pid)}`)
 
       invoke :'sidekiq:quiet'
 
       invoke :'sidekiq:stop'
-      queue! %[(kill -0 `cat #{sidekiq_pid}`) 2> /dev/null && exit 1 || exit 0]
+      command %((kill -0 `cat #{fetch(:sidekiq_pid)}`) 2> /dev/null && exit 1 || exit 0)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Joerg Thalheim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -16,9 +16,37 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -50,12 +78,7 @@ homepage: http://github.com/Mic92/mina-sidekiq
 licenses:
 - MIT
 metadata: {}
-post_install_message: |
-  Starting with 0.2.0, you have to add:
-
-      require "mina_sidekiq/tasks"
-
-  in your deploy.rb to load the library
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -71,11 +94,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Tasks to deploy Sidekiq with mina.
 test_files:
 - test/deploy_test.rb
 - test/test_helper.rb
-has_rdoc: