invoker 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWUzNjRlNGZlNTI4Njg4NjJmNmRiYWQ3NzdkZGRhMDM0MzFjMGYxMg==
+    MDQxOTg1ZTE4N2EwYTUyMzA5MDhjNWUyNjZiY2NlMTI5MGFlMDdlYw==
   data.tar.gz: !binary |-
-    N2NkYjJiMGM4YmZjZmM4MzQyYTM4YzgzODg5MWMxN2FiMWI3OTQ5MA==
+    MjNiOWYwM2UzZDkwNmQ3ZGU0NDcwMGY5YTRlYmJhZTY5ZWRmMWIwYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWRhNDI1YTNkMDczMDk0YzQ4MzM1NzczN2U1ZGQzNDdiZWRjY2Y4MDQyMGZk
-    NjUyY2M0ZDUzMzgzZmJhOWIxY2ZlYmNkNjY0ZTFkYTllMmE1OTQyNWU0OTIz
-    ZTA4YzNlNzUyYmViNWMyMzBiMDc3NzFjZDY4ODE4ZTE2NjBlZGU=
+    YzQxY2VhODQxNzIwN2VlNmI1MmQzN2EzMDEwMWM3MmUyM2MwMDYwYzE1MzFj
+    OWIwMTViN2RkZDgyZmI3YWYwNjA0MDczZWU1MDcxMTUzM2NmZDZhNGIzOTEy
+    NDMyMWQzNjhkYzZlNzA3ODAwMmIzMTQ2MWZmNTI4MWQ2NGZlMjg=
   data.tar.gz: !binary |-
-    YzgzYzQ4Zjk4ZGMzZTY4ZDFjOGI5N2MxMWMyMGYwMWMwOGZlZWMwZjYxNDAy
-    OWI1MzQ2ZGZkMmQ0ZGFjNzk2Zjc4YWM3ZDhkYTQ3YzY0NGMyYzgwMTM0Mzky
-    ZTJmNTQwZWEyNjM5ZWU0YzU1NjMyYzEwZTI1MjhmYmZjN2Q1NzY=
+    MWE3Njc4Y2FkZTdhYTg4OGU4YzcyMmRkZjAwMGU1MjJhNWQxYTdiYmNiMDQw
+    ODFkNGVkZWYzMDcwZjViNzM2YjQyZmVkOTc0ZTczNDQzNDFhNDMyNDgyZmZk
+    ZDVkZGEwMDkxNmFiYjc2ZWVkNzM1ZWIzMTQ2MGRlYzA3ZjE3NzM=

data/lib/invoker/parsers/option_parser.rb

@@ -32,6 +32,13 @@ module Invoker
             end
           end
 
+          command 'uninstall' do
+            banner "Usage : invoker uninstall \n Removes firewall rules created by setup"
+            run do |cmd_opts, cmd_args|
+              selected_command = OpenStruct.new(:command => 'uninstall')
+            end
+          end
+
           command 'list' do
             banner "Usage : invoker list\n List processes managed by invoker"
             run do |cmd_opts, cmd_args|

data/lib/invoker/power/config.rb

@@ -17,6 +17,12 @@ module Invoker
         config.save
       end
 
+      def self.delete
+        if File.exists?(CONFIG_LOCATION)
+          File.delete(CONFIG_LOCATION)
+        end
+      end
+
       def initialize(options = {})
         @config = options
       end

data/lib/invoker/power/setup.rb

@@ -7,11 +7,21 @@ module Invoker
       FIREWALL_PLIST_FILE = "/Library/LaunchDaemons/com.codemancers.invoker.firewall.plist"
       def self.install
         installer = new
-        unless installer.check_if_already_setup?
-          installer.setup_invoker
+        if Invoker.darwin?
+          if installer.check_if_setup_can_run?
+            installer.setup_invoker
+          else
+            Invoker::Logger.puts("The setup has been already run.".color(:red))
+          end
         else
-          Invoker::Logger.puts("The setup has been already run.".color(:red))
+          Invoker::Logger.puts("Domain feature is currently not supported on systems other than OSX".color(:red))
         end
+        installer
+      end
+
+      def self.uninstall
+        installer = new
+        installer.uninstall_invoker
       end
 
       def setup_invoker
@@ -29,6 +39,18 @@ module Invoker
         self
       end
 
+      def uninstall_invoker
+        uninstall_invoker_flag = agree("Are you sure you want to uninstall firewall rules created by setup (y/n) : ")
+
+        if uninstall_invoker_flag
+          remove_resolver_file
+          unload_firewall_rule(true)
+          flush_dns_rules
+          Invoker::Power::Config.delete
+          Invoker::Logger.puts("Firewall rules were removed")
+        end
+      end
+
       def drop_to_normal_user
         EventMachine.set_effective_user(ENV["SUDO_USER"])
       end
@@ -61,18 +83,36 @@ module Invoker
         raise
       end
 
-      def check_if_already_setup?
-        File.exists?(Invoker::Power::Config::CONFIG_LOCATION)
+      def remove_resolver_file
+        if File.exists?(RESOLVER_FILE)
+          File.delete(RESOLVER_FILE)
+        end
+      rescue Errno::EACCES
+        Invoker::Logger.puts("Running uninstall requires root access, please rerun it with sudo".color(:red))
+        raise
+      end
+
+      def check_if_setup_can_run?
+        !File.exists?(Invoker::Power::Config::CONFIG_LOCATION)
       end
 
       def install_firewall(balancer_port)
         File.open(FIREWALL_PLIST_FILE, "w") { |fl|
           fl.write(plist_string(balancer_port))
         }
-        system("launchctl unload -w #{FIREWALL_PLIST_FILE} 2>/dev/null")
+        unload_firewall_rule
+        load_firewall_rule
+      end
+
+      def load_firewall_rule
         system("launchctl load -Fw #{FIREWALL_PLIST_FILE} 2>/dev/null")
       end
 
+      def unload_firewall_rule(remove = false)
+        system("launchctl unload -w #{FIREWALL_PLIST_FILE} 2>/dev/null")
+        system("rm -rf #{FIREWALL_PLIST_FILE}") if remove
+      end
+
       # Ripped from POW code
       def plist_string(balancer_port)
         plist =<<-EOD

data/lib/invoker/runner.rb

@@ -16,6 +16,8 @@ module Invoker
       case selected_command.command
       when 'setup'
         setup_pow(selected_command)
+      when 'uninstall'
+        uninstall_pow(selected_command)
       when 'start'
         start_server(selected_command)
       when 'add'
@@ -35,6 +37,10 @@ module Invoker
       Invoker::Power::Setup.install()
     end
 
+    def self.uninstall_pow(selected_command)
+      Invoker::Power::Setup.uninstall()
+    end
+
     def self.start_server(selected_command)
       config = Invoker::Parsers::Config.new(selected_command.file, selected_command.port)
       Invoker.const_set(:CONFIG, config)

data/lib/invoker/version.rb

@@ -1,3 +1,3 @@
 module Invoker
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/readme.md

@@ -11,92 +11,9 @@ First we need to install `invoker` gem to get command line utility called `invok
 
 Currently it only works with Ruby 1.9.3 and 2.0.
 
-You need to start by creating a `ini` file which will define processes you want to manage using invoker. An example
-`ini` file is included in the repo.
-
-    [rails]
-    directory = /home/gnufied/god_particle
-    command = zsh -c 'bundle exec rails s -p 5000'
-
-    [dj]
-    directory = /home/gnufied/god_particle
-    command = zsh -c 'bundle exec ruby script/delayed_job'
-
-    [events]
-    directory = /home/gnufied/god_particle
-    command = zsh -c 'bundle exec ruby script/event_server'
-
-## Invoker as Pow alternative
-
-Invoker now supports pow like `.dev` subdomain. It will automatically
-make all your app servers defined on subdomain `label.dev`.
-
-To make it work though, you need to run following command, just once from anywhere:
-
-    ~> sudo invoker setup
-
-Now because invoker is making your app server available on a subdomain. It requires
-control over port on which your applications will be listening. This can be simply
-done by replacing specific port number in `ini` file with `$PORT`. For example:
-
-    [spree]
-    directory = /home/gnufied/spree
-    command = zsh -c 'bundle exec rails s -p $PORT'
-
-    [api]
-    directory = /home/gnufied/api
-    command = zsh -c 'bundle exec rails s -p $PORT'
-
-    [events]
-    directory = /home/gnufied/god_particle
-    command = zsh -c 'bundle exec ruby script/event_server'
-
-The subdomain feature won't work for apps which don't use `$PORT` placeholder.
-
-## Running Invoker
-
-After that you can start process manager via:
-
-    ~> invoker start invoker.ini
-
-Above command will start all your processes in one terminal with their stdout/stderr merged and labelled.
-
-Now additionally you can control individual process by,
-
-    # Will try to stop running delayed job by sending SIGINT to the process
-    ~> invoker remove dj
-
-    # If Process can't be killed by SIGINT send a custom signal
-    ~> invoker remove dj -s 9
-
-    # add and start running
-    ~> invoker add dj
-
-    # List currently running processes managed by invoker
-    ~> invoker list
-
-    # Restart process given by command Label
-    ~> invoker reload dj
-
-    # Restart process given by command label using specific signal for killing
-    ~> invoker reload dj -s 9
-
-You can also enable OSX notifications for crashed processes by installing `terminal-notifier` gem. It is not a dependency, but can be useful if something crashed and you weren't paying attention.
-
-## Using with rbenv or rvm ##
-
-The way `rbenv` and `rvm` work sometimes creates problems when you are trying to use a process supervisor like `invoker`. There are couple of things to keep in mind,
-If you are running `invoker` with Ruby version x, but your application requires Ruby version Y:
-
-* When using `rbenv`, you can define the command with environment variable `RBENV_VERSION=Y` and then start your application. In other words:
-
-        command = RBENV_VERSION=2.0.0-p0 zsh -c "bundle exec rails s"
-
-* Unless version of Ruby using which you are running `invoker` command and version of Ruby you are using in the application is same, you almost always will want to use
-`zsh -c` or `bash -c`. `RVM` in particular requires a login shell and hence sometimes you may have to use `bash -lc`. For example:
-
-        command = bash -lc "rvm 2.0.0-p0 do bundle exec rails s"
+## Manual ##
 
+Information about configuring and using Invoker can be found on -  [Invoker Website](http://invoker.codemancers.com)
 
 ## Bug reports and Feature requests
 

data/spec/invoker/power/setup_spec.rb

@@ -2,6 +2,8 @@ require "spec_helper"
 
 describe "Setup" do
   before {
+    @original_verbosity = $VERBOSE
+    $VERBOSE = nil
     @old_config = Invoker::Power::Config::CONFIG_LOCATION
     Invoker::Power::Config.const_set(:CONFIG_LOCATION, "/tmp/.invoker")
 
@@ -24,6 +26,7 @@ describe "Setup" do
     File.exists?(Invoker::Power::Setup::RESOLVER_FILE) &&
       File.delete(Invoker::Power::Setup::RESOLVER_FILE)
     Invoker::Power::Setup.const_set(:RESOLVER_FILE, @old_resolver)
+    $VERBOSE = @original_verbosity
   }
 
   describe "When no setup exists" do
@@ -42,6 +45,14 @@ describe "Setup" do
     end
   end
 
+  describe "setup on non osx systems" do
+    it "should not run setup" do
+      Invoker.expects(:ruby_platform).returns("i686-linux")
+      Invoker::Power::Setup.any_instance.expects(:check_if_setup_can_run?).never()
+      Invoker::Power::Setup.install
+    end
+  end
+
   describe "when a setup file exists" do
     it "should throw error about existing file" do
       File.open(Invoker::Power::Config::CONFIG_LOCATION, "w") {|fl|
@@ -84,4 +95,18 @@ describe "Setup" do
       end
     end
   end
+
+  describe "uninstalling firewall rules" do
+    it "should uninstall firewall rules and remove all files created by setup" do
+      setup = Invoker::Power::Setup.new
+
+      HighLine.any_instance.expects(:agree).returns(true)
+      setup.expects(:remove_resolver_file).once
+      setup.expects(:unload_firewall_rule).with(true).once
+      setup.expects(:flush_dns_rules).once
+      Invoker::Power::Config.expects(:delete).once
+
+      setup.uninstall_invoker
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invoker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Hemant Kumar