bluepill 0.0.67 → 0.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6a6e9c8ca09b86c05408c467802998559911d1
-  data.tar.gz: 3a02ded7cad9e098e3add640a0da28310b794c0e
+  metadata.gz: 35f98731b6e37b345dc0abd6c97ef152004b7c1e
+  data.tar.gz: e2a074334d09655a98797944a70d582fd712b295
 SHA512:
-  metadata.gz: 828074cd01dbab698e803f9f73fdedfca8b808183f7a40d563b34ecde7541e63b6ebbbe73eb26d7b91b4d2f65a3f62afb0398e688f2d92df9ccf2add3e136541
-  data.tar.gz: 148bb1636929c5a7b4115c05a0c6296451e5d7db8a6a873fe3f602f9f761a0277942862d88f7dc0fcd849c06865f4d5b93f63fa6cf7996632a6b30e6452afbb2
+  metadata.gz: a6f3a92d2d04bb5ecc994882039cfdf56039315dbd0a869b7a2756a137367f7feaa62e7b396fcd03f5d1d5f78b3b033862da0338e60a33722287e0fa19296fc8
+  data.tar.gz: a9642dd51a9fa311b03e2b8b175e18e2a792c1d360886590330c6c36f8fa11b568e7662fe9929f429c1e7edc2602ab68ba0c418fde838f68a37529ccefda31c2

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
   - jruby-18mode
   - jruby-19mode
   - jruby-head

data/Gemfile

@@ -3,7 +3,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in bluepill.gemspec
 gemspec
 
-gem 'activesupport', '~> 3.0', :platforms => [:ruby_18, :jruby]
+if RUBY_PLATFORM =~ /jruby|java/ || RUBY_VERSION =~ /1.8|1.9.2/
+  gem 'activesupport', '~> 3.0'
+else
+  gem 'activesupport', '~> 4.1'
+end
+
 gem 'rake'
 
 group :doc do
@@ -14,9 +19,9 @@ group :doc do
 end
 
 group :test do
+  gem 'coveralls', :require => false, :platforms => [:mri_19, :mri_20, :mri_21]
   gem 'faker', '>= 1.2'
-  gem 'rspec', '>= 2.14'
+  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
+  gem 'rspec', '>= 3'
   gem 'simplecov', '>= 0.4', :platforms => :ruby_19
 end
-
-gem 'coveralls', :require => false, :platforms => [:mri_19, :mri_20], :group => :development

data/bluepill.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.description = %q{Bluepill keeps your daemons up while taking up as little resources as possible. After all you probably want the resources of your server to be used by whatever daemons you are running rather than the thing that's supposed to make sure they are brought back up, should they die or misbehave.}
   s.license     = 'MIT'
 
-  s.add_dependency 'activesupport', ['>= 3', '< 4.1']
+  s.add_dependency 'activesupport', ['>= 3', '< 5']
   s.add_dependency 'blue-daemons', '~> 1.1.11'
   s.add_dependency 'i18n', '~> 0.5'
   s.add_dependency 'state_machine', '~> 1.1'

data/lib/bluepill/process_conditions/mem_usage.rb

@@ -17,7 +17,7 @@ module Bluepill
       end
 
       def check(value)
-        value.kilobytes < @below
+        value.kilobytes < @below rescue true
       end
 
       def format_value(value)

data/lib/bluepill/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module Bluepill
-  VERSION = "0.0.67"
+  VERSION = "0.0.68"
 end

data/spec/lib/bluepill/application_spec.rb

@@ -2,29 +2,49 @@ describe Bluepill::Application do
   describe "#initialize" do
     let(:options){ {} }
     subject {described_class.new('test', options)}
-    before(:each) {described_class.any_instance.should_receive(:setup_pids_dir)}
+    before(:each) {expect_any_instance_of(described_class).to receive(:setup_pids_dir)}
 
     context "when euid is not root" do
-      before(:each) {::Process.stub(:euid).and_return(1)}
-      its(:base_dir){ should eq(File.join(ENV['HOME'], '.bluepill')) }
+      before(:each) {allow(::Process).to receive(:euid).and_return(1)}
+
+      describe '#base_dir' do
+        subject { super().base_dir }
+        it{ should eq(File.join(ENV['HOME'], '.bluepill')) }
+      end
     end
     context "when euid is root" do
-      before(:each) {::Process.stub(:euid).and_return(0)}
-      its(:base_dir) { should eq('/var/run/bluepill') }
+      before(:each) {allow(::Process).to receive(:euid).and_return(0)}
+
+      describe '#base_dir' do
+        subject { super().base_dir }
+        it { should eq('/var/run/bluepill') }
+      end
     end
 
     context "when option base_dir is specified" do
       let(:options) { {:base_dir=>'/var/bluepill'} }
-      its(:base_dir) { should eq(options[:base_dir]) }
+
+      describe '#base_dir' do
+        subject { super().base_dir }
+        it { should eq(options[:base_dir]) }
+      end
     end
 
     context "when environment BLUEPILL_BASE_DIR is specified" do
       before(:each) {ENV['BLUEPILL_BASE_DIR'] = '/bluepill'}
-      its(:base_dir) { should eq(ENV['BLUEPILL_BASE_DIR']) }
+
+      describe '#base_dir' do
+        subject { super().base_dir }
+        it { should eq(ENV['BLUEPILL_BASE_DIR']) }
+      end
 
       context "and option base_dir is specified" do
         let(:options) { {:base_dir=>'/var/bluepill'} }
-        its(:base_dir) { should eq(options[:base_dir]) }
+
+        describe '#base_dir' do
+          subject { super().base_dir }
+          it { should eq(options[:base_dir]) }
+        end
       end
     end
   end

data/spec/lib/bluepill/process_spec.rb

@@ -15,35 +15,70 @@ describe Bluepill::Process do
         :daemonize, :pid_file, :working_dir, :uid, :gid, :child_process_factory,
         :pid_command, :auto_start, :supplementary_groups, :stop_signals
       ].each do |attr|
-        its(attr) { should be_nil }
+        describe attr do
+          subject { super().send(attr) }
+          it { should be_nil }
+        end
+      end
+
+      describe '#monitor_children' do
+        subject { super().monitor_children }
+        it { should be false }
+      end
+
+      describe '#cache_actual_pid' do
+        subject { super().cache_actual_pid }
+        it { should be true }
+      end
+
+      describe '#start_grace_time' do
+        subject { super().start_grace_time }
+        it { should eq 3 }
+      end
+
+      describe '#stop_grace_time' do
+        subject { super().stop_grace_time }
+        it { should eq 3 }
+      end
+
+      describe '#restart_grace_time' do
+        subject { super().restart_grace_time }
+        it { should eq 3 }
+      end
+
+      describe '#on_start_timeout' do
+        subject { super().on_start_timeout }
+        it { should eq "start" }
+      end
+
+      describe '#environment' do
+        subject { super().environment }
+        it { should eq Hash[] }
       end
-      its(:monitor_children) { should be_false }
-      its(:cache_actual_pid) { should be_true }
-      its(:start_grace_time) { should eq 3 }
-      its(:stop_grace_time) { should eq 3 }
-      its(:restart_grace_time) { should eq 3 }
-      its(:on_start_timeout) { should eq "start" }
-      its(:environment) { should eq Hash[] }
     end
 
     context "overrides" do
       subject { Bluepill::Process.new(:proc_name, [], :start_grace_time => 17) }
-      its(:start_grace_time) { should eq 17 }
+
+      describe '#start_grace_time' do
+        subject { super().start_grace_time }
+        it { should eq 17 }
+      end
     end
   end
 
   describe "#start_process" do
     it "functions" do
-      subject.stub(:start_command) { "/etc/init.d/script start" }
-      subject.stub(:on_start_timeout) { "freakout" }
-      subject.logger.stub(:warning)
-      subject.stub(:daemonize?) { false }
+      allow(subject).to receive(:start_command) { "/etc/init.d/script start" }
+      allow(subject).to receive(:on_start_timeout) { "freakout" }
+      allow(subject.logger).to receive(:warning)
+      allow(subject).to receive(:daemonize?) { false }
 
-      subject.should_receive(:with_timeout).
+      expect(subject).to receive(:with_timeout).
         with(3, "freakout").
         and_yield
 
-      Bluepill::System.should_receive(:execute_blocking).
+      expect(Bluepill::System).to receive(:execute_blocking).
         with("/etc/init.d/script start", subject.system_command_options).
         and_return(:exit_code => 0)
 
@@ -52,13 +87,13 @@ describe Bluepill::Process do
 
     describe "#stop_process" do
       it "functions" do
-        subject.stub(:stop_command) { "/etc/init.d/script stop" }
-        subject.logger.stub(:warning)
-        subject.should_receive(:with_timeout).
+        allow(subject).to receive(:stop_command) { "/etc/init.d/script stop" }
+        allow(subject.logger).to receive(:warning)
+        expect(subject).to receive(:with_timeout).
           with(3, "stop").
           and_yield
 
-        Bluepill::System.should_receive(:execute_blocking).
+        expect(Bluepill::System).to receive(:execute_blocking).
           with("/etc/init.d/script stop", subject.system_command_options).
           and_return(:exit_code => 0)
 
@@ -68,13 +103,13 @@ describe Bluepill::Process do
 
     describe "#restart_process" do
       it "functions" do
-        subject.stub(:restart_command) { "/etc/init.d/script restart" }
-        subject.logger.stub(:warning)
-        subject.should_receive(:with_timeout).
+        allow(subject).to receive(:restart_command) { "/etc/init.d/script restart" }
+        allow(subject.logger).to receive(:warning)
+        expect(subject).to receive(:with_timeout).
           with(3, "restart").
           and_yield
 
-        Bluepill::System.should_receive(:execute_blocking).
+        expect(Bluepill::System).to receive(:execute_blocking).
           with("/etc/init.d/script restart", subject.system_command_options).
           and_return(:exit_code => 0)
 
@@ -87,12 +122,12 @@ describe Bluepill::Process do
     let(:block) { proc { nil } }
 
     before(:each) do
-      subject.logger.stub(:err)
-      Timeout.should_receive(:timeout).with(3.to_f, &block).and_raise(Timeout::Error)
+      allow(subject.logger).to receive(:err)
+      expect(Timeout).to receive(:timeout).with(3.to_f, &block).and_raise(Timeout::Error)
     end
 
     it "proceeds to next_state on timeout." do
-      subject.should_receive(:dispatch!).with("state_override")
+      expect(subject).to receive(:dispatch!).with("state_override")
       subject.with_timeout(3, "state_override", &block)
     end
   end

data/spec/lib/bluepill/process_statistics_spec.rb

@@ -6,19 +6,19 @@ describe Bluepill::ProcessStatistics do
   it "should record events" do
     @stats.record_event('some event', 'some reason')
     @stats.record_event('another event', 'another reason')
-    @stats.events.should have(2).events
+    expect(@stats.events.size).to eq(2)
   end
 
   it "should record #EVENTS_TO_PERSIST events" do
     (2 * Bluepill::ProcessStatistics::EVENTS_TO_PERSIST).times do
       @stats.record_event('some event', 'some reason')
     end
-    @stats.events.should have(Bluepill::ProcessStatistics::EVENTS_TO_PERSIST).events
+    expect(@stats.events.size).to eq(Bluepill::ProcessStatistics::EVENTS_TO_PERSIST)
   end
 
   it "should return event history" do
     @stats.record_event('some event', 'some reason')
-    @stats.to_s.should match(/some reason/)
-    @stats.to_s.should match(/event history/)
+    expect(@stats.to_s).to match(/some reason/)
+    expect(@stats.to_s).to match(/event history/)
   end
 end

data/spec/lib/bluepill/system_spec.rb

@@ -1,28 +1,28 @@
 describe Bluepill::System do
   describe :pid_alive? do
     it "should be true if process responds to zero signal" do
-      Process.should_receive(:kill).with(0, 555).and_return(0)
-      Bluepill::System.should be_pid_alive(555)
+      expect(Process).to receive(:kill).with(0, 555).and_return(0)
+      expect(Bluepill::System).to be_pid_alive(555)
     end
 
     it "should be false if process throws exception on zero signal" do
-      Process.should_receive(:kill).with(0, 555).and_raise(Errno::ESRCH)
-      Bluepill::System.should_not be_pid_alive(555)
+      expect(Process).to receive(:kill).with(0, 555).and_raise(Errno::ESRCH)
+      expect(Bluepill::System).not_to be_pid_alive(555)
     end
   end
 
   describe :store do
     it "should be Hash" do
-      Bluepill::System.store.should be_kind_of(Hash)
+      expect(Bluepill::System.store).to be_kind_of(Hash)
     end
 
     it "should return same Hash or every call" do
-      Bluepill::System.store.should be_equal(Bluepill::System.store)
+      expect(Bluepill::System.store).to be_equal(Bluepill::System.store)
     end
 
     it "should store assigned pairs" do
       Bluepill::System.store[:somekey] = 10
-      Bluepill::System.store[:somekey].should be_eql(10)
+      expect(Bluepill::System.store[:somekey]).to be_eql(10)
     end
   end
 
@@ -30,16 +30,16 @@ describe Bluepill::System do
     it 'should clear the #store' do
       Bluepill::System.store[:anotherkey] = Faker::Lorem.sentence
       Bluepill::System.reset_data
-      Bluepill::System.store.should be_empty
+      expect(Bluepill::System.store).to be_empty
     end
   end
 
   describe :parse_etime do
     it "should parse etime format" do
-      Bluepill::System.parse_elapsed_time("400-00:04:01").should be_equal(34560241)
-      Bluepill::System.parse_elapsed_time("02:04:02").should be_equal(7442)
-      Bluepill::System.parse_elapsed_time("20:03").should be_equal(1203)
-      Bluepill::System.parse_elapsed_time("invalid").should be_equal(0)
+      expect(Bluepill::System.parse_elapsed_time("400-00:04:01")).to be_equal(34560241)
+      expect(Bluepill::System.parse_elapsed_time("02:04:02")).to be_equal(7442)
+      expect(Bluepill::System.parse_elapsed_time("20:03")).to be_equal(1203)
+      expect(Bluepill::System.parse_elapsed_time("invalid")).to be_equal(0)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bluepill
 version: !ruby/object:Gem::Version
-  version: 0.0.67
+  version: 0.0.68
 platform: ruby
 authors:
 - Arya Asemanfar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -21,7 +21,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: blue-daemons
   requirement: !ruby/object:Gem::Requirement
@@ -188,3 +188,4 @@ test_files:
 - spec/lib/bluepill/process_statistics_spec.rb
 - spec/lib/bluepill/system_spec.rb
 - spec/spec_helper.rb
+has_rdoc: