mina-sidekiq 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1bba161f9399c6c8cea213d7faf58b4876edb8c
-  data.tar.gz: 6670d52acffcb22eeefccf07a18c51b3b246b33e
+  metadata.gz: d4ad61054148338a35c4ecdddeba0f75ffe3e84d
+  data.tar.gz: cb22bb7811c809f78f0b08830b21cb119904b585
 SHA512:
-  metadata.gz: 51b9d652430f4cf542ebe35f9d23b8057353e4626ae2f6d501744878d0ed07449d4a63062edf7699aa8e5a47071e54ee1889046f2f4fbf200db45375ffdc82d8
-  data.tar.gz: 7da87f2b7e6e483237028710cb75849551c64dafba2343c5c33a02e3fd9e371e91d42384d02e352c88dc86ff7fcaf5ef587a564ef22d91352d473292edb773e3
+  metadata.gz: 0e9ac235f8f2a49d640b03b14899a889dff88b87bc401de329b313a8b56719e6180d7229e9cb05e069a20d14f571264146b1cae74ec4339ab86930b2a2429b04
+  data.tar.gz: f32ab1cdced24d2c85d1c43e24f86f1ecb7b9a19ea2bfd0a505d6899e3301df3b703b488ce88f285feb4e9fbb15cdfb69e2f4b9c9878d16fdda3e0513f3fa7cb

data/.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
+  - "2.1.0"
 services: redis
 env: FORCE_ADD_SSH_KEY=1

data/Changelog.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.3.1 2015-01-18
+----------------
+
+* fix starting in background
+
 0.2.0 2013-08-18
 ----------------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mina-sidekiq (0.2.0)
+    mina-sidekiq (0.3.0)
       mina
 
 GEM
@@ -11,7 +11,7 @@ GEM
       open4
       rake
     open4 (1.3.0)
-    rake (10.1.0)
+    rake (10.1.1)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,52 +1,9 @@
-require 'rake'
+require "rake"
+require "rake/testtask"
 
-desc 'Run integration tests'
-task :test do
-  Dir.chdir("#{Rake.original_dir}/test_env") do
-    if ENV['FORCE_ADD_SSH_KEY']
-      force_add_ssh_key
-    end
-
-    FileUtils.rm_rf('deploy')
-    sh 'mina setup --verbose'
-    begin
-      # fresh deploy
-      sh 'mina deploy --verbose'
-      # second deploy
-      sh 'mina deploy --verbose'
-    rescue Exception => e
-      puts e.message
-      puts e.backtrace.inspect
-      log = "./deploy/shared/sidekiq.log"
-      if File.exists?(log)
-        puts "cat #{log}"
-        puts File.open(log).read
-      end
-    end
-  end
-end
-
-def force_add_ssh_key(&block)
-  ssh_key = File.expand_path("~/.ssh/id_rsa.pub")
-  unless File.exists?(ssh_key)
-    sh "ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa"
-  end
-  file = File.open(ssh_key)
-  pub_key = file.readline
-  file.close
-
-  authorized_keys = File.expand_path("~/.ssh/authorized_keys")
-  begin
-    File.open(authorized_keys, 'a+') do |f|
-      File.chmod(0600, authorized_keys)
-      f.puts(pub_key)
-    end
-  rescue Exception => e
-    puts e.message
-    puts e.backtrace.inspect
-  ensure
-    File.chmod(0400, authorized_keys)
-  end
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/lib/mina_sidekiq/tasks.rb

@@ -110,7 +110,7 @@ namespace :sidekiq do
     for_each_process do |pid_file, idx|
       queue %{
         cd "#{deploy_to}/#{current_path}"
-        #{echo_cmd %[nohup #{sidekiq} -e #{rails_env} -C #{sidekiq_config} -i #{idx} -P #{pid_file} >> #{sidekiq_log} 2>&1 &] }
+        #{echo_cmd %[#{sidekiq} -d -e #{rails_env} -C #{sidekiq_config} -i #{idx} -P #{pid_file} -L #{sidekiq_log}] }
       }
     end
   end

data/lib/mina_sidekiq/version.rb

@@ -1,5 +1,5 @@
 module MinaSidekiq
   def self.version
-    "0.3.0"
+    "0.3.1"
   end
 end

data/mina-sidekiq.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/Mic92/mina-sidekiq"
   s.summary = "Tasks to deploy Sidekiq with mina."
   s.description = "Adds tasks to aid in the deployment of Sidekiq"
-  s.license = 'MIT'
+  s.license = "MIT"
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.post_install_message = <<-MESSAGE
 Starting with 0.2.0, you have to add:
 
-    require 'mina_sidekiq/tasks'
+    require "mina_sidekiq/tasks"
 
 in your deploy.rb to load the library
 MESSAGE

data/test/deploy_test.rb

@@ -0,0 +1,61 @@
+require "test_helper"
+
+describe "mina_sidekiq" do
+  before do
+    @old_cwd = Dir.pwd
+    @env_root = TEST_ROOT.join("..", "test_env")
+    Dir.chdir(@env_root)
+    FileUtils.rm_rf("deploy")
+  end
+  after { Dir.chdir(@old_cwd) }
+
+  def mina(task)
+    cmd = "bundle exec mina --verbose #{task}"
+    puts "$ #{cmd}"
+    system cmd
+  end
+
+  def check_process(pid)
+    begin
+      Process.kill(0, pid)
+      return true
+    rescue Errno::EPERM => e
+      puts "No permission to query #{pid}!"
+      raise e
+    rescue Errno::ESRCH
+      puts "#{pid} is NOT running."
+      return false
+    rescue
+      puts "Unable to determine status for #{pid} : #{$!}"
+    end
+  end
+
+  describe "setup" do
+    before { mina "setup" }
+    it "should deploy" do
+      begin
+        # fresh deploy
+        mina "deploy"
+        # second deploy
+        mina "deploy"
+      rescue Exception => e
+        log = "./deploy/shared/sidekiq.log"
+        if File.exists?(log)
+          puts "cat #{log}"
+          puts File.open(log).read
+        end
+        raise e
+      end
+    end
+    it "should start/stop sidekiq" do
+      sidekiq_pid_path = @env_root.join("deploy", "shared", "pids", "sidekiq.pid")
+      # fresh 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
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,63 @@
+require "minitest/spec"
+require "minitest/autorun"
+require 'pathname'
+
+TEST_ROOT = Pathname.new(File.dirname(__FILE__))
+
+module MiniTestWithHooks
+  class Unit < MiniTest::Unit
+    def before_suites; end
+    def after_suites; end
+
+    def _run_suites(suites, type)
+      begin
+        before_suites
+        super(suites, type)
+      ensure
+        after_suites
+      end
+    end
+
+    def _run_suite(suite, type)
+      begin
+        suite.before_suite
+        super(suite, type)
+      ensure
+        suite.after_suite
+      end
+    end
+  end
+end
+
+module MiniTestWithTransactions
+  class Unit < MiniTestWithHooks::Unit
+    def before_suites
+      super
+      if ENV["FORCE_ADD_SSH_KEY"]
+        force_add_ssh_key
+      end
+    end
+    def force_add_ssh_key(&block)
+      ssh_key = File.expand_path("~/.ssh/id_rsa.pub")
+      unless File.exists?(ssh_key)
+        sh "ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa"
+      end
+      file = File.open(ssh_key)
+      pub_key = file.readline
+      file.close
+
+      authorized_keys = File.expand_path("~/.ssh/authorized_keys")
+      begin
+        File.open(authorized_keys, "a+") do |f|
+          File.chmod(0600, authorized_keys)
+          f.puts(pub_key)
+        end
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace.inspect
+      ensure
+        File.chmod(0400, authorized_keys)
+      end
+    end
+  end
+end

data/test_env/config/deploy.rb

@@ -6,6 +6,7 @@ require 'mina/bundler'
 require 'mina/rvm'
 require 'fileutils'
 
+
 FileUtils.mkdir_p "#{Dir.pwd}/deploy"
 
 set :ssh_options, '-o StrictHostKeyChecking=no'
@@ -19,15 +20,15 @@ set :sidekiq_processes, 2
 set :shared_paths, ['log']
 
 task :environment do
-  invoke :'rvm:use[ruby-2.0.0]'
+  invoke :'rvm:use[ruby-2.1.2]'
 end
 
-task :setup => :environment do
+task setup: :environment do
   queue! %[mkdir -p "#{deploy_to}/shared/pids/"]
   queue! %[mkdir -p "#{deploy_to}/shared/log/"]
 end
 
-task :deploy => :environment do
+task deploy: :environment do
   deploy do
     invoke :'git:clone'
     invoke :'deploy:link_shared_paths'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: mina-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Joerg Thalheim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
   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'
 description: Adds tasks to aid in the deployment of Sidekiq
@@ -31,8 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Gemfile.lock
@@ -43,6 +43,8 @@ files:
 - lib/mina_sidekiq/tasks.rb
 - lib/mina_sidekiq/version.rb
 - mina-sidekiq.gemspec
+- test/deploy_test.rb
+- test/test_helper.rb
 - test_env/config/deploy.rb
 homepage: http://github.com/Mic92/mina-sidekiq
 licenses:
@@ -51,7 +53,7 @@ metadata: {}
 post_install_message: |
   Starting with 0.2.0, you have to add:
 
-      require 'mina_sidekiq/tasks'
+      require "mina_sidekiq/tasks"
 
   in your deploy.rb to load the library
 rdoc_options: []
@@ -59,18 +61,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tasks to deploy Sidekiq with mina.
-test_files: []
+test_files:
+- test/deploy_test.rb
+- test/test_helper.rb
+has_rdoc: