akaer 2.1.2 → 2.2.0

data/lib/akaer/configuration.rb

@@ -46,11 +46,11 @@ module Akaer
       super(file, overrides, logger)
 
       # Make sure some arguments are of correct type
-      self.log_file = $stdout if self.log_file == "STDOUT"
-      self.log_file = $stderr if self.log_file == "STDERR"
-      self.addresses = self.addresses.ensure_array
-      self.aliases = self.aliases.to_integer
-      self.log_level = self.log_level.to_integer
+      self.log_file = $stdout if log_file == "STDOUT"
+      self.log_file = $stderr if log_file == "STDERR"
+      self.addresses = addresses.ensure_array
+      self.aliases = aliases.to_integer
+      self.log_level = log_level.to_integer
     end
   end
 end

data/lib/akaer/version.rb

@@ -13,10 +13,10 @@ module Akaer
     MAJOR = 2
 
     # The minor version.
-    MINOR = 1
+    MINOR = 2
 
     # The patch version.
-    PATCH = 2
+    PATCH = 0
 
     # The current version of akaer.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

data/spec/akaer/application_spec.rb

@@ -39,13 +39,13 @@ describe Akaer::Application do
     end
 
     it("should return the same instance") do
-      ::Akaer::Application.stub(:new) do Time.now end
+      ::Akaer::Application.stub(:new) { Time.now }
       instance = ::Akaer::Application.instance("start")
       expect(::Akaer::Application.instance("stop")).to be(instance)
     end
 
     it("should return a new instance if requested to") do
-      ::Akaer::Application.stub(:new) do Time.now end
+      ::Akaer::Application.stub(:new) { Time.now }
       instance = ::Akaer::Application.instance("")
       expect(::Akaer::Application.instance({"log-file" => "/dev/null"}, nil, true)).not_to be(instance)
     end
@@ -171,6 +171,15 @@ describe Akaer::Application do
     end
   end
 
+  describe "#is_osx?" do
+    it "should return the correct information" do
+      stub_const("RbConfig::CONFIG", {"host_os" => "darwin foo"})
+      expect(application.is_osx?).to be_true
+      stub_const("RbConfig::CONFIG", {"host_os" => "another"})
+      expect(application.is_osx?).to be_false
+    end
+  end
+
   describe "#manage" do
     it "should show a right message to the user" do
       application.logger.should_receive(:info).with(/.+.*03.*\/.*05.*.+ *Adding.* address .*10.0.0.3.* to interface .*lo0.*/)
@@ -265,37 +274,41 @@ describe Akaer::Application do
   end
 
   describe "#action_install" do
-    if ::RbConfig::CONFIG['host_os'] =~ /^darwin/ then
-      it "should create the agent" do
-        application.stub(:launch_agent_path).and_return(launch_agent_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-
-        application.action_install
-        expect(::File.exists?(application.launch_agent_path)).to be_true
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+    before(:each) do
+      application.stub(:is_osx?).and_return(true)
+      application.stub(:execute_command)
+    end
 
-      it "should not create and invalid agent" do
-        application.stub(:launch_agent_path).and_return("/invalid/agent")
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    it "should create the agent" do
+      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
-        application.logger.should_receive(:error).with("Cannot create the launch agent.")
-        application.action_install
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      application.action_install
+      expect(::File.exists?(application.launch_agent_path)).to be_true
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    end
+
+    it "should not create and invalid agent" do
+      application.stub(:launch_agent_path).and_return("/invalid/agent")
 
-      it "should not load an invalid agent" do
-        application.stub(:execute_command) do |command|
-          command =~ /^launchctl/ ? raise(StandardError) : system(command)
-        end
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
-        application.stub(:launch_agent_path).and_return(launch_agent_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+      application.logger.should_receive(:error).with("Cannot create the launch agent.")
+      application.action_install
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    end
 
-        application.logger.should_receive(:error).with("Cannot load the launch agent.")
-        application.action_install
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    it "should not load an invalid agent" do
+      application.stub(:execute_command) do |command|
+        command =~ /^launchctl/ ? raise(StandardError) : true
       end
+
+      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+
+      application.logger.should_receive(:error).with("Cannot load the launch agent.")
+      application.action_install
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
     end
 
     it "should raise an exception if not running on OSX" do
@@ -306,45 +319,48 @@ describe Akaer::Application do
   end
 
   describe "#action_uninstall" do
-    if ::RbConfig::CONFIG['host_os'] =~ /^darwin/ then
-      it "should remove the agent" do
-        application.stub(:launch_agent_path).and_return(launch_agent_path)
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-
-        Bovem::Logger.stub(:default_file).and_return($stdout)
-        application.action_install
-        application.action_uninstall
-        expect(::File.exists?(application.launch_agent_path)).to be_false
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+    before(:each) do
+      application.stub(:is_osx?).and_return(true)
+      application.stub(:execute_command)
+    end
 
-      it "should not load delete an invalid resolver" do
-        application.stub(:launch_agent_path).and_return("/invalid/agent")
+    it "should remove the agent" do
+      application.stub(:launch_agent_path).and_return(launch_agent_path)
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
 
-        application.action_install
-        application.logger.should_receive(:warn).at_least(1)
-        application.action_uninstall
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      Bovem::Logger.stub(:default_file).and_return($stdout)
+      application.action_install
+      application.action_uninstall
+      expect(::File.exists?(application.launch_agent_path)).to be_false
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    end
 
-      it "should not delete an invalid agent" do
-        application.stub(:launch_agent_path).and_return("/invalid/agent")
+    it "should not load delete an invalid resolver" do
+      application.stub(:launch_agent_path).and_return("/invalid/agent")
 
-        application.action_install
-        application.logger.should_receive(:warn).at_least(1)
-        application.action_uninstall
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      application.action_install
+      application.logger.should_receive(:warn).at_least(1)
+      application.action_uninstall
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    end
 
-      it "should not load delete invalid agent" do
-        application.stub(:launch_agent_path).and_return("/invalid/agent")
+    it "should not delete an invalid agent" do
+      application.stub(:launch_agent_path).and_return("/invalid/agent")
 
-        application.action_install
-        application.stub(:execute_command).and_raise(StandardError)
-        application.logger.should_receive(:warn).at_least(1)
-        application.action_uninstall
-        ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
-      end
+      application.action_install
+      application.logger.should_receive(:warn).at_least(1)
+      application.action_uninstall
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
+    end
+
+    it "should not load delete invalid agent" do
+      application.stub(:launch_agent_path).and_return("/invalid/agent")
+
+      application.action_install
+      application.stub(:execute_command).and_raise(StandardError)
+      application.logger.should_receive(:warn).at_least(1)
+      application.action_uninstall
+      ::File.unlink(application.launch_agent_path) if ::File.exists?(application.launch_agent_path)
     end
 
     it "should raise an exception if not running on OSX" do

data/spec/coverage_helper.rb

@@ -6,6 +6,9 @@
 
 require "pathname"
 require "simplecov"
+require "coveralls"
+
+Coveralls.wear!
 
 SimpleCov.start do
   root = Pathname.new(File.dirname(__FILE__)) + ".."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akaer
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mamertes
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1555315638351113188
+      hash: -3163015799533818897
 requirements: []
 rubyforge_project: akaer
 rubygems_version: 1.8.25